From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 1 21:30:01 2010 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 5CA4E1065676 for ; Tue, 1 Jun 2010 21:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1DD758FC16 for ; Tue, 1 Jun 2010 21:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o51LU0wT058962 for ; Tue, 1 Jun 2010 21:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o51LU075058961; Tue, 1 Jun 2010 21:30:00 GMT (envelope-from gnats) Resent-Date: Tue, 1 Jun 2010 21:30:00 GMT Resent-Message-Id: <201006012130.o51LU075058961@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, Beat Gätzi Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F6C61065676 for ; Tue, 1 Jun 2010 21:26:39 +0000 (UTC) (envelope-from beat@FreeBSD.org) Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55]) by mx1.freebsd.org (Postfix) with ESMTP id 1BC5A8FC0C for ; Tue, 1 Jun 2010 21:26:38 +0000 (UTC) Received: from _HOSTNAME_ (113-91.2-85.cust.bluewin.ch [85.2.91.113]) (authenticated bits=0) by marvin.chruetertee.ch (8.14.3/8.14.3) with ESMTP id o51LQa7e011745 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Tue, 1 Jun 2010 21:26:37 GMT (envelope-from beat@FreeBSD.org) Received: by _HOSTNAME_ (sSMTP sendmail emulation); Tue, 01 Jun 2010 23:27:39 +0200 Message-Id: <201006012126.o51LQa7e011745@marvin.chruetertee.ch> Date: Tue, 01 Jun 2010 23:27:39 +0200 From: Beat Gätzi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/147296: [PATCH] Mk/bsd.licenses.mk: Fix leftovers with custom @cwd in plist X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Beat Gätzi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2010 21:30:01 -0000 >Number: 147296 >Category: ports >Synopsis: [PATCH] Mk/bsd.licenses.mk: Fix leftovers with custom @cwd in plist >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: Tue Jun 01 21:30:00 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Beat Gätzi >Release: FreeBSD 8.0-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD daedalus.network.local 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #17 r201690: Thu Jan 7 00:23:37 CET 2010 root@daedalus.network.local:/usr/obj/usr/src/sys/BEASTIE i386 >Description: If a port set @cwd != ${PREFIX} in the pkg-plist the new bsd.licenses.mk will leave some leftovers behind. >How-To-Repeat: Install emulators/virtualbox-ose-kmod with LICENSE and LICENSE_FILE set and deinstall it afterwards: ===> Deinstalling for emulators/virtualbox-ose-kmod ===> Deinstalling virtualbox-ose-kmod-3.2.0 pkg_delete: file '//share/licenses/virtualbox-ose-kmod-3.2.0' doesn't exist pkg_delete: unable to completely remove directory '//share/licenses/virtualbox-ose-kmod-3.2.0' pkg_delete: couldn't entirely delete package (perhaps the packing list is incorrectly specified?) # ls /usr/local/share/licenses/ virtualbox-ose-kmod-3.2.0/ >Fix: --- bsd.licenses.mk.patch begins here --- Index: bsd.licenses.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.licenses.mk,v retrieving revision 1.2 diff -u -r1.2 bsd.licenses.mk --- bsd.licenses.mk 26 May 2010 02:20:27 -0000 1.2 +++ bsd.licenses.mk 1 Jun 2010 21:14:54 -0000 @@ -720,7 +720,6 @@ .if !defined(NO_LICENSES_INSTALL) PLIST_FILES+= ${_LICENSE_DIR_REL}/${_LICENSE_CATALOG:T} \ ${_LICENSE_DIR_REL}/${_LICENSE_REPORT:T} -PLIST_DIRS+= ${_LICENSE_DIR_REL} .if ${_LICENSE_COMB} == "single" PLIST_FILES+= ${_LICENSE_DIR_REL}/${_LICENSE_FILE:T} @@ -744,6 +743,8 @@ . endfor .endif # XXX @dirrmtry entry must be here (no way to do with PLIST_* vars) + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm ${_LICENSE_DIR_REL}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir %D/share/licenses 2>/dev/null || true" >> ${TMPPLIST} .else --- bsd.licenses.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: