ports/89694: [maintainer-update]: www/phpwiki

[Babak Farrokhi]

>Number:         89694
>Category:       ports
>Synopsis:       [maintainer-update]: www/phpwiki
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 28 22:00:16 GMT 2005
>Closed-Date:
>Last-Modified:
>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 at royalway.propagation.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	
- Added CONFLICT with phpwiki13 port
- Updated Makefile to make portlint happy
>How-To-Repeat:
	
>Fix:

	

--- phpwiki12.patch begins here ---
diff -ruN phpwiki.orig/Makefile phpwiki/Makefile
--- phpwiki.orig/Makefile	Tue Nov 29 01:15:42 2005
+++ phpwiki/Makefile	Tue Nov 29 01:20:43 2005
@@ -14,6 +14,8 @@
 MAINTAINER=	babak at farrokhi.net
 COMMENT=	A PHP WikiWikiWeb
 
+CONFLICTS=	phpwiki-1.3*
+
 .if !defined(WITHOUT_PHP_DEPENDS)
 USE_PHP=	ctype pcre posix session tokenizer xml zlib
 .endif
@@ -38,14 +40,14 @@
 do-install:
 	-${MKDIR} ${PREFIX}/${PHPWIKI}/lib
 	-${MKDIR} ${PREFIX}/${PHPWIKI}/pages
-	@${CHOWN} www:www ${PREFIX}/${PHPWIKI}/pages
+	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPWIKI}/pages
 	@${CHMOD} 755 ${PREFIX}/${PHPWIKI}/pages
 	@(cd ${WRKSRC} && ${CP} ${ROOTFILES} ${PREFIX}/${PHPWIKI}/ )
 .for i in ${ROOTDIRS}
 	@(cd ${WRKSRC} && ${CP} -R ${i} ${PREFIX}/${PHPWIKI}/ )
 .endfor
 .for i in ${USERFILES}
-	@if test ! -f ${PREFIX}/${PHPWIKI}/${i} ; then \
+	@if ${TEST} ! -f ${PREFIX}/${PHPWIKI}/${i} ; then \
 		${CP} ${PREFIX}/${PHPWIKI}/${i}-dist \
 			${PREFIX}/${PHPWIKI}/${i}; \
 	fi
--- phpwiki12.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: