ports/80746: [UPDATE] www/dokuwiki: update to 20050507

[chinsan]

>Number:         80746
>Category:       ports
>Synopsis:       [UPDATE] www/dokuwiki: update to 20050507
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 08 05:40:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     chinsan
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root at harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:

	update to 20050507

>How-To-Repeat:
>Fix:

--- dokuwiki.diff begins here ---
diff -ruN dokuwiki.orig/Makefile dokuwiki/Makefile
--- dokuwiki.orig/Makefile	Mon Apr 18 21:08:02 2005
+++ dokuwiki/Makefile	Sun May  8 13:11:21 2005
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	dokuwiki
-PORTVERSION=	20050218
-PORTREVISION=	1
+PORTVERSION=	20050507
+PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://www.splitbrain.org/Programming/PHP/DokuWiki/
-DISTNAME=	dokuwiki-2005-02-18
+DISTNAME=	${PORTNAME}-2005-05-07
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A simple and easy to use wiki, no database required
 
-USE_PHP=	pcre session
+USE_PHP=	pcre session xml zlib
 PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 
 WWWDOCROOT?=	www/data-dist
-DOKUWIKIURL?=	dokuwiki
+DOKUWIKIURL?=	${PORTNAME}
 WWWOWN?=	www
 WWWGRP?=	www
 DOKUWIKIDIR?=	${WWWDOCROOT}/${DOKUWIKIURL}
@@ -36,7 +36,7 @@
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${DOKUWIKIDIR}/|' >> ${PLIST} \
 		&& ${ECHO_CMD} ${DOKUWIKIDIR}/changes.log >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${DOKUWIKIDIR} >> ${PLIST}
+		&& ${ECHO_CMD} "@unexec rmdir %D/${DOKUWIKIDIR} 2>/dev/null || true">> ${PLIST}
 
 do-install:
 	# Data files
@@ -57,3 +57,4 @@
 		-e 's|%%DOKUWIKIURL%%|${DOKUWIKIURL}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
+
diff -ruN dokuwiki.orig/distinfo dokuwiki/distinfo
--- dokuwiki.orig/distinfo	Mon Apr 11 00:49:08 2005
+++ dokuwiki/distinfo	Sun May  8 10:35:50 2005
@@ -1,2 +1,2 @@
-MD5 (dokuwiki-2005-02-18.tgz) = a4cb8233de0926e5ee6922a517c7dfdb
-SIZE (dokuwiki-2005-02-18.tgz) = 337051
+MD5 (dokuwiki-2005-05-07.tgz) = 03c4c26376250fdc8a755d8e8232c778
+SIZE (dokuwiki-2005-05-07.tgz) = 439671
diff -ruN dokuwiki.orig/files/patch-conf-dokuwiki.php dokuwiki/files/patch-conf-dokuwiki.php
--- dokuwiki.orig/files/patch-conf-dokuwiki.php	Mon Apr 18 21:08:02 2005
+++ dokuwiki/files/patch-conf-dokuwiki.php	Thu Jan  1 08:00:00 1970
@@ -1,11 +0,0 @@
---- conf/dokuwiki.php.orig	Fri Feb 18 21:04:39 2005
-+++ conf/dokuwiki.php	Mon Apr 18 07:14:35 2005
-@@ -17,7 +17,7 @@
- $conf['mediadir']    = './media';         //where to store media files
- $conf['mediaweb']    = 'media';           //access to media from the web
- $conf['changelog']   = './changes.log';   //change log
--$conf['uploadtypes'] = 'gif|jpe?g|png|zip|pdf|tar(\.gz)?|tgz'; //regexp of allowed filetypes to upload
-+$conf['uploadtypes'] = '(gif|jpe?g|png|zip|pdf|tar(\.gz)?|tgz)'; //regexp of allowed filetypes to upload
- 
- /* Display Options */
- 
diff -ruN dokuwiki.orig/pkg-message dokuwiki/pkg-message
--- dokuwiki.orig/pkg-message	Mon Apr 18 21:08:02 2005
+++ dokuwiki/pkg-message	Sun May  8 13:22:10 2005
@@ -1,9 +1,9 @@
 =================================================================
           	**** NOTE ****
-  edit %%PREFIX%%/%%WWWDOCROOT%%/%%DOKUWIKIURL%%/conf/dokuwiki.php 
-  if you want to change anything within it or (better) create
-  dokuwiki/conf/local.php containing those lines from dokuwiki.php, 
-  which you want to change. This way your changes are preserved 
-  when overwriting the dokuwiki.php with a new release.
+  Remember to edit the following file:
+    %%PREFIX%%/%%WWWDOCROOT%%/%%DOKUWIKIURL%%/conf/dokuwiki.php 
+
+  For FULL configuration instructions see
+  http://wiki.splitbrain.org/wiki:install
 
 =================================================================
--- dokuwiki.diff ends here ---


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