ports/175225: [PATCH] Update graphics/darktable to 1.1.2

[Jean-Sébastien Pédron]

>Number:         175225
>Category:       ports
>Synopsis:       [PATCH] Update graphics/darktable to 1.1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 12 01:30:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Sébastien Pédron
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
The FreeBSD Project
>Environment:
FreeBSD magellan.dumbbell.fr 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r245297M: Fri Jan 11 13:42:43 CET 2013     root at magellan.dumbbell.fr:/usr/obj/home/dumbbell/Projects/freebsd/src/SVN/head/sys/MAGELLAN  amd64
>Description:
The patch is attached to this PR.

This patch includes several changes not related to the version update:
    o I took the liberty to rename the "GLIBJSON" option to "FACEBOOK" and change the associated description. The json-glib dependency is only used by the Facebook export plugin, and I think it better explains the added feature.
    o Fix plist related to GEO and FACEBOOK options.
    o No need to remove data/js/.DS_Store, it's fixed upstream.

This PR replaces ports/174531, which updated darktable to 1.1.1.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: graphics/darktable/Makefile
===================================================================
--- graphics/darktable/Makefile	(revision 310255)
+++ graphics/darktable/Makefile	(working copy)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	darktable
-PORTVERSION=	1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
 
 MAINTAINER=	danfe at FreeBSD.org
 COMMENT=	Virtual lighttable and darkroom for photographers
@@ -12,11 +12,14 @@
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	exiv2:${PORTSDIR}/graphics/exiv2 \
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
+		exiv2:${PORTSDIR}/graphics/exiv2 \
 		IlmImf:${PORTSDIR}/graphics/OpenEXR \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		lcms2:${PORTSDIR}/graphics/lcms2 \
 		lensfun:${PORTSDIR}/graphics/lensfun \
-		lcms2:${PORTSDIR}/graphics/lcms2 \
-		curl:${PORTSDIR}/ftp/curl
+		png15:${PORTSDIR}/graphics/png \
+		tiff:${PORTSDIR}/graphics/tiff
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	uses SSE extensions
@@ -25,18 +28,18 @@
 
 USE_CMAKE=	yes
 CMAKE_OUTSOURCE=	yes
-USE_GNOME=	librsvg2
+USE_GNOME=	libxml2 librsvg2
 USE_SQLITE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 INSTALLS_ICONS=	yes
 MAN1=		${PORTNAME}.1
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	GPHOTO GEO FLICKR GLIBJSON KWALLET GNOMEKEYRING RAWSPEED \
+OPTIONS_DEFINE=	GPHOTO GEO FLICKR FACEBOOK KWALLET GNOMEKEYRING RAWSPEED \
 		SLIDESHOW NLS GCC46
 
 GEO_DESC=	Build geotagging parts
-GLIBJSON_DESC=	GlibJson library support
+FACEBOOK_DESC=	Support images export to Facebook
 RAWSPEED_DESC=	Compile with rawspeed backend
 SLIDESHOW_DESC=	Build OpenGL/SDL slideshow viewer
 GCC46_DESC=	Build with GCC 4.6+ (better OpenMP support)
@@ -57,6 +60,9 @@
 
 .if ${PORT_OPTIONS:MGEO}
 LIB_DEPENDS+=	soup-2.4:${PORTSDIR}/devel/libsoup
+PLIST_FILES+=	lib/darktable/plugins/lighttable/liblocation.so \
+		lib/darktable/plugins/lighttable/libmap_settings.so \
+		lib/darktable/views/libmap.so
 .else
 CMAKE_ARGS+=	-DUSE_GEO:BOOL=OFF
 .endif
@@ -68,8 +74,9 @@
 CMAKE_ARGS+=	-DUSE_FLICKR:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MGLIBJSON}
+.if ${PORT_OPTIONS:MFACEBOOK}
 LIB_DEPENDS+=	json-glib-1.0:${PORTSDIR}/devel/json-glib
+PLIST_FILES+=	lib/darktable/plugins/imageio/storage/libfacebook.so
 .else
 CMAKE_ARGS+=	-DUSE_GLIBJSON:BOOL=OFF
 .endif
@@ -117,7 +124,6 @@
 .endif
 
 post-patch:
-	@${RM} ${WRKSRC}/data/js/.DS_Store
 	@${REINPLACE_CMD} -e 's,const gint,gint,' \
 		${WRKSRC}/src/external/osm-gps-map/src/osm-gps-map-image.*
 # Do not install useless (to end-user) documentation; adjust manpages path
Index: graphics/darktable/distinfo
===================================================================
--- graphics/darktable/distinfo	(revision 310255)
+++ graphics/darktable/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (darktable-1.1.tar.gz) = 8f2401422ab3e0bb038b3fedf411aaf69994d679674757ee7886b6146b9fdd4f
-SIZE (darktable-1.1.tar.gz) = 3423644
+SHA256 (darktable-1.1.2.tar.gz) = 225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765
+SIZE (darktable-1.1.2.tar.gz) = 3432009
Index: graphics/darktable/pkg-plist
===================================================================
--- graphics/darktable/pkg-plist	(revision 310255)
+++ graphics/darktable/pkg-plist	(working copy)
@@ -102,7 +102,6 @@
 lib/darktable/plugins/imageio/format/libtiff.so
 lib/darktable/plugins/imageio/storage/libdisk.so
 lib/darktable/plugins/imageio/storage/libemail.so
-lib/darktable/plugins/imageio/storage/libfacebook.so
 lib/darktable/plugins/imageio/storage/libgallery.so
 lib/darktable/plugins/imageio/storage/liblatex.so
 lib/darktable/plugins/imageio/storage/libpicasa.so
@@ -176,8 +175,6 @@
 lib/darktable/plugins/lighttable/libimport.so
 lib/darktable/plugins/lighttable/libkeywords.so
 lib/darktable/plugins/lighttable/liblighttable_mode.so
-lib/darktable/plugins/lighttable/liblocation.so
-lib/darktable/plugins/lighttable/libmap_settings.so
 lib/darktable/plugins/lighttable/libmetadata.so
 lib/darktable/plugins/lighttable/libmetadata_view.so
 lib/darktable/plugins/lighttable/libmodule_toolbox.so
@@ -195,7 +192,6 @@
 lib/darktable/plugins/lighttable/libviewswitcher.so
 lib/darktable/views/libdarkroom.so
 lib/darktable/views/liblighttable.so
-lib/darktable/views/libmap.so
 share/applications/darktable.desktop
 share/icons/hicolor/16x16/apps/darktable.png
 share/icons/hicolor/22x22/apps/darktable.png


>Release-Note:
>Audit-Trail:
>Unformatted: