ports/116497: [patch] Make D-BUS and GNOME VFS optional in graphics/gimp-app-devel

[Henrik Brix Andersen]

>Number:         116497
>Category:       ports
>Synopsis:       [patch] Make D-BUS and GNOME VFS optional in graphics/gimp-app-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 20 22:30:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Henrik Brix Andersen
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD lothlorien.brixandersen.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #72: Wed Sep 19 15:00:48 CEST 2007 root at lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386


	
>Description:

The recent update of graphics/gimp-app-devel added hardcoded
dependencies on devel/dbus-glib and security/gnome-keyring. This patch
makes both of these optional.

	
>How-To-Repeat:
	
>Fix:

	

--- gimp-app-devel.diff begins here ---
diff -urp /usr/ports/graphics/gimp-app-devel/Makefile graphics/gimp-app-devel/Makefile
--- /usr/ports/graphics/gimp-app-devel/Makefile	2007-09-13 18:26:46.000000000 +0200
+++ graphics/gimp-app-devel/Makefile	2007-09-17 19:54:34.000000000 +0200
@@ -8,7 +8,7 @@
 
 PORTNAME=	gimp-app
 DISTVERSION=	2.4.0-rc2
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -33,9 +33,7 @@ LIB_DEPENDS=	exif.12:${PORTSDIR}/graphic
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		lcms.1:${PORTSDIR}/graphics/lcms \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+		lcms.1:${PORTSDIR}/graphics/lcms
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -62,6 +60,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/
 
 .if !defined(GIMP_SLAVE)
 OPTIONS?=	DEBUG "debugging" off \
+		DBUS "D-BUS support" on \
+		GNOMEVFS "Use GNOME VFS for the URI plug-in" on \
 		HELPBROWSER "internal help browser" on \
 		MP "multiple processor support" off \
 		RSVG "SVG format support" on
@@ -123,6 +123,18 @@ CONFIGURE_ARGS+=	--without-gtkhtml2
 PLIST_SUB+=		HELPBROWSER="@comment "
 .endif
 
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+CONFIGURE_ARGS+=	--with-dbus
+.else
+CONFIGURE_ARGS+=	--without-dbus
+.endif
+
+.if defined(WITH_GNOMEVFS)
+LIB_DEPENDS+=		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+USE_GNOME+=		gnomevfs2
+.endif
+
 .endif
 
 post-patch:
--- gimp-app-devel.diff ends here ---


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