1: update to 20050507

2: make portlint happy.

PR:		ports/80746
Submitted by:	chinsan <chinsan@mail2000.com.tw>

5 files changed, 15 insertions, 26 deletions

diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index 3ed6e66e1d7f..2350d7515534 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -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@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 @@ pre-install:
 		&& ${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
diff --git a/www/dokuwiki/distinfo b/www/dokuwiki/distinfo
index 12cb59496315..494bb17907da 100644
--- a/www/dokuwiki/distinfo
+++ b/www/dokuwiki/distinfo
@@ -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 --git a/www/dokuwiki/files/patch-conf-dokuwiki.php b/www/dokuwiki/files/patch-conf-dokuwiki.php
deleted file mode 100644
index bacb63e8aa06..000000000000
--- a/www/dokuwiki/files/patch-conf-dokuwiki.php
+++ /dev/null
@@ -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 --git a/www/dokuwiki/pkg-descr b/www/dokuwiki/pkg-descr
index 325dd3e6997d..ec475d5262a7 100644
--- a/www/dokuwiki/pkg-descr
+++ b/www/dokuwiki/pkg-descr
@@ -2,7 +2,7 @@ DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
 creating documentation of any kind. It is targeted at developer teams,
 workgroups and small companies. It has a simple but powerful syntax which
 makes sure the datafiles remain readable outside the Wiki and eases the
-creation of structured texts. 
-All data is stored in plain text files ¡V no database is required.
+creation of structured texts.
+All data is stored in plain text files - no database is required.
 
 WWW: http://wiki.splitbrain.org/wiki:dokuwiki
diff --git a/www/dokuwiki/pkg-message b/www/dokuwiki/pkg-message
index a1f5df517ea3..f985230836cb 100644
--- a/www/dokuwiki/pkg-message
+++ b/www/dokuwiki/pkg-message
@@ -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
 
 =================================================================