From beat@FreeBSD.org  Tue Jun  1 21:26:39 2010
Return-Path: <beat@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7F6C61065676
	for <FreeBSD-gnats-submit@FreeBSD.org>; 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 <FreeBSD-gnats-submit@FreeBSD.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 Gtzi <beat@FreeBSD.org>
Reply-To: Beat Gtzi <beat@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:
Subject: [PATCH] Mk/bsd.licenses.mk: Fix leftovers with custom @cwd in plist
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 01 21:30:00 UTC 2010
>Closed-Date:    Fri Aug 20 12:17:33 UTC 2010
>Last-Modified:  Fri Aug 20 12:20:01 UTC 2010
>Originator:     Beat Gtzi
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: beat 
Responsible-Changed-When: Tue Jun 1 21:31:01 UTC 2010 
Responsible-Changed-Why:  
portmgr territory. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147296 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Aug 20 12:17:22 UTC 2010 
State-Changed-Why:  
Comitted, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147296 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/147296: commit references a PR
Date: Fri, 20 Aug 2010 12:15:11 +0000 (UTC)

 pav         2010-08-20 12:15:02 UTC
 
   FreeBSD ports repository
 
   Modified files:
     Mk                   bsd.commands.mk bsd.licenses.mk 
                          bsd.port.mk 
   Log:
   - Fix plist leftovers when using LICENSE framework and having @cwd command in
     plist
   
   PR:             ports/147296
   Submitted by:   beat
   
   - Provide end-user DISABLE_LICENSES knob to disable licensing framework
   
   PR:             ports/149070
   Submitted by:   amdmi3
   
   - Include bsd.gnome.mk when INSTALLS_ICONS is defined
   
   PR:             ports/148051
   Submitted by:   amdmi3
   
   - Disable xz memory limit to fix port builds on low-memory systems
   
   PR:             ports/148250
   Submitted by:   Warren Block <wblock@wonkity.com>
   
   - Remove compatibility shim for 6.3-RELEASE and older in describe target
   
   PR:             ports/146067
   Submitted by:   Alex Kozlov <spam@rm-rf.kiev.ua>
   
   - Remove INSTALLS_SHLIB
   
   PR:             ports/146351
   Submitted by:   Alex Kozlov <spam@rm-rf.kiev.ua>
   
   - Remove last trace of APACHE_COMPAT
   
   PR:             ports/147114
   Submitted by:   pgollucci
   
   - Allow ports to override _MAKE_JOBS
   
   PR:             ports/148754
   Submitted by:   Anonymous <swell.k@gmail.com>
   
   - Fixes to comments block
   
   PR:             ports/135649, ports/148190
   Submitted by:   pgollucci, gcooper
   
   Revision  Changes    Path
   1.6       +4 -3      ports/Mk/bsd.commands.mk
   1.3       +6 -10     ports/Mk/bsd.licenses.mk
   1.644     +36 -139   ports/Mk/bsd.port.mk
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
