ports/122732: [Maintainer] x11-toolkits/fltk2: update to r6090

[Thomas-Martin Seck]

>Number:         122732
>Category:       ports
>Synopsis:       [Maintainer] x11-toolkits/fltk2: update to r6090
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 13 17:40:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of April 13, 2008.

	
>Description:
- Update to snapshot r6090, released 2008-04-11
- Add a new option FLTK_XINERAMA (on by default) to control the
  (newly added) dependency on libXinerama
- Remove unnecessary quoting in make macro assignments
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: Makefile
===================================================================
--- Makefile	(.../x11-toolkits/fltk2)	(revision 1352)
+++ Makefile	(.../local/fltk2)	(revision 1352)
@@ -7,7 +7,6 @@
 
 PORTNAME=	fltk
 PORTVERSION=	2.0.${SNAPSHOT}
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_EASYSW}
 MASTER_SITE_SUBDIR=	fltk/snapshots
@@ -30,11 +29,12 @@
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 
-SNAPSHOT=	r6066
+SNAPSHOT=	r6090
 
 OPTIONS=	FLTK_THREADS "Install with threads support" on \
 		FLTK_CAIRO "Use cairo as graphics backend" off \
-		FLTK_EXAMPLES "Build and install example programs" on
+		FLTK_EXAMPLES "Build and install example programs" on \
+		FLTK_XINERAMA "Enable Xinerama support" on
 
 EXAMPLESDIR=	${PREFIX}/share/examples/fltk2
 LATEST_LINK=	fltk2
@@ -44,8 +44,8 @@
 USE_GL=		yes
 GNU_CONFIGURE=	yes
 
-CPPFLAGS+=	"-I${LOCALBASE}/include"
-LDFLAGS+=	"-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--enable-jpeg --enable-png --enable-gl --enable-xft \
 			--enable-zlib
@@ -63,8 +63,8 @@
 
 .if defined(WITH_FLTK_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
-CPPFLAGS+=	"${PTHREAD_CFLAGS}"
-LDFLAGS+=	"${PTHREAD_LIBS}"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--disable-threads
 .endif
@@ -95,6 +95,13 @@
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile
 .endif
 
+.if defined(WITH_FLTK_XINERAMA)
+USE_XORG+=	xinerama
+CONFIGURE_ARGS+=	--enable-xinerama
+.else
+CONFIGURE_ARGS+=	--disable-xinerama
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's:%%CXX%%:${CXX}:g' \
 	    ${WRKSRC}/fltk2-config.in \
Index: distinfo
===================================================================
--- distinfo	(.../x11-toolkits/fltk2)	(revision 1352)
+++ distinfo	(.../local/fltk2)	(revision 1352)
@@ -1,3 +1,3 @@
-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
+MD5 (fltk-2.0.x-r6090.tar.bz2) = 4f6f95e0d27e42ee46538d5fffafc822
+SHA256 (fltk-2.0.x-r6090.tar.bz2) = da5e99930700409ff5bedd84da7d6e878706f8f71ae15200cf53bb1331799fcc
+SIZE (fltk-2.0.x-r6090.tar.bz2) = 2592769
	


>Release-Note:
>Audit-Trail:
>Unformatted: