Bug 90101

Summary: update port www/phpwiki13 - Add OPTIONS
Product: Ports & Packages Reporter: babak
Component: Individual Port(s)Assignee: Aaron Dalton <aaron>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
phpwiki13.patch
none
Makefile.rej none

Description babak 2005-12-08 12:50:03 UTC 
	
- Add OPTIONS to choose database backend
- Move additional docs to DOCSDIR
- Add pkg-message
- Updated pkg-plist to reflect new changes
Comment 1 Aaron Dalton freebsd_committer freebsd_triage 2005-12-09 02:03:11 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->aaron

Take.
Comment 2 Aaron Dalton freebsd_committer freebsd_triage 2005-12-09 04:47:21 UTC 
State Changed
From-To: open->feedback

Over to maintainer to tweak submission.
Comment 3 Aaron Dalton freebsd_committer freebsd_triage 2005-12-09 04:47:38 UTC 
I get the following errors when running portlint -C (which one should 
always do when submitting port updates).

$ portlint -C
WARN: Makefile [45]: use a tab (not space) after a variable name
FATAL: Makefile [45]: USE_PHP is set after including bsd.port.pre.mk.
FATAL: Makefile [49]: USE_PHP is set after including bsd.port.pre.mk.
FATAL: Makefile [53]: USE_PHP is set after including bsd.port.pre.mk.
FATAL: Makefile [57]: USE_PHP is set after including bsd.port.pre.mk.
4 fatal errors and 1 warnings found.

Please take a look at databases/phpmyadmin (which I know you've already 
done with your www/textpattern submission) and resubmit a new diff. 
Thanks, Babak!

-- 
Aaron Dalton
aaron@FreeBSD.org
FreeBSD Ports Committer
Comment 4 babak 2005-12-09 08:57:40 UTC 
Aaron,

I just fixed the Makefile and here comes the new patch:

--- phpwiki13.patch begins here ---
diff -ruN phpwiki13.orig/Makefile phpwiki13/Makefile
--- phpwiki13.orig/Makefile	Fri Dec  9 11:54:19 2005
+++ phpwiki13/Makefile	Fri Dec  9 12:09:25 2005
@@ -1,12 +1,13 @@
 # New ports collection makefile for:	phpwiki
-# Date created:		09.Oct 2003
-# Whom:			dirk.meyer@dinoex.sub.org
+# Date created:		29-NOV-2005
+# Whom:			babak@farrokhi.net
 #
 # $FreeBSD: ports/www/phpwiki13/Makefile,v 1.13 2005/11/30 17:10:25 pav Exp $
 #
 
 PORTNAME=	phpwiki
 PORTVERSION=	1.3.11p1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpwiki
@@ -17,24 +18,50 @@
 CONFLICTS+=	phpwiki-1.2*
 LATEST_LINK=	phpwiki13
 
-.if !defined(WITHOUT_PHP_DEPENDS)
-USE_PHP=	ctype pcre posix session tokenizer xml zlib mysql
-.if defined(WITH_CDB) || defined(WITH_DB4) || defined(WITH_GDBM) ||
defined(WITH_INIFILE)
-USE_PHP+=	dba
-.endif
-.endif
+USE_PHP=	ctype pcre posix session tokenizer xml zlib
 
 NO_BUILD=	YES
 PHP4_PORT?=	www/mod_php4
 PHPWIKI?=	www/data-dist/phpwiki
 PLIST_SUB+=	PHPWIKI=${PHPWIKI}
+SUB_FILES=	pkg-message
 ROOTFILES=	GoogleSearch.wsdl PhpWiki.wsdl RPC2.php SOAP.php \
 		configurator.php favicon.ico getimg.php gforge.php \
 		index.php passencrypt.php wiki
-ROOTDIRS=	config doc lib locale pgsrc schemas tests themes uploads
+ROOTDIRS=	config lib locale pgsrc schemas tests themes uploads
 DOCFILES=	INSTALL LICENSE README TODO UPGRADING
 
-do-configure:
+OPTIONS=	MYSQL "Use MySQL backend" on \
+		PGSQL "Use PostgreSQL backend" off \
+		DB4   "Use Berkeley DB4 backend" off
+
+.if defined(PHP_VER) && ${PHP_VER} == 5
+		OPTIONS+=	SQLITE "Use SQLite backend" off
+.endif
+
+PORT_DBDIR?=	/var/db/ports
+LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
+OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
+
+.if exists(${OPTIONSFILE})
+.include "${OPTIONSFILE}"
+.endif
+
+.if defined(WITH_DB4)
+USE_PHP+=	dba
+.endif
+
+.if !defined(WITHOUT_MYSQL)
+USE_PHP+=	mysql
+.endif
+
+.if defined(WITH_PGSQL)
+USE_PHP+=	pgsql
+.endif
+
+.if defined(WITH_SQLITE)
+USE_PHP+=	sqlite
+.endif
 
 do-install:
 	-${MKDIR} ${PREFIX}/${PHPWIKI}
@@ -48,6 +75,10 @@
 .for i in ${DOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
 .endfor
+	@(cd ${WRKSRC} && ${CP} -R doc/* ${DOCSDIR}/ )
 .endif
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -ruN phpwiki13.orig/pkg-plist phpwiki13/pkg-plist
--- phpwiki13.orig/pkg-plist	Fri Dec  9 11:54:19 2005
+++ phpwiki13/pkg-plist	Fri Dec  9 11:54:24 2005
@@ -3,6 +3,23 @@
 %%DOCSDIR%%/README
 %%DOCSDIR%%/TODO
 %%DOCSDIR%%/UPGRADING
+%%DOCSDIR%%/CREDITS
+%%DOCSDIR%%/HISTORY
+%%DOCSDIR%%/INSTALL.MacOSX
+%%DOCSDIR%%/INSTALL.flatfile
+%%DOCSDIR%%/INSTALL.mSQL
+%%DOCSDIR%%/INSTALL.mysql
+%%DOCSDIR%%/INSTALL.oci8
+%%DOCSDIR%%/INSTALL.pgsql
+%%DOCSDIR%%/INSTALL.sqlite
+%%DOCSDIR%%/README.coding
+%%DOCSDIR%%/README.foaf
+%%DOCSDIR%%/README.fpdf
+%%DOCSDIR%%/README.phpwiki-auth
+%%DOCSDIR%%/README.phpwiki-cache
+%%DOCSDIR%%/README.security
+%%DOCSDIR%%/THEMES
+%%DOCSDIR%%/phpwiki_architecture.png
 %%PHPWIKI%%/GoogleSearch.wsdl
 %%PHPWIKI%%/PhpWiki.wsdl
 %%PHPWIKI%%/RPC2.php
@@ -14,23 +31,6 @@
 %%PHPWIKI%%/config/make-dbhelper.pl
 %%PHPWIKI%%/config/phpwiki.spec
 %%PHPWIKI%%/configurator.php
-%%PHPWIKI%%/doc/CREDITS
-%%PHPWIKI%%/doc/HISTORY
-%%PHPWIKI%%/doc/INSTALL.MacOSX
-%%PHPWIKI%%/doc/INSTALL.flatfile
-%%PHPWIKI%%/doc/INSTALL.mSQL
-%%PHPWIKI%%/doc/INSTALL.mysql
-%%PHPWIKI%%/doc/INSTALL.oci8
-%%PHPWIKI%%/doc/INSTALL.pgsql
-%%PHPWIKI%%/doc/INSTALL.sqlite
-%%PHPWIKI%%/doc/README.coding
-%%PHPWIKI%%/doc/README.foaf
-%%PHPWIKI%%/doc/README.fpdf
-%%PHPWIKI%%/doc/README.phpwiki-auth
-%%PHPWIKI%%/doc/README.phpwiki-cache
-%%PHPWIKI%%/doc/README.security
-%%PHPWIKI%%/doc/THEMES
-%%PHPWIKI%%/doc/phpwiki_architecture.png
 %%PHPWIKI%%/favicon.ico
 %%PHPWIKI%%/getimg.php
 %%PHPWIKI%%/gforge.php
@@ -1616,7 +1616,6 @@
 @dirrm %%PHPWIKI%%/lib/DbSession
 @dirrm %%PHPWIKI%%/lib/ASCIIMathPHP
 @dirrm %%PHPWIKI%%/lib
-@dirrm %%PHPWIKI%%/doc
 @dirrm %%PHPWIKI%%/config
 @dirrm %%PHPWIKI%%
 @dirrm %%DOCSDIR%%
--- phpwiki13.patch ends here ---

--
Babak Farrokhi
babak@farrokhi.net
Comment 5 babak 2005-12-09 09:45:22 UTC 
Consider this as the latest patch please:

--- phpwiki13.patch begins here ---
diff -ruN phpwiki13.orig/Makefile phpwiki13/Makefile
--- phpwiki13.orig/Makefile	Fri Dec  9 12:47:12 2005
+++ phpwiki13/Makefile	Fri Dec  9 12:47:25 2005
@@ -1,12 +1,13 @@
 # New ports collection makefile for:	phpwiki
-# Date created:		09.Oct 2003
-# Whom:			dirk.meyer@dinoex.sub.org
+# Date created:		29-NOV-2005
+# Whom:			babak@farrokhi.net
 #
 # $FreeBSD: ports/www/phpwiki13/Makefile,v 1.13 2005/11/30 17:10:25 pav Exp $
 #
 
 PORTNAME=	phpwiki
 PORTVERSION=	1.3.11p1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpwiki
@@ -17,24 +18,50 @@
 CONFLICTS+=	phpwiki-1.2*
 LATEST_LINK=	phpwiki13
 
-.if !defined(WITHOUT_PHP_DEPENDS)
-USE_PHP=	ctype pcre posix session tokenizer xml zlib mysql
-.if defined(WITH_CDB) || defined(WITH_DB4) || defined(WITH_GDBM) ||
defined(WITH_INIFILE)
-USE_PHP+=	dba
-.endif
-.endif
+USE_PHP=	ctype pcre posix session tokenizer xml zlib
 
 NO_BUILD=	YES
 PHP4_PORT?=	www/mod_php4
 PHPWIKI?=	www/data-dist/phpwiki
 PLIST_SUB+=	PHPWIKI=${PHPWIKI}
+SUB_FILES=	pkg-message
 ROOTFILES=	GoogleSearch.wsdl PhpWiki.wsdl RPC2.php SOAP.php \
 		configurator.php favicon.ico getimg.php gforge.php \
 		index.php passencrypt.php wiki
-ROOTDIRS=	config doc lib locale pgsrc schemas tests themes uploads
+ROOTDIRS=	config lib locale pgsrc schemas tests themes uploads
 DOCFILES=	INSTALL LICENSE README TODO UPGRADING
 
-do-configure:
+OPTIONS=	MYSQL "Use MySQL backend" on \
+		PGSQL "Use PostgreSQL backend" off \
+		DB4   "Use Berkeley DB4 backend" off
+
+.if defined(PHP_VER) && ${PHP_VER} == 5
+		OPTIONS+=	SQLITE "Use SQLite backend" off
+.endif
+
+PORT_DBDIR?=	/var/db/ports
+LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
+OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
+
+.if exists(${OPTIONSFILE})
+.include "${OPTIONSFILE}"
+.endif
+
+.if defined(WITH_DB4)
+USE_PHP+=	dba
+.endif
+
+.if !defined(WITHOUT_MYSQL)
+USE_PHP+=	mysql
+.endif
+
+.if defined(WITH_PGSQL)
+USE_PHP+=	pgsql
+.endif
+
+.if defined(WITH_SQLITE)
+USE_PHP+=	sqlite
+.endif
 
 do-install:
 	-${MKDIR} ${PREFIX}/${PHPWIKI}
@@ -48,6 +75,10 @@
 .for i in ${DOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
 .endfor
+	@(cd ${WRKSRC} && ${CP} -R doc/* ${DOCSDIR}/ )
 .endif
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -ruN phpwiki13.orig/files/pkg-message.in phpwiki13/files/pkg-message.in
--- /dev/null	Thu Jan  1 03:30:00 1970
+++ phpwiki13/files/pkg-message.in	Fri Dec  9 12:48:35 2005
@@ -0,0 +1,13 @@
+
+===========================================================
+
+* If this is your first install, read the installation 
+  instructions to setup your database, located at:
+  %%DOCSDIR%%/INSTALL.*:
+
+* If you are upgrading from an older version of phpwiki, please 
+  read upgrade instructions located at:
+  %%DOCSDIR%%/UPGRADING
+
+===========================================================
+
diff -ruN phpwiki13.orig/pkg-plist phpwiki13/pkg-plist
--- phpwiki13.orig/pkg-plist	Fri Dec  9 12:47:12 2005
+++ phpwiki13/pkg-plist	Fri Dec  9 12:47:25 2005
@@ -3,6 +3,23 @@
 %%DOCSDIR%%/README
 %%DOCSDIR%%/TODO
 %%DOCSDIR%%/UPGRADING
+%%DOCSDIR%%/CREDITS
+%%DOCSDIR%%/HISTORY
+%%DOCSDIR%%/INSTALL.MacOSX
+%%DOCSDIR%%/INSTALL.flatfile
+%%DOCSDIR%%/INSTALL.mSQL
+%%DOCSDIR%%/INSTALL.mysql
+%%DOCSDIR%%/INSTALL.oci8
+%%DOCSDIR%%/INSTALL.pgsql
+%%DOCSDIR%%/INSTALL.sqlite
+%%DOCSDIR%%/README.coding
+%%DOCSDIR%%/README.foaf
+%%DOCSDIR%%/README.fpdf
+%%DOCSDIR%%/README.phpwiki-auth
+%%DOCSDIR%%/README.phpwiki-cache
+%%DOCSDIR%%/README.security
+%%DOCSDIR%%/THEMES
+%%DOCSDIR%%/phpwiki_architecture.png
 %%PHPWIKI%%/GoogleSearch.wsdl
 %%PHPWIKI%%/PhpWiki.wsdl
 %%PHPWIKI%%/RPC2.php
@@ -14,23 +31,6 @@
 %%PHPWIKI%%/config/make-dbhelper.pl
 %%PHPWIKI%%/config/phpwiki.spec
 %%PHPWIKI%%/configurator.php
-%%PHPWIKI%%/doc/CREDITS
-%%PHPWIKI%%/doc/HISTORY
-%%PHPWIKI%%/doc/INSTALL.MacOSX
-%%PHPWIKI%%/doc/INSTALL.flatfile
-%%PHPWIKI%%/doc/INSTALL.mSQL
-%%PHPWIKI%%/doc/INSTALL.mysql
-%%PHPWIKI%%/doc/INSTALL.oci8
-%%PHPWIKI%%/doc/INSTALL.pgsql
-%%PHPWIKI%%/doc/INSTALL.sqlite
-%%PHPWIKI%%/doc/README.coding
-%%PHPWIKI%%/doc/README.foaf
-%%PHPWIKI%%/doc/README.fpdf
-%%PHPWIKI%%/doc/README.phpwiki-auth
-%%PHPWIKI%%/doc/README.phpwiki-cache
-%%PHPWIKI%%/doc/README.security
-%%PHPWIKI%%/doc/THEMES
-%%PHPWIKI%%/doc/phpwiki_architecture.png
 %%PHPWIKI%%/favicon.ico
 %%PHPWIKI%%/getimg.php
 %%PHPWIKI%%/gforge.php
@@ -1616,7 +1616,6 @@
 @dirrm %%PHPWIKI%%/lib/DbSession
 @dirrm %%PHPWIKI%%/lib/ASCIIMathPHP
 @dirrm %%PHPWIKI%%/lib
-@dirrm %%PHPWIKI%%/doc
 @dirrm %%PHPWIKI%%/config
 @dirrm %%PHPWIKI%%
 @dirrm %%DOCSDIR%%
--- phpwiki13.patch ends here ---
Comment 6 Aaron Dalton freebsd_committer freebsd_triage 2005-12-10 00:57:42 UTC 
Sorry to be such a bear, Babak, but the patch is not applying cleanly. 
I am attaching the Makefile.rej file for your perusal.  One thing I 
noticed right away was your modification of the "Date Created" and 
"Whom" fields at the top of the Makefile.  These fields are historical 
and should never change.  Only the maintainer field will change over 
time.  Just send me another tweaked patch when you're ready.  If you 
have any questions or problems, let me know.

Cheers!
-- 
Aaron Dalton
aaron@FreeBSD.org
FreeBSD Ports Committer
Comment 7 babak 2005-12-10 20:39:05 UTC 
Aaron,

I modified the patch and removed the Makefile header modification bit. 
Now the patch applies cleanly on a fresh cvsuped ports directory.
The problem is that the patch tries to create a new file called 
"phpwiki13/files/pkg-message.in" while "/files/" directory does not 
exist in original "phpwiki13/" directory. But when you run the patch, it 
ends up creating the "pkg-message.in" file in the current directory.

The patch comes as follows:

--- phpwiki13.patch begins here ---
diff -ruN phpwiki13.orig/Makefile phpwiki13/Makefile
--- phpwiki13.orig/Makefile	Sat Dec 10 23:19:27 2005
+++ phpwiki13/Makefile	Sat Dec 10 23:24:01 2005
@@ -7,6 +7,7 @@

  PORTNAME=	phpwiki
  PORTVERSION=	1.3.11p1
+PORTREVISION=	1
  CATEGORIES=	www
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	phpwiki
@@ -17,24 +18,50 @@
  CONFLICTS+=	phpwiki-1.2*
  LATEST_LINK=	phpwiki13

-.if !defined(WITHOUT_PHP_DEPENDS)
-USE_PHP=	ctype pcre posix session tokenizer xml zlib mysql
-.if defined(WITH_CDB) || defined(WITH_DB4) || defined(WITH_GDBM) || 
defined(WITH_INIFILE)
-USE_PHP+=	dba
-.endif
-.endif
+USE_PHP=	ctype pcre posix session tokenizer xml zlib

  NO_BUILD=	YES
  PHP4_PORT?=	www/mod_php4
  PHPWIKI?=	www/data-dist/phpwiki
  PLIST_SUB+=	PHPWIKI=${PHPWIKI}
+SUB_FILES=	pkg-message
  ROOTFILES=	GoogleSearch.wsdl PhpWiki.wsdl RPC2.php SOAP.php \
  		configurator.php favicon.ico getimg.php gforge.php \
  		index.php passencrypt.php wiki
-ROOTDIRS=	config doc lib locale pgsrc schemas tests themes uploads
+ROOTDIRS=	config lib locale pgsrc schemas tests themes uploads
  DOCFILES=	INSTALL LICENSE README TODO UPGRADING

-do-configure:
+OPTIONS=	MYSQL "Use MySQL backend" on \
+		PGSQL "Use PostgreSQL backend" off \
+		DB4   "Use Berkeley DB4 backend" off
+
+.if defined(PHP_VER) && ${PHP_VER} == 5
+		OPTIONS+=	SQLITE "Use SQLite backend" off
+.endif
+
+PORT_DBDIR?=	/var/db/ports
+LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
+OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
+
+.if exists(${OPTIONSFILE})
+.include "${OPTIONSFILE}"
+.endif
+
+.if defined(WITH_DB4)
+USE_PHP+=	dba
+.endif
+
+.if !defined(WITHOUT_MYSQL)
+USE_PHP+=	mysql
+.endif
+
+.if defined(WITH_PGSQL)
+USE_PHP+=	pgsql
+.endif
+
+.if defined(WITH_SQLITE)
+USE_PHP+=	sqlite
+.endif

  do-install:
  	-${MKDIR} ${PREFIX}/${PHPWIKI}
@@ -48,6 +75,10 @@
  .for i in ${DOCFILES}
  	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
  .endfor
+	@(cd ${WRKSRC} && ${CP} -R doc/* ${DOCSDIR}/ )
  .endif
+
+post-install:
+	@${CAT} ${PKGMESSAGE}

  .include <bsd.port.mk>
diff -ruN /dev/null phpwiki13/files/pkg-message.in
--- /dev/null	Thu Jan  1 03:30:00 1970
+++ phpwiki13/files/pkg-message.in	Sat Dec 10 23:21:11 2005
@@ -0,0 +1,13 @@
+
+===========================================================
+
+* If this is your first install, read the installation
+  instructions to setup your database, located at:
+  %%DOCSDIR%%/INSTALL.*:
+
+* If you are upgrading from an older version of phpwiki, please
+  read upgrade instructions located at:
+  %%DOCSDIR%%/UPGRADING
+
+===========================================================
+
diff -ruN phpwiki13.orig/pkg-plist phpwiki13/pkg-plist
--- phpwiki13.orig/pkg-plist	Sat Dec 10 23:19:27 2005
+++ phpwiki13/pkg-plist	Sat Dec 10 23:21:11 2005
@@ -3,6 +3,23 @@
  %%DOCSDIR%%/README
  %%DOCSDIR%%/TODO
  %%DOCSDIR%%/UPGRADING
+%%DOCSDIR%%/CREDITS
+%%DOCSDIR%%/HISTORY
+%%DOCSDIR%%/INSTALL.MacOSX
+%%DOCSDIR%%/INSTALL.flatfile
+%%DOCSDIR%%/INSTALL.mSQL
+%%DOCSDIR%%/INSTALL.mysql
+%%DOCSDIR%%/INSTALL.oci8
+%%DOCSDIR%%/INSTALL.pgsql
+%%DOCSDIR%%/INSTALL.sqlite
+%%DOCSDIR%%/README.coding
+%%DOCSDIR%%/README.foaf
+%%DOCSDIR%%/README.fpdf
+%%DOCSDIR%%/README.phpwiki-auth
+%%DOCSDIR%%/README.phpwiki-cache
+%%DOCSDIR%%/README.security
+%%DOCSDIR%%/THEMES
+%%DOCSDIR%%/phpwiki_architecture.png
  %%PHPWIKI%%/GoogleSearch.wsdl
  %%PHPWIKI%%/PhpWiki.wsdl
  %%PHPWIKI%%/RPC2.php
@@ -14,23 +31,6 @@
  %%PHPWIKI%%/config/make-dbhelper.pl
  %%PHPWIKI%%/config/phpwiki.spec
  %%PHPWIKI%%/configurator.php
-%%PHPWIKI%%/doc/CREDITS
-%%PHPWIKI%%/doc/HISTORY
-%%PHPWIKI%%/doc/INSTALL.MacOSX
-%%PHPWIKI%%/doc/INSTALL.flatfile
-%%PHPWIKI%%/doc/INSTALL.mSQL
-%%PHPWIKI%%/doc/INSTALL.mysql
-%%PHPWIKI%%/doc/INSTALL.oci8
-%%PHPWIKI%%/doc/INSTALL.pgsql
-%%PHPWIKI%%/doc/INSTALL.sqlite
-%%PHPWIKI%%/doc/README.coding
-%%PHPWIKI%%/doc/README.foaf
-%%PHPWIKI%%/doc/README.fpdf
-%%PHPWIKI%%/doc/README.phpwiki-auth
-%%PHPWIKI%%/doc/README.phpwiki-cache
-%%PHPWIKI%%/doc/README.security
-%%PHPWIKI%%/doc/THEMES
-%%PHPWIKI%%/doc/phpwiki_architecture.png
  %%PHPWIKI%%/favicon.ico
  %%PHPWIKI%%/getimg.php
  %%PHPWIKI%%/gforge.php
@@ -1616,7 +1616,6 @@
  @dirrm %%PHPWIKI%%/lib/DbSession
  @dirrm %%PHPWIKI%%/lib/ASCIIMathPHP
  @dirrm %%PHPWIKI%%/lib
-@dirrm %%PHPWIKI%%/doc
  @dirrm %%PHPWIKI%%/config
  @dirrm %%PHPWIKI%%
  @dirrm %%DOCSDIR%%
--- phpwiki13.patch ends here ---

--
Babak Farrokhi
babak@farrokhi.net
Comment 8 Aaron Dalton freebsd_committer freebsd_triage 2005-12-19 21:23:40 UTC 
State Changed
From-To: feedback->closed

Committed, thanks!