4 files changed, 25 insertions, 15 deletions

diff --git a/www/twiki/Makefile b/www/twiki/Makefile
index ef30b3fee057..fa77de1978f5 100644
--- a/www/twiki/Makefile
+++ b/www/twiki/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	twiki
-PORTVERSION=	4.2.0
-PORTREVISION=	2
+PORTVERSION=	4.2.3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://twiki.org/p/pub/Codev/Release/ \
@@ -18,8 +17,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Flexible, powerful, and easy to use enterprise wiki
 
-FORBIDDEN=	Contains security exploit: http://twiki.org/cgi-bin/view/Codev/SecurityAlert-CVE-2008-3195
-
 RUN_DEPENDS=	\
 		p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
 		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
@@ -34,12 +31,14 @@ RUN_DEPENDS=	\
 		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
 		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
 		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-Time-Local>=0:${PORTSDIR}/devel/p5-Time-Local \
+		twiki-TWikiUserMappingContrib>=0:${PORTSDIR}/www/twiki-TWikiUserMappingContrib
 
 USE_PERL5=	yes
 
 post-extract:
-	@cd ${WRKDIR}/ && ${MKDIR} .t/ && ${MV} * .t/ && ${MV} .t ${WRKSRC}
+	@cd ${WRKDIR}/ && ${INSTALL} -d .t/ && ${MV} * .t/ && ${MV} .t ${WRKSRC}
 	@${RM} -rf ${WRKSRC}/lib/CPAN
 	@${CAT} ${.CURDIR}/../twiki-*/pkg-plist |\
 		${SED} -e 's|%%TWDIR%%|${WRKSRC}|;/^@/d' |\
diff --git a/www/twiki/bsd.twiki.mk b/www/twiki/bsd.twiki.mk
index 18bf130745d8..bd62e798d4b3 100644
--- a/www/twiki/bsd.twiki.mk
+++ b/www/twiki/bsd.twiki.mk
@@ -20,7 +20,8 @@ PKGNAMEPREFIX?=	twiki-
 PNAME=	${PORTNAME}
 FILESDIR?=	${.CURDIR}/../twiki/files
 .endif
-MASTER_SITES?=	CENKES/myports/twiki
+MASTER_SITES?=	http://www.sourcehosting.net/freebsd/distfiles/ \
+		LOCAL/glarkin
 CATEGORIES?=	www
 SVNURL?=	http://svn.twiki.org/svn/twiki/trunk/${PNAME}
 NO_BUILD=	yes
@@ -34,7 +35,7 @@ DIST_SUBDIR?=	twiki
 RUN_DEPENDS+=	${TWDEP:C/([^=<>]*)([=<>]*)(.*)/twiki-\1\20.0.\3:${PORTSDIR}\/www\/twiki-\1/}
 
 make-dist:
-	@${MKDIR} ${WRKDIR}/
+	@${INSTALL} -d ${WRKDIR}/
 	@cd ${WRKDIR}/ && svn export -r ${SVNREV} ${SVNURL} && \
 		${MV} ${PNAME} ${DISTNAME} && \
 		${FIND} . -type d -empty | ${SED} -e 's|$$|/.keep_me|' | \
diff --git a/www/twiki/distinfo b/www/twiki/distinfo
index e148957b54f3..f560c3fe82c1 100644
--- a/www/twiki/distinfo
+++ b/www/twiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (twiki/TWiki-4.2.0.tgz) = 778ce528f72fd07395b6e2f346799988
-SHA256 (twiki/TWiki-4.2.0.tgz) = dd999df750a9745cef93aa5701bc2fd11c46de55fb0c39a3762485428b344317
-SIZE (twiki/TWiki-4.2.0.tgz) = 5380501
+MD5 (twiki/TWiki-4.2.3.tgz) = d7ddbefd1999e83abe25879297cc7b69
+SHA256 (twiki/TWiki-4.2.3.tgz) = d70cbd3da9a3d3125a8c73231bb8a9e61ed110c1716b5e921280f50b1b0b2258
+SIZE (twiki/TWiki-4.2.3.tgz) = 5509392
diff --git a/www/twiki/pkg-plist b/www/twiki/pkg-plist
index 9f2b4be405d4..4e294e1af432 100644
--- a/www/twiki/pkg-plist
+++ b/www/twiki/pkg-plist
@@ -44,8 +44,6 @@
 %%TWDIR%%/data/Main/TWikiGroups.txt,v
 %%TWDIR%%/data/Main/TWikiGuest.txt
 %%TWDIR%%/data/Main/TWikiGuest.txt,v
-%%TWDIR%%/data/Main/TWikiGuestLeftBar.txt
-%%TWDIR%%/data/Main/TWikiGuestLeftBar.txt,v
 %%TWDIR%%/data/Main/TWikiPreferences.txt
 %%TWDIR%%/data/Main/TWikiPreferences.txt,v
 %%TWDIR%%/data/Main/UnknownUser.txt
@@ -460,6 +458,8 @@
 %%TWDIR%%/data/TWiki/TWikiUserMappingDotPm.txt,v
 %%TWDIR%%/data/TWiki/TWikiUsersApacheHtpasswdUserDotPm.txt
 %%TWDIR%%/data/TWiki/TWikiUsersApacheHtpasswdUserDotPm.txt,v
+%%TWDIR%%/data/TWiki/TWikiUsersBaseUserMappingDotPm.txt,v
+%%TWDIR%%/data/TWiki/TWikiUsersBaseUserMappingDotPm.txt
 %%TWDIR%%/data/TWiki/TWikiUsersDotPm.txt
 %%TWDIR%%/data/TWiki/TWikiUsersDotPm.txt,v
 %%TWDIR%%/data/TWiki/TWikiUsersGuide.txt
@@ -532,6 +532,8 @@
 %%TWDIR%%/data/TWiki/VarDISPLAYTIME.txt,v
 %%TWDIR%%/data/TWiki/VarDISPLAYTIME2.txt
 %%TWDIR%%/data/TWiki/VarDISPLAYTIME2.txt,v
+%%TWDIR%%/data/TWiki/VarEDITACTION.txt
+%%TWDIR%%/data/TWiki/VarEDITACTION.txt,v
 %%TWDIR%%/data/TWiki/VarENCODE.txt
 %%TWDIR%%/data/TWiki/VarENCODE.txt,v
 %%TWDIR%%/data/TWiki/VarENDCOLOR.txt
@@ -1064,14 +1066,16 @@
 %%TWDIR%%/locale/da.po
 %%TWDIR%%/locale/de.po
 %%TWDIR%%/locale/es.po
+%%TWDIR%%/locale/fi.po
 %%TWDIR%%/locale/fr.po
 %%TWDIR%%/locale/it.po
-%%TWDIR%%/locale/jp.po
+%%TWDIR%%/locale/ja.po
 %%TWDIR%%/locale/nl.po
 %%TWDIR%%/locale/pl.po
 %%TWDIR%%/locale/pt.po
 %%TWDIR%%/locale/ru.po
 %%TWDIR%%/locale/sv.po
+%%TWDIR%%/locale/uk.po
 %%TWDIR%%/locale/zh-cn.po
 %%TWDIR%%/locale/zh-tw.po
 %%TWDIR%%/pub/Main/WebPreferences/favicon.ico
@@ -1118,6 +1122,7 @@
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/TWikiDocGraphics_Text_updated.psd
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/_filetypes.txt
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/addon.gif
+%%TWDIR%%/pub/TWiki/TWikiDocGraphics/air.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/application.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/arrowbdown.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/arrowbleft.gif
@@ -1149,6 +1154,7 @@
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/choice-yes.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/closed.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/code.gif
+%%TWDIR%%/pub/TWiki/TWikiDocGraphics/css.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/days.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/detail.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/dll.gif
@@ -1235,6 +1241,7 @@
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/line_ul.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/line_ulr.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/line_ur.gif
+%%TWDIR%%/pub/TWiki/TWikiDocGraphics/line_ur_gray.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/lock.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/lockfolder.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/lockfoldergray.gif
@@ -1258,6 +1265,7 @@
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/note.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/notify.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/package.gif
+%%TWDIR%%/pub/TWiki/TWikiDocGraphics/parent_gray.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/parked.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/parts.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/pdf.gif
@@ -1340,6 +1348,8 @@
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/unchecked.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/up.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/updated.gif
+%%TWDIR%%/pub/TWiki/TWikiDocGraphics/useractive.gif
+%%TWDIR%%/pub/TWiki/TWikiDocGraphics/userinactive.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/uweb-bo.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/uweb-bo12.gif
 %%TWDIR%%/pub/TWiki/TWikiDocGraphics/uweb-g.gif
@@ -1456,6 +1466,7 @@
 %%TWDIR%%/templates/editform.tmpl
 %%TWDIR%%/templates/edittext.tmpl
 %%TWDIR%%/templates/form.tmpl
+%%TWDIR%%/templates/form.pattern.tmpl
 %%TWDIR%%/templates/formtables.tmpl
 %%TWDIR%%/templates/login.sudo.tmpl
 %%TWDIR%%/templates/login.tmpl
@@ -1486,7 +1497,6 @@
 %%TWDIR%%/templates/renamewebbase.tmpl
 %%TWDIR%%/templates/renamewebconfirm.tmpl
 %%TWDIR%%/templates/renamewebdelete.tmpl
-%%TWDIR%%/templates/search.classic.tmpl
 %%TWDIR%%/templates/search.text.tmpl
 %%TWDIR%%/templates/search.tmpl
 %%TWDIR%%/templates/searchbookview.tmpl