From owner-svn-ports-head@FreeBSD.ORG Thu Oct 31 00:32:40 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 48311FC8; Thu, 31 Oct 2013 00:32:40 +0000 (UTC) (envelope-from nemysis@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 338E52FCC; Thu, 31 Oct 2013 00:32:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9V0We6J023337; Thu, 31 Oct 2013 00:32:40 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9V0WVLX023287; Thu, 31 Oct 2013 00:32:31 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201310310032.r9V0WVLX023287@svn.freebsd.org> From: Rusmir Dusko Date: Thu, 31 Oct 2013 00:32:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332189 - in head: devel/qtcreator devel/synfig editors/calligra games/pink-pony graphics/ImageMagick graphics/OpenEXR graphics/OpenEXR/files graphics/ampasCTL graphics/aqsis graphics/a... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Oct 2013 00:32:40 -0000 Author: nemysis Date: Thu Oct 31 00:32:31 2013 New Revision: 332189 URL: http://svnweb.freebsd.org/changeset/ports/332189 Log: graphics/ilmbase - Update to 2.0.1 - Change master sites to SAVANNAH - Change maintainer email to @FreeBSD.org - Remove conflict with non existent Port - USES pathfix pkgconfig - Add executable - Add DOCS Option - Support STAGEDIR and add OPTIONS_SUB - Use pathfix instead of simple patches - Adjust patches - Change WWW graphics/OpenEXR - Update to 2.0.1 - Change master sites to SAVANNAH - Change maintainer email to @FreeBSD.org - Use the new format for LIB_DEPENDS - USES gmake pathfix pkgconfig - Add DOCS and EXAMPLES Options - Support STAGEDIR and add OPTIONS_SUB - Change REINPLACE_CMD - Add extra patch for EXAMPLES - Remove obsolete patches - Bump dependent ports' revisions Approved by: pawel / wg (mentors) Added: head/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in (contents, props changed) head/graphics/aqsis/files/patch-libs-tex-io_exrinputfile.h (contents, props changed) Deleted: head/graphics/OpenEXR/files/patch-ImfAutoArray.h head/graphics/ilmbase/files/patch-Makefile.in Modified: head/devel/qtcreator/Makefile head/devel/synfig/Makefile head/editors/calligra/Makefile head/games/pink-pony/Makefile head/graphics/ImageMagick/Makefile head/graphics/OpenEXR/Makefile head/graphics/OpenEXR/distinfo head/graphics/OpenEXR/files/patch-exrenvmap-main.cpp head/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp head/graphics/OpenEXR/pkg-plist head/graphics/ampasCTL/Makefile head/graphics/aqsis/Makefile head/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt (contents, props changed) head/graphics/aqsis/pkg-plist head/graphics/blender/Makefile head/graphics/cimg/Makefile head/graphics/cinepaint/Makefile head/graphics/darktable/Makefile head/graphics/devil/Makefile head/graphics/enblend/Makefile head/graphics/exact-image/Makefile head/graphics/exrtools/Makefile head/graphics/fyre/Makefile head/graphics/gegl/Makefile head/graphics/gimp-gmic-plugin/Makefile head/graphics/hugin-devel/Makefile head/graphics/hugin/Makefile head/graphics/ilmbase/Makefile head/graphics/ilmbase/distinfo head/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp head/graphics/ilmbase/files/patch-Imath-ImathFun.cpp (contents, props changed) head/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp head/graphics/ilmbase/files/patch-ImathTest-testShear.cpp (contents, props changed) head/graphics/ilmbase/files/patch-configure head/graphics/ilmbase/pkg-descr head/graphics/ilmbase/pkg-plist head/graphics/k3d/Makefile head/graphics/luminance/Makefile head/graphics/luxrender/Makefile head/graphics/nvidia-texture-tools/Makefile head/graphics/opencv/Makefile head/graphics/openimageio/Makefile head/graphics/openshadinglanguage/Makefile head/graphics/osg-devel/Makefile head/graphics/osg/Makefile head/graphics/pfstools/Makefile head/graphics/pixie/Makefile head/graphics/povray37/Makefile head/graphics/py-openexr/Makefile head/graphics/vigra/Makefile head/graphics/vips/Makefile head/graphics/visionworkbench/Makefile head/science/gwyddion/Makefile head/x11/kde4-runtime/Makefile Modified: head/devel/qtcreator/Makefile ============================================================================== --- head/devel/qtcreator/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/devel/qtcreator/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -3,6 +3,7 @@ PORTNAME= qtcreator DISTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT:S/$/:qtcreator/} \ ${MASTER_SITE_QT} Modified: head/devel/synfig/Makefile ============================================================================== --- head/devel/synfig/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/devel/synfig/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -3,7 +3,7 @@ PORTNAME= synfig DISTVERSION= 0.63.05 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel graphics multimedia MASTER_SITES= SF Modified: head/editors/calligra/Makefile ============================================================================== --- head/editors/calligra/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/editors/calligra/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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}/ Modified: head/games/pink-pony/Makefile ============================================================================== --- head/games/pink-pony/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/games/pink-pony/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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/ Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ImageMagick/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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/ \ Modified: head/graphics/OpenEXR/Makefile ============================================================================== --- head/graphics/OpenEXR/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/OpenEXR/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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 -.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 Modified: head/graphics/OpenEXR/distinfo ============================================================================== --- head/graphics/OpenEXR/distinfo Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/OpenEXR/distinfo Thu Oct 31 00:32:31 2013 (r332189) @@ -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 Added: head/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in Thu Oct 31 00:32:31 2013 (r332189) @@ -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) Modified: head/graphics/OpenEXR/files/patch-exrenvmap-main.cpp ============================================================================== --- head/graphics/OpenEXR/files/patch-exrenvmap-main.cpp Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/OpenEXR/files/patch-exrenvmap-main.cpp Thu Oct 31 00:32:31 2013 (r332189) @@ -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 +--- 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 + #include +#include #include Modified: head/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp ============================================================================== --- head/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp Thu Oct 31 00:32:31 2013 (r332189) @@ -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 - #include +#include + #include #include #include - #include Modified: head/graphics/OpenEXR/pkg-plist ============================================================================== --- head/graphics/OpenEXR/pkg-plist Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/OpenEXR/pkg-plist Thu Oct 31 00:32:31 2013 (r332189) @@ -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 Modified: head/graphics/ampasCTL/Makefile ============================================================================== --- head/graphics/ampasCTL/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ampasCTL/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -3,6 +3,7 @@ PORTNAME= ampasCTL PORTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= nemysis@FreeBSD.org Modified: head/graphics/aqsis/Makefile ============================================================================== --- head/graphics/aqsis/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/aqsis/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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 + +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 Added: head/graphics/aqsis/files/patch-libs-tex-io_exrinputfile.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aqsis/files/patch-libs-tex-io_exrinputfile.h Thu Oct 31 00:32:31 2013 (r332189) @@ -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 + ++#include ++ + //------------------------------------------------------------------------------ +-namespace Imf { +- class InputFile; +-} ++//namespace Imf { ++// class InputFile; ++//} + + namespace Aqsis { + Modified: head/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt ============================================================================== --- head/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/aqsis/files/patch-libs-utils_CMakeLists.txt Thu Oct 31 00:32:31 2013 (r332189) @@ -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) Modified: head/graphics/aqsis/pkg-plist ============================================================================== --- head/graphics/aqsis/pkg-plist Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/aqsis/pkg-plist Thu Oct 31 00:32:31 2013 (r332189) @@ -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 Modified: head/graphics/blender/Makefile ============================================================================== --- head/graphics/blender/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/blender/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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/ \ Modified: head/graphics/cimg/Makefile ============================================================================== --- head/graphics/cimg/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/cimg/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -3,7 +3,7 @@ PORTNAME= cimg PORTVERSION= 1.5.6 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 3 CATEGORIES= graphics devel MASTER_SITES= SF/${PORTNAME} \ Modified: head/graphics/cinepaint/Makefile ============================================================================== --- head/graphics/cinepaint/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/cinepaint/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -3,6 +3,7 @@ PORTNAME= cinepaint DISTVERSION= 1.0-4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/CinePaint/CinePaint-${DISTVERSION} Modified: head/graphics/darktable/Makefile ============================================================================== --- head/graphics/darktable/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/darktable/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -3,7 +3,7 @@ PORTNAME= darktable PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} Modified: head/graphics/devil/Makefile ============================================================================== --- head/graphics/devil/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/devil/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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} Modified: head/graphics/enblend/Makefile ============================================================================== --- head/graphics/enblend/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/enblend/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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} Modified: head/graphics/exact-image/Makefile ============================================================================== --- head/graphics/exact-image/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/exact-image/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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 Modified: head/graphics/exrtools/Makefile ============================================================================== --- head/graphics/exrtools/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/exrtools/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -3,7 +3,7 @@ PORTNAME= exrtools PORTVERSION= 0.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://scanline.ca/exrtools/ \ CRITICAL Modified: head/graphics/fyre/Makefile ============================================================================== --- head/graphics/fyre/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/fyre/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -3,7 +3,7 @@ PORTNAME= fyre PORTVERSION= 1.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://releases.navi.cx/fyre/ Modified: head/graphics/gegl/Makefile ============================================================================== --- head/graphics/gegl/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/gegl/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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/ Modified: head/graphics/gimp-gmic-plugin/Makefile ============================================================================== --- head/graphics/gimp-gmic-plugin/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/gimp-gmic-plugin/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -2,6 +2,7 @@ PORTNAME= gmic PORTVERSION= 1.5.7.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/old Modified: head/graphics/hugin-devel/Makefile ============================================================================== --- head/graphics/hugin-devel/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/hugin-devel/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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 Modified: head/graphics/hugin/Makefile ============================================================================== --- head/graphics/hugin/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/hugin/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -3,7 +3,7 @@ PORTNAME= hugin PORTVERSION= 2012.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} Modified: head/graphics/ilmbase/Makefile ============================================================================== --- head/graphics/ilmbase/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ilmbase/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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 .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 Modified: head/graphics/ilmbase/distinfo ============================================================================== --- head/graphics/ilmbase/distinfo Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ilmbase/distinfo Thu Oct 31 00:32:31 2013 (r332189) @@ -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 Modified: head/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp ============================================================================== --- head/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp Thu Oct 31 00:32:31 2013 (r332189) @@ -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 Modified: head/graphics/ilmbase/files/patch-Imath-ImathFun.cpp ============================================================================== --- head/graphics/ilmbase/files/patch-Imath-ImathFun.cpp Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ilmbase/files/patch-Imath-ImathFun.cpp Thu Oct 31 00:32:31 2013 (r332189) @@ -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 #include "ImathFun.h" - namespace Imath { + IMATH_INTERNAL_NAMESPACE_SOURCE_ENTER @@ -41,14 +42,14 @@ float succf (float f) Modified: head/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp ============================================================================== --- head/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp Thu Oct 31 00:32:31 2013 (r332189) @@ -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 () }; Modified: head/graphics/ilmbase/files/patch-ImathTest-testShear.cpp ============================================================================== --- head/graphics/ilmbase/files/patch-ImathTest-testShear.cpp Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ilmbase/files/patch-ImathTest-testShear.cpp Thu Oct 31 00:32:31 2013 (r332189) @@ -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 ); Modified: head/graphics/ilmbase/files/patch-configure ============================================================================== --- head/graphics/ilmbase/files/patch-configure Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ilmbase/files/patch-configure Thu Oct 31 00:32:31 2013 (r332189) @@ -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 Modified: head/graphics/ilmbase/pkg-descr ============================================================================== --- head/graphics/ilmbase/pkg-descr Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ilmbase/pkg-descr Thu Oct 31 00:32:31 2013 (r332189) @@ -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/ Modified: head/graphics/ilmbase/pkg-plist ============================================================================== --- head/graphics/ilmbase/pkg-plist Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/ilmbase/pkg-plist Thu Oct 31 00:32:31 2013 (r332189) @@ -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 Modified: head/graphics/k3d/Makefile ============================================================================== --- head/graphics/k3d/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/k3d/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -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} Modified: head/graphics/luminance/Makefile ============================================================================== --- head/graphics/luminance/Makefile Wed Oct 30 22:57:52 2013 (r332188) +++ head/graphics/luminance/Makefile Thu Oct 31 00:32:31 2013 (r332189) @@ -2,7 +2,7 @@ # $FreeBSD$ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***