summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorikatsu Shigemura <nork@FreeBSD.org>2003-01-27 16:48:17 +0000
committerNorikatsu Shigemura <nork@FreeBSD.org>2003-01-27 16:48:17 +0000
commit9222584b287afb448dbd5c5759b6928862155886 (patch)
tree485ad650a112add18cd86e42966dbe471d2dcd6d /graphics
parentUpdate to 2003.01.22 (diff)
make more clean Makefile and CFLAGS.
Bump PORTREVISION for *_DEPENDS. PR: ports/47378 Submitted by: Miguel Mendez <flynn@energyhq.homeip.net> Submitted by: Simon 'corecode' Schubert <corecode@corecode.ath.cx>
Notes
Notes: svn path=/head/; revision=74096
Diffstat (limited to 'graphics')
-rw-r--r--graphics/OpenEXR/Makefile22
-rw-r--r--graphics/OpenEXR/files/patch-configure10
2 files changed, 20 insertions, 12 deletions
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index cbb036976aa4..59a36166a04c 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -7,6 +7,7 @@
PORTNAME= OpenEXR
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= http://savannah.nongnu.org/download/openexr/${PORTNAME}.pkg/${PORTVERSION}/
@@ -15,35 +16,34 @@ MAINTAINER= nork@FreeBSD.org
USE_GCC= 3.1
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-
-#CONFIGURE_ENV+= --program-transform-name=''
+INSTALLS_SHLIB= YES
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_X11)
-.if defined(WITH_FLTK) || defined(WITH_FLTK_XUNICODE)
+.if !defined(WITHOUT_X11) && (defined(WITH_FLTK) || defined(WITH_FLTK_XUNICODE))
.if defined(WITH_FLTK_XUNICODE)
-BUILD_DEPENDS= fltk-config:${PORTSDIR}/x11-toolkits/fltk-xunicode
+LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk-xunicode
.else
-BUILD_DEPENDS= fltk-config:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
.endif
USE_MESA= YES
-RUN_DEPENDS= ${BUILD_DEPENDS}
CONFIGURE_ARGS+=--with-fltk-prefix=${X11BASE}
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LDFLAGS}
PLIST_SUB+= WITH_FLTK=
.if ${OSVERSION} < 500035
pre-everything::
+ @${ECHO_CMD} ===================================================
@${ECHO_CMD} Please install x11-toolkits/fltk* with USE_GCC=3.1.
+ @${ECHO_CMD} ===================================================
.endif
.else
CONFIGURE_ARGS+=--with-fltk-prefix=DUMMY
-PLIST_SUB+= WITH_FLTK=@comment
+PLIST_SUB+= WITH_FLTK="@comment "
.endif
-.else
-CONFIGURE_ARGS+=--without-x --with-fltk-prefix=DUMMY
-PLIST_SUB+= WITH_FLTK=@comment
+
+.ifdef WITHOUT_X11
+CONFIGURE_ARGS+=--without-x
.endif
.include <bsd.port.post.mk>
diff --git a/graphics/OpenEXR/files/patch-configure b/graphics/OpenEXR/files/patch-configure
index 748947115268..c14e76926814 100644
--- a/graphics/OpenEXR/files/patch-configure
+++ b/graphics/OpenEXR/files/patch-configure
@@ -1,5 +1,5 @@
--- configure.orig Tue Jan 21 17:47:43 2003
-+++ configure Sun Jan 26 21:20:16 2003
++++ configure Mon Jan 27 15:03:50 2003
@@ -1559,10 +1559,12 @@
# The aliases save the names the user supplied, while $host etc.
@@ -21,3 +21,11 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -10533,7 +10536,6 @@
+ echo "$as_me:$LINENO: checking for gcc optimization flags" >&5
+ echo $ECHO_N "checking for gcc optimization flags... $ECHO_C" >&6
+ old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -O2 -funroll-loops -pipe"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */