From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 14 09:20:02 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A7E0106566B for ; Wed, 14 Mar 2012 09:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 558CA8FC15 for ; Wed, 14 Mar 2012 09:20:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q2E9K2ad051375 for ; Wed, 14 Mar 2012 09:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q2E9K2oW051374; Wed, 14 Mar 2012 09:20:02 GMT (envelope-from gnats) Resent-Date: Wed, 14 Mar 2012 09:20:02 GMT Resent-Message-Id: <201203140920.q2E9K2oW051374@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Romain Tartiere Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEE461065670 for ; Wed, 14 Mar 2012 09:17:40 +0000 (UTC) (envelope-from romain@blogreen.org) Received: from marvin.blogreen.org (marvin.blogreen.org [109.190.4.139]) by mx1.freebsd.org (Postfix) with ESMTP id 823658FC0C for ; Wed, 14 Mar 2012 09:17:40 +0000 (UTC) Received: by marvin.blogreen.org (Postfix, from userid 1001) id 3DBBC3D402; Wed, 14 Mar 2012 10:17:37 +0100 (CET) Message-Id: <20120314091738.3DBBC3D402@marvin.blogreen.org> Date: Wed, 14 Mar 2012 10:17:37 +0100 (CET) From: Romain Tartiere To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/166082: [patch] devel/gdb does not install gdb link from packages. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Romain Tartiere List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2012 09:20:02 -0000 >Number: 166082 >Category: ports >Synopsis: [patch] devel/gdb does not install gdb link from packages. >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: Wed Mar 14 09:20:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Romain Tartiere >Release: FreeBSD 9.0-STABLE amd64 >Organization: >Environment: System: FreeBSD marvin.blogreen.org 9.0-STABLE FreeBSD 9.0-STABLE #25 r230911: Thu Feb 2 14:45:22 CET 2012 root@marvin.blogreen.org:/usr/obj/usr/src/sys/MARVIN amd64 >Description: Installing a package of devel/gdb with GDB_LINK option set does not install the ${LOCALBASE}/bin/gdb link. >How-To-Repeat: # cd /usr/ports/devel/gdb && make package # file /usr/local/bin/gdb # Works # pkg_delete gdb-\* # pkg_add gdb* # file /usr/local/bin/gdb # Fails >Fix: Either create the link from the pkg-plist in the same fashion it is removed on uninstall and remove the related lines from the Makefile: --- p1 begins here --- diff -Nur /var/cache/portshaker/ports/devel/gdb/Makefile ./Makefile --- /var/cache/portshaker/ports/devel/gdb/Makefile 2012-03-09 18:03:28.000000000 +0100 +++ ./Makefile 2012-03-14 10:08:51.845892784 +0100 @@ -105,8 +105,5 @@ (cd ${WRKSRC}/gdb; ${GMAKE} install-python ) (cd ${WRKSRC}/gdb/data-directory; ${GMAKE} install-python ) .endif -.if defined(WITH_GDB_LINK) - ${LN} -s ${PREFIX}/bin/gdb${VER} ${PREFIX}/bin/gdb -.endif .include diff -Nur /var/cache/portshaker/ports/devel/gdb/pkg-plist ./pkg-plist --- /var/cache/portshaker/ports/devel/gdb/pkg-plist 2012-03-09 18:03:28.000000000 +0100 +++ ./pkg-plist 2012-03-14 10:09:02.533985850 +0100 @@ -11,4 +11,5 @@ %%PYTHON%%@dirrm share/gdb%%VER%%/python/gdb %%PYTHON%%@dirrm share/gdb%%VER%%/python %%PYTHON%%@dirrm share/gdb%%VER%% +@exec if $( %%GDB_LINK%% ) ; then ln -fs %%PREFIX%%/bin/gdb%%VER%% %%PREFIX%%/bin/gdb; fi @unexec if $( %%GDB_LINK%% ) ; then rm -f %%PREFIX%%/bin/gdb; fi --- p1 ends here --- OR package the link in pkg-plist: --- p2 begins here --- diff -Nur /var/cache/portshaker/ports/devel/gdb/Makefile ./Makefile --- /var/cache/portshaker/ports/devel/gdb/Makefile 2012-03-09 18:03:28.000000000 +0100 +++ ./Makefile 2012-03-14 10:12:45.204626165 +0100 @@ -55,9 +55,9 @@ .include .if defined(WITH_GDB_LINK) -PLIST_SUB+= GDB_LINK=true +PLIST_SUB+= GDB_LINK="" .else -PLIST_SUB+= GDB_LINK=false +PLIST_SUB+= GDB_LINK="@comment " .endif .if defined(WITH_PYTHON) diff -Nur /var/cache/portshaker/ports/devel/gdb/pkg-plist ./pkg-plist --- /var/cache/portshaker/ports/devel/gdb/pkg-plist 2012-03-09 18:03:28.000000000 +0100 +++ ./pkg-plist 2012-03-14 10:13:11.288629566 +0100 @@ -1,3 +1,4 @@ +%%GDB_LINK%%bin/gdb bin/gdb%%VER%% bin/gdbtui%%VER%% %%PYTHON%%share/gdb%%VER%%/python/gdb/__init__.py @@ -11,4 +12,3 @@ %%PYTHON%%@dirrm share/gdb%%VER%%/python/gdb %%PYTHON%%@dirrm share/gdb%%VER%%/python %%PYTHON%%@dirrm share/gdb%%VER%% -@unexec if $( %%GDB_LINK%% ) ; then rm -f %%PREFIX%%/bin/gdb; fi --- p2 ends here --- >Release-Note: >Audit-Trail: >Unformatted: