7 files changed, 31 insertions, 21 deletions

diff --git a/www/e107/Makefile b/www/e107/Makefile
index 09d65a4f0119..2b60891327e3 100644
--- a/www/e107/Makefile
+++ b/www/e107/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	e107
-PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20v${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_full
@@ -22,13 +21,12 @@ SUB_FILES=	pkg-message
 SUB_LIST=	E107DIR=${E107DIR}
 E107DIR=	www/e107
 
-post-extract:
-	@cd ${WRKDIR} && ${MKDIR} ${WRKSRC}
-	@cd ${WRKDIR} && ${MV} *.php ${WRKSRC}
-	@cd ${WRKDIR} && ${MV} e107_* ${WRKSRC}
-	@cd ${WRKDIR} && ${MV} e107.htaccess ${WRKSRC}
-	@cd ${WRKDIR} && ${MV} favicon.ico ${WRKSRC}
-	@cd ${WRKDIR} && ${MV} e107.robots.txt ${WRKSRC}
+USES=		dos2unix shebangfix
+SHEBANG_FILES=	cron.php e107_handlers/bounce_handler.php
+
+do-extract:
+	@${MKDIR} ${WRKSRC}
+	@${TAR} -yxf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} -C ${WRKSRC}
 
 pre-install:
 	@${ECHO_CMD} -e '@owner ${WWWOWN}\n@group ${WWWGRP}' > ${PLIST}
diff --git a/www/e107/distinfo b/www/e107/distinfo
index 5983febfbdfe..42af300be0e3 100644
--- a/www/e107/distinfo
+++ b/www/e107/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e107_1.0.4_full.tar.gz) = 2a4abbb062b1330aa8052b9688a84502f1ae5a8fac592ec74e67e74de72b0dad
-SIZE (e107_1.0.4_full.tar.gz) = 4400394
+SHA256 (e107_2.0_full.tar.gz) = c139f48c7f5d7b496e40a021c65a875f7fc942f0a074cd8c8e2749f9f23c76ea
+SIZE (e107_2.0_full.tar.gz) = 6238386
diff --git a/www/mediawiki123/Makefile b/www/mediawiki123/Makefile
index 3777d83aa968..ad01da9943cb 100644
--- a/www/mediawiki123/Makefile
+++ b/www/mediawiki123/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mediawiki
 PORTVERSION=	1.23.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/
 PKGNAMESUFFIX=	123
@@ -21,7 +21,8 @@ SHEBANG_FILES=	maintenance/dev/*.sh \
 SHEBANG_LANG=	hhvm
 hhvm_OLD_CMD=	/usr/bin/hhvm
 hhvm_CMD=	${LOCALBASE}/bin/hhvm # not installed by anything yet
-USE_PHP=	ctype hash iconv mbstring pcre session xml zlib readline dom json
+USE_PHP=	ctype dom hash iconv json mbstring pcre readline \
+		session xml xmlreader zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
@@ -79,6 +80,9 @@ USE_PHP+=	sockets
 
 pre-install:
 	@${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}
+	@${ECHO} "@mode 0777" >> ${PLIST}
+	@${ECHO} "@dir %%WWWDIR%%/images" >> ${PLIST}
+	@${ECHO} "@mode" >> ${PLIST}
 	@${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST}
 
 do-install:
diff --git a/www/mediawiki124/Makefile b/www/mediawiki124/Makefile
index 65ee2c8a9f21..a67edfd0f8d4 100644
--- a/www/mediawiki124/Makefile
+++ b/www/mediawiki124/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mediawiki
 PORTVERSION=	1.24.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/
 PKGNAMESUFFIX=	124
@@ -21,7 +21,8 @@ SHEBANG_FILES=	maintenance/dev/*.sh \
 SHEBANG_LANG=	hhvm
 hhvm_OLD_CMD=	/usr/bin/hhvm
 hhvm_CMD=	${LOCALBASE}/bin/hhvm # not installed by anything yet
-USE_PHP=	ctype hash iconv mbstring pcre session xml zlib readline dom json
+USE_PHP=	ctype dom hash iconv json mbstring pcre readline \
+		session xml xmlreader zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
@@ -79,6 +80,9 @@ USE_PHP+=	sockets
 
 pre-install:
 	@${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}
+	@${ECHO} "@mode 0777" >> ${PLIST}
+	@${ECHO} "@dir %%WWWDIR%%/images" >> ${PLIST}
+	@${ECHO} "@mode" >> ${PLIST}
 	@${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST}
 
 do-install:
diff --git a/www/mediawiki125/Makefile b/www/mediawiki125/Makefile
index fca2c5106ff7..2e312e50e455 100644
--- a/www/mediawiki125/Makefile
+++ b/www/mediawiki125/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mediawiki
 PORTVERSION=	1.25.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/
 PKGNAMESUFFIX=	125
@@ -26,7 +26,8 @@ SHEBANG_FILES=	maintenance/dev/*.sh \
 SHEBANG_LANG=	hhvm
 hhvm_OLD_CMD=	/usr/bin/hhvm
 hhvm_CMD=	${LOCALBASE}/bin/hhvm # not installed by anything yet
-USE_PHP=	ctype hash iconv mbstring pcre session xml zlib readline dom json
+USE_PHP=	ctype dom hash iconv json mbstring pcre readline \
+		session xml xmlreader zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
@@ -63,10 +64,13 @@ XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/ww
 pre-install:
 	@${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}
 	@${ECHO} "@dir %%WWWDIR%%/vendor/monolog/monolog/tests/Monolog/Handler/Fixtures" >> ${PLIST}
+	@${ECHO} "@mode 0777" >> ${PLIST}
+	@${ECHO} "@dir %%WWWDIR%%/images" >> ${PLIST}
+	@${ECHO} "@mode" >> ${PLIST}
 	@${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
-	${CP} -r ${WRKSRC}/ ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
 
 .include <bsd.port.mk>
diff --git a/www/punbb/Makefile b/www/punbb/Makefile
index e9aafa8bfe5a..83d40df493f7 100644
--- a/www/punbb/Makefile
+++ b/www/punbb/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	punbb
-PORTVERSION=	1.2.23
+PORTVERSION=	1.4.3
 CATEGORIES=	www
 MASTER_SITES=	http://punbb.informer.com/download/ \
 		http://punbb.informer.com/download/plugins/:plugins \
diff --git a/www/punbb/distinfo b/www/punbb/distinfo
index 15603713ee30..a3d8292bb4db 100644
--- a/www/punbb/distinfo
+++ b/www/punbb/distinfo
@@ -1,5 +1,5 @@
-SHA256 (punbb-1.2.23.tar.bz2) = c175872b029acd7ac68b7a77affcc15dcf5b672b6dd592df0cbe8703a1c00602
-SIZE (punbb-1.2.23.tar.bz2) = 112727
+SHA256 (punbb-1.4.3.tar.bz2) = 7e6bc271b4a1568746ae50513e2073855061e6cae3550e00f47a5eb590042fc3
+SIZE (punbb-1.4.3.tar.bz2) = 272897
 SHA256 (Arabic.zip) = b7d00d1d9fcdc266b3876e719feb7c57729ba1a0e012a0392ad39d9df054812d
 SIZE (Arabic.zip) = 18921
 SHA256 (Bangla_UTF8.zip) = 594d065f96fe8ee2953d2367df30a81d83ae00da2d0a7d6aeafcc96f1db84234