28 files changed, 84 insertions, 84 deletions

diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki/distinfo b/www/mediawiki/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki/distinfo
+++ b/www/mediawiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki110/Makefile b/www/mediawiki110/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki110/Makefile
+++ b/www/mediawiki110/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki110/distinfo b/www/mediawiki110/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki110/distinfo
+++ b/www/mediawiki110/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki111/Makefile b/www/mediawiki111/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki111/Makefile
+++ b/www/mediawiki111/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki111/distinfo b/www/mediawiki111/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki111/distinfo
+++ b/www/mediawiki111/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki112/Makefile b/www/mediawiki112/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki112/Makefile
+++ b/www/mediawiki112/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki112/distinfo b/www/mediawiki112/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki112/distinfo
+++ b/www/mediawiki112/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki113/Makefile b/www/mediawiki113/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki113/Makefile
+++ b/www/mediawiki113/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki113/distinfo b/www/mediawiki113/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki113/distinfo
+++ b/www/mediawiki113/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki114/Makefile b/www/mediawiki114/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki114/Makefile
+++ b/www/mediawiki114/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki114/distinfo b/www/mediawiki114/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki114/distinfo
+++ b/www/mediawiki114/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki115/Makefile b/www/mediawiki115/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki115/Makefile
+++ b/www/mediawiki115/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki115/distinfo b/www/mediawiki115/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki115/distinfo
+++ b/www/mediawiki115/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki116/Makefile b/www/mediawiki116/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki116/Makefile
+++ b/www/mediawiki116/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki116/distinfo b/www/mediawiki116/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki116/distinfo
+++ b/www/mediawiki116/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki118/Makefile b/www/mediawiki118/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki118/Makefile
+++ b/www/mediawiki118/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki118/distinfo b/www/mediawiki118/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki118/distinfo
+++ b/www/mediawiki118/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki12/Makefile b/www/mediawiki12/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki12/Makefile
+++ b/www/mediawiki12/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki12/distinfo b/www/mediawiki12/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki12/distinfo
+++ b/www/mediawiki12/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki16/Makefile b/www/mediawiki16/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki16/Makefile
+++ b/www/mediawiki16/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki16/distinfo b/www/mediawiki16/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki16/distinfo
+++ b/www/mediawiki16/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki17/Makefile b/www/mediawiki17/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki17/Makefile
+++ b/www/mediawiki17/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki17/distinfo b/www/mediawiki17/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki17/distinfo
+++ b/www/mediawiki17/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki18/Makefile b/www/mediawiki18/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki18/Makefile
+++ b/www/mediawiki18/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki18/distinfo b/www/mediawiki18/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki18/distinfo
+++ b/www/mediawiki18/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980
diff --git a/www/mediawiki19/Makefile b/www/mediawiki19/Makefile
index 4d301a51963e..09ebeb4880ca 100644
--- a/www/mediawiki19/Makefile
+++ b/www/mediawiki19/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -19,7 +19,7 @@ CONFLICTS=	mediawiki-1.[0-57-9].*
 NO_BUILD=	yes
 USE_PHP=	iconv mbstring pcre session xml zlib readline
 WANT_PHP_WEB=	yes
-MEDIAWIKIDIR?=	www/data-dist/mediawiki
+MEDIAWIKIDIR?=	www/mediawiki
 
 OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
 		LDAP "Use LDAP authentication" off
@@ -52,7 +52,7 @@ post-install:
 		| ${SED} -ne 's,^${WRKSRC},${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${file} -type d \
 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/www/data-dist 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/www/ 2>/dev/null || true" >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mediawiki19/distinfo b/www/mediawiki19/distinfo
index 56ca756e9c72..048ea3a7bb47 100644
--- a/www/mediawiki19/distinfo
+++ b/www/mediawiki19/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.6.tar.gz) = b19b11dbe4a9c61bf857f6584e4d6010
-SHA256 (mediawiki-1.6.6.tar.gz) = 937b472906600614f2534a45fbff79afdad99c913822345fc25b1ca9f375fd63 
-SIZE (mediawiki-1.6.6.tar.gz) = 2727287
+MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
+SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
+SIZE (mediawiki-1.6.7.tar.gz) = 2728980