From m.seaman@infracaninophile.co.uk  Sun Jan 22 17:08:44 2006
Return-Path: <m.seaman@infracaninophile.co.uk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8DD9E16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Jan 2006 17:08:44 +0000 (GMT)
	(envelope-from m.seaman@infracaninophile.co.uk)
Received: from smtp.infracaninophile.co.uk (imap.infracaninophile.co.uk [81.187.76.162])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 987B343D45
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 22 Jan 2006 17:08:42 +0000 (GMT)
	(envelope-from m.seaman@infracaninophile.co.uk)
Received: from happy-idiot-talk.infracaninophile.co.uk (localhost [IPv6:::1])
	by smtp.infracaninophile.co.uk (8.13.4/8.13.4) with ESMTP id k0MH8WXF002178
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Sun, 22 Jan 2006 17:08:32 GMT
	(envelope-from matthew@happy-idiot-talk.infracaninophile.co.uk)
Received: (from matthew@localhost)
	by happy-idiot-talk.infracaninophile.co.uk (8.13.4/8.13.4/Submit) id k0MH8UuR002177;
	Sun, 22 Jan 2006 17:08:30 GMT
	(envelope-from matthew)
Message-Id: <200601221708.k0MH8UuR002177@happy-idiot-talk.infracaninophile.co.uk>
Date: Sun, 22 Jan 2006 17:08:30 GMT
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Reply-To: Matthew Seaman <m.seaman@infracaninophile.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc: edwin@mavetju.org
Subject: [maintainer] net/phpldapadmin -- an @unexec rmdir that got away
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         92161
>Category:       ports
>Synopsis:       [maintainer] net/phpldapadmin -- an @unexec rmdir that got away
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sem
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 22 17:10:02 GMT 2006
>Closed-Date:    Sun Jan 22 18:36:07 GMT 2006
>Last-Modified:  Sun Jan 22 18:36:07 GMT 2006
>Originator:     Matthew Seaman
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 4.11-STABLE FreeBSD 4.11-STABLE #96: Thu Dec 29 14:07:11 GMT 2005 root@happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

Here's one that slipped through the net when Edwin purged the tree
of '@unexec rmdir' type constructs in pkg-plist etc. 


>How-To-Repeat:
	
>Fix:

	

--- phpldapadmin.diff begins here ---
diff -Nur /usr/ports/net/phpldapadmin/Makefile phpldapadmin/Makefile
--- /usr/ports/net/phpldapadmin/Makefile	Sat Jan 21 23:00:07 2006
+++ phpldapadmin/Makefile	Sun Jan 22 16:58:48 2006
@@ -51,9 +51,6 @@
 PLIST=		${WRKDIR}/plist
 PLIST_SUB+=	PLADIR=${PLADIR} PLAGRP=${PLAGRP}
 
-sedSTART=	@unexec ${RMDIR} %D/%%PLADIR%%
-sedEND=		2>/dev/null || true
-
 .SILENT:
 
 pre-everything::
@@ -70,8 +67,8 @@
 	    ${SORT} | ${SED} -e "s!^\.!%%PLADIR%%!"             >${PLIST} ; \
 	${CAT} ${PKGDIR}/pkg-plist-chunk                       >>${PLIST} ; \
 	${FIND} . -type d | ${SORT} -r | ${SED}                             \
-	    -e 's!^\./${CFGDIR}$$!${sedSTART}/${CFGDIR} ${sedEND}!'         \
-	    -e 's!^\.$$!${sedSTART} ${sedEND}!'                             \
+	    -e 's!^\./${CFGDIR}$$!@dirrmtry %%PLADIR%%/${CFGDIR}!'          \
+	    -e 's!^\.$$!@dirrmtry %%PLADIR%%!'                              \
 	    -e 's!^\.!@dirrm %%PLADIR%%!'                      >>${PLIST}
 
 pre-install:
--- phpldapadmin.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sem 
Responsible-Changed-By: sem 
Responsible-Changed-When: Sun Jan 22 18:19:38 UTC 2006 
Responsible-Changed-Why:  
Take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92161 
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Sun Jan 22 18:36:05 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92161 
>Unformatted:
