3 files changed, 67 insertions, 21 deletions

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index c2f901e6f8f3..85889bf34f99 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	darktable
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	1.0.3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
 
@@ -22,6 +21,9 @@ LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		lcms2.2:${PORTSDIR}/graphics/lcms2 \
 		curl.6:${PORTSDIR}/ftp/curl
 
+ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS_REASON=	uses SSE extensions
+
 USE_CMAKE=	yes
 CMAKE_OUTSOURCE=	yes
 USE_GNOME=	librsvg2
@@ -37,14 +39,11 @@ OPTIONS=	GCONF	"Enable GConf backend"			off \
 		SLIDESHOW "Build OpenGL/SDL slideshow viewer"	off \
 		KWALLET	"Enable KWallet support (requires dbus-glib)" off \
 		GKEYRING "Enable GNOME Keyring support"		off \
-		NLS	"Enable Native Language Support"	on
+		NLS	"Enable Native Language Support"	on \
+		GCC46	"Build with GCC 4.6+ (better OpenMP support)" on
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		does not compile: invokes i386 assembler
-.endif
-
 .if defined(WITH_GCONF)
 USE_GNOME+=	gconf2
 CMAKE_ARGS+=	-DDONT_INSTALL_GCONF_SCHEMAS:BOOL=ON	# bogus name, no typo
@@ -100,14 +99,26 @@ USE_GETTEXT=	yes
 CMAKE_ARGS+=	-DUSE_NLS:BOOL=OFF
 .endif
 
-post-patch:
-# FreeBSD 7.X does not have dprintf()
-.if ${OSVERSION} < 800071
-	@${REINPLACE_CMD} -e '80s,APPLE,${OPSYS}, ; /va_start/s,&,,' \
-		${WRKSRC}/src/common/darktable.c
+.if defined(WITH_GCC46)
+USE_GCC=	4.6+
+# libdarktable.so has parts written in C++ (built-in rawspeed and libraw)
+# and is linked to GCC 4.6's libstdc++.  However CMake removes RPATH from
+# this library, and libstdc++ from base (GCC 4.2.1) is pulled at runtime,
+# preventing darktable from starting.
+#
+# To workaround this, link darktable executable with libstdc++ explicitly;
+# it still has the RPATH and the correct libstdc++ is pulled.
+LDFLAGS+=	-lstdc++
 .endif
-# Do not install useless (to end-user) documentation files
-	@${REINPLACE_CMD} -e '/DOC_FILES/d' ${WRKSRC}/doc/CMakeLists.txt
+
+post-patch:
+# Do not define _XOPEN_SOURCE, it breaks the build on FreeBSD (and is bogus
+# here anyways); instead, use this space to define required _WITH_DPRINTF
+	@${REINPLACE_CMD} -e 's,_XOPEN_SOURCE 700,_WITH_DPRINTF,' \
+		${WRKSRC}/src/common/darktable.h
+# Do not install useless (to end-user) documentation; adjust manpages path
+	@${REINPLACE_CMD} -e '/DOC_FILES/d ; s,share/man/man1,man/man1,' \
+		${WRKSRC}/doc/CMakeLists.txt
 # Respect CFLAGS for release builds; remove `-g' from common CFLAGS which
 # are used for release builds as well
 	@${REINPLACE_CMD} -e '/-O3/s,^,#, ; /-msse2/s, -g,,' \
@@ -115,9 +126,9 @@ post-patch:
 # Fix GConf schemas installation prefix
 	@${REINPLACE_CMD} -e 's,/etc/gconf/schemas,.&,' \
 		${WRKSRC}/data/CMakeLists.txt
-# Adjust manpages path
-	@${REINPLACE_CMD} -e 's,share/man/man1,man/man1,' \
-		${WRKSRC}/doc/CMakeLists.txt
+# Do not use bash(1) when good ol' sh(1) can suffice
+	@${REINPLACE_CMD} -e 's,usr/bin/env bash,bin/sh,' \
+		${WRKSRC}/tools/create_preferences.sh.in
 
 post-install:
 .if !defined(WITH_RAWSPEED)
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 53c8bdb77342..540258c7aac4 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (darktable-0.9.3.tar.gz) = 1cd75253355bd70b698dc78c2463c1b70867ac96cb6f23337a3b6dec6277892a
-SIZE (darktable-0.9.3.tar.gz) = 2330605
+SHA256 (darktable-1.0.3.tar.gz) = 112d237a9ec99dab814eccf938a6a9aea1d2e7eec2da685633a03632f9ae99f1
+SIZE (darktable-1.0.3.tar.gz) = 2538467
diff --git a/graphics/darktable/pkg-plist b/graphics/darktable/pkg-plist
index 512815389a35..66eaad34fc9e 100644
--- a/graphics/darktable/pkg-plist
+++ b/graphics/darktable/pkg-plist
@@ -1,6 +1,5 @@
 bin/darktable
 bin/darktable-cltest
-bin/darktable-faster
 %%DATADIR%%/darktable.gtkrc
 %%DATADIR%%/gdb_commands
 %%DATADIR%%/kernels/atrous.cl
@@ -12,6 +11,8 @@ bin/darktable-faster
 %%DATADIR%%/kernels/nlmeans.cl
 %%DATADIR%%/kernels/programs.conf
 %%DATADIR%%/kernels/sharpen.cl
+%%DATADIR%%/pixmaps/idbutton.png
+%%DATADIR%%/pixmaps/off.png
 %%DATADIR%%/pixmaps/plugins/darkroom/anlfyeni.png
 %%DATADIR%%/pixmaps/plugins/darkroom/atrous.png
 %%DATADIR%%/pixmaps/plugins/darkroom/basecurve.png
@@ -36,6 +37,7 @@ bin/darktable-faster
 %%DATADIR%%/pixmaps/plugins/darkroom/hotpixels.png
 %%DATADIR%%/pixmaps/plugins/darkroom/invert.png
 %%DATADIR%%/pixmaps/plugins/darkroom/lens.png
+%%DATADIR%%/pixmaps/plugins/darkroom/levels.png
 %%DATADIR%%/pixmaps/plugins/darkroom/lowlight.png
 %%DATADIR%%/pixmaps/plugins/darkroom/lowpass.png
 %%DATADIR%%/pixmaps/plugins/darkroom/monochrome.png
@@ -45,6 +47,7 @@ bin/darktable-faster
 %%DATADIR%%/pixmaps/plugins/darkroom/rawdenoise.png
 %%DATADIR%%/pixmaps/plugins/darkroom/rawimport.png
 %%DATADIR%%/pixmaps/plugins/darkroom/relight.png
+%%DATADIR%%/pixmaps/plugins/darkroom/shadhi.png
 %%DATADIR%%/pixmaps/plugins/darkroom/sharpen.png
 %%DATADIR%%/pixmaps/plugins/darkroom/soften.png
 %%DATADIR%%/pixmaps/plugins/darkroom/splittoning.png
@@ -88,25 +91,32 @@ lib/darktable/plugins/libclipping.so
 lib/darktable/plugins/libcolorcontrast.so
 lib/darktable/plugins/libcolorcorrection.so
 lib/darktable/plugins/libcolorin.so
+lib/darktable/plugins/libcolorize.so
 lib/darktable/plugins/libcolorout.so
+lib/darktable/plugins/libcolortransfer.so
 lib/darktable/plugins/libcolorzones.so
 lib/darktable/plugins/libdemosaic.so
 lib/darktable/plugins/libequalizer.so
 lib/darktable/plugins/libexposure.so
+lib/darktable/plugins/libflip.so
 lib/darktable/plugins/libgamma.so
 lib/darktable/plugins/libgraduatednd.so
 lib/darktable/plugins/libgrain.so
 lib/darktable/plugins/libhighlights.so
 lib/darktable/plugins/libhighpass.so
 lib/darktable/plugins/libhotpixels.so
+lib/darktable/plugins/libinvert.so
 lib/darktable/plugins/liblens.so
+lib/darktable/plugins/liblevels.so
 lib/darktable/plugins/liblowlight.so
+lib/darktable/plugins/liblowpass.so
 lib/darktable/plugins/libmonochrome.so
 lib/darktable/plugins/libnlmeans.so
 lib/darktable/plugins/liboverexposed.so
 lib/darktable/plugins/libprofile_gamma.so
 lib/darktable/plugins/librawdenoise.so
 lib/darktable/plugins/librelight.so
+lib/darktable/plugins/libshadhi.so
 lib/darktable/plugins/libsharpen.so
 lib/darktable/plugins/libsoften.so
 lib/darktable/plugins/libsplittoning.so
@@ -115,24 +125,48 @@ lib/darktable/plugins/libtemperature.so
 lib/darktable/plugins/libtonecurve.so
 lib/darktable/plugins/libtonemap.so
 lib/darktable/plugins/libvelvia.so
+lib/darktable/plugins/libvibrance.so
 lib/darktable/plugins/libvignette.so
 lib/darktable/plugins/libwatermark.so
 lib/darktable/plugins/libzonesystem.so
+lib/darktable/plugins/lighttable/libbackgroundjobs.so
 lib/darktable/plugins/lighttable/libcollect.so
+lib/darktable/plugins/lighttable/libcolorlabels.so
+lib/darktable/plugins/lighttable/libcolorpicker.so
 lib/darktable/plugins/lighttable/libcopy_history.so
+lib/darktable/plugins/lighttable/libdarktable_label.so
 lib/darktable/plugins/lighttable/libexport.so
+lib/darktable/plugins/lighttable/libfilmstrip.so
+lib/darktable/plugins/lighttable/libfilter.so
+lib/darktable/plugins/lighttable/libglobal_toolbox.so
+lib/darktable/plugins/lighttable/libhinter.so
+lib/darktable/plugins/lighttable/libhistogram.so
+lib/darktable/plugins/lighttable/libhistory.so
 lib/darktable/plugins/lighttable/libimage.so
+lib/darktable/plugins/lighttable/libimport.so
+lib/darktable/plugins/lighttable/libkeywords.so
+lib/darktable/plugins/lighttable/liblighttable_mode.so
 lib/darktable/plugins/lighttable/libmetadata.so
+lib/darktable/plugins/lighttable/libmetadata_view.so
+lib/darktable/plugins/lighttable/libmodule_toolbox.so
+lib/darktable/plugins/lighttable/libmodulegroups.so
+lib/darktable/plugins/lighttable/libmodulelist.so
+lib/darktable/plugins/lighttable/libnavigation.so
+lib/darktable/plugins/lighttable/libratings.so
 lib/darktable/plugins/lighttable/librecentcollect.so
 lib/darktable/plugins/lighttable/libselect.so
+lib/darktable/plugins/lighttable/libsnapshots.so
 lib/darktable/plugins/lighttable/libstyles.so
 lib/darktable/plugins/lighttable/libtagging.so
+lib/darktable/plugins/lighttable/libview_toolbox.so
+lib/darktable/plugins/lighttable/libviewswitcher.so
 lib/darktable/views/libdarkroom.so
-lib/darktable/views/libfilmstrip.so
 lib/darktable/views/liblighttable.so
 share/applications/darktable.desktop
 share/icons/hicolor/16x16/apps/darktable.png
 share/icons/hicolor/22x22/apps/darktable.png
+share/icons/hicolor/24x24/apps/darktable.png
+share/icons/hicolor/256x256/apps/darktable.png
 share/icons/hicolor/32x32/apps/darktable.png
 share/icons/hicolor/48x48/apps/darktable.png
 share/icons/hicolor/64x64/apps/darktable.png
@@ -153,6 +187,7 @@ share/locale/ru/LC_MESSAGES/darktable.mo
 share/locale/sq/LC_MESSAGES/darktable.mo
 share/locale/sv/LC_MESSAGES/darktable.mo
 share/locale/th/LC_MESSAGES/darktable.mo
+share/locale/zh_CN/LC_MESSAGES/darktable.mo
 @dirrmtry share/applications
 @dirrm lib/darktable/views
 @dirrm lib/darktable/plugins/lighttable