Update to 20051023

Change MASTER_SITES order

PR:		87869
Submitted by:	chinsan <chinsan.tw@gmail.com> (maintainer)

6 files changed, 38 insertions, 38 deletions

diff --git a/www/dokuwiki-devel/Makefile b/www/dokuwiki-devel/Makefile
index 90ec719c8660..ad60440da1e8 100644
--- a/www/dokuwiki-devel/Makefile
+++ b/www/dokuwiki-devel/Makefile
@@ -6,35 +6,27 @@
 #
 
 PORTNAME=	dokuwiki
-PORTVERSION=	20050922
+PORTVERSION=	20051023
 CATEGORIES=	www
-MASTER_SITES=	http://www.splitbrain.org/Programming/PHP/DokuWiki/
-DISTNAME=	${PORTNAME}-2005-09-22
+MASTER_SITES=	http://bbs.ilc.edu.tw/chinsan/ports/dokuwiki/ \
+		http://dev.splitbrain.org/browse/snapshots/ \
+		http://www.splitbrain.org/Programming/PHP/DokuWiki/
+DISTNAME=	${PORTNAME}-2005-10-23
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A simple and easy to use wiki, no database required
 
-BROKEN=		Unfetchable
-
 USE_PHP=	gd imagick pcre session xml zlib
 PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 USE_REINPLACE=	YES
 
-pre-fetch:
-.if !defined(DOKUWIKI_DIR)
-	 @${ECHO_MSG} ""
-	 @${ECHO_MSG} "Define DOKUWIKI_DIR to override default of '${DOKUWIKI_DIR}'."
-	 @${ECHO_MSG} ""
-.endif
-
 WWWDOCROOT?=	www/data
 DOKUWIKI_URL?=	${PORTNAME}
-WWWOWN?=	www
-WWWGRP?=	www
 DOKUWIKI_DIR?=	${WWWDOCROOT}/${DOKUWIKI_URL}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST=		${WRKDIR}/pkg-plist
 
 .if defined(BATCH)
@@ -83,6 +75,14 @@ pre-everything::
 	@${ECHO_MSG} '*******************************************************'
 .endif
 
+pre-fetch:
+.if ${DOKUWIKI_DIR} == ${WWWDOCROOT}/${DOKUWIKI_URL}
+	 @${ECHO_MSG} ""
+	 @${ECHO_MSG} "You can define DOKUWIKI_DIR to override default '${DOKUWIKI_DIR}'"
+	 @${ECHO_MSG} "installed under ${PREFIX}"
+	 @${ECHO_MSG} ""
+.endif
+
 pre-patch:
 .if defined(WIKI_LANG)
 	@${REINPLACE_CMD} -e 's|lang\(.*\)'en'|lang\1'${WIKI_LANG}'|g' \
@@ -99,12 +99,12 @@ pre-install:
 		&& ${ECHO_CMD} "@unexec ${RMDIR} %D/${DOKUWIKI_DIR} 2>/dev/null || true">> ${PLIST}
 
 do-install:
-	# Data files
+# 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
+# Setup the correct permissions
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKI_DIR}/data
 
 post-install:
diff --git a/www/dokuwiki-devel/distinfo b/www/dokuwiki-devel/distinfo
index 3df5747e7e1a..97148884262a 100644
--- a/www/dokuwiki-devel/distinfo
+++ b/www/dokuwiki-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (dokuwiki-2005-09-22.tgz) = 8d0076185f426656a19dd9a075ada3b0
-SIZE (dokuwiki-2005-09-22.tgz) = 643167
+MD5 (dokuwiki-2005-10-23.tgz) = d404e8b2a8791f3900e8c0727db2a73a
+SIZE (dokuwiki-2005-10-23.tgz) = 690139
diff --git a/www/dokuwiki-devel/pkg-message b/www/dokuwiki-devel/pkg-message
index 2b2cb4502ca0..ded7355d5d60 100644
--- a/www/dokuwiki-devel/pkg-message
+++ b/www/dokuwiki-devel/pkg-message
@@ -1,7 +1,7 @@
 =================================================================
           	**** NOTE ****
   Remember to edit the following file:
-    %%PREFIX%%/%%DOKUWIKI_DIR%%/conf/dokuwiki.php 
+    %%PREFIX%%/%%DOKUWIKI_DIR%%/conf/dokuwiki.php
 
   For FULL configuration instructions see
   http://wiki.splitbrain.org/wiki:config
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index 90ec719c8660..ad60440da1e8 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -6,35 +6,27 @@
 #
 
 PORTNAME=	dokuwiki
-PORTVERSION=	20050922
+PORTVERSION=	20051023
 CATEGORIES=	www
-MASTER_SITES=	http://www.splitbrain.org/Programming/PHP/DokuWiki/
-DISTNAME=	${PORTNAME}-2005-09-22
+MASTER_SITES=	http://bbs.ilc.edu.tw/chinsan/ports/dokuwiki/ \
+		http://dev.splitbrain.org/browse/snapshots/ \
+		http://www.splitbrain.org/Programming/PHP/DokuWiki/
+DISTNAME=	${PORTNAME}-2005-10-23
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A simple and easy to use wiki, no database required
 
-BROKEN=		Unfetchable
-
 USE_PHP=	gd imagick pcre session xml zlib
 PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 USE_REINPLACE=	YES
 
-pre-fetch:
-.if !defined(DOKUWIKI_DIR)
-	 @${ECHO_MSG} ""
-	 @${ECHO_MSG} "Define DOKUWIKI_DIR to override default of '${DOKUWIKI_DIR}'."
-	 @${ECHO_MSG} ""
-.endif
-
 WWWDOCROOT?=	www/data
 DOKUWIKI_URL?=	${PORTNAME}
-WWWOWN?=	www
-WWWGRP?=	www
 DOKUWIKI_DIR?=	${WWWDOCROOT}/${DOKUWIKI_URL}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST=		${WRKDIR}/pkg-plist
 
 .if defined(BATCH)
@@ -83,6 +75,14 @@ pre-everything::
 	@${ECHO_MSG} '*******************************************************'
 .endif
 
+pre-fetch:
+.if ${DOKUWIKI_DIR} == ${WWWDOCROOT}/${DOKUWIKI_URL}
+	 @${ECHO_MSG} ""
+	 @${ECHO_MSG} "You can define DOKUWIKI_DIR to override default '${DOKUWIKI_DIR}'"
+	 @${ECHO_MSG} "installed under ${PREFIX}"
+	 @${ECHO_MSG} ""
+.endif
+
 pre-patch:
 .if defined(WIKI_LANG)
 	@${REINPLACE_CMD} -e 's|lang\(.*\)'en'|lang\1'${WIKI_LANG}'|g' \
@@ -99,12 +99,12 @@ pre-install:
 		&& ${ECHO_CMD} "@unexec ${RMDIR} %D/${DOKUWIKI_DIR} 2>/dev/null || true">> ${PLIST}
 
 do-install:
-	# Data files
+# 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
+# Setup the correct permissions
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKI_DIR}/data
 
 post-install:
diff --git a/www/dokuwiki/distinfo b/www/dokuwiki/distinfo
index 3df5747e7e1a..97148884262a 100644
--- a/www/dokuwiki/distinfo
+++ b/www/dokuwiki/distinfo
@@ -1,2 +1,2 @@
-MD5 (dokuwiki-2005-09-22.tgz) = 8d0076185f426656a19dd9a075ada3b0
-SIZE (dokuwiki-2005-09-22.tgz) = 643167
+MD5 (dokuwiki-2005-10-23.tgz) = d404e8b2a8791f3900e8c0727db2a73a
+SIZE (dokuwiki-2005-10-23.tgz) = 690139
diff --git a/www/dokuwiki/pkg-message b/www/dokuwiki/pkg-message
index 2b2cb4502ca0..ded7355d5d60 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/dokuwiki.php
 
   For FULL configuration instructions see
   http://wiki.splitbrain.org/wiki:config