update to 4.1.1 .

from Jason Crawford <jasonrcrawford@gmail.com>

www/twiki/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2005/11/09 10:27:06 aanriot Exp $
+# $OpenBSD: Makefile,v 1.6 2007/06/01 22:07:39 aanriot Exp $
 
 COMMENT=	"web-based collaboration platform"
 
-DISTNAME=	TWiki20040903
-PKGNAME=	TWiki-20040903p0
+DISTNAME=	TWiki-4.1.1
+EXTRACT_SUFX=	.tgz
 CATEGORIES=	www
 
 HOMEPAGE=	http://twiki.org/
@@ -14,22 +14,26 @@ PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=	${HOMEPAGE}/swd/	
+MASTER_SITES=	${HOMEPAGE}/p/pub/Codev/Release/
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
 PKG_ARCH=	*
 
-WRKDIST=	${WRKDIR}/twiki
+RUN_DEPENDS=	::www/p5-CGI-Session
+
+WRKDIST=	${WRKDIR}
 
 PREFIX=		/var/www
 WWWDOCDIR=	${PREFIX}/htdocs/twiki
 WWWCGIDIR=	${PREFIX}/cgi-bin/twiki
 SUBST_VARS=	WWWDOCDIR WWWCGIDIR
 
+post-extract:
+	@cp -p ${WRKSRC}/bin/LocalLib.cfg.txt ${WRKSRC}/bin/LocalLib.cfg
+
 do-configure:
-	@perl -i -pe 's@%%WWWDOCDIR%%@${WWWDOCDIR}@g' ${WRKSRC}/lib/TWiki.cfg
-	@perl -i -pe 's@%%WWWDOCDIR%%@${WWWDOCDIR}@g' ${WRKSRC}/bin/setlib.cfg
+	@perl -i -pe 's@%%WWWDOCDIR%%@${WWWDOCDIR}@g' ${WRKSRC}/bin/LocalLib.cfg
 	@find ${WRKSRC} -name '*.orig' |xargs rm
 	@find ${WRKSRC} -name '*\,v' |xargs rm
 
@@ -39,13 +43,17 @@ do-install:
 
 	${INSTALL_DATA_DIR} ${WWWDOCDIR}
 	${INSTALL_SCRIPT_DIR} ${WWWCGIDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${WWWCGIDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/!(logos) ${WWWCGIDIR}
+
+.for f in index.html robots.txt INSTALL.html TWikiHistory.html \
+	TWikiReleaseNotes04x01.html TWikiUpgradeGuide.html \
+	pub-htaccess.txt readme.txt root-htaccess.txt \
+	subdir-htaccess.txt  
 
-.for f in index.html robots.txt TWikiDocumentation.html TWikiHistory.html
 	${INSTALL_DATA} ${WRKSRC}/${f} ${WWWDOCDIR}
 .endfor
 
-.for d in data lib pub templates
+.for d in data lib pub templates tools
 	cp -R ${WRKSRC}/${d} ${WWWDOCDIR}
 .endfor
 

www/twiki/distinfo

@@ -1,5 +1,6 @@
-MD5 (TWiki20040903.tar.gz) = pDYZbG+7xNtquPao0834GQ==
-RMD160 (TWiki20040903.tar.gz) = KNM4W91EnNeVhb6DFSFBGL83K60=
-SHA1 (TWiki20040903.tar.gz) = oZviLQjvbagGcYTFpYx40ah7Fhg=
-SHA256 (TWiki20040903.tar.gz) = qPj4qvySYCq8IYC6bCgg/sL16xkxSTOUwy//8hkuSbg=
+MD5 (TWiki-4.1.1.tgz) = 700ba2cbb50e89ec79db15e6c97e911f
+RMD160 (TWiki-4.1.1.tgz) = d47d50f21d55c153e6a1057641621d0c63c57cdc
+SHA1 (TWiki-4.1.1.tgz) = e9110e1d7392a0b1d50bccf26dfd48a3e898a8fa
+SHA256 (TWiki-4.1.1.tgz) = 752d18d307a639bf620f82d33f05293ff77bbf67ce689a0d7ba16e2141c26a8a
+SIZE (TWiki-4.1.1.tgz) = 4674349
 SIZE (TWiki20040903.tar.gz) = 1834178

www/twiki/patches/patch-bin_LocalLib_cfg

@@ -0,0 +1,11 @@
+--- bin/LocalLib.cfg.orig	Sun Feb  4 19:11:35 2007
++++ bin/LocalLib.cfg	Fri Feb 23 12:47:56 2007
+@@ -19,7 +19,7 @@
+ # REQUIRED
+ # The absolute path to the 'lib' directory in your installation..
+
+-$twikiLibPath = "/absolute/path/to/your/lib";
++$twikiLibPath = "%%WWWDOCDIR%%/lib";
+
+
+ # -------------- Extra path components to include in @INC

www/twiki/patches/patch-bin_setlib_cfg

@@ -1,12 +0,0 @@
-$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.
- #    ATTENTION: Set to absolute file path:
--$twikiLibPath = '../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,30 +0,0 @@
-$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%%/pub";
- #                   Template directory :
--$templateDir      = "/home/httpd/twiki/templates";
-+$templateDir      = "%%WWWDOCDIR%%/templates";
- #                   Data (topic files) root directory (file path not URL):
--$dataDir          = "/home/httpd/twiki/data";
-+$dataDir          = "%%WWWDOCDIR%%/data";
- #                   Log directory for log files, debug and warning files. Default "$dataDir" :
- $logDir           = "$dataDir";
- 
-@@ -210,9 +210,9 @@ $storeTopicImpl = "RcsWrap"; 
- #                   Unix ls command :  (deprecated since 01 Nov 2003)
- $lsCmd            = "/bin/ls";
- #                   Unix egrep command :
--$egrepCmd         = "/bin/egrep";
-+$egrepCmd         = "/usr/bin/egrep";
- #                   Unix fgrep command :
--$fgrepCmd         = "/bin/fgrep";
-+$fgrepCmd         = "/usr/bin/fgrep";
- 
- #display Time in the following timezones (this only effects the display of times, all internal storage is still in GMT)
- # gmtime / servertime

www/twiki/pkg/MESSAGE

@@ -1,6 +1,6 @@
 If you're using Apache, run it in non-chrooted mode, or create a correct
 environment with sendmail(8), egrep(1) etc. You should add
-"include /var/www/conf/httpd-twiki.conf" to your httpd.conf.
+"Include /var/www/conf/httpd-twiki.conf" to your httpd.conf.
 
 You have to customize your twiki installation (like WIKIWEBMASTER)
 in ${PREFIX}/htdocs/twiki/data/TWiki/TWikiPreferences.txt