From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 20 13:50:07 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8776410657A5 for ; Mon, 20 Aug 2012 13:50:07 +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 3FFBD8FC16 for ; Mon, 20 Aug 2012 13:50:07 +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 q7KDo7hT000456 for ; Mon, 20 Aug 2012 13:50:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q7KDo7HT000455; Mon, 20 Aug 2012 13:50:07 GMT (envelope-from gnats) Resent-Date: Mon, 20 Aug 2012 13:50:07 GMT Resent-Message-Id: <201208201350.q7KDo7HT000455@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, Pietro Cerutti Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F43F1065674 for ; Mon, 20 Aug 2012 13:47:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 2AA878FC18 for ; Mon, 20 Aug 2012 13:47:10 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q7KDl9JC053390 for ; Mon, 20 Aug 2012 13:47:10 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q7KDl9oo053357; Mon, 20 Aug 2012 13:47:09 GMT (envelope-from nobody) Message-Id: <201208201347.q7KDl9oo053357@red.freebsd.org> Date: Mon, 20 Aug 2012 13:47:09 GMT From: Pietro Cerutti To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/170784: [bsd.port.mk] [patch] resolve symlinks in PREFIX on deinstall X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2012 13:50:07 -0000 >Number: 170784 >Category: ports >Synopsis: [bsd.port.mk] [patch] resolve symlinks in PREFIX on deinstall >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Aug 20 13:50:06 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Pietro Cerutti >Release: >Organization: The FreeBSD Project >Environment: >Description: The deinstall target checks whether PREFIX equals the cwd registered at install time, but fails to resolve symlinks. >How-To-Repeat: mkdir -p /usr/tmp/prefix ln -sf prefix /usr/tmp/link sudo make -C /usr/ports/audio/etcd (whatever) install deinstall ===> Deinstalling for audio/etcd ===> etcd-1.0.1 has a different PREFIX: /usr/tmp/prefix, skipping >Fix: Patch attached with submission follows: Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk (revision 302796) +++ Mk/bsd.port.mk (working copy) @@ -4477,7 +4477,7 @@ check_name=`${ECHO_CMD} $${p} | ${SED} -e 's/-[^-]*$$//'`; \ if [ "$${check_name}" = "${PKGBASE}" ]; then \ prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \ - if [ "x${PREFIX}" = "x$${prfx}" ]; then \ + if [ "x`${READLINK_CMD} -f ${PREFIX}`" = "x$${prfx}" ]; then \ ${ECHO_MSG} "===> Deinstalling $${p}"; \ ${PKG_DELETE} -f $${p}; \ else \ >Release-Note: >Audit-Trail: >Unformatted: