From farrokhi@royalway.propagation.net  Mon Feb 13 14:42:19 2006
Return-Path: <farrokhi@royalway.propagation.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C1D6F16A422
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Feb 2006 14:42:19 +0000 (GMT)
	(envelope-from farrokhi@royalway.propagation.net)
Received: from royalway.propagation.net (royalway.propagation.net [66.221.228.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7299D43D5C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Feb 2006 14:42:19 +0000 (GMT)
	(envelope-from farrokhi@royalway.propagation.net)
Received: from localhost (localhost [127.0.0.1])
	by royalway.propagation.net (Postfix) with ESMTP id 497EA56424
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Feb 2006 08:42:19 -0600 (CST)
Received: from royalway.propagation.net ([127.0.0.1])
 by localhost (royalway.propagation.net [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 16857-10 for <FreeBSD-gnats-submit@freebsd.org>;
 Mon, 13 Feb 2006 08:42:11 -0600 (CST)
Received: by royalway.propagation.net (Postfix, from userid 1002)
	id AFC4956423; Mon, 13 Feb 2006 08:42:11 -0600 (CST)
Message-Id: <20060213144211.AFC4956423@royalway.propagation.net>
Date: Mon, 13 Feb 2006 08:42:11 -0600 (CST)
From: Babak Farrokhi <babak@farrokhi.net>
Reply-To: Babak Farrokhi <babak@farrokhi.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update port www/pmwiki - UnBROKEN
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         93288
>Category:       ports
>Synopsis:       update port www/pmwiki - UnBROKEN
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lawrance
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 13 14:50:05 GMT 2006
>Closed-Date:    Tue Feb 14 12:26:48 GMT 2006
>Last-Modified:  Tue Feb 14 12:26:48 GMT 2006
>Originator:     Babak Farrokhi
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD royalway.propagation.net 5.4-STABLE FreeBSD 5.4-STABLE #6: Thu Jun 30 05:11:17 CDT 2005 root@royalway.propagation.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	
clean up Makefile to make it work on read-only ports tree
>How-To-Repeat:
	
>Fix:

	

--- pmwiki.patch begins here ---
diff -ruN pmwiki.orig/Makefile pmwiki/Makefile
--- pmwiki.orig/Makefile	Mon Feb 13 15:32:12 2006
+++ pmwiki/Makefile	Mon Feb 13 18:03:13 2006
@@ -16,22 +16,21 @@
 MAINTAINER=	babak@farrokhi.net
 COMMENT=	A WikiWikiWeb clone using PHP
 
-BROKEN=		Does not build with read-only ports tree
-
 USE_PHP=	mbstring
 PHP4_PORT?=	www/mod_php4
 WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_BUILD=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 PLIST_SUB+=	PMWIKIDIR=${PMWIKIDIR}
+SUB_LIST+=	PMWIKIDIR=${PMWIKIDIR}
+SUB_FILES=	pkg-message
 
 pre-fetch:
 .if !defined(PMWIKIDIR)
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define PMWIKIDIR to override default of 'www/data/pmwiki'."
+	@${ECHO_MSG} "Define PMWIKIDIR to override default of ${PMWIKIDIR}."
 	@${ECHO_MSG} ""
 .endif
 
@@ -39,18 +38,10 @@
 WWWUSER?=	www
 WWWGROUP?=	www
 
-post-configure:
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' -e 's#%%PMWIKIDIR%%#${PMWIKIDIR}#g' pkg-message > ${PKGMESSAGE}
-
 do-install:
 	@${MKDIR} -m 755 ${PREFIX}/${PMWIKIDIR}
 	@${CP} -R ${WRKSRC}/ ${PREFIX}/${PMWIKIDIR}
 	@${CHOWN} ${WWWUSER}:${WWWGROUP} ${PREFIX}/${PMWIKIDIR}
-
-pre-install:
-	cd ${WRKSRC} && ${FIND} -s * -type f | ${SED} -e 's|^|${PMWIKIDIR}/|' > ${PLIST} \
-	&& ${FIND} -d * -type d | ${SED} -e 's|^|@dirrm ${PMWIKIDIR}/|' >> ${PLIST} \
-	&& ${ECHO_MSG} "@unexec rmdir ${PMWIKIDIR} 2>/dev/null || true" >> ${PLIST}
 
 post-install:
 	@${MKDIR} -m 775 ${PREFIX}/${PMWIKIDIR}/wiki.d
diff -ruN pmwiki.orig/files/pkg-message.in pmwiki/files/pkg-message.in
--- /dev/null	Thu Jan  1 03:30:00 1970
+++ pmwiki/files/pkg-message.in	Sun Mar  6 12:06:45 2005
@@ -0,0 +1,10 @@
+**********************************************************************
+
+ Before the first use of PmWiki, copy sample-config.php to config.php
+
+ in %%PREFIX%%/%%PMWIKIDIR%%
+
+ Please visit 'http://{host.domain}/pmwiki/pmwiki.php' in a
+ web-browser and follow the configuration instructions.
+
+**********************************************************************
diff -ruN pmwiki.orig/pkg-message pmwiki/pkg-message
--- pmwiki.orig/pkg-message	Mon Feb 13 15:32:12 2006
+++ pmwiki/pkg-message	Thu Jan  1 03:30:00 1970
@@ -1,10 +0,0 @@
-**********************************************************************
-
- Before the first use of PmWiki, copy sample-config.php to config.php
-
- in %%PREFIX%%/%%PMWIKIDIR%%
-
- Please visit 'http://{host.domain}/pmwiki/pmwiki.php' in a
- web-browser and follow the configuration instructions.
-
-**********************************************************************
--- pmwiki.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lawrance 
Responsible-Changed-By: lawrance 
Responsible-Changed-When: Tue Feb 14 08:54:45 UTC 2006 
Responsible-Changed-Why:  
Grab 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93288 
State-Changed-From-To: open->closed 
State-Changed-By: lawrance 
State-Changed-When: Tue Feb 14 12:26:46 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

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