Sorry, the patch wasn't against current ports-tree. See attachment for
one that applies cleanly.
--
Best,
Hannes
diff -u luminance/Makefile luminanceNEW/Makefile
--- luminance/Makefile 2014-03-23 21:22:29.000000000 +0100
+++ luminanceNEW/Makefile 2014-03-23 20:24:48.518562234 +0100
@@ -2,8 +2,7 @@
# $FreeBSD: head/graphics/luminance/Makefile 341289 2014-01-26 21:20:03Z
rakuco $
PORTNAME= luminance-hdr
-PORTREVISION= 5
-DISTVERSION= 2.3.0
+DISTVERSION= 2.3.1
CATEGORIES= graphics
MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}
@@ -45,4 +44,20 @@
's,@GIT_SHA1@,be5409f2ed028b0a509d3f4cd44a970a09d2ef6c,' \
${WRKSRC}/src/Common/GitSHA1.cpp.in
+# Include <string> in addition to <string.h> where necessary, as this
+# is required for building with libc++
+ @${REINPLACE_CMD} -E '1s|^|#include \<string\>|;' \
+ ${WRKSRC}/src/TonemappingOperators/drago03/pfstmo_drago03.cpp \
+ ${WRKSRC}/src/TonemappingOperators/reinhard02/pfstmo_reinhard02.cpp \
+ ${WRKSRC}/src/TonemappingOperators/reinhard05/pfstmo_reinhard05.cpp \
+ ${WRKSRC}/src/TonemappingOperators/mantiuk08/display_function.cpp \
+ ${WRKSRC}/src/TonemappingOperators/mantiuk08/display_size.cpp \
+ ${WRKSRC}/src/TonemappingOperators/mantiuk08/pfstmo_mantiuk08.cpp \
+ ${WRKSRC}/src/TonemappingOperators/fattal02/pfstmo_fattal02.cpp \
+ ${WRKSRC}/src/TonemappingOperators/durand02/pfstmo_durand02.cpp \
+ ${WRKSRC}/src/TonemappingOperators/pattanaik00/pfstmo_pattanaik00.cpp \
+ ${WRKSRC}/src/Libpfs/io/pfsreader.cpp \
+ ${WRKSRC}/src/Libpfs/io/rgbereader.cpp \
+ ${WRKSRC}/src/Libpfs/colorspace/colorspace.cpp
+
.include <bsd.port.mk>
diff -u luminance/distinfo luminanceNEW/distinfo
--- luminance/distinfo 2014-03-23 21:22:29.000000000 +0100
+++ luminanceNEW/distinfo 2014-03-23 19:12:16.914558094 +0100
@@ -1,2 +1,2 @@
-SHA256 (luminance-hdr-2.3.0.tar.bz2) =
dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676
-SIZE (luminance-hdr-2.3.0.tar.bz2) = 5398576
+SHA256 (luminance-hdr-2.3.1.tar.bz2) =
c2a4764986bf8860d448530f3c8d76143d7504cebb07b3e58e37eb0db5347722
+SIZE (luminance-hdr-2.3.1.tar.bz2) = 10323806
Only in luminance: files
diff -u luminance/pkg-plist luminanceNEW/pkg-plist
--- luminance/pkg-plist 2014-03-23 21:22:29.000000000 +0100
+++ luminanceNEW/pkg-plist 2014-03-23 20:17:28.540561608 +0100
@@ -60,9 +60,6 @@
%%DATADIR%%/help/en/tonemapping_cli.html
%%DATADIR%%/help/en/tonemapping_interactive.html
%%DATADIR%%/help/en/workflow.html
-%%DATADIR%%/help/js/jquery.js
-%%DATADIR%%/help/js/jquery.jtabs.pack.js
-@dirrm %%DATADIR%%/help/js
@dirrm %%DATADIR%%/help/en/images
@dirrm %%DATADIR%%/help/en
@dirrm %%DATADIR%%/help
_______________________________________________
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
