From 0baa1edf3318c1a9be0ea0ce43a2590c7b2ab3fb Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Mon, 24 Mar 2003 11:57:41 +0000 Subject: [PATCH] Update to 1.0.5 and fix conditions for fltk dependency. --- graphics/OpenEXR/Makefile | 12 ++++-------- graphics/OpenEXR/distinfo | 2 +- graphics/OpenEXR/files/patch-OpenEXR.pc.in | 10 ---------- graphics/OpenEXR/files/patch-exrdisplay::Makefile.in | 11 +++++++++++ graphics/OpenEXR/pkg-plist | 1 + 5 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 graphics/OpenEXR/files/patch-OpenEXR.pc.in create mode 100644 graphics/OpenEXR/files/patch-exrdisplay::Makefile.in diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile index 43f21ebfccc6..8b089188fd7a 100644 --- a/graphics/OpenEXR/Makefile +++ b/graphics/OpenEXR/Makefile @@ -6,8 +6,8 @@ # PORTNAME= OpenEXR -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.0.5 +#PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= http://savannah.nongnu.org/download/openexr/${PORTNAME}.pkg/${PORTVERSION}/ @@ -35,7 +35,7 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk-xunicode LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk .endif USE_MESA= YES -CONFIGURE_ARGS+=--with-fltk-prefix=${X11BASE} +CONFIGURE_ARGS+=--with-fltk-config=${X11BASE}/bin/fltk-config CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LDFLAGS} PLIST_SUB+= WITH_FLTK= @@ -46,12 +46,8 @@ pre-everything:: @${ECHO_CMD} =================================================== .endif .else -CONFIGURE_ARGS+=--with-fltk-prefix=DUMMY +CONFIGURE_ARGS+=--with-fltk-config=/usr/bin/false --without-x PLIST_SUB+= WITH_FLTK="@comment " .endif -.ifdef WITHOUT_X11 -CONFIGURE_ARGS+=--without-x -.endif - .include diff --git a/graphics/OpenEXR/distinfo b/graphics/OpenEXR/distinfo index 759deb99e26b..463ca800bcf6 100644 --- a/graphics/OpenEXR/distinfo +++ b/graphics/OpenEXR/distinfo @@ -1 +1 @@ -MD5 (OpenEXR-1.0.4.tar.gz) = b480452f132dea4747293cf2bd5eccda +MD5 (OpenEXR-1.0.5.tar.gz) = 243fe06d253969bc8a7a65619113071a diff --git a/graphics/OpenEXR/files/patch-OpenEXR.pc.in b/graphics/OpenEXR/files/patch-OpenEXR.pc.in deleted file mode 100644 index ec5112981097..000000000000 --- a/graphics/OpenEXR/files/patch-OpenEXR.pc.in +++ /dev/null @@ -1,10 +0,0 @@ ---- OpenEXR.pc.in.orig Tue Jan 21 15:32:59 2003 -+++ OpenEXR.pc.in Sun Jan 26 17:22:48 2003 -@@ -8,5 +8,5 @@ - Description: OpenEXR image library - Version: @OPENEXR_VERSION@ - Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz --Cflags: -I${OpenEXR_includedir --Cxxflags: -I${OpenEXR_includedir} -+Cflags: -I${OpenEXR_includedir} -+#Cxxflags: -I${OpenEXR_includedir} diff --git a/graphics/OpenEXR/files/patch-exrdisplay::Makefile.in b/graphics/OpenEXR/files/patch-exrdisplay::Makefile.in new file mode 100644 index 000000000000..2eb3685ee600 --- /dev/null +++ b/graphics/OpenEXR/files/patch-exrdisplay::Makefile.in @@ -0,0 +1,11 @@ +--- exrdisplay/Makefile.in.orig Sun Mar 23 20:08:11 2003 ++++ exrdisplay/Makefile.in Mon Mar 24 20:17:50 2003 +@@ -392,7 +392,7 @@ + uninstall-binPROGRAMS uninstall-info-am + + +-@HAVE_FLTK_TRUE@install-exec-hook: ++install-exec-hook: + @HAVE_FLTK_TRUE@ @FLTK_CONFIG@ --post $(DESTDIR)$(bindir)/exrdisplay + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/graphics/OpenEXR/pkg-plist b/graphics/OpenEXR/pkg-plist index a6996772594d..022e4f0ddfd9 100644 --- a/graphics/OpenEXR/pkg-plist +++ b/graphics/OpenEXR/pkg-plist @@ -41,6 +41,7 @@ include/OpenEXR/ImathMath.h include/OpenEXR/ImathMatrix.h include/OpenEXR/ImathMatrixAlgo.h include/OpenEXR/ImathPlane.h +include/OpenEXR/ImathPlatform.h include/OpenEXR/ImathQuat.h include/OpenEXR/ImathRandom.h include/OpenEXR/ImathRoots.h