ports/147296: [PATCH] Mk/bsd.licenses.mk: Fix leftovers with custom @cwd in plist

[Beat Gätzi]

>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 at 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: