- Update to 4.1

- Unbreak

Approved by:	maintainer (implicit)

www/twiki/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twiki
-PORTVERSION=	4.0.5
+PORTVERSION=	4.1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://twiki.org/p/pub/Codev/Release/ \
@@ -18,8 +18,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A flexible, powerful, and easy to use Web-based collaboration platform
 
-BROKEN=		Incomplete pkg-plist
-
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
@@ -38,16 +36,13 @@ pre-everything::
 	@${ECHO} "*  This software can't be upgraded automatically without       *"
 	@${ECHO} "*  damaging data in your wiki!                                 *"
 	@${ECHO} "****************************************************************"
-	@sleep 10
+	@sleep 1
 
 post-patch:
 	@${REINPLACE_CMD} -i "" -e "s|\/home\/httpd\/twiki|${TWIKIDIR}|g" \
 	${WRKSRC}/twiki_httpd_conf.txt
 	@${REINPLACE_CMD} -i "" -e "s|\/home\/httpd\/twiki|${TWIKIDIR}|g" \
 	${WRKSRC}/lib/LocalSite.cfg.txt
-	@${REINPLACE_CMD} -i "" -e "s|\/home\/httpd\/twiki|${TWIKIDIR}|g" \
-	${WRKSRC}/lib/TWiki.cfg
-	@${CP} ${WRKSRC}/lib/TWiki.cfg ${WRKSRC}/lib/TWiki.cfg.sample
 
 do-install:
 	${INSTALL} -d -m 0755 ${TWIKIDIR}

www/twiki/distinfo

@@ -1,3 +1,3 @@
-MD5 (TWiki-4.0.5.tgz) = d984b90886c12601b76f51419bb5352b
-SHA256 (TWiki-4.0.5.tgz) = cbe97bd965e13940a6f9aa496c0c2657d42bf900dd8d0bdcf8b4e866d090dc8f
-SIZE (TWiki-4.0.5.tgz) = 4264148
+MD5 (TWiki-4.1.0.tgz) = fd5bb7b6d26f2c5d78a64d1449ef291e
+SHA256 (TWiki-4.1.0.tgz) = 63df752f2f0c4725e242345e915cdb09345f738133d2409a4a0cad929c094338
+SIZE (TWiki-4.1.0.tgz) = 4637237

www/twiki/files/pkg-install.in

@@ -19,10 +19,6 @@ case $2 in
 		# 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?
-		$REINPLACE_CMD -e "s|/home/httpd/twiki|${TWIKIDIR}|g" \
-			-e "s|your.domain.com|$HOSTNAME|" -e "s|/bin/egrep|/usr/bin/egrep|" \
-			-e "s|/bin/fgrep|/usr/bin/fgrep|" ${TWIKIDIR}/lib/TWiki.cfg.sample
-		rm ${TWIKIDIR}/lib/TWiki.cfg.sample.bak
 
 		for i in `find ${TWIKIDIR}/data -type f`; do
 			$REINPLACE_CMD -e "s/nobody:/${WWWUSER}:/g" $i;