update to latest version (20030201).

help and ok naddy@

www/twiki/Makefile

@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.2 2005/03/08 07:43:19 kevlo Exp $
+# $OpenBSD: Makefile,v 1.3 2005/08/02 22:19:06 aanriot Exp $
 
 COMMENT=	"web-based collaboration platform"
 
-DISTNAME=	TWiki20030201
-PKGNAME=	TWiki-20030201
+DISTNAME=	TWiki20040902
+PKGNAME=	TWiki-20040902
 CATEGORIES=	www
 
 HOMEPAGE=	http://twiki.org/
 
+# GPL
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=Yes
@@ -19,24 +20,33 @@ NO_BUILD=	Yes
 NO_REGRESS=	Yes
 PKG_ARCH=	*
 
-WRKDIST=	${WRKDIR}
+WRKDIST=	${WRKDIR}/twiki
 
 PREFIX=		/var/www
-WWWDOCDIR=	${PREFIX}/htdocs
-SUBST_VARS=	WWWDOCDIR
+WWWDOCDIR=	${PREFIX}/htdocs/twiki
+WWWCGIDIR=	${PREFIX}/cgi-bin/twiki
+SUBST_VARS=	WWWDOCDIR WWWCGIDIR
 
 do-configure:
 	@perl -i -pe 's@%%WWWDOCDIR%%@${WWWDOCDIR}@g' ${WRKSRC}/lib/TWiki.cfg
 	@perl -i -pe 's@%%WWWDOCDIR%%@${WWWDOCDIR}@g' ${WRKSRC}/bin/setlib.cfg
 	@find ${WRKSRC} -name '*.orig' |xargs rm
+	@find ${WRKSRC} -name '*\,v' |xargs rm
 
 do-install:
-	${INSTALL_SCRIPT_DIR} ${PREFIX}/cgi-bin/twiki
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${PREFIX}/cgi-bin/twiki
-	${INSTALL_DATA} ${WRKSRC}/lib/TWiki.cfg ${WRKSRC}/lib/TWiki.cfg-sample
-	${INSTALL_DATA_DIR} ${WWWDOCDIR}/twiki
+	${INSTALL_DATA_DIR} ${PREFIX}/conf
+	${INSTALL_DATA} ${FILESDIR}/httpd-twiki.conf ${PREFIX}/conf/
+
+	${INSTALL_DATA_DIR} ${WWWDOCDIR}
+	${INSTALL_SCRIPT_DIR} ${WWWCGIDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${WWWCGIDIR}
+
+.for f in index.html robots.txt TWikiDocumentation.html TWikiHistory.html
+	${INSTALL_DATA} ${WRKSRC}/${f} ${WWWDOCDIR}
+.endfor
+
 .for d in data lib pub templates
-	cp -R ${WRKSRC}/${d} ${WWWDOCDIR}/twiki
+	cp -R ${WRKSRC}/${d} ${WWWDOCDIR}
 .endfor
 
 .include <bsd.port.mk>

www/twiki/distinfo

@@ -1,4 +1,4 @@
-MD5 (TWiki20030201.tar.gz) = cbbd937b51b56c5343b5e72f1be6a0cf
-RMD160 (TWiki20030201.tar.gz) = 3d83038448277df777dab68fa1c8f65cb37e82d1
-SHA1 (TWiki20030201.tar.gz) = 2819f903d260dab9a460401e115447e520b3ec42
-SIZE (TWiki20030201.tar.gz) = 892554
+MD5 (TWiki20040902.tar.gz) = d04b2041d83dc6c97905faa1c6b9116d
+RMD160 (TWiki20040902.tar.gz) = fd3ceaaba61a8f20801274687caa17908839c609
+SHA1 (TWiki20040902.tar.gz) = 0615f18bfa4707bb2eb053bfa4cf8e6e491194bb
+SIZE (TWiki20040902.tar.gz) = 1833008

www/twiki/patches/patch-bin_setlib_cfg

@@ -1,12 +1,12 @@
-$OpenBSD: patch-bin_setlib_cfg,v 1.1.1.1 2004/04/14 08:27:56 kevlo Exp $
---- bin/setlib.cfg.orig	2003-02-02 02:45:15.000000000 +0000
-+++ bin/setlib.cfg	2004-04-13 15:36:35.000000000 +0000
-@@ -22,7 +22,7 @@
- # -------------- Change these settings if required
+$OpenBSD: patch-bin_setlib_cfg,v 1.2 2005/08/02 22:19:06 aanriot Exp $
+--- bin/setlib.cfg.orig	Thu Jul 14 09:32:41 2005
++++ bin/setlib.cfg	Thu Jul 14 09:33:22 2005
+@@ -37,7 +37,7 @@
  
- #    Path to lib directory containing TWiki.pm. Set to absolute file path:
+ #    Path to lib directory containing TWiki.pm.
+ #    ATTENTION: Set to absolute file path:
 -$twikiLibPath = '../lib';
-+$twikiLibPath = '%%WWWDOCDIR%%/twiki/lib';
++$twikiLibPath = '%%WWWDOCDIR%%/lib';
  
  #    Path to local Perl modules (e.g. under home directory for users
  #    without 'root' on Unix/Linux). Uncomment and set if needed:

www/twiki/patches/patch-lib_TWiki_cfg

@@ -1,28 +1,23 @@
-$OpenBSD: patch-lib_TWiki_cfg,v 1.1.1.1 2004/04/14 08:27:56 kevlo Exp $
---- lib/TWiki.cfg.orig	2003-02-02 02:45:15.000000000 +0000
-+++ lib/TWiki.cfg	2004-04-13 17:43:32.000000000 +0000
-@@ -61,15 +61,15 @@
- #                   URL for TWiki host :    (e.g. "http://myhost.com:123")
- $defaultUrlHost   = "http://your.domain.com";
- #                   %SCRIPTURLPATH% : cgi-bin URL path for TWiki:
--$scriptUrlPath    = "/twiki/bin";
-+$scriptUrlPath    = "/cgi-bin/twiki";
+$OpenBSD: patch-lib_TWiki_cfg,v 1.2 2005/08/02 22:19:06 aanriot Exp $
+--- lib/TWiki.cfg.orig	Thu Jul 14 10:25:57 2005
++++ lib/TWiki.cfg	Thu Jul 14 10:27:08 2005
+@@ -69,11 +69,11 @@ $dispViewPath     = "/view";
  #                   %PUBURLPATH% : Public data URL path for TWiki (root of attachments) :
  $pubUrlPath       = "/twiki/pub";
  #                   Public data directory (file path not URL), must match $pubUrlPath :
 -$pubDir           = "/home/httpd/twiki/pub";
-+$pubDir           = "%%WWWDOCDIR%%/twiki/pub";
++$pubDir           = "%%WWWDOCDIR%%/pub";
  #                   Template directory :
 -$templateDir      = "/home/httpd/twiki/templates";
-+$templateDir      = "%%WWWDOCDIR%%/twiki/templates";
++$templateDir      = "%%WWWDOCDIR%%/templates";
  #                   Data (topic files) root directory (file path not URL):
 -$dataDir          = "/home/httpd/twiki/data";
-+$dataDir          = "%%WWWDOCDIR%%/twiki/data";
++$dataDir          = "%%WWWDOCDIR%%/data";
  #                   Log directory for log files, debug and warning files. Default "$dataDir" :
  $logDir           = "$dataDir";
  
-@@ -200,9 +200,9 @@ $storeTopicImpl = "RcsWrap"; 
- #                   Unix ls command :
+@@ -210,9 +210,9 @@ $storeTopicImpl = "RcsWrap"; 
+ #                   Unix ls command :  (deprecated since 01 Nov 2003)
  $lsCmd            = "/bin/ls";
  #                   Unix egrep command :
 -$egrepCmd         = "/bin/egrep";
@@ -31,5 +26,5 @@ $OpenBSD: patch-lib_TWiki_cfg,v 1.1.1.1 2004/04/14 08:27:56 kevlo Exp $
 -$fgrepCmd         = "/bin/fgrep";
 +$fgrepCmd         = "/usr/bin/fgrep";
  
- 
- # internationalisation setup:
+ #display Time in the following timezones (this only effects the display of times, all internal storage is still in GMT)
+ # gmtime / servertime