From farrokhi@royalway.propagation.net  Thu Dec 22 22:08:19 2005
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 8039716A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Dec 2005 22:08: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 06E4E43D7F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Dec 2005 22:08:17 +0000 (GMT)
	(envelope-from farrokhi@royalway.propagation.net)
Received: from localhost (localhost [127.0.0.1])
	by royalway.propagation.net (Postfix) with ESMTP id D41695645C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Dec 2005 16:08:16 -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 75321-02 for <FreeBSD-gnats-submit@freebsd.org>;
 Thu, 22 Dec 2005 16:08:07 -0600 (CST)
Received: by royalway.propagation.net (Postfix, from userid 1002)
	id 34F455645A; Thu, 22 Dec 2005 16:08:07 -0600 (CST)
Message-Id: <20051222220807.34F455645A@royalway.propagation.net>
Date: Thu, 22 Dec 2005 16:08:07 -0600 (CST)
From: Babak Farrokhi <babak@farrokhi.net>
Reply-To: Babak Farrokhi <babak@farrokhi.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer-update port www/phpwiki13
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         90824
>Category:       ports
>Synopsis:       maintainer-update port www/phpwiki13
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 22 22:10:03 GMT 2005
>Closed-Date:    Fri Dec 23 10:30:37 GMT 2005
>Last-Modified:  Fri Dec 23 10:30:37 GMT 2005
>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:
	
- Improved PHP version checking method
- Removed mysql dependency from php dependency list - should be chosen from OPTIONS
>How-To-Repeat:
	
>Fix:

	

--- phpwiki13.patch begins here ---
diff -ruN phpwiki13.orig/Makefile phpwiki13/Makefile
--- phpwiki13.orig/Makefile	Fri Dec 23 01:25:29 2005
+++ phpwiki13/Makefile	Fri Dec 23 01:31:24 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	phpwiki
 PORTVERSION=	1.3.11p1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpwiki
@@ -18,7 +18,7 @@
 CONFLICTS+=	phpwiki-1.2*
 LATEST_LINK=	phpwiki13
 
-USE_PHP=	ctype pcre posix session tokenizer xml zlib mysql
+USE_PHP=	ctype pcre posix session tokenizer xml zlib
 
 NO_BUILD=	YES
 PHP4_PORT?=	www/mod_php4
@@ -30,10 +30,15 @@
 		index.php passencrypt.php wiki
 ROOTDIRS=	config lib locale pgsrc schemas tests themes uploads
 DOCFILES=	INSTALL LICENSE README TODO UPGRADING
+LOCALBASE?=	/usr/local
 
 OPTIONS=	MYSQL "Use MySQL backend" on \
 		PGSQL "Use PostgreSQL backend" off \
 		DB4   "Use Berkeley DB4 backend" off
+
+.if exists(${LOCALBASE}/etc/php.conf)
+.include "${LOCALBASE}/etc/php.conf"
+.endif
 
 .if defined(PHP_VER) && ${PHP_VER} == 5
 OPTIONS+=	SQLITE "Use SQLite backend" off
--- phpwiki13.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Fri Dec 23 10:30:34 UTC 2005 
State-Changed-Why:  
Committed. Thanks! 

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