- Update to 4.0.1

PR:		ports/92993
Submitted by:	Piet Delport <pjd@satori.za.net>
Approved by:	maintainer timeout (1 month)

www/twiki/Makefile

@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	twiki
-PORTVERSION=	20040904
+PORTVERSION=	4.0.1
+PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	http://twiki.org/swd/ \
-		http://www.thoeny.com/peter/twiki/
-DISTNAME=	TWiki${PORTVERSION}
+MASTER_SITES=	http://twiki.org/p/pub/Codev/Release/
+DISTNAME=	TWiki-${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	justin@hawkins.id.au
 COMMENT=	A flexible, powerful, and easy to use Web-based collaboration platform
 
-USE_REINPLACE=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
+NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 WWW_ROOT?=	${WWWOWN}
@@ -43,7 +42,7 @@ post-extract:
 
 do-install:
 	${INSTALL} -d -m 0755 ${TWIKIDIR}
-	(cd ${WRKSRC} && ${FIND} . | \
+	(cd ${WRKSRC} && ${FIND} . -not -name .PLIST.mktmp -not -name '.*_done.*' -not -name pkg-install | \
 		${CPIO} -pdmu -R${SHAREOWN}:${SHAREGRP} ${TWIKIDIR})
 
 post-install:

www/twiki/distinfo

@@ -1,3 +1,3 @@
-MD5 (TWiki20040904.tar.gz) = 1ee1fdf5309ee0300d29cafacc30b75c
-SHA256 (TWiki20040904.tar.gz) = c622c5d6c215905d8e0e99cc329af4b817d6b18b4eba257af44efe6350214169
-SIZE (TWiki20040904.tar.gz) = 1703741
+MD5 (TWiki-4.0.1.tgz) = bbfaa7fe279b374407a5bd7d946bbe7a
+SHA256 (TWiki-4.0.1.tgz) = 209b749ed737868b7d3b960132a27104107d15866c10ba1b8bf362b13a992be6
+SIZE (TWiki-4.0.1.tgz) = 3849689

www/twiki/files/pkg-install.in

@@ -16,18 +16,6 @@ case $2 in
 	PRE-INSTALL)
 		;;
 	POST-INSTALL)
-		# create the empty dirs if necessary (the port creates them
-		# but pkg_add does not)
-		if [ ! -d "${TWIKIDIR}/pub/Main" ]; then
-			mkdir ${TWIKIDIR}/pub/Main
-		fi
-		if [ ! -d "${TWIKIDIR}/pub/Sandbox" ]; then
-			mkdir ${TWIKIDIR}/pub/Sandbox
-		fi
-		if [ ! -d "${TWIKIDIR}/pub/Trash" ]; then
-			mkdir ${TWIKIDIR}/pub/Trash
-		fi
-
 		# hmmm, if we modify this here, the file fails md5sum when deinstalling
 		# but if we do this in Makefile, then we have a hardcoded PREFIX. What to
 		# do?