- Update to 20060305

PR:		ports/94257
Submitted by:	chinsan <chinsan.tw@gmail.com> (maintainer)

3 files changed, 23 insertions, 23 deletions

diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index 3f440a5a3153..bbad2c65bbbe 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -6,32 +6,26 @@
 #
 
 PORTNAME=	dokuwiki
-PORTVERSION=	20051109
-PORTREVISION=	1
+PORTVERSION=	${DIST_VER:S/${PORTNAME}//:S/-//g}
 CATEGORIES=	www
-MASTER_SITES=	ftp://bbs.ilc.edu.tw/chinsan/distfiles/ \
-		http://bbs.ilc.edu.tw/chinsan/ports/dokuwiki/ \
-		http://dev.splitbrain.org/browse/snapshots/ \
-		http://www.splitbrain.org/Programming/PHP/DokuWiki/
-DISTNAME=	${PORTNAME}-2005-11-09
+MASTER_SITES=	http://www.splitbrain.org/_media/projects/dokuwiki/ \
+		http://dev.splitbrain.org/browse/snapshots/
+DISTNAME=	${DIST_VER}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A simple and easy to use wiki, no database required
 
+DIST_VER=	${PORTNAME}-2006-03-05
 USE_PHP=	gd pcre session xml zlib
-.if !defined(WITHOUT_X11)
-USE_PHP+=	imagick
-.endif
 PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
-USE_REINPLACE=	YES
 
 WWWDOCROOT?=	www/data
 DOKUWIKI_URL?=	${PORTNAME}
 DOKUWIKI_DIR?=	${WWWDOCROOT}/${DOKUWIKI_URL}
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${DIST_VER}
 PLIST=		${WRKDIR}/pkg-plist
 
 .if defined(BATCH)
@@ -45,11 +39,12 @@ pre-everything::
 	@${ECHO_MSG} '*******************************************************'
 	@${ECHO_MSG} '* You can customize the wiki language by typing	      *'
 	@${ECHO_MSG} '*                               Use make-flag:        *'
+	@${ECHO_MSG} '*  - Arabic			WIKI_LANG=ar	      *'
 	@${ECHO_MSG} '*  - Basque			WIKI_LANG=eu	      *'
 	@${ECHO_MSG} '*  - Brazilian Portuguese       WIKI_LANG=pt-br	      *'
-	@${ECHO_MSG} '*  - Simplified Chinese		WIKI_LANG=zh	      *'
-	@${ECHO_MSG} '*  - Traditional Chinese        WIKI_LANG=zh-tw	      *'
 	@${ECHO_MSG} '*  - Catalan			WIKI_LANG=ca	      *'
+	@${ECHO_MSG} '*  - Chinese(Simplified)        WIKI_LANG=zh	      *'
+	@${ECHO_MSG} '*  - Chinese(Traditional)       WIKI_LANG=zh-tw	      *'
 	@${ECHO_MSG} '*  - Czech			WIKI_LANG=cs	      *'
 	@${ECHO_MSG} '*  - Danish			WIKI_LANG=da          *'
 	@${ECHO_MSG} '*  - Dutch			WIKI_LANG=nl	      *'
@@ -61,6 +56,7 @@ pre-everything::
 	@${ECHO_MSG} '*  - German			WIKI_LANG=de	      *'
 	@${ECHO_MSG} '*  - Hebrew			WIKI_LANG=he	      *'
 	@${ECHO_MSG} '*  - Hungarian			WIKI_LANG=hu	      *'
+	@${ECHO_MSG} '*  - Indonesian			WIKI_LANG=id	      *'
 	@${ECHO_MSG} '*  - Italian			WIKI_LANG=it	      *'
 	@${ECHO_MSG} '*  - Japanese			WIKI_LANG=ja	      *'
 	@${ECHO_MSG} '*  - Korean			WIKI_LANG=ko	      *'
@@ -71,9 +67,12 @@ pre-everything::
 	@${ECHO_MSG} '*  - Portuguese			WIKI_LANG=pt	      *'
 	@${ECHO_MSG} '*  - Romanian			WIKI_LANG=ro	      *'
 	@${ECHO_MSG} '*  - Russian			WIKI_LANG=ru	      *'
-	@${ECHO_MSG} '*  - Spanish			WIKI_LANG=es	      *'
+	@${ECHO_MSG} '*  - Serbian			WIKI_LANG=sr	      *'
+	@${ECHO_MSG} '*  - Slovak			WIKI_LANG=sk	      *'
 	@${ECHO_MSG} '*  - Slovenian			WIKI_LANG=sl	      *'
+	@${ECHO_MSG} '*  - Spanish			WIKI_LANG=es	      *'
 	@${ECHO_MSG} '*  - Swedish			WIKI_LANG=sv	      *'
+	@${ECHO_MSG} '*  - Turkish			WIKI_LANG=tr	      *'
 	@${ECHO_MSG} '*  - Vietnamese			WIKI_LANG=vi	      *'
 	@${ECHO_MSG} '*					              *'
 	@${ECHO_MSG} '* Example: "make WIKI_LANG=zh-tw install clean"	      *'
@@ -97,6 +96,8 @@ pre-patch:
 
 pre-install:
 	@${TOUCH} ${WRKSRC}/data/changes.log
+	@${CP} ${WRKSRC}/conf/acl.auth.php.dist ${WRKSRC}/conf/acl.auth.php
+	@${CP} ${WRKSRC}/conf/users.auth.php.dist ${WRKSRC}/conf/users.auth.php
 	@cd ${WRKSRC} && ${FIND} -s . -type f | \
 		${SED} -e 's|^./||;s|^|${DOKUWIKI_DIR}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
@@ -106,11 +107,10 @@ pre-install:
 do-install:
 # Data files
 	-${MKDIR} ${PREFIX}/${DOKUWIKI_DIR}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKI_DIR}
-	@${CHMOD} 755 ${PREFIX}/${DOKUWIKI_DIR}
 	@${CP} -R ${WRKSRC}/ ${PREFIX}/${DOKUWIKI_DIR}
-# Setup the correct permissions
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKI_DIR}/data
+	@${CHMOD} 664 ${PREFIX}/${DOKUWIKI_DIR}/conf/acl.auth.php
+	@${CHMOD} 664 ${PREFIX}/${DOKUWIKI_DIR}/conf/users.auth.php
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKI_DIR}
 
 post-install:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
diff --git a/www/dokuwiki/distinfo b/www/dokuwiki/distinfo
index 7524c13a667b..e120c4b0567c 100644
--- a/www/dokuwiki/distinfo
+++ b/www/dokuwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (dokuwiki-2005-11-09.tgz) = a30792cfda72814b7aad5dfec0b68d40
-SHA256 (dokuwiki-2005-11-09.tgz) = c29b73946765d8200f6d057ad4743a1f839f568ea3c3ac799999cd8c08e2664c
-SIZE (dokuwiki-2005-11-09.tgz) = 710736
+MD5 (dokuwiki-2006-03-05.tgz) = a105be3d33729006513ce07b1dded9d3
+SHA256 (dokuwiki-2006-03-05.tgz) = e3586e8b941f0e33ebfba47655239d612e06b4e3ce43c3af6f9f07500cf8dd6b
+SIZE (dokuwiki-2006-03-05.tgz) = 828293
diff --git a/www/dokuwiki/pkg-message b/www/dokuwiki/pkg-message
index ded7355d5d60..b28c0a0031c6 100644
--- a/www/dokuwiki/pkg-message
+++ b/www/dokuwiki/pkg-message
@@ -1,7 +1,7 @@
 =================================================================
           	**** NOTE ****
   Remember to edit the following file:
-    %%PREFIX%%/%%DOKUWIKI_DIR%%/conf/dokuwiki.php
+    %%PREFIX%%/%%DOKUWIKI_DIR%%/conf/local.php
 
   For FULL configuration instructions see
   http://wiki.splitbrain.org/wiki:config