From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 28 22:00:22 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C87D316A43C for ; Mon, 28 Nov 2005 22:00:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 105FD43D81 for ; Mon, 28 Nov 2005 22:00:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jASM0GsO091986 for ; Mon, 28 Nov 2005 22:00:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jASM0Gn1091980; Mon, 28 Nov 2005 22:00:16 GMT (envelope-from gnats) Resent-Date: Mon, 28 Nov 2005 22:00:16 GMT Resent-Message-Id: <200511282200.jASM0Gn1091980@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Babak Farrokhi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F037116A41F for ; Mon, 28 Nov 2005 21:55:41 +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 B0DD643D5F for ; Mon, 28 Nov 2005 21:55:41 +0000 (GMT) (envelope-from farrokhi@royalway.propagation.net) Received: by royalway.propagation.net (Postfix, from userid 1002) id 0A20A5641D; Mon, 28 Nov 2005 15:55:42 -0600 (CST) Message-Id: <20051128215542.0A20A5641D@royalway.propagation.net> Date: Mon, 28 Nov 2005 15:55:42 -0600 (CST) From: Babak Farrokhi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89694: [maintainer-update]: www/phpwiki X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Babak Farrokhi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2005 22:00:23 -0000 >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@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@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: