- Update to r6066

- Fix a bashism in FLTK's configure script
- Add x11/xprop as a build dependency and discuss the rationale for this a bit
  in a comment

PR:		121764
Submitted by:	Thomas-Martin Seck <tmseck@web.de> (maintainer)

x11-toolkits/fltk2/Makefile

@@ -15,11 +15,21 @@ DISTNAME=	fltk-2.0.x-${SNAPSHOT}
 MAINTAINER=	tmseck@web.de
 COMMENT=	Fast Light Toolkit version 2 (development snapshot)
 
+# XXX:
+# FLTK2's configure script tries to find out whether the running X server
+# supports overlay visuals; this is a bit difficult to find out if you
+# are building in an environment where it cannot connect to an X server...
+# If one wants to force a certain setting one needs to set ac_cv_have_overlay
+# to "yes" or "no" in the configure environment. Since I am not sure whether
+# this is desirable, leave this as is for now.
+# If xprop cannot connect to an X server of if xprop cannot be found, X overlay
+# support will be disabled without breaking the build.
+BUILD_DEPENDS=	xprop:${PORTSDIR}/x11/xprop
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 
-SNAPSHOT=	r6025
+SNAPSHOT=	r6066
 
 OPTIONS=	FLTK_THREADS "Install with threads support" on \
 		FLTK_CAIRO "Use cairo as graphics backend" off \

x11-toolkits/fltk2/distinfo

@@ -1,3 +1,3 @@
-MD5 (fltk-2.0.x-r6025.tar.bz2) = ff0e4d7a173fe836ea811ebe5399947c
-SHA256 (fltk-2.0.x-r6025.tar.bz2) = 5693c26d041a313a6b05f3ee1bee8974e14b07e9283a06ece48bc2ea9f5b974c
-SIZE (fltk-2.0.x-r6025.tar.bz2) = 2582866
+MD5 (fltk-2.0.x-r6066.tar.bz2) = f3cc7788e64140d236c9678e67886dd8
+SHA256 (fltk-2.0.x-r6066.tar.bz2) = 769e5cd03ca90683412f714a8142caecadb896d2d6b4476f924d3d1acd144541
+SIZE (fltk-2.0.x-r6066.tar.bz2) = 2592321

x11-toolkits/fltk2/files/patch-configure

@@ -1,6 +1,6 @@
---- configure.orig	Fri Jun  2 06:01:04 2006
-+++ configure	Mon Jun  5 14:44:17 2006
-@@ -1328,7 +1328,7 @@
+--- configure.orig	2008-03-14 16:01:49.000000000 +0100
++++ configure	2008-03-16 16:28:03.000000000 +0100
+@@ -1762,7 +1762,7 @@
  FL_MINOR_VERSION=0
  FL_PATCH_VERSION=0
  FL_RELEASE_VERSION=a0
@@ -9,3 +9,12 @@
  
  
  
+@@ -11085,7 +11085,7 @@
+   enableval=$enable_xshm;
+ fi
+ 
+-	if test x$enable_xshm == xyes; then
++	if test "x$enable_xshm" = xyes; then
+ 	  { echo "$as_me:$LINENO: checking for X11/extensions/XShm.h" >&5
+ echo $ECHO_N "checking for X11/extensions/XShm.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XShm_h+set}" = set; then