3 files changed, 156 insertions, 47 deletions

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 7ee7676f1ac3..f1aac7c32303 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -6,50 +6,53 @@
 #
 
 PORTNAME=	darktable
-PORTVERSION=	0.5
-PORTREVISION=	2
+PORTVERSION=	0.7.1
 CATEGORIES=	graphics
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.7
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A virtual lighttable and darkroom for photographers
 
-LIB_DEPENDS=	gegl-0.1.101:${PORTSDIR}/graphics/gegl \
-		exiv2.9:${PORTSDIR}/graphics/exiv2 \
+LICENSE=	GPLv3
+
+LIB_DEPENDS=	exiv2.9:${PORTSDIR}/graphics/exiv2 \
+		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
+		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
 		lensfun.2:${PORTSDIR}/graphics/lensfun \
-		lcms.1:${PORTSDIR}/graphics/lcms
+		lcms.1:${PORTSDIR}/graphics/lcms \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		curl.6:${PORTSDIR}/ftp/curl
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gconf2 libglade2
+USE_GNOME=	libglade2 librsvg2 gconf2
 GCONF_SCHEMAS=	${PORTNAME}.schemas
 USE_SQLITE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-silent-rules
+CONFIGURE_ARGS=	--disable-silent-rules --disable-gkeyring
+INSTALLS_ICONS=	yes
 MAN1=		${PORTNAME}.1
 
 post-patch:
-# Bandaid for log2f(3), which FreeBSD lacks
-	@${REINPLACE_CMD} -E 's,log2f\(([^)]*),logf(\1)/logf(2.0f,' \
-		${WRKSRC}/src/iop/exposure.c \
-		${WRKSRC}/src/iop/equalizer.c
-# Better respect for CFLAGS
-	@${REINPLACE_CMD} -E 's,-Werror( -g)?,,' \
-		${WRKSRC}/src/iop/Makefile.in \
-		${WRKSRC}/src/views/Makefile.in \
+# BSD readlink(1) is incompatible with one from GNU coreutils
+	@${REINPLACE_CMD} -e 's,readlink -f,realpath,' \
+		${WRKSRC}/tools/create_version_h.sh
+# Adjust location of `gnome-keyring.h' header file
+	@${REINPLACE_CMD} -e 's,gnome-keyring\.h,gnome-keyring-1/&,' \
+		${WRKSRC}/src/common/pwstorage/backend_gkeyring.c
+# Remove `-g' from C[PP]FLAGS
+	@${REINPLACE_CMD} -e 's, -g$$,,' \
+		${WRKSRC}/src/LibRaw/Makefile.in \
+		${WRKSRC}/src/iop/Makefile.in
+	@${REINPLACE_CMD} -E 's,[[:blank:]]-g([^t]),\1,' \
+		${WRKSRC}/src/imageio/format/Makefile.in \
+		${WRKSRC}/src/imageio/storage/Makefile.in \
 		${WRKSRC}/src/libs/Makefile.in \
-		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's,-O4 ,,' ${WRKSRC}/src/LibRaw/Makefile.in
-# FreeBSD 6.X does not have posix_memalign(3)
-	@${REINPLACE_CMD} -e 's,__APPLE__),& || __FreeBSD_version < 700013,' \
-		${WRKSRC}/src/common/darktable.c
-# Fix for libpng 1.4
-	@${REINPLACE_CMD} -e 's|png_infopp_NULL|NULL|g' \
-		-e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
-		${WRKSRC}/src/common/imageio_png.c
-	@${REINPLACE_CMD} -e 's|libpng12|libpng14|g' ${WRKSRC}/configure
+		${WRKSRC}/src/iop/Makefile.in \
+		${WRKSRC}/src/views/Makefile.in
+# Drop `-Werror' to fix the build of `common/image.c' on i386
+	@${REINPLACE_CMD} -e 's,-Werror ,,' ${WRKSRC}/src/Makefile.in
 # Do not install useless documentation files
 	@${REINPLACE_CMD} -e 's, install-dtdocDATA,,' ${WRKSRC}/Makefile.in
 
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 530f3c1d9b80..0bccdf1dc32d 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,3 +1,2 @@
-MD5 (darktable-0.5.tar.bz2) = 7e441a94e6c44e8b212439f7ac5cf3a6
-SHA256 (darktable-0.5.tar.bz2) = e5469091c54f053b6666d105e16bce88a6972241fd7e8efe4c443cf0193185d4
-SIZE (darktable-0.5.tar.bz2) = 821578
+SHA256 (darktable-0.7.1.tar.gz) = 15aaef52f3795334c337d2725638beae253f7ffef6b5ade9062b8ffb8adb0f20
+SIZE (darktable-0.7.1.tar.gz) = 1515605
diff --git a/graphics/darktable/pkg-plist b/graphics/darktable/pkg-plist
index 6a817a063d03..eaa5962aae71 100644
--- a/graphics/darktable/pkg-plist
+++ b/graphics/darktable/pkg-plist
@@ -1,38 +1,79 @@
 bin/darktable
-share/applications/darktable.desktop
-share/locale/fr/LC_MESSAGES/darktable.mo
-share/locale/ru/LC_MESSAGES/darktable.mo
-share/locale/sv/LC_MESSAGES/darktable.mo
-share/pixmaps/darktable.png
-%%DATADIR%%/color/in/linear_rgb.icc
-%%DATADIR%%/color/out/linear_rgb.icc
 %%DATADIR%%/darktable.glade
 %%DATADIR%%/darktable.gtkrc
-%%DATADIR%%/pixmaps/darktable-16.png
-%%DATADIR%%/pixmaps/darktable-32.png
-%%DATADIR%%/pixmaps/darktable-48.png
-%%DATADIR%%/pixmaps/darktable.png
-%%DATADIR%%/pixmaps/off.png
 %%DATADIR%%/pixmaps/plugins/darkroom/basecurve.png
+%%DATADIR%%/pixmaps/plugins/darkroom/bilateral.png
+%%DATADIR%%/pixmaps/plugins/darkroom/channelmixer.png
+%%DATADIR%%/pixmaps/plugins/darkroom/clahe.png
 %%DATADIR%%/pixmaps/plugins/darkroom/clipping.png
 %%DATADIR%%/pixmaps/plugins/darkroom/colorcorrection.png
 %%DATADIR%%/pixmaps/plugins/darkroom/colorin.png
 %%DATADIR%%/pixmaps/plugins/darkroom/colorout.png
+%%DATADIR%%/pixmaps/plugins/darkroom/colortransfer.png
 %%DATADIR%%/pixmaps/plugins/darkroom/colorzones.png
 %%DATADIR%%/pixmaps/plugins/darkroom/equalizer.png
 %%DATADIR%%/pixmaps/plugins/darkroom/exposure.png
-%%DATADIR%%/pixmaps/plugins/darkroom/gamma.png
+%%DATADIR%%/pixmaps/plugins/darkroom/graduatednd.png
+%%DATADIR%%/pixmaps/plugins/darkroom/grain.png
 %%DATADIR%%/pixmaps/plugins/darkroom/highlights.png
 %%DATADIR%%/pixmaps/plugins/darkroom/lens.png
 %%DATADIR%%/pixmaps/plugins/darkroom/monochrome.png
+%%DATADIR%%/pixmaps/plugins/darkroom/profile_gamma.png
 %%DATADIR%%/pixmaps/plugins/darkroom/rawimport.png
+%%DATADIR%%/pixmaps/plugins/darkroom/relight.png
 %%DATADIR%%/pixmaps/plugins/darkroom/sharpen.png
+%%DATADIR%%/pixmaps/plugins/darkroom/splittoning.png
 %%DATADIR%%/pixmaps/plugins/darkroom/temperature.png
 %%DATADIR%%/pixmaps/plugins/darkroom/template.png
 %%DATADIR%%/pixmaps/plugins/darkroom/tonecurve.png
+%%DATADIR%%/pixmaps/plugins/darkroom/velvia.png
+%%DATADIR%%/pixmaps/plugins/darkroom/vignette.png
+%%DATADIR%%/pixmaps/plugins/darkroom/watermark.png
+%%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.png
+%%DATADIR%%/watermarks/darktable.svg
+%%DATADIR%%/watermarks/promo.svg
+lib/darktable/libdarktable.a
+lib/darktable/libdarktable.la
+lib/darktable/libdarktable.so
+lib/darktable/plugins/imageio/format/libexr.a
+lib/darktable/plugins/imageio/format/libexr.la
+lib/darktable/plugins/imageio/format/libexr.so
+lib/darktable/plugins/imageio/format/libjpeg.a
+lib/darktable/plugins/imageio/format/libjpeg.la
+lib/darktable/plugins/imageio/format/libjpeg.so
+lib/darktable/plugins/imageio/format/libpfm.a
+lib/darktable/plugins/imageio/format/libpfm.la
+lib/darktable/plugins/imageio/format/libpfm.so
+lib/darktable/plugins/imageio/format/libpng.a
+lib/darktable/plugins/imageio/format/libpng.la
+lib/darktable/plugins/imageio/format/libpng.so
+lib/darktable/plugins/imageio/format/libppm.a
+lib/darktable/plugins/imageio/format/libppm.la
+lib/darktable/plugins/imageio/format/libppm.so
+lib/darktable/plugins/imageio/format/libtiff.a
+lib/darktable/plugins/imageio/format/libtiff.la
+lib/darktable/plugins/imageio/format/libtiff.so
+lib/darktable/plugins/imageio/storage/libdisk.a
+lib/darktable/plugins/imageio/storage/libdisk.la
+lib/darktable/plugins/imageio/storage/libdisk.so
+lib/darktable/plugins/imageio/storage/libemail.a
+lib/darktable/plugins/imageio/storage/libemail.la
+lib/darktable/plugins/imageio/storage/libemail.so
+lib/darktable/plugins/imageio/storage/libpicasa.a
+lib/darktable/plugins/imageio/storage/libpicasa.la
+lib/darktable/plugins/imageio/storage/libpicasa.so
 lib/darktable/plugins/libbasecurve.a
 lib/darktable/plugins/libbasecurve.la
 lib/darktable/plugins/libbasecurve.so
+lib/darktable/plugins/libbilateral.a
+lib/darktable/plugins/libbilateral.la
+lib/darktable/plugins/libbilateral.so
+lib/darktable/plugins/libchannelmixer.a
+lib/darktable/plugins/libchannelmixer.la
+lib/darktable/plugins/libchannelmixer.so
+lib/darktable/plugins/libclahe.a
+lib/darktable/plugins/libclahe.la
+lib/darktable/plugins/libclahe.so
 lib/darktable/plugins/libclipping.a
 lib/darktable/plugins/libclipping.la
 lib/darktable/plugins/libclipping.so
@@ -45,6 +86,9 @@ lib/darktable/plugins/libcolorin.so
 lib/darktable/plugins/libcolorout.a
 lib/darktable/plugins/libcolorout.la
 lib/darktable/plugins/libcolorout.so
+lib/darktable/plugins/libcolortransfer.a
+lib/darktable/plugins/libcolortransfer.la
+lib/darktable/plugins/libcolortransfer.so
 lib/darktable/plugins/libcolorzones.a
 lib/darktable/plugins/libcolorzones.la
 lib/darktable/plugins/libcolorzones.so
@@ -57,6 +101,12 @@ lib/darktable/plugins/libexposure.so
 lib/darktable/plugins/libgamma.a
 lib/darktable/plugins/libgamma.la
 lib/darktable/plugins/libgamma.so
+lib/darktable/plugins/libgraduatednd.a
+lib/darktable/plugins/libgraduatednd.la
+lib/darktable/plugins/libgraduatednd.so
+lib/darktable/plugins/libgrain.a
+lib/darktable/plugins/libgrain.la
+lib/darktable/plugins/libgrain.so
 lib/darktable/plugins/libhighlights.a
 lib/darktable/plugins/libhighlights.la
 lib/darktable/plugins/libhighlights.so
@@ -66,18 +116,45 @@ lib/darktable/plugins/liblens.so
 lib/darktable/plugins/libmonochrome.a
 lib/darktable/plugins/libmonochrome.la
 lib/darktable/plugins/libmonochrome.so
+lib/darktable/plugins/libprofile_gamma.a
+lib/darktable/plugins/libprofile_gamma.la
+lib/darktable/plugins/libprofile_gamma.so
 lib/darktable/plugins/librawimport.a
 lib/darktable/plugins/librawimport.la
 lib/darktable/plugins/librawimport.so
+lib/darktable/plugins/librelight.a
+lib/darktable/plugins/librelight.la
+lib/darktable/plugins/librelight.so
 lib/darktable/plugins/libsharpen.a
 lib/darktable/plugins/libsharpen.la
 lib/darktable/plugins/libsharpen.so
+lib/darktable/plugins/libsplittoning.a
+lib/darktable/plugins/libsplittoning.la
+lib/darktable/plugins/libsplittoning.so
 lib/darktable/plugins/libtemperature.a
 lib/darktable/plugins/libtemperature.la
 lib/darktable/plugins/libtemperature.so
 lib/darktable/plugins/libtonecurve.a
 lib/darktable/plugins/libtonecurve.la
 lib/darktable/plugins/libtonecurve.so
+lib/darktable/plugins/libvelvia.a
+lib/darktable/plugins/libvelvia.la
+lib/darktable/plugins/libvelvia.so
+lib/darktable/plugins/libvignette.a
+lib/darktable/plugins/libvignette.la
+lib/darktable/plugins/libvignette.so
+lib/darktable/plugins/libwatermark.a
+lib/darktable/plugins/libwatermark.la
+lib/darktable/plugins/libwatermark.so
+lib/darktable/plugins/libzonesystem.a
+lib/darktable/plugins/libzonesystem.la
+lib/darktable/plugins/libzonesystem.so
+lib/darktable/plugins/lighttable/libcamera.a
+lib/darktable/plugins/lighttable/libcamera.la
+lib/darktable/plugins/lighttable/libcamera.so
+lib/darktable/plugins/lighttable/libcapture.a
+lib/darktable/plugins/lighttable/libcapture.la
+lib/darktable/plugins/lighttable/libcapture.so
 lib/darktable/plugins/lighttable/libcollect.a
 lib/darktable/plugins/lighttable/libcollect.la
 lib/darktable/plugins/lighttable/libcollect.so
@@ -93,22 +170,53 @@ lib/darktable/plugins/lighttable/libimage.so
 lib/darktable/plugins/lighttable/libselect.a
 lib/darktable/plugins/lighttable/libselect.la
 lib/darktable/plugins/lighttable/libselect.so
+lib/darktable/plugins/lighttable/libstyles.a
+lib/darktable/plugins/lighttable/libstyles.la
+lib/darktable/plugins/lighttable/libstyles.so
 lib/darktable/plugins/lighttable/libtagging.a
 lib/darktable/plugins/lighttable/libtagging.la
 lib/darktable/plugins/lighttable/libtagging.so
+lib/darktable/views/libcapture.a
+lib/darktable/views/libcapture.la
+lib/darktable/views/libcapture.so
 lib/darktable/views/libdarkroom.a
 lib/darktable/views/libdarkroom.la
 lib/darktable/views/libdarkroom.so
+lib/darktable/views/libfilmstrip.a
+lib/darktable/views/libfilmstrip.la
+lib/darktable/views/libfilmstrip.so
 lib/darktable/views/liblighttable.a
 lib/darktable/views/liblighttable.la
 lib/darktable/views/liblighttable.so
-lib/libdarktable.a
-lib/libdarktable.la
-lib/libdarktable.so
+share/applications/darktable.desktop
+share/icons/hicolor/16x16/apps/darktable.png
+share/icons/hicolor/22x22/apps/darktable.png
+share/icons/hicolor/32x32/apps/darktable.png
+share/icons/hicolor/48x48/apps/darktable.png
+share/icons/hicolor/64x64/apps/darktable.png
+share/icons/hicolor/scalable/apps/darktable.svg
+share/locale/ca/LC_MESSAGES/darktable.mo
+share/locale/cs/LC_MESSAGES/darktable.mo
+share/locale/de/LC_MESSAGES/darktable.mo
+share/locale/es/LC_MESSAGES/darktable.mo
+share/locale/fi/LC_MESSAGES/darktable.mo
+share/locale/fr/LC_MESSAGES/darktable.mo
+share/locale/gl/LC_MESSAGES/darktable.mo
+share/locale/it/LC_MESSAGES/darktable.mo
+share/locale/nl/LC_MESSAGES/darktable.mo
+share/locale/pl/LC_MESSAGES/darktable.mo
+share/locale/ru/LC_MESSAGES/darktable.mo
+share/locale/sq/LC_MESSAGES/darktable.mo
+share/locale/sv/LC_MESSAGES/darktable.mo
+@dirrmtry share/applications
 @dirrm lib/darktable/views
 @dirrm lib/darktable/plugins/lighttable
+@dirrm lib/darktable/plugins/imageio/storage
+@dirrm lib/darktable/plugins/imageio/format
+@dirrm lib/darktable/plugins/imageio
 @dirrm lib/darktable/plugins
 @dirrm lib/darktable
+@dirrm %%DATADIR%%/watermarks
 @dirrm %%DATADIR%%/pixmaps/plugins/darkroom
 @dirrm %%DATADIR%%/pixmaps/plugins
 @dirrm %%DATADIR%%/pixmaps
@@ -116,4 +224,3 @@ lib/libdarktable.so
 @dirrm %%DATADIR%%/color/in
 @dirrm %%DATADIR%%/color
 @dirrm %%DATADIR%%
-@dirrmtry share/applications