diff options
| author | Rusmir Dusko <nemysis@FreeBSD.org> | 2013-10-31 00:32:31 +0000 |
|---|---|---|
| committer | Rusmir Dusko <nemysis@FreeBSD.org> | 2013-10-31 00:32:31 +0000 |
| commit | 1752bb5a6e253b2040e8fc493b85d7980962c42c (patch) | |
| tree | 7b8bf4527ee8a7f7c5d3f4e85a1707da0b869062 | |
| parent | 0157fa0fe8d64d0d31225fb8f57ae6ecb2d1d4b2 (diff) | |
| download | ports-1752bb5a6e253b2040e8fc493b85d7980962c42c.tar.gz ports-1752bb5a6e253b2040e8fc493b85d7980962c42c.zip | |
Notes
58 files changed, 255 insertions, 293 deletions
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 84a0413234c5..234dbdb68e45 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -3,6 +3,7 @@ PORTNAME= qtcreator DISTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT:S/$/:qtcreator/} \ ${MASTER_SITE_QT} diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile index c61f468cc86f..72f368d7086f 100644 --- a/devel/synfig/Makefile +++ b/devel/synfig/Makefile @@ -3,7 +3,7 @@ PORTNAME= synfig DISTVERSION= 0.63.05 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel graphics multimedia MASTER_SITES= SF diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 544e44dffe24..01477c8bff10 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -2,7 +2,7 @@ PORTNAME= calligra PORTVERSION= ${CALLIGRA_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/ diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile index 5d54af23e34c..3d740cf0535b 100644 --- a/games/pink-pony/Makefile +++ b/games/pink-pony/Makefile @@ -3,7 +3,7 @@ PORTNAME= pink-pony PORTVERSION= 1.2.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= GOOGLE_CODE \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index bd8d1d54d0eb..ff2fb00ba172 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -3,7 +3,7 @@ PORTNAME= ImageMagick PORTREVISION= 1 DISTVERSION= 6.8.0-7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ http://servingzone.com/mirrors/ImageMagick/ \ diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile index 405fa769fb92..c804ae7f59f5 100644 --- a/graphics/OpenEXR/Makefile +++ b/graphics/OpenEXR/Makefile @@ -2,74 +2,68 @@ # $FreeBSD$ PORTNAME= OpenEXR -PORTVERSION= 1.7.1 +PORTVERSION= 2.0.1 CATEGORIES= graphics devel -MASTER_SITES= http://cloud.github.com/downloads/openexr/openexr/ -DISTNAME= ${PORTNAME:L}-${DISTVERSION} +MASTER_SITES= SAVANNAH/openexr/ +DISTNAME= openexr-${DISTVERSION} -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= High dynamic-range (HDR) image file format LICENSE= BSD -LIB_DEPENDS= Imath:${PORTSDIR}/graphics/ilmbase +LIB_DEPENDS= libImath.so:${PORTSDIR}/graphics/ilmbase WRKSRC= ${WRKDIR}/${DISTNAME} -USES= pkgconfig -USE_GMAKE= yes -USE_LDCONFIG= yes +USES= gmake pathfix pkgconfig +GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--disable-ilmbasetest --enable-imfexamples USE_AUTOTOOLS= libtool -GNU_CONFIGURE= YES - -CONFIGURE_ARGS+=--enable-imfexamples +USE_LDCONFIG= yes # must be explicitely linked with -l{thr|pthread} LDFLAGS+= ${PTHREAD_LIBS} +PORTDOCS= * +PORTEXAMPLES= * + DOCSRCDIR1= ${WRKSRC} DOC_FILES1= AUTHORS ChangeLog NEWS README DOCSRCDIR2= ${WRKSRC}/doc -DOC_FILES2= MultiViewOpenEXR.pdf OpenEXRFileLayout.pdf \ - ReadingAndWritingImageFiles.pdf TechnicalIntroduction.pdf +DOCSDIR2= ${DOCSDIR}/doc +DOC_FILES2= *.pdf -OPTIONS_DEFINE= LARGE_STACK +OPTIONS_DEFINE= DOCS EXAMPLES LARGE_STACK LARGE_STACK_DESC= Enable sys-dependant large stack optimizations -NO_STAGE= yes +OPTIONS_SUB= yes + +LARGE_STACK_CONFIGURE_ENABLE= large-stack + .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MLARGE_STACK} -CONFIGURE_ARGS+=--enable-large-stack -.endif +PLIST_SUB= MAJORVER=2_0 post-patch: - @${REINPLACE_CMD} -e 's|examplesdir = $$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples|examplesdir = $$(prefix)/share/examples/OpenEXR|' \ + @${REINPLACE_CMD} -e 's|$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples|$$(prefix)/share/examples/${PORTNAME}|' \ ${WRKSRC}/IlmImfExamples/Makefile.in - @${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = $$(prefix)/libdata/pkgconfig|' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|docdir=$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@|docdir = $$(datadir)/doc/OpenEXR|' \ - -e 's|doc_DATA = $$(EXTRA_DIST)|doc_DATA =|' ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in + @${REINPLACE_CMD} -e 's|$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@||' \ + -e 's|$$(EXTRA_DIST)||' \ + ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in + +.if ! ${PORT_OPTIONS:MEXAMPLES} +EXTRA_PATCHES+=${FILESDIR}/extra-patch-IlmImfExamples-Makefile.in +.endif regression-test regression test check: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR} -.endif - -# IlmImfTest hangs indefinitely -# -#.if defined(PACKAGE_BUILDING) -#.if ${ARCH} != sparc64 || ${OSVERSION} >= 700055 -#.if ${ARCH} != amd64 || ${OSVERSION} < 800000 -#pre-install: test -#.endif -#.endif -#.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR2} + ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} .include <bsd.port.mk> diff --git a/graphics/OpenEXR/distinfo b/graphics/OpenEXR/distinfo index c9c835a78ee9..691e4ab8046a 100644 --- a/graphics/OpenEXR/distinfo +++ b/graphics/OpenEXR/distinfo @@ -1,2 +1,2 @@ -SHA256 (openexr-1.7.1.tar.gz) = 692ee6566d49939b2613e63b3afea2d38b871c0202cc829a7e32ced780af55c5 -SIZE (openexr-1.7.1.tar.gz) = 13554138 +SHA256 (openexr-2.0.1.tar.gz) = b9924d2f9d57376ff99234209231ad97a47f5cfebd18a5d0570db6d1a220685a +SIZE (openexr-2.0.1.tar.gz) = 12609335 diff --git a/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in b/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in new file mode 100644 index 000000000000..cbb7d5c3caea --- /dev/null +++ b/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in @@ -0,0 +1,33 @@ +--- IlmImfExamples/Makefile.in.orig 2013-07-12 02:09:22.000000000 +0200 ++++ IlmImfExamples/Makefile.in 2013-10-06 22:56:21.000000000 +0200 +@@ -356,18 +356,18 @@ + + clean-libtool: + -rm -rf .libs _libs +-install-examplesDATA: $(examples_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)" +- @list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \ +- for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesdir)" || exit $$?; \ +- done ++#install-examplesDATA: $(examples_DATA) ++# @$(NORMAL_INSTALL) ++# test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)" ++# @list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \ ++# for p in $$list; do \ ++# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++# echo "$$d$$p"; \ ++# done | $(am__base_list) | \ ++# while read files; do \ ++# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesdir)'"; \ ++# $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesdir)" || exit $$?; \ ++# done + + uninstall-examplesDATA: + @$(NORMAL_UNINSTALL) diff --git a/graphics/OpenEXR/files/patch-ImfAutoArray.h b/graphics/OpenEXR/files/patch-ImfAutoArray.h deleted file mode 100644 index a5cc72c8c69f..000000000000 --- a/graphics/OpenEXR/files/patch-ImfAutoArray.h +++ /dev/null @@ -1,22 +0,0 @@ ---- IlmImf/ImfAutoArray.h.orig 2012-07-17 19:27:26.000000000 -0400 -+++ IlmImf/ImfAutoArray.h 2012-11-30 21:29:19.902497168 -0500 -@@ -46,6 +46,10 @@ - - #include "OpenEXRConfig.h" - -+#if !defined (HAVE_LARGE_STACK) -+#include <cstring> -+#endif -+ - namespace Imf { - - -@@ -57,7 +61,7 @@ - { - public: - -- AutoArray (): _data (new T [size]) { memset(_data, 0, size*sizeof(T)); } -+ AutoArray (): _data (new T [size]) {::std::memset(_data, 0, size * sizeof(T));} - ~AutoArray () {delete [] _data;} - - operator T * () {return _data;} diff --git a/graphics/OpenEXR/files/patch-exrenvmap-main.cpp b/graphics/OpenEXR/files/patch-exrenvmap-main.cpp index 9c2f987fc2f8..a1207bb8cd70 100644 --- a/graphics/OpenEXR/files/patch-exrenvmap-main.cpp +++ b/graphics/OpenEXR/files/patch-exrenvmap-main.cpp @@ -1,8 +1,8 @@ ---- exrenvmap/main.cpp.orig 2012-07-18 01:27:28.000000000 +0200 -+++ exrenvmap/main.cpp 2012-10-04 10:44:12.000000000 +0200 -@@ -46,6 +46,7 @@ - #include <ImfEnvmap.h> +--- exrenvmap/main.cpp.orig 2013-06-18 21:51:40.000000000 +0200 ++++ exrenvmap/main.cpp 2013-10-05 18:45:26.000000000 +0200 +@@ -47,6 +47,7 @@ #include <ImfHeader.h> + #include <iostream> +#include <cstring> #include <exception> diff --git a/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp b/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp index 4b29978b3263..b01736f2cadf 100644 --- a/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp +++ b/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp @@ -1,10 +1,10 @@ ---- exrmaketiled/main.cpp.orig 2012-07-18 01:27:28.000000000 +0200 -+++ exrmaketiled/main.cpp 2012-10-04 10:45:18.000000000 +0200 -@@ -44,6 +44,7 @@ +--- exrmaketiled/main.cpp.orig 2013-06-18 21:51:40.000000000 +0200 ++++ exrmaketiled/main.cpp 2013-10-05 18:49:14.000000000 +0200 +@@ -43,6 +43,7 @@ + #include "makeTiled.h" #include <iostream> - #include <exception> +#include <cstring> + #include <exception> #include <string> #include <string.h> - #include <stdlib.h> diff --git a/graphics/OpenEXR/pkg-plist b/graphics/OpenEXR/pkg-plist index 1f7f3fb7bcf7..fd1ab8b00b7e 100644 --- a/graphics/OpenEXR/pkg-plist +++ b/graphics/OpenEXR/pkg-plist @@ -1,8 +1,8 @@ -bin/exr2aces bin/exrenvmap bin/exrheader bin/exrmakepreview bin/exrmaketiled +bin/exrmultipart bin/exrmultiview bin/exrstdattr include/OpenEXR/ImfAcesFile.h @@ -15,19 +15,35 @@ include/OpenEXR/ImfChannelList.h include/OpenEXR/ImfChannelListAttribute.h include/OpenEXR/ImfChromaticities.h include/OpenEXR/ImfChromaticitiesAttribute.h +include/OpenEXR/ImfCompositeDeepScanLine.h include/OpenEXR/ImfCompression.h include/OpenEXR/ImfCompressionAttribute.h include/OpenEXR/ImfConvert.h +include/OpenEXR/ImfDeepCompositing.h +include/OpenEXR/ImfDeepFrameBuffer.h +include/OpenEXR/ImfDeepScanLineInputFile.h +include/OpenEXR/ImfDeepScanLineInputPart.h +include/OpenEXR/ImfDeepScanLineOutputFile.h +include/OpenEXR/ImfDeepScanLineOutputPart.h +include/OpenEXR/ImfDeepTiledInputFile.h +include/OpenEXR/ImfDeepTiledInputPart.h +include/OpenEXR/ImfDeepTiledOutputFile.h +include/OpenEXR/ImfDeepTiledOutputPart.h include/OpenEXR/ImfDoubleAttribute.h include/OpenEXR/ImfEnvmap.h include/OpenEXR/ImfEnvmapAttribute.h +include/OpenEXR/ImfExport.h include/OpenEXR/ImfFloatAttribute.h +include/OpenEXR/ImfForward.h include/OpenEXR/ImfFrameBuffer.h include/OpenEXR/ImfFramesPerSecond.h +include/OpenEXR/ImfGenericInputFile.h +include/OpenEXR/ImfGenericOutputFile.h include/OpenEXR/ImfHeader.h include/OpenEXR/ImfHuf.h include/OpenEXR/ImfIO.h include/OpenEXR/ImfInputFile.h +include/OpenEXR/ImfInputPart.h include/OpenEXR/ImfInt64.h include/OpenEXR/ImfIntAttribute.h include/OpenEXR/ImfKeyCode.h @@ -36,10 +52,17 @@ include/OpenEXR/ImfLineOrder.h include/OpenEXR/ImfLineOrderAttribute.h include/OpenEXR/ImfLut.h include/OpenEXR/ImfMatrixAttribute.h +include/OpenEXR/ImfMisc.h +include/OpenEXR/ImfMultiPartInputFile.h +include/OpenEXR/ImfMultiPartOutputFile.h include/OpenEXR/ImfMultiView.h include/OpenEXR/ImfName.h +include/OpenEXR/ImfNamespace.h include/OpenEXR/ImfOpaqueAttribute.h include/OpenEXR/ImfOutputFile.h +include/OpenEXR/ImfOutputPart.h +include/OpenEXR/ImfPartHelper.h +include/OpenEXR/ImfPartType.h include/OpenEXR/ImfPixelType.h include/OpenEXR/ImfPreviewImage.h include/OpenEXR/ImfPreviewImageAttribute.h @@ -56,7 +79,9 @@ include/OpenEXR/ImfThreading.h include/OpenEXR/ImfTileDescription.h include/OpenEXR/ImfTileDescriptionAttribute.h include/OpenEXR/ImfTiledInputFile.h +include/OpenEXR/ImfTiledInputPart.h include/OpenEXR/ImfTiledOutputFile.h +include/OpenEXR/ImfTiledOutputPart.h include/OpenEXR/ImfTiledRgbaFile.h include/OpenEXR/ImfTimeCode.h include/OpenEXR/ImfTimeCodeAttribute.h @@ -65,36 +90,11 @@ include/OpenEXR/ImfVersion.h include/OpenEXR/ImfWav.h include/OpenEXR/ImfXdr.h include/OpenEXR/OpenEXRConfig.h +lib/libIlmImf-Imf_%%MAJORVER%%.so +lib/libIlmImf-Imf_%%MAJORVER%%.so.20 lib/libIlmImf.a lib/libIlmImf.la lib/libIlmImf.so -lib/libIlmImf.so.7 libdata/pkgconfig/OpenEXR.pc share/aclocal/openexr.m4 -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/MultiViewOpenEXR.pdf -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/OpenEXRFileLayout.pdf -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/ReadingAndWritingImageFiles.pdf -%%PORTDOCS%%%%DOCSDIR%%/TechnicalIntroduction.pdf -%%EXAMPLESDIR%%/drawImage.cpp -%%EXAMPLESDIR%%/drawImage.h -%%EXAMPLESDIR%%/generalInterfaceExamples.cpp -%%EXAMPLESDIR%%/generalInterfaceExamples.h -%%EXAMPLESDIR%%/generalInterfaceTiledExamples.cpp -%%EXAMPLESDIR%%/generalInterfaceTiledExamples.h -%%EXAMPLESDIR%%/lowLevelIoExamples.cpp -%%EXAMPLESDIR%%/lowLevelIoExamples.h -%%EXAMPLESDIR%%/main.cpp -%%EXAMPLESDIR%%/previewImageExamples.cpp -%%EXAMPLESDIR%%/previewImageExamples.h -%%EXAMPLESDIR%%/rgbaInterfaceExamples.cpp -%%EXAMPLESDIR%%/rgbaInterfaceExamples.h -%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.cpp -%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.h -@dirrm %%EXAMPLESDIR%% -@dirrm %%DOCSDIR%%-1.7.1 -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry include/OpenEXR diff --git a/graphics/ampasCTL/Makefile b/graphics/ampasCTL/Makefile index ae21c39c05fd..3cce15119285 100644 --- a/graphics/ampasCTL/Makefile +++ b/graphics/ampasCTL/Makefile @@ -3,6 +3,7 @@ PORTNAME= ampasCTL PORTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= nemysis@FreeBSD.org diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index 91257afb1bfe..e1a1873dbead 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -3,31 +3,44 @@ PORTNAME= aqsis PORTVERSION= 1.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} MAINTAINER= gahr@FreeBSD.org -COMMENT= A photorealistic rendering system +COMMENT= Photorealistic rendering system LICENSE= BSD GPLv2 LICENSE_COMB= multi BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ xsltproc:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ - boost_filesystem:${PORTSDIR}/devel/boost-libs \ - tiff.4:${PORTSDIR}/graphics/tiff \ - fltk.1:${PORTSDIR}/x11-toolkits/fltk +LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ + libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \ + libtiff.so:${PORTSDIR}/graphics/tiff LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes -USES= cmake:outsource +USES= cmake:outsource desktop-file-utils shared-mime-info USE_QT4= opengl qmake_build moc_build rcc_build uic_build PLIST_SUB+= LIBVERS=${PORTVERSION:R} INSTALLS_ICONS= yes -NO_STAGE= yes +OPTIONS_DEFINE= EXAMPLES + +PORTEXAMPLES= * + +.include <bsd.port.options.mk> + +post-patch: + @${REINPLACE_CMD} -e 's|examples_install_dir $${EXAMPLESDIR}|examples_install_dir ${PREFIX}/share/examples/${PORTNAME}|' \ + ${WRKSRC}/examples/CMakeLists.txt + +.if !${PORT_OPTIONS:MEXAMPLES} + @${REINPLACE_CMD} -i '' -e '/add_subdirectory(examples)/d' \ + ${WRKSRC}/CMakeLists.txt +.endif + .include <bsd.port.mk> diff --git a/graphics/aqsis/files/patch-libs-tex-io_exrinputfile.h b/graphics/aqsis/files/patch-libs-tex-io_exrinputfile.h new file mode 100644 index 000000000000..5a9169bbee04 --- /dev/null +++ b/graphics/aqsis/files/patch-libs-tex-io_exrinputfile.h @@ -0,0 +1,18 @@ +--- ./libs/tex/io/exrinputfile.h.orig 2012-08-24 14:26:50.000000000 +0200 ++++ ./libs/tex/io/exrinputfile.h 2013-10-29 13:16:03.000000000 +0100 +@@ -48,10 +48,12 @@ + + #include <aqsis/tex/io/itexinputfile.h> + ++#include <OpenEXR/ImfInputFile.h> ++ + //------------------------------------------------------------------------------ +-namespace Imf { +- class InputFile; +-} ++//namespace Imf { ++// class InputFile; ++//} + + namespace Aqsis { + diff --git a/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt b/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt index e75a6b837d59..d42133cfb47d 100644 --- a/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt +++ b/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libs/util/CMakeLists.txt.orig 2009-12-31 13:34:07.000000000 +0100 -+++ libs/util/CMakeLists.txt 2009-12-31 13:34:12.000000000 +0100 -@@ -33,7 +33,7 @@ +--- ./libs/util/CMakeLists.txt.orig 2012-08-24 14:26:50.000000000 +0200 ++++ ./libs/util/CMakeLists.txt 2013-10-29 13:12:48.000000000 +0100 +@@ -37,7 +37,7 @@ set(linklibs ${Boost_FILESYSTEM_LIBRARY}) if(UNIX) diff --git a/graphics/aqsis/pkg-plist b/graphics/aqsis/pkg-plist index fb126c58d879..dddf39bdcfde 100644 --- a/graphics/aqsis/pkg-plist +++ b/graphics/aqsis/pkg-plist @@ -59,73 +59,6 @@ share/applications/aqsl.desktop share/applications/aqsltell.desktop share/applications/eqsl.desktop share/applications/piqsl.desktop -%%DATADIR%%/examples/features/archives/bike.rib -%%DATADIR%%/examples/features/archives/bikeData.rib.gz -%%DATADIR%%/examples/features/archives/render.sh -%%DATADIR%%/examples/features/bake/bakesphere.rib -%%DATADIR%%/examples/features/bake/render.sh -%%DATADIR%%/examples/features/bake/sphere.rib -%%DATADIR%%/examples/features/curves/bezier.rib -%%DATADIR%%/examples/features/curves/render.sh -%%DATADIR%%/examples/features/layeredshaders/grid.tif -%%DATADIR%%/examples/features/layeredshaders/layered.rib -%%DATADIR%%/examples/features/layeredshaders/render.sh -%%DATADIR%%/examples/features/layeredshaders/texmap.sl -%%DATADIR%%/examples/features/levelofdetail/detail.rib -%%DATADIR%%/examples/features/levelofdetail/render.sh -%%DATADIR%%/examples/features/motionblur/camera.rib -%%DATADIR%%/examples/features/motionblur/deformation.rib -%%DATADIR%%/examples/features/motionblur/render_camera.sh -%%DATADIR%%/examples/features/motionblur/render_deformation.sh -%%DATADIR%%/examples/features/multipass/aov.rib -%%DATADIR%%/examples/features/multipass/myval.sl -%%DATADIR%%/examples/features/multipass/render.sh -%%DATADIR%%/examples/features/objectinstance/render.sh -%%DATADIR%%/examples/features/objectinstance/singlepolygon.rib -%%DATADIR%%/examples/features/occlusion/envlight.sl -%%DATADIR%%/examples/features/occlusion/occlmap.py -%%DATADIR%%/examples/features/occlusion/occlmap.rib -%%DATADIR%%/examples/features/occlusion/render.sh -%%DATADIR%%/examples/features/occlusion/simple.rib -%%DATADIR%%/examples/features/occlusion/world.rib -%%DATADIR%%/examples/features/shadows/autoshadow.rib -%%DATADIR%%/examples/features/shadows/render_autoshadow.sh -%%DATADIR%%/examples/features/shadows/render_softshadow.sh -%%DATADIR%%/examples/features/shadows/softshadow.rib -%%DATADIR%%/examples/features/solidmodeling/csg.rib -%%DATADIR%%/examples/features/solidmodeling/render.sh -%%DATADIR%%/examples/features/subdivision/creases.rib -%%DATADIR%%/examples/features/subdivision/render.sh -%%DATADIR%%/examples/features/textures/grid.tif -%%DATADIR%%/examples/features/textures/render.sh -%%DATADIR%%/examples/features/textures/sticky.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/all_passes.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/ao.sl -%%DATADIR%%/examples/point_based_gi/cornellbox/bake_pass.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/bake_points.sl -%%DATADIR%%/examples/point_based_gi/cornellbox/beauty_pass.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/beauty_pass_ao.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/beautycam.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/geometry.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/indirect.sl -%%DATADIR%%/examples/point_based_gi/cornellbox/lights.rib -%%DATADIR%%/examples/point_based_gi/cornellbox/shadow_pass.rib -%%DATADIR%%/examples/procedurals/menger/README.txt -%%DATADIR%%/examples/procedurals/menger/menger.cpp -%%DATADIR%%/examples/procedurals/menger/menger.rib -%%DATADIR%%/examples/procedurals/menger/render.sh -%%DATADIR%%/examples/scenes/fisheye/README.txt -%%DATADIR%%/examples/scenes/fisheye/envmap.rib -%%DATADIR%%/examples/scenes/fisheye/fisheye.rib -%%DATADIR%%/examples/scenes/fisheye/fisheye_projection.sl -%%DATADIR%%/examples/scenes/fisheye/lights.rib -%%DATADIR%%/examples/scenes/fisheye/render.sh -%%DATADIR%%/examples/scenes/fisheye/scene.rib -%%DATADIR%%/examples/scenes/fisheye/world.rib -%%DATADIR%%/examples/scenes/microbe/microbe.rib -%%DATADIR%%/examples/scenes/microbe/render.sh -%%DATADIR%%/examples/scenes/vase/render.sh -%%DATADIR%%/examples/scenes/vase/vase.rib %%DATADIR%%/plugins/houdini/README.txt %%DATADIR%%/plugins/houdini/RIBtargets %%DATADIR%%/plugins/houdini/hshaders.otl @@ -246,37 +179,8 @@ share/applications/piqsl.desktop @dirrm %%DATADIR%%/plugins/houdini/scripts @dirrm %%DATADIR%%/plugins/houdini @dirrm %%DATADIR%%/plugins -@dirrm %%DATADIR%%/examples/scenes/vase -@dirrm %%DATADIR%%/examples/scenes/microbe -@dirrm %%DATADIR%%/examples/scenes/fisheye -@dirrm %%DATADIR%%/examples/scenes -@dirrm %%DATADIR%%/examples/procedurals/menger -@dirrm %%DATADIR%%/examples/procedurals -@dirrm %%DATADIR%%/examples/point_based_gi/cornellbox -@dirrm %%DATADIR%%/examples/point_based_gi -@dirrm %%DATADIR%%/examples/features/textures -@dirrm %%DATADIR%%/examples/features/subdivision -@dirrm %%DATADIR%%/examples/features/solidmodeling -@dirrm %%DATADIR%%/examples/features/shadows -@dirrm %%DATADIR%%/examples/features/occlusion -@dirrm %%DATADIR%%/examples/features/objectinstance -@dirrm %%DATADIR%%/examples/features/multipass -@dirrm %%DATADIR%%/examples/features/motionblur -@dirrm %%DATADIR%%/examples/features/levelofdetail -@dirrm %%DATADIR%%/examples/features/layeredshaders -@dirrm %%DATADIR%%/examples/features/curves -@dirrm %%DATADIR%%/examples/features/bake -@dirrm %%DATADIR%%/examples/features/archives -@dirrm %%DATADIR%%/examples/features -@dirrm %%DATADIR%%/examples @dirrm %%DATADIR%% @dirrm lib/aqsis @dirrm include/aqsis/ri @dirrm include/aqsis @dirrm etc/aqsis -@dirrmtry share/icons/hicolor/192x192/mimetypes -@dirrmtry share/icons/hicolor/192x192 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons -@dirrmtry share/mime/packages -@dirrmtry share/mime diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 28d0e10e3dd0..7675ed4f46fd 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -3,6 +3,7 @@ PORTNAME= blender PORTVERSION= 2.68a +PORTREVISION= 1 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index b8b331c9983d..561e0d1d607b 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -3,7 +3,7 @@ PORTNAME= cimg PORTVERSION= 1.5.6 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 3 CATEGORIES= graphics devel MASTER_SITES= SF/${PORTNAME} \ diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile index b8d7f20e44a6..228e48f627da 100644 --- a/graphics/cinepaint/Makefile +++ b/graphics/cinepaint/Makefile @@ -3,6 +3,7 @@ PORTNAME= cinepaint DISTVERSION= 1.0-4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/CinePaint/CinePaint-${DISTVERSION} diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index a152ce450f1c..7020b937ddb6 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -3,7 +3,7 @@ PORTNAME= darktable PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile index 043826cde8f6..f76b7359bc34 100644 --- a/graphics/devil/Makefile +++ b/graphics/devil/Makefile @@ -4,7 +4,7 @@ PORTNAME= devil PORTVERSION= 1.7.8 PORTEPOCH= 1 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics MASTER_SITES= SF/openil/DevIL/${PORTVERSION} DISTNAME= DevIL-${PORTVERSION} diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile index 7e9c8d135d53..ebe0fb5e5339 100644 --- a/graphics/enblend/Makefile +++ b/graphics/enblend/Makefile @@ -3,7 +3,7 @@ PORTNAME= enblend PORTVERSION= 4.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R} DISTNAME= enblend-enfuse-${PORTVERSION} diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile index 1605f88249c8..ed8a0eab0dd9 100644 --- a/graphics/exact-image/Makefile +++ b/graphics/exact-image/Makefile @@ -3,6 +3,7 @@ PORTNAME= exact-image PORTVERSION= 0.8.9 +PORTREVISION= 1 CATEGORIES= graphics perl5 python MASTER_SITES= http://dl.exactcode.de/oss/${PORTNAME}/ LOCAL/bf diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile index 9c5e5b641f17..87e6fba28b25 100644 --- a/graphics/exrtools/Makefile +++ b/graphics/exrtools/Makefile @@ -3,7 +3,7 @@ PORTNAME= exrtools PORTVERSION= 0.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://scanline.ca/exrtools/ \ CRITICAL diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile index 11686904bd0f..da81abaca45e 100644 --- a/graphics/fyre/Makefile +++ b/graphics/fyre/Makefile @@ -3,7 +3,7 @@ PORTNAME= fyre PORTVERSION= 1.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://releases.navi.cx/fyre/ diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index 2694d46a8e3f..fe48d9a10428 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -3,7 +3,7 @@ PORTNAME= gegl PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/gegl/0.2/ diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile index 36ac3104e3f2..343611fceab3 100644 --- a/graphics/gimp-gmic-plugin/Makefile +++ b/graphics/gimp-gmic-plugin/Makefile @@ -2,6 +2,7 @@ PORTNAME= gmic PORTVERSION= 1.5.7.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/old diff --git a/graphics/hugin-devel/Makefile b/graphics/hugin-devel/Makefile index 6dee3098c244..d6a8480d0f24 100644 --- a/graphics/hugin-devel/Makefile +++ b/graphics/hugin-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= hugin PORTVERSION= 2013.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-2013.0 PKGNAMESUFFIX= -devel diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index a72ea57a649f..2c85706d2cb3 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= hugin PORTVERSION= 2012.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile index ae918a710ded..5fcf9dcda57b 100644 --- a/graphics/ilmbase/Makefile +++ b/graphics/ilmbase/Makefile @@ -2,46 +2,55 @@ # $FreeBSD$ PORTNAME= ilmbase -PORTVERSION= 1.0.3 +PORTVERSION= 2.0.1 CATEGORIES= graphics devel -MASTER_SITES= http://cloud.github.com/downloads/openexr/openexr/ +MASTER_SITES= SAVANNAH/openexr/ +DISTNAME= ilmbase-${PORTVERSION} -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex LICENSE= BSD -CONFLICTS= OpenEXR-1.[0-4].* - -USES= pkgconfig -USE_LDCONFIG= yes +USES= pathfix pkgconfig GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool +USE_LDCONFIG= yes PORTDOCS= AUTHORS ChangeLog README -OPTIONS_DEFINE= THREAD +BIN= eLut toFloat + +OPTIONS_DEFINE= DOCS THREAD OPTIONS_DEFAULT= THREAD THREAD_DESC= Enable multithreaded file I/O support -NO_STAGE= yes +OPTIONS_SUB= yes + +THREAD_CONFIGURE_ENABLE= threading + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MTHREAD} -CONFIGURE_ARGS+=--enable-threading CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -.else -CONFIGURE_ARGS+=--disable-threading .endif +PLIST_SUB= MAJORVER=2_0 + regression-test regression test check: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) +post-patch: + @${REINPLACE_CMD} -e 's|Iex/libIex.la|Iex/libIex.la $(PTHREAD_LIBS)|' \ + ${WRKSRC}/IlmThread/Makefile.am + post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif +.for e in ${BIN} + ${INSTALL_PROGRAM} ${WRKSRC}/Half/${e} ${STAGEDIR}${PREFIX}/bin/${e} +.endfor + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/graphics/ilmbase/distinfo b/graphics/ilmbase/distinfo index 458e534f7c6b..54cb32af3e8b 100644 --- a/graphics/ilmbase/distinfo +++ b/graphics/ilmbase/distinfo @@ -1,2 +1,2 @@ -SHA256 (ilmbase-1.0.3.tar.gz) = a998e064d6960ba258731fa5c8e7a3870b0eaa7ba9c1a5e5078263e9d9f76502 -SIZE (ilmbase-1.0.3.tar.gz) = 534980 +SHA256 (ilmbase-2.0.1.tar.gz) = 19b03975fea4461f2eff91f5df138b301b3ea9709eccbda98447f372bf09735f +SIZE (ilmbase-2.0.1.tar.gz) = 555828 diff --git a/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp b/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp index 61307aca6ef6..78dad32533ef 100644 --- a/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp +++ b/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp @@ -1,6 +1,6 @@ ---- IexMath/IexMathFpu.cpp.orig 2012-07-26 20:51:55.000000000 +0200 -+++ IexMath/IexMathFpu.cpp 2012-11-01 12:00:36.000000000 +0100 -@@ -27,7 +27,7 @@ +--- IexMath/IexMathFpu.cpp.orig 2013-06-18 21:51:38.000000000 +0200 ++++ IexMath/IexMathFpu.cpp 2013-10-04 19:25:00.000000000 +0200 +@@ -53,7 +53,7 @@ #endif diff --git a/graphics/ilmbase/files/patch-Imath-ImathFun.cpp b/graphics/ilmbase/files/patch-Imath-ImathFun.cpp index 0b29461b0152..0c5a8df907cc 100644 --- a/graphics/ilmbase/files/patch-Imath-ImathFun.cpp +++ b/graphics/ilmbase/files/patch-Imath-ImathFun.cpp @@ -1,5 +1,5 @@ ---- Imath/ImathFun.cpp.orig 2006-12-09 06:59:37.000000000 +0900 -+++ Imath/ImathFun.cpp 2007-10-07 23:23:38.000000000 +0900 +--- Imath/ImathFun.cpp.orig 2013-06-18 21:51:38.000000000 +0200 ++++ Imath/ImathFun.cpp 2013-10-04 20:06:42.000000000 +0200 @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////// @@ -7,7 +7,7 @@ +#include <inttypes.h> #include "ImathFun.h" - namespace Imath { + IMATH_INTERNAL_NAMESPACE_SOURCE_ENTER @@ -41,14 +42,14 @@ float succf (float f) diff --git a/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp b/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp index 53ff18d06458..7ee388ad6ebb 100644 --- a/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp +++ b/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp @@ -1,5 +1,5 @@ ---- ImathTest/testBoxAlgo.cpp.orig 2012-07-18 01:27:26.000000000 +0200 -+++ ImathTest/testBoxAlgo.cpp 2012-10-04 15:45:00.000000000 +0200 +--- ImathTest/testBoxAlgo.cpp.orig 2013-06-18 21:51:38.000000000 +0200 ++++ ImathTest/testBoxAlgo.cpp 2013-10-04 20:10:10.000000000 +0200 @@ -356,7 +356,7 @@ Box3f () }; diff --git a/graphics/ilmbase/files/patch-ImathTest-testShear.cpp b/graphics/ilmbase/files/patch-ImathTest-testShear.cpp index c396a2b43abc..ac73372d7362 100644 --- a/graphics/ilmbase/files/patch-ImathTest-testShear.cpp +++ b/graphics/ilmbase/files/patch-ImathTest-testShear.cpp @@ -1,10 +1,10 @@ ---- ImathTest/testShear.cpp.orig 2006-12-09 06:59:38.000000000 +0900 -+++ ImathTest/testShear.cpp 2007-10-07 23:24:27.000000000 +0900 +--- ImathTest/testShear.cpp.orig 2013-06-18 21:51:38.000000000 +0200 ++++ ImathTest/testShear.cpp 2013-10-04 20:16:08.000000000 +0200 @@ -54,7 +54,6 @@ - const float epsilon = Imath::limits< float >::epsilon(); + const float epsilon = IMATH_INTERNAL_NAMESPACE::limits< float >::epsilon(); - float array[6] = { 1.0F, 2.0F, 3.0F, 4.0F, 5.0F, 6.0F }; - Imath::Shear6f testConstructor1; - Imath::Shear6f testConstructor2( testConstructor1 ); + IMATH_INTERNAL_NAMESPACE::Shear6f testConstructor1; + IMATH_INTERNAL_NAMESPACE::Shear6f testConstructor2( testConstructor1 ); diff --git a/graphics/ilmbase/files/patch-Makefile.in b/graphics/ilmbase/files/patch-Makefile.in deleted file mode 100644 index ae1777219e44..000000000000 --- a/graphics/ilmbase/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2012-07-31 22:09:25.000000000 +0200 -+++ Makefile.in 2012-10-04 14:25:06.000000000 +0200 -@@ -224,7 +224,7 @@ - README README.CVS README.OSX README.win32 bootstrap \ - config.windows/IlmBaseConfig.h - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = IlmBase.pc - all: all-recursive - diff --git a/graphics/ilmbase/files/patch-configure b/graphics/ilmbase/files/patch-configure index bcf9d2b9ef13..61834be3eebd 100644 --- a/graphics/ilmbase/files/patch-configure +++ b/graphics/ilmbase/files/patch-configure @@ -1,8 +1,8 @@ ---- configure.orig 2012-07-31 00:11:22.000000000 +0200 -+++ configure 2012-10-04 14:20:16.000000000 +0200 -@@ -15978,25 +15978,25 @@ - osx_arch=default - fi; +--- configure.orig 2013-10-04 18:58:30.000000000 +0200 ++++ configure 2013-10-04 19:09:40.000000000 +0200 +@@ -17373,25 +17373,25 @@ + fi + - if test "${osx_arch}" != default ; then - osx_arch_flags="-arch ${osx_arch// / -arch }" @@ -11,11 +11,11 @@ - if test "$enable_dependency_tracking" != no ; then - osx_arch_array=( ${osx_arch} ) - if test ${#osx_arch_array[@]} -gt 1 ; then -- { { echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking. +- { { $as_echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking. -Please re-run configure with these options: - --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking - " >&5 --echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking. +-$as_echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking. -Please re-run configure with these options: - --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking - " >&2;} @@ -30,11 +30,11 @@ +# if test "$enable_dependency_tracking" != no ; then +# osx_arch_array=( ${osx_arch} ) +# if test ${#osx_arch_array[@]} -gt 1 ; then -+# { { echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking. ++# { { $as_echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking. +#Please re-run configure with these options: +# --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking +# " >&5 -+#echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking. ++#$as_echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking. +#Please re-run configure with these options: +# --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking +# " >&2;} @@ -43,5 +43,5 @@ +# fi +# fi - # Check whether --enable-osx-sdk or --disable-osx-sdk was given. + # Check whether --enable-osx-sdk was given. if test "${enable_osx_sdk+set}" = set; then diff --git a/graphics/ilmbase/pkg-descr b/graphics/ilmbase/pkg-descr index aa59684d8e5f..c5567aaf4624 100644 --- a/graphics/ilmbase/pkg-descr +++ b/graphics/ilmbase/pkg-descr @@ -15,4 +15,4 @@ Iex is an exception-handling library. If you have questions about using the IlmBase libraries, you may want to join our developer mailing list. -WWW: http://www.openexr.com/ +WWW: http://www.openexr.com/ diff --git a/graphics/ilmbase/pkg-plist b/graphics/ilmbase/pkg-plist index e23c91cb3d95..9aa5d17d48f8 100644 --- a/graphics/ilmbase/pkg-plist +++ b/graphics/ilmbase/pkg-plist @@ -1,15 +1,23 @@ +bin/eLut +bin/toFloat include/OpenEXR/Iex.h include/OpenEXR/IexBaseExc.h include/OpenEXR/IexErrnoExc.h +include/OpenEXR/IexExport.h +include/OpenEXR/IexForward.h include/OpenEXR/IexMacros.h include/OpenEXR/IexMathExc.h include/OpenEXR/IexMathFloatExc.h include/OpenEXR/IexMathFpu.h include/OpenEXR/IexMathIeeeExc.h +include/OpenEXR/IexNamespace.h include/OpenEXR/IexThrowErrnoExc.h include/OpenEXR/IlmBaseConfig.h include/OpenEXR/IlmThread.h +include/OpenEXR/IlmThreadExport.h +include/OpenEXR/IlmThreadForward.h include/OpenEXR/IlmThreadMutex.h +include/OpenEXR/IlmThreadNamespace.h include/OpenEXR/IlmThreadPool.h include/OpenEXR/IlmThreadSemaphore.h include/OpenEXR/ImathBox.h @@ -18,6 +26,8 @@ include/OpenEXR/ImathColor.h include/OpenEXR/ImathColorAlgo.h include/OpenEXR/ImathEuler.h include/OpenEXR/ImathExc.h +include/OpenEXR/ImathExport.h +include/OpenEXR/ImathForward.h include/OpenEXR/ImathFrame.h include/OpenEXR/ImathFrustum.h include/OpenEXR/ImathFun.h @@ -32,6 +42,7 @@ include/OpenEXR/ImathLineAlgo.h include/OpenEXR/ImathMath.h include/OpenEXR/ImathMatrix.h include/OpenEXR/ImathMatrixAlgo.h +include/OpenEXR/ImathNamespace.h include/OpenEXR/ImathPlane.h include/OpenEXR/ImathPlatform.h include/OpenEXR/ImathQuat.h @@ -42,27 +53,32 @@ include/OpenEXR/ImathSphere.h include/OpenEXR/ImathVec.h include/OpenEXR/ImathVecAlgo.h include/OpenEXR/half.h +include/OpenEXR/halfExport.h include/OpenEXR/halfFunction.h include/OpenEXR/halfLimits.h lib/libHalf.a lib/libHalf.la lib/libHalf.so -lib/libHalf.so.7 +lib/libHalf.so.10 +lib/libIex-%%MAJORVER%%.so +lib/libIex-%%MAJORVER%%.so.10 lib/libIex.a lib/libIex.la lib/libIex.so -lib/libIex.so.7 +lib/libIexMath-%%MAJORVER%%.so +lib/libIexMath-%%MAJORVER%%.so.10 lib/libIexMath.a lib/libIexMath.la lib/libIexMath.so -lib/libIexMath.so.7 +lib/libIlmThread-%%MAJORVER%%.so +lib/libIlmThread-%%MAJORVER%%.so.10 lib/libIlmThread.a lib/libIlmThread.la lib/libIlmThread.so -lib/libIlmThread.so.7 +lib/libImath-%%MAJORVER%%.so +lib/libImath-%%MAJORVER%%.so.10 lib/libImath.a lib/libImath.la lib/libImath.so -lib/libImath.so.7 libdata/pkgconfig/IlmBase.pc @dirrmtry include/OpenEXR diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile index 5e407721e856..16e3b26c404b 100644 --- a/graphics/k3d/Makefile +++ b/graphics/k3d/Makefile @@ -3,7 +3,7 @@ PORTNAME= k3d PORTVERSION= 0.8.0.2 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= source- CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/K-3D%20Source/K-3D%20${PORTVERSION} diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile index a365652d7b94..61f25359d722 100644 --- a/graphics/luminance/Makefile +++ b/graphics/luminance/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= luminance-hdr -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSION= 2.3.0 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile index b259798a9f90..a0a26b3abd0f 100644 --- a/graphics/luxrender/Makefile +++ b/graphics/luxrender/Makefile @@ -3,7 +3,7 @@ PORTNAME= luxrender PORTVERSION= 0.7.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://src.luxrender.net/lux/archive/ \ http://freebsd.nsu.ru/distfiles/luxrender/ diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile index 2a8008587023..873e8d5a8a76 100644 --- a/graphics/nvidia-texture-tools/Makefile +++ b/graphics/nvidia-texture-tools/Makefile @@ -3,7 +3,7 @@ PORTNAME= nvidia-texture-tools DISTVERSION= 2.0.8-1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index ccb34c0a19d0..d59b7177a1b2 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -3,7 +3,7 @@ PORTNAME?= opencv PORTVERSION= 2.3.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION} DISTNAME= OpenCV-${DISTVERSION}a diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index ef2b24d03f31..1dfa3e6e2793 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -3,7 +3,7 @@ PORTNAME= openimageio PORTVERSION= 1.2.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile index 67f774546ce5..9f22b81497f7 100644 --- a/graphics/openshadinglanguage/Makefile +++ b/graphics/openshadinglanguage/Makefile @@ -3,6 +3,7 @@ PORTNAME= openshadinglanguage PORTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= FreeBSD@Shaneware.biz diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index 65491da613fa..5996208ad9e3 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= osg PORTVERSION= 3.1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.openscenegraph.org/downloads/developer_releases/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index 0f90b88fecdc..2b3a4526af17 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -3,7 +3,7 @@ PORTNAME= osg PORTVERSION= 3.0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PORTVERSION}/source/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile index 0100f154d650..060d5f7cc768 100644 --- a/graphics/pfstools/Makefile +++ b/graphics/pfstools/Makefile @@ -3,7 +3,7 @@ PORTNAME= pfstools PORTVERSION= 1.6.4 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile index 9ef893143cc0..e1d022db09da 100644 --- a/graphics/pixie/Makefile +++ b/graphics/pixie/Makefile @@ -3,7 +3,7 @@ PORTNAME= pixie PORTVERSION= 2.2.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION} DISTNAME= Pixie-src-${PORTVERSION} diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index f6cae9ea4283..3ffd862a7aaf 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -2,7 +2,7 @@ PORTNAME= povray DISTVERSION= 3.7.0.RC6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.povray.org/beta/source/ DIST_SUBDIR= ${UNIQUENAME} diff --git a/graphics/py-openexr/Makefile b/graphics/py-openexr/Makefile index 0198bdb9bfd5..8e5c5417dc4a 100644 --- a/graphics/py-openexr/Makefile +++ b/graphics/py-openexr/Makefile @@ -3,7 +3,7 @@ PORTNAME= openexr PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= http://excamera.com/files/ \ CHEESESHOP diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index 663463018bcc..183a5aedf68c 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -3,7 +3,7 @@ PORTNAME= vigra PORTVERSION= 1.9.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index ff4649139e06..a9fdf110f0d8 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -3,7 +3,7 @@ PORTNAME= vips PORTVERSION= 7.26.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/ diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile index 92c3a6f5359c..2a74e6712eea 100644 --- a/graphics/visionworkbench/Makefile +++ b/graphics/visionworkbench/Makefile @@ -3,7 +3,7 @@ PORTNAME= visionworkbench PORTVERSION= 2.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://ti.arc.nasa.gov/m/project/nasa-vision-workbench/ DISTNAME= VisionWorkbench-${PORTVERSION} diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile index 4dbc81eaab7f..6a7aa416d01d 100644 --- a/science/gwyddion/Makefile +++ b/science/gwyddion/Makefile @@ -3,6 +3,7 @@ PORTNAME= gwyddion PORTVERSION= 2.33 +PORTREVISION= 1 CATEGORIES= science graphics MASTER_SITES= SF diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 5b27630ea531..a5b575cd8578 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -2,7 +2,7 @@ PORTNAME= kde-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src |