From owner-freebsd-gnome@FreeBSD.ORG Wed May 2 22:20:29 2007 Return-Path: X-Original-To: gnome@FreeBSD.org Delivered-To: freebsd-gnome@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BA03416A400; Wed, 2 May 2007 22:20:29 +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 81EC313C469; Wed, 2 May 2007 22:20:29 +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 85BE11CC0B8; Thu, 3 May 2007 00:00:58 +0200 (CEST) Received: by lothlorien.brixandersen.dk (Postfix, from userid 1001) id F0A3711422; Thu, 3 May 2007 00:00:57 +0200 (CEST) To: FreeBSD-gnats-submit@freebsd.org From: Henrik Brix Andersen X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20070502220057.F0A3711422@lothlorien.brixandersen.dk> Date: Thu, 3 May 2007 00:00:57 +0200 (CEST) Cc: gnome@FreeBSD.org, Michael Johnson Subject: [patch] Make helpbrowser plug-in 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: Wed, 02 May 2007 22:20:29 -0000 >Submitter-Id: current-users >Originator: Henrik Brix Andersen >Organization: pil.dk >Confidential: no >Synopsis: [patch] Make helpbrowser plug-in 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 #26: Wed May 2 20:40:03 CEST 2007 root@lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386 >Description: With revision 1.166 of graphics/gimp-app-devel/Makefile libgtkhtml support, which is only needed for the internal help browser, is no longer optional. Since www/libgtkhtml pulls in quite a few large dependencies I propose making this optional (again). >How-To-Repeat: >Fix: Proposed patch: --- gimp-app-devel.diff begins here --- diff -urp /usr/ports/graphics/gimp-app-devel/Makefile gimp-app-devel/Makefile --- /usr/ports/graphics/gimp-app-devel/Makefile Wed Apr 25 20:38:50 2007 +++ gimp-app-devel/Makefile Tue May 1 23:57:10 2007 @@ -8,6 +8,7 @@ PORTNAME= gimp-app PORTVERSION= 2.3.16 +PORTREVISION= 1 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -38,7 +39,7 @@ USE_GETTEXT= yes USE_XPM= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -USE_GNOME+= gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils libgtkhtml +USE_GNOME+= gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils WANT_GNOME= yes USE_GCC= 3.4+ USE_LDCONFIG= yes @@ -57,6 +58,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/ .if !defined(GIMP_SLAVE) OPTIONS?= DEBUG "debugging" off \ + HELPBROWSER "internal help browser" on \ MP "multiple processor support" off \ RSVG "SVG format support" on .endif @@ -101,6 +103,15 @@ USE_GNOME+= desktopfileutils gnomehier PLIST_SUB+= GNOME="" .else PLIST_SUB+= GNOME="@comment " +.endif + +.if defined(WITH_HELPBROWSER) +USE_GNOME+= libgtkhtml +CONFIGURE_ARGS+= --with-gtkhtml2 +PLIST_SUB+= HELPBROWSER="" +.else +CONFIGURE_ARGS+= --without-gtkhtml2 +PLIST_SUB+= HELPBROWSER="@comment " .endif .endif diff -urp /usr/ports/graphics/gimp-app-devel/pkg-plist gimp-app-devel/pkg-plist --- /usr/ports/graphics/gimp-app-devel/pkg-plist Wed Apr 25 19:57:45 2007 +++ gimp-app-devel/pkg-plist Tue May 1 23:59:39 2007 @@ -356,7 +356,7 @@ libexec/gimp/2.2/plug-ins/gtm libexec/gimp/2.2/plug-ins/guillotine libexec/gimp/2.2/plug-ins/header libexec/gimp/2.2/plug-ins/help -libexec/gimp/2.2/plug-ins/helpbrowser +%%HELPBROWSER%%libexec/gimp/2.2/plug-ins/helpbrowser libexec/gimp/2.2/plug-ins/hot libexec/gimp/2.2/plug-ins/ifscompose libexec/gimp/2.2/plug-ins/illusion --- gimp-app-devel.diff ends here ---