From owner-freebsd-gnome@FreeBSD.ORG Thu Sep 20 23:43:55 2007 Return-Path: Delivered-To: gnome@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CAC416A418 for ; Thu, 20 Sep 2007 23:43:55 +0000 (UTC) (envelope-from brix@lothlorien.brixandersen.dk) Received: from solow.pil.dk (relay.pil.dk [195.41.47.164]) by mx1.freebsd.org (Postfix) with ESMTP id AF33913C45D for ; Thu, 20 Sep 2007 23:43:54 +0000 (UTC) (envelope-from brix@lothlorien.brixandersen.dk) Received: from lothlorien.brixandersen.dk (osgiliath.brixandersen.dk [87.53.223.189]) by solow.pil.dk (Postfix) with ESMTP id 37C271CC0E8; Thu, 20 Sep 2007 16:49:00 +0200 (CEST) Received: by lothlorien.brixandersen.dk (Postfix, from userid 1001) id E48C611425; Thu, 20 Sep 2007 16:48:59 +0200 (CEST) To: FreeBSD-gnats-submit@freebsd.org From: Henrik Brix Andersen X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20070920144859.E48C611425@lothlorien.brixandersen.dk> Date: Thu, 20 Sep 2007 16:48:59 +0200 (CEST) Cc: gnome@FreeBSD.org Subject: [patch] Make D-BUS and GNOME VFS optional in graphics/gimp-app-devel X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Henrik Brix Andersen List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Sep 2007 23:43:55 -0000 >Submitter-Id: current-users >Originator: Henrik Brix Andersen >Organization: >Confidential: no >Synopsis: [patch] Make D-BUS and GNOME VFS optional in graphics/gimp-app-devel >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 7.0-CURRENT i386 >Environment: System: FreeBSD lothlorien.brixandersen.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #72: Wed Sep 19 15:00:48 CEST 2007 root@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 ---