From owner-freebsd-gnome@FreeBSD.ORG Fri Jul 20 12:28:45 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 9949016A41A for ; Fri, 20 Jul 2007 12:28:45 +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 669CB13C4B5 for ; Fri, 20 Jul 2007 12:28:45 +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 90B151CC0C9; Fri, 20 Jul 2007 14:05:02 +0200 (CEST) Received: by lothlorien.brixandersen.dk (Postfix, from userid 1001) id 03A741141F; Fri, 20 Jul 2007 14:05:01 +0200 (CEST) To: FreeBSD-gnats-submit@freebsd.org From: Henrik Brix Andersen X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20070720120502.03A741141F@lothlorien.brixandersen.dk> Date: Fri, 20 Jul 2007 14:05:01 +0200 (CEST) Cc: gnome@FreeBSD.org Subject: [patch] Make graphics/gimp-app-devel install "default binaries" 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: Fri, 20 Jul 2007 12:28:45 -0000 >Submitter-Id: current-users >Originator: Henrik Brix Andersen >Organization: pil.dk >Confidential: no >Synopsis: [patch] Make graphics/gimp-app-devel install "default binaries" >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 #55: Fri Jul 20 01:36:09 CEST 2007 root@lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386 >Description: Since graphics/gimp-app-devel already conflicts with both graphics/gimp1 and graphics/gimp-app it might as well install "default binaries" - meaning create symlinks for gimp -> gimp-2.3 etc. >How-To-Repeat: # cd /usr/ports/graphics/gimp-devel # make install clean $ gimp gimp: Command not found. >Fix: The patch below adds '--enable-default-binary' to the configure call. It also utilizes $MLINKS for handling the man page symlinks (including the existing gimp-console-2.3.1 -> gimp-2.3.1 symlink). --- 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-06-13 11:25:32.000000000 +0200 +++ graphics/gimp-app-devel/Makefile 2007-07-20 13:26:51.000000000 +0200 @@ -8,6 +8,7 @@ PORTNAME= gimp-app PORTVERSION= 2.3.18 +PORTREVISION= 1 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -50,7 +51,8 @@ CONFIGURE_ARGS?=--disable-perl \ --without-print \ --disable-python \ --with-desktop-dir=${PREFIX}/share \ - --docdir=${PREFIX}/share/doc/gimp + --docdir=${PREFIX}/share/doc/gimp \ + --enable-default-binary CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ GIMP_THREAD_LIBS=${PTHREAD_LIBS} @@ -78,6 +80,11 @@ CONFLICTS= gimp-1.* gimp-app-[0-9]* MAN1+= gimp-2.3.1 gimp-remote-2.3.1 gimptool-2.0.1 MAN5+= gimprc-2.3.5 +MLINKS= gimp-2.3.1 gimp.1 \ + gimp-2.3.1 gimp-console-2.3.1 \ + gimp-console-2.3.1 gimp-console.1 \ + gimp-remote-2.3.1 gimp-remote.1 \ + gimprc-2.3.5 gimprc.5 .if defined(WITHOUT_RSVG) CONFIGURE_ARGS+= --without-librsvg diff -urp /usr/ports/graphics/gimp-app-devel/pkg-plist graphics/gimp-app-devel/pkg-plist --- /usr/ports/graphics/gimp-app-devel/pkg-plist 2007-06-13 11:25:32.000000000 +0200 +++ graphics/gimp-app-devel/pkg-plist 2007-07-20 13:05:40.000000000 +0200 @@ -1,5 +1,8 @@ +bin/gimp bin/gimp-2.3 +bin/gimp-console bin/gimp-console-2.3 +bin/gimp-remote bin/gimp-remote-2.3 bin/gimptool-2.0 etc/gimp/2.2/controllerrc @@ -251,8 +254,6 @@ libdata/pkgconfig/gimp-2.0.pc libdata/pkgconfig/gimpthumb-2.0.pc libdata/pkgconfig/gimpui-2.0.pc libexec/gimp/2.2/environ/default.env -@comment this is a simlink to gimp-2.3.1, so put it here because it gives me trouble with MAN1. -man/man1/gimp-console-2.3.1 libexec/gimp/2.2/interpreters/default.interp libexec/gimp/2.2/modules/libcdisplay_colorblind.a libexec/gimp/2.2/modules/libcdisplay_colorblind.la --- gimp-app-devel.diff ends here ---