Index: graphics/enblend/Makefile =================================================================== --- graphics/enblend/Makefile (revision 493903) +++ graphics/enblend/Makefile (working copy) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= enblend -PORTVERSION= 4.1.4 -PORTREVISION= 23 +PORTVERSION= 4.2 CATEGORIES= graphics -MASTER_SITES= SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R} +MASTER_SITES= SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION} DISTNAME= enblend-enfuse-${PORTVERSION} MAINTAINER= grog@FreeBSD.org @@ -14,25 +13,21 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_powerpc64= fails to configure: libvigraimpex is required to compile Enblend + BUILD_DEPENDS= help2man:misc/help2man \ - openexr>=1.0:graphics/openexr + ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libtiff.so:graphics/tiff \ - libboost_filesystem.so:devel/boost-libs \ libvigraimpex.so:graphics/vigra \ libgsl.so:math/gsl \ + libIlmImf.so:graphics/openexr \ libpng.so:graphics/png -RUN_DEPENDS= openexr>=1.0:graphics/openexr -BROKEN_powerpc64= fails to configure: libvigraimpex is required to compile Enblend +USES= compiler:features gmake jpeg localbase pkgconfig -USES= compiler:features gmake jpeg localbase makeinfo -CONFIGURE_ARGS= --with-boost-filesystem - -USE_GL= glew glut GNU_CONFIGURE= yes -INFO= enfuse enblend PLIST_FILES= bin/enblend bin/enfuse man/man1/enblend.1.gz man/man1/enfuse.1.gz PORTDOCS= AUTHORS NEWS README @@ -49,8 +44,8 @@ CXXFLAGS+= -Wno-c++11-extensions .endif -post-install: - ${INSTALL_DATA} ${WRKSRC}/doc/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH} +post-patch: + @${REINPLACE_CMD} -e '/a LaTeX/d' ${WRKSRC}/configure post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: graphics/enblend/distinfo =================================================================== --- graphics/enblend/distinfo (revision 493903) +++ graphics/enblend/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (enblend-enfuse-4.1.4.tar.gz) = 85f6c3506065c05425631d45677a3d84a9c6f31c501a5fa9c730891003e80808 -SIZE (enblend-enfuse-4.1.4.tar.gz) = 881787 +TIMESTAMP = 1551167762 +SHA256 (enblend-enfuse-4.2.tar.gz) = 8703e324939ebd70d76afd350e56800f5ea2c053a040a5f5218b2a1a4300bd48 +SIZE (enblend-enfuse-4.2.tar.gz) = 777747 Index: graphics/enblend/files/patch-include_vigra__ext_impexalpha.hxx =================================================================== --- graphics/enblend/files/patch-include_vigra__ext_impexalpha.hxx (revision 493903) +++ graphics/enblend/files/patch-include_vigra__ext_impexalpha.hxx (nonexistent) @@ -1,57 +0,0 @@ -# HG changeset patch -# User Chris -# Date 1453651551 -3600 -# Node ID 467a73754dbb0e269f1b515bc2ef6664ab328bfa -# Parent 6aec0cc8d22a6fa617f983e676df68d75ffabbcf -Fix issue #1537368: Unconditional usage of std::auto_ptr<> -in "vigra_ext" code. - -diff -r 6aec0cc8d22a -r 467a73754dbb include/vigra_ext/impexalpha.hxx ---- include/vigra_ext/impexalpha.hxx.orig 2015-08-07 14:45:05 UTC -+++ include/vigra_ext/impexalpha.hxx -@@ -26,6 +26,9 @@ - #include - #include - -+#ifndef VIGRA_UNIQUE_PTR -+#define VIGRA_UNIQUE_PTR std::auto_ptr -+#endif - - namespace vigra_ext - { -@@ -194,7 +197,7 @@ namespace vigra_ext - AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor, - vigra::VigraTrueType) - { -- std::auto_ptr decoder(vigra::decoder(import_info)); -+ VIGRA_UNIQUE_PTR decoder(vigra::decoder(import_info)); - - switch (pixel_t_of_string(decoder->getPixelType())) - { -@@ -249,7 +252,7 @@ namespace vigra_ext - AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor, - vigra::VigraFalseType) - { -- std::auto_ptr decoder(vigra::decoder(import_info)); -+ VIGRA_UNIQUE_PTR decoder(vigra::decoder(import_info)); - - switch (pixel_t_of_string(decoder->getPixelType())) - { -@@ -467,7 +470,7 @@ namespace vigra_ext - vigra::VigraTrueType) - { - const std::string pixel_type(export_info.getPixelType()); -- std::auto_ptr encoder(vigra::encoder(export_info)); -+ VIGRA_UNIQUE_PTR encoder(vigra::encoder(export_info)); - - encoder->setPixelType(pixel_type); - -@@ -525,7 +528,7 @@ namespace vigra_ext - vigra::VigraFalseType) - { - const std::string pixel_type(export_info.getPixelType()); -- std::auto_ptr encoder(vigra::encoder(export_info)); -+ VIGRA_UNIQUE_PTR encoder(vigra::encoder(export_info)); - - encoder->setPixelType(pixel_type); - Property changes on: graphics/enblend/files/patch-include_vigra__ext_impexalpha.hxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/enblend/files/patch-src_filespec.cc =================================================================== --- graphics/enblend/files/patch-src_filespec.cc (revision 493903) +++ graphics/enblend/files/patch-src_filespec.cc (nonexistent) @@ -1,40 +0,0 @@ -# HG changeset patch -# User Chris -# Date 1455528030 -3600 -# Node ID 73e6f16de80a94175db61f82ad10d4cd96790e85 -# Parent 596efbff27a8271a4c20184163e72b5914e334bf -Fix issue #1537368 (additional patch): Get rid of `boost::assign::map_list_of'. - -diff -r 596efbff27a8 -r 73e6f16de80a src/filespec.cc ---- src/filespec.cc.orig 2015-08-07 14:45:02 UTC -+++ src/filespec.cc -@@ -37,7 +37,6 @@ - #include - - #include --#include - - #include - -@@ -412,17 +411,12 @@ class Globbing - public: - Globbing() : algorithm_name_("literal"), algorithm_(NULL) - { -- installed_algorithms_ = -- boost::assign::map_list_of -- ("literal", MAKE_ALGORITHM(new LiteralGlobbingAlgorithm)) -- ("wildcard", MAKE_ALGORITHM(new WildcardGlobbingAlgorithm)) --#ifndef _WIN32 -- ("shell", MAKE_ALGORITHM(new ShellGlobbingAlgorithm)) --#endif -- ; -- -+ installed_algorithms_["literal"] = MAKE_ALGORITHM(new LiteralGlobbingAlgorithm); -+ installed_algorithms_["wildcard"] = MAKE_ALGORITHM(new WildcardGlobbingAlgorithm); - setup_alias("literal", "none"); -+ - #ifndef _WIN32 -+ installed_algorithms_["shell"] = MAKE_ALGORITHM(new ShellGlobbingAlgorithm); - setup_alias("shell", "sh"); - #endif - } Property changes on: graphics/enblend/files/patch-src_filespec.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property