From nobody@FreeBSD.org  Sat Jan 12 01:22:41 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id CDD00E95
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 12 Jan 2013 01:22:41 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id AEB28DAC
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 12 Jan 2013 01:22:41 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r0C1Mfjc049499
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 12 Jan 2013 01:22:41 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r0C1Mfw4049498;
	Sat, 12 Jan 2013 01:22:41 GMT
	(envelope-from nobody)
Message-Id: <201301120122.r0C1Mfw4049498@red.freebsd.org>
Date: Sat, 12 Jan 2013 01:22:41 GMT
From: Jean-Sbastien Pdron <dumbbell@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] Update graphics/darktable to 1.1.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         175225
>Category:       ports
>Synopsis:       [PATCH] Update graphics/darktable to 1.1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    danfe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 12 01:30:01 UTC 2013
>Closed-Date:    Wed Jan 30 09:32:09 UTC 2013
>Last-Modified:  Wed Jan 30 09:40:00 UTC 2013
>Originator:     Jean-Sbastien Pdron
>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@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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->danfe 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jan 12 01:30:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175225 

From: =?ISO-8859-1?Q?Jean-S=E9bastien_P=E9dron?= <dumbbell@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175225: [PATCH] Update graphics/darktable to 1.1.2
Date: Sat, 12 Jan 2013 21:01:24 +0100

 FYI, a new tarball was uploaded by the darktable developers, but the
 distinfo in this patch is already made against the correct re-uploaded
 version.
State-Changed-From-To: open->closed 
State-Changed-By: danfe 
State-Changed-When: Wed Jan 30 09:31:45 UTC 2013 
State-Changed-Why:  
Committed with minor modifications, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175225 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175225: commit references a PR
Date: Wed, 30 Jan 2013 09:31:42 +0000 (UTC)

 Author: danfe
 Date: Wed Jan 30 09:31:34 2013
 New Revision: 311207
 URL: http://svnweb.freebsd.org/changeset/ports/311207
 
 Log:
   - Update to version 1.1.2
   - Rename GLIBJSON option to FACEBOOK
   
   PR:		ports/175225
   Submitted by:	dumbbell
 
 Modified:
   head/graphics/darktable/Makefile
   head/graphics/darktable/distinfo
   head/graphics/darktable/pkg-plist
 
 Modified: head/graphics/darktable/Makefile
 ==============================================================================
 --- head/graphics/darktable/Makefile	Wed Jan 30 09:13:06 2013	(r311206)
 +++ head/graphics/darktable/Makefile	Wed Jan 30 09:31:34 2013	(r311207)
 @@ -2,10 +2,9 @@
  # $FreeBSD$
  
  PORTNAME=	darktable
 -PORTVERSION=	1.1
 -PORTREVISION=	1
 +PORTVERSION=	1.1.2
  CATEGORIES=	graphics
 -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
  
  MAINTAINER=	danfe@FreeBSD.org
  COMMENT=	Virtual lighttable and darkroom for photographers
 @@ -33,11 +32,11 @@ 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)
 @@ -58,6 +57,9 @@ CMAKE_ARGS+=	-DUSE_CAMERA_SUPPORT:BOOL=O
  
  .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
 @@ -69,8 +71,9 @@ PLIST_FILES+=	lib/darktable/plugins/imag
  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
 @@ -118,7 +121,6 @@ LDFLAGS+=	-lstdc++
  .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
 @@ -128,12 +130,6 @@ post-patch:
  # are used for release builds as well
  	@${REINPLACE_CMD} -e '/-O3/s,^,#, ; /-msse2/s, -g,,' \
  		${WRKSRC}/src/CMakeLists.txt
 -# Add some missing newlines at the EOF to unbreak the build
 -	@${ECHO_CMD} >> ${WRKSRC}/src/common/srgb_tone_curve_values.h
 -	@${ECHO_CMD} >> ${WRKSRC}/src/common/gpx.c
 -	@${ECHO_CMD} >> ${WRKSRC}/src/gui/drag_and_drop.h
 -	@${ECHO_CMD} >> ${WRKSRC}/src/gui/gtkentry.c
 -	@${ECHO_CMD} >> ${WRKSRC}/src/views/map.c
  
  post-install:
  .if ! ${PORT_OPTIONS:MRAWSPEED}
 
 Modified: head/graphics/darktable/distinfo
 ==============================================================================
 --- head/graphics/darktable/distinfo	Wed Jan 30 09:13:06 2013	(r311206)
 +++ head/graphics/darktable/distinfo	Wed Jan 30 09:31:34 2013	(r311207)
 @@ -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
 
 Modified: head/graphics/darktable/pkg-plist
 ==============================================================================
 --- head/graphics/darktable/pkg-plist	Wed Jan 30 09:13:06 2013	(r311206)
 +++ head/graphics/darktable/pkg-plist	Wed Jan 30 09:31:34 2013	(r311207)
 @@ -102,7 +102,6 @@ lib/darktable/plugins/imageio/format/lib
  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/libimag
  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/libview
  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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
