Date: Sun, 23 Jul 2006 12:04:45 +0200 (CEST) From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/100744: [Maintainer] x11-toolkits/fltk2: update to r5256 Message-ID: <200607231004.k6NA4jKg077989@hardy.tmseck.homedns.org> Resent-Message-ID: <200607231010.k6NAAKSu079987@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 100744
>Category: ports
>Synopsis: [Maintainer] x11-toolkits/fltk2: update to r5256
>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 Jul 23 10:10:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 6.1-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of July 23, 2006.
>Description:
- Update to snapshot r5256.
- Add a new option WITH_/WITHOUT_FLTK_CAIRO to enable cairo support
(default: off)
Added files:
files/extra-patch-test-Makefile
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../x11-toolkits/fltk2) (revision 968)
+++ Makefile (.../local/fltk2) (revision 968)
@@ -26,9 +26,10 @@
jpeg.9:${PORTSDIR}/graphics/jpeg \
Xft.2:${PORTSDIR}/x11-fonts/libXft
-SNAPSHOT= r5170
+SNAPSHOT= r5256
-OPTIONS= FLTK_THREADS "Install with threads support" on
+OPTIONS= FLTK_THREADS "Install with threads support" on \
+ FLTK_CAIRO "Use cairo as graphics backend" off
LATEST_LINK= fltk2
@@ -63,6 +64,17 @@
CONFIGURE_ARGS+= --disable-threads
.endif
+.if defined(WITH_FLTK_CAIRO)
+CONFIGURE_ARGS+= --enable-cairo
+LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
+# XXX:
+# FLTK2's configure check currently depends on pkg-config being available...
+BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+.else
+CONFIGURE_ARGS+= --disable-cairo
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-test-Makefile
+.endif
+
post-patch:
${REINPLACE_CMD} -e 's:%%CXX%%:${CXX}:g' \
${WRKSRC}/fltk2-config.in \
@@ -72,6 +84,7 @@
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/documentation && ${INSTALL_DATA} *.html *.gif ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README_fltk1_to_fltk2.txt ${DOCSDIR}
.endif
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo (.../x11-toolkits/fltk2) (revision 968)
+++ distinfo (.../local/fltk2) (revision 968)
@@ -1,3 +1,3 @@
-MD5 (fltk-2.0.x-r5170.tar.bz2) = 66fcc9c28806dae198a80f32b2368bc5
-SHA256 (fltk-2.0.x-r5170.tar.bz2) = 39db34ed0d70f1c08b0334fa436b769057b54d15d70534be8b8643e9a86fc420
-SIZE (fltk-2.0.x-r5170.tar.bz2) = 2533439
+MD5 (fltk-2.0.x-r5256.tar.bz2) = 2a96a9b46e8108d75f03a92dad294599
+SHA256 (fltk-2.0.x-r5256.tar.bz2) = 80c761f781c88a1642abb614eda3c254cf538da279508b9d87be3394b6461b00
+SIZE (fltk-2.0.x-r5256.tar.bz2) = 2586246
Index: files/patch-test-Makefile
===================================================================
--- files/patch-test-Makefile (.../x11-toolkits/fltk2) (revision 968)
+++ files/patch-test-Makefile (.../local/fltk2) (revision 968)
@@ -4,17 +4,9 @@
do so.
The issue is known and probably a fluid2 bug, see FLTK2 STR #1302.
---- test/Makefile.orig Fri May 12 22:16:29 2006
-+++ test/Makefile Mon Jun 5 14:44:17 2006
-@@ -142,7 +142,6 @@
- image$(EXEEXT) \
- inactive$(EXEEXT) \
- input$(EXEEXT) \
-- keyboard$(EXEEXT) \
- label$(EXEEXT) \
- line_style$(EXEEXT) \
- list_visuals$(EXEEXT) \
-@@ -155,7 +154,6 @@
+--- test/Makefile.orig Fri Jul 7 19:38:14 2006
++++ test/Makefile Fri Jul 7 19:38:14 2006
+@@ -156,7 +156,6 @@
pack$(EXEEXT) \
pixmap$(EXEEXT) \
progress$(EXEEXT) \
@@ -22,7 +14,7 @@
qubix$(EXEEXT) \
resizable$(EXEEXT) \
resizealign$(EXEEXT) \
-@@ -169,7 +167,6 @@
+@@ -170,7 +169,6 @@
timer$(EXEEXT) \
utf$(EXEEXT) \
fullscreen$(EXEEXT) \
Index: files/extra-patch-test-Makefile
===================================================================
--- files/extra-patch-test-Makefile (.../x11-toolkits/fltk2) (revision 0)
+++ files/extra-patch-test-Makefile (.../local/fltk2) (revision 968)
@@ -0,0 +1,10 @@
+--- test/Makefile.orig Fri Jul 7 19:25:42 2006
++++ test/Makefile Fri Jul 7 19:26:04 2006
+@@ -119,7 +119,6 @@
+ bitmap$(EXEEXT) \
+ boxtype$(EXEEXT) \
+ browser$(EXEEXT) \
+- cairo$(EXEEXT) \
+ checkers$(EXEEXT) \
+ clock$(EXEEXT) \
+ button$(EXEEXT) \
Index: pkg-plist
===================================================================
--- pkg-plist (.../x11-toolkits/fltk2) (revision 968)
+++ pkg-plist (.../local/fltk2) (revision 968)
@@ -137,6 +137,7 @@
include/fltk/Style.h
include/fltk/StyleSet.h
include/fltk/Symbol.h
+include/fltk/SystemMenuBar.h
include/fltk/TabGroup.h
include/fltk/TextBuffer.h
include/fltk/TextDisplay.h
@@ -164,15 +165,16 @@
include/fltk/events.h
include/fltk/file_chooser.h
include/fltk/filename.h
+include/fltk/fltk_cairo.h
include/fltk/forms.h
include/fltk/gl.h
include/fltk/gl2opengl.h
include/fltk/glut.h
include/fltk/layout.h
include/fltk/load_plugin.h
-include/fltk/mac.h
include/fltk/mac.r
include/fltk/math.h
+include/fltk/osx.h
include/fltk/pnmImage.h
include/fltk/rgbImage.h
include/fltk/run.h
@@ -183,6 +185,7 @@
include/fltk/visual.h
include/fltk/win32.h
include/fltk/x.h
+include/fltk/x11.h
include/fltk/xbmImage.h
include/fltk/xpmImage.h
@dirrm include/fltk
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607231004.k6NA4jKg077989>