summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/OpenEXR/Makefile29
-rw-r--r--graphics/OpenEXR/distinfo6
-rw-r--r--graphics/OpenEXR/files/patch-Makefile.in12
-rw-r--r--graphics/OpenEXR/pkg-plist18
-rw-r--r--graphics/blender-devel/Makefile3
-rw-r--r--graphics/cinepaint/Makefile3
-rw-r--r--graphics/exrtools/Makefile1
-rw-r--r--graphics/fyre/Makefile2
-rw-r--r--graphics/k3d/Makefile4
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/kdelibs4/Makefile2
11 files changed, 51 insertions, 31 deletions
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index b35677d2e86c..c1d5a8facaaa 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -6,8 +6,10 @@
#
PORTNAME= OpenEXR
-PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTVERSION= 1.4.0
+PORTREVISION= 0
+DISTNAME= ${PORTNAME:L}-${PORTVERSION}${DISTVERSIONSUFFIX}
+DISTVERSIONSUFFIX=a
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= openexr
@@ -23,18 +25,23 @@ INSTALLS_SHLIB= YES
EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}-${PORTVERSION}
+CONFIGURE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} \
+ PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
+
+WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
+
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_X11) && defined(WITH_FLTK)
-CONFIGURE_ARGS+=--with-fltk-config=${X11BASE}/bin/fltk-config
-CFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= ${PTHREAD_LIBS}
-PLIST_SUB+= WITH_FLTK=
-LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads \
- glut.4:${PORTSDIR}/graphics/libglut
-.else
+#.if !defined(WITHOUT_X11) && defined(WITH_FLTK)
+#CONFIGURE_ARGS+=--with-fltk-config=${X11BASE}/bin/fltk-config
+#CFLAGS+= ${PTHREAD_CFLAGS}
+#LDFLAGS+= ${PTHREAD_LIBS}
+#PLIST_SUB+= WITH_FLTK=
+#LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads \
+# glut.4:${PORTSDIR}/graphics/libglut
+#.else
CONFIGURE_ARGS+=--with-fltk-config=${FALSE} --without-x
PLIST_SUB+= WITH_FLTK="@comment "
-.endif
+#.endif
.include <bsd.port.post.mk>
diff --git a/graphics/OpenEXR/distinfo b/graphics/OpenEXR/distinfo
index 6d324d382f55..1ada3f212f32 100644
--- a/graphics/OpenEXR/distinfo
+++ b/graphics/OpenEXR/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenEXR-1.2.2.tar.gz) = a2e56af78dc47c7294ff188c8f78394b
-SHA256 (OpenEXR-1.2.2.tar.gz) = 77e6e93cb40d5f6d69b26c05ca9738cdcc3978753e0053c9115026d7adaefc8d
-SIZE (OpenEXR-1.2.2.tar.gz) = 9324108
+MD5 (openexr-1.4.0a.tar.gz) = d0a4b9a930c766fa51561b05fb204afe
+SHA256 (openexr-1.4.0a.tar.gz) = 5d8a7327bd28eeb5d3064640d8eb32c3cd8c5a15999c70b0afa9f8af851936d1
+SIZE (openexr-1.4.0a.tar.gz) = 9673041
diff --git a/graphics/OpenEXR/files/patch-Makefile.in b/graphics/OpenEXR/files/patch-Makefile.in
index d34842d24583..cf28e8cc9010 100644
--- a/graphics/OpenEXR/files/patch-Makefile.in
+++ b/graphics/OpenEXR/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig Thu Mar 10 10:29:29 2005
-+++ Makefile.in Sun Oct 9 05:42:44 2005
-@@ -158,7 +158,7 @@
-
- EXTRA_DIST = bootstrap README.win32 README.OSX README.CVS LICENSE openexr.m4
+--- Makefile.in.orig Wed Aug 9 14:45:53 2006
++++ Makefile.in Sun Mar 11 12:53:52 2007
+@@ -210,7 +210,7 @@
+ EXTRA_DIST = bootstrap README.win32 README.OSX README.CVS LICENSE openexr.m4 \
+ config.windows/OpenEXRConfig.h
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = OpenEXR.pc
-
m4datadir = $(datadir)/aclocal
+ m4data_DATA = openexr.m4
diff --git a/graphics/OpenEXR/pkg-plist b/graphics/OpenEXR/pkg-plist
index d9d762f100ca..227de005cd14 100644
--- a/graphics/OpenEXR/pkg-plist
+++ b/graphics/OpenEXR/pkg-plist
@@ -7,25 +7,33 @@ bin/exrstdattr
lib/libHalf.a
lib/libHalf.la
lib/libHalf.so
-lib/libHalf.so.2
+lib/libHalf.so.4
lib/libIex.a
lib/libIex.la
lib/libIex.so
-lib/libIex.so.2
+lib/libIex.so.4
lib/libIlmImf.a
lib/libIlmImf.la
lib/libIlmImf.so
-lib/libIlmImf.so.2
+lib/libIlmImf.so.4
lib/libImath.a
lib/libImath.la
lib/libImath.so
-lib/libImath.so.2
+lib/libImath.so.4
+lib/libIlmThread.a
+lib/libIlmThread.la
+lib/libIlmThread.so
+lib/libIlmThread.so.4
include/OpenEXR/Iex.h
include/OpenEXR/IexBaseExc.h
include/OpenEXR/IexErrnoExc.h
include/OpenEXR/IexMacros.h
include/OpenEXR/IexMathExc.h
include/OpenEXR/IexThrowErrnoExc.h
+include/OpenEXR/IlmThread.h
+include/OpenEXR/IlmThreadMutex.h
+include/OpenEXR/IlmThreadPool.h
+include/OpenEXR/IlmThreadSemaphore.h
include/OpenEXR/ImathBox.h
include/OpenEXR/ImathBoxAlgo.h
include/OpenEXR/ImathColor.h
@@ -94,6 +102,7 @@ include/OpenEXR/ImfRgbaYca.h
include/OpenEXR/ImfStandardAttributes.h
include/OpenEXR/ImfStringAttribute.h
include/OpenEXR/ImfTestFile.h
+include/OpenEXR/ImfThreading.h
include/OpenEXR/ImfTileDescription.h
include/OpenEXR/ImfTileDescriptionAttribute.h
include/OpenEXR/ImfTiledInputFile.h
@@ -105,6 +114,7 @@ include/OpenEXR/ImfVecAttribute.h
include/OpenEXR/ImfVersion.h
include/OpenEXR/ImfWav.h
include/OpenEXR/ImfXdr.h
+include/OpenEXR/OpenEXRConfig.h
include/OpenEXR/half.h
include/OpenEXR/halfFunction.h
include/OpenEXR/halfLimits.h
diff --git a/graphics/blender-devel/Makefile b/graphics/blender-devel/Makefile
index 00cff704b9e5..66ecb3737cdd 100644
--- a/graphics/blender-devel/Makefile
+++ b/graphics/blender-devel/Makefile
@@ -6,6 +6,7 @@
PORTNAME= blender
PORTVERSION= 2.43
+PORTREVISION= 1
CATEGORIES= graphics games
MASTER_SITES= http://download.blender.org/source/ \
ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
@@ -21,7 +22,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
SDL.11:${PORTSDIR}/devel/sdl12 \
- Half.2:${PORTSDIR}/graphics/OpenEXR \
+ Half.4:${PORTSDIR}/graphics/OpenEXR \
gettextpo.1:${PORTSDIR}/devel/gettext \
openal.0:${PORTSDIR}/audio/openal \
alut.1:${PORTSDIR}/audio/freealut \
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 0a7221c732d1..c1a1174649a8 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cinepaint
PORTVERSION= 0.20
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -35,7 +36,7 @@ PLIST_SUB= VER=${PORTVERSION}-1
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
.if !defined(WITHOUT_OPENEXR)
-LIB_DEPENDS+= IlmImf.2:${PORTSDIR}/graphics/OpenEXR \
+LIB_DEPENDS+= IlmImf.4:${PORTSDIR}/graphics/OpenEXR \
fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads
CONFIGURE_ARGS+= --with-openexr-prefix=${LOCALBASE}
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/OpenEXR"
diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile
index 273aa8f714c3..ec57efcb339c 100644
--- a/graphics/exrtools/Makefile
+++ b/graphics/exrtools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= exrtools
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://scanline.ca/exrtools/ \
http://critical.ch/distfiles/ \
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index 9118d6dde6ba..63edc8182113 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fyre
PORTVERSION= 1.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://samy.kerneled.org/ports/ \
http://www.felinemenace.org/~nemo/
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index 1e857915b71b..9c34bd92910b 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -8,7 +8,7 @@
PORTNAME= k3d
PORTVERSION= 0.4.4.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,7 +24,7 @@ LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ \
tiff.4:${PORTSDIR}/graphics/tiff \
Magick++.10:${PORTSDIR}/graphics/ImageMagick \
netpbm.1:${PORTSDIR}/graphics/netpbm \
- Half.2:${PORTSDIR}/graphics/OpenEXR \
+ Half.4:${PORTSDIR}/graphics/OpenEXR \
gts.5:${PORTSDIR}/graphics/gts
CONFLICTS= atlas-3* superlu-3*
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 0ed68a7d7aee..b83bb044e80c 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 0ed68a7d7aee..b83bb044e80c 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src