39 files changed, 182 insertions, 234 deletions

diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki/distinfo b/www/mediawiki/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki/distinfo
+++ b/www/mediawiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki/pkg-message b/www/mediawiki/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki/pkg-message
+++ b/www/mediawiki/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki110/Makefile b/www/mediawiki110/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki110/Makefile
+++ b/www/mediawiki110/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki110/distinfo b/www/mediawiki110/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki110/distinfo
+++ b/www/mediawiki110/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki110/pkg-message b/www/mediawiki110/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki110/pkg-message
+++ b/www/mediawiki110/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki111/Makefile b/www/mediawiki111/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki111/Makefile
+++ b/www/mediawiki111/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki111/distinfo b/www/mediawiki111/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki111/distinfo
+++ b/www/mediawiki111/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki111/pkg-message b/www/mediawiki111/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki111/pkg-message
+++ b/www/mediawiki111/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki112/Makefile b/www/mediawiki112/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki112/Makefile
+++ b/www/mediawiki112/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki112/distinfo b/www/mediawiki112/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki112/distinfo
+++ b/www/mediawiki112/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki112/pkg-message b/www/mediawiki112/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki112/pkg-message
+++ b/www/mediawiki112/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki113/Makefile b/www/mediawiki113/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki113/Makefile
+++ b/www/mediawiki113/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki113/distinfo b/www/mediawiki113/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki113/distinfo
+++ b/www/mediawiki113/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki113/pkg-message b/www/mediawiki113/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki113/pkg-message
+++ b/www/mediawiki113/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki114/Makefile b/www/mediawiki114/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki114/Makefile
+++ b/www/mediawiki114/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki114/distinfo b/www/mediawiki114/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki114/distinfo
+++ b/www/mediawiki114/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki114/pkg-message b/www/mediawiki114/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki114/pkg-message
+++ b/www/mediawiki114/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki115/Makefile b/www/mediawiki115/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki115/Makefile
+++ b/www/mediawiki115/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki115/distinfo b/www/mediawiki115/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki115/distinfo
+++ b/www/mediawiki115/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki115/pkg-message b/www/mediawiki115/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki115/pkg-message
+++ b/www/mediawiki115/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki116/Makefile b/www/mediawiki116/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki116/Makefile
+++ b/www/mediawiki116/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki116/distinfo b/www/mediawiki116/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki116/distinfo
+++ b/www/mediawiki116/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki116/pkg-message b/www/mediawiki116/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki116/pkg-message
+++ b/www/mediawiki116/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki118/Makefile b/www/mediawiki118/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki118/Makefile
+++ b/www/mediawiki118/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki118/distinfo b/www/mediawiki118/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki118/distinfo
+++ b/www/mediawiki118/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki118/pkg-message b/www/mediawiki118/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki118/pkg-message
+++ b/www/mediawiki118/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki12/Makefile b/www/mediawiki12/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki12/Makefile
+++ b/www/mediawiki12/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki12/distinfo b/www/mediawiki12/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki12/distinfo
+++ b/www/mediawiki12/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki12/pkg-message b/www/mediawiki12/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki12/pkg-message
+++ b/www/mediawiki12/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki17/Makefile b/www/mediawiki17/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki17/Makefile
+++ b/www/mediawiki17/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki17/distinfo b/www/mediawiki17/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki17/distinfo
+++ b/www/mediawiki17/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki17/pkg-message b/www/mediawiki17/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki17/pkg-message
+++ b/www/mediawiki17/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki18/Makefile b/www/mediawiki18/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki18/Makefile
+++ b/www/mediawiki18/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki18/distinfo b/www/mediawiki18/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki18/distinfo
+++ b/www/mediawiki18/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki18/pkg-message b/www/mediawiki18/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki18/pkg-message
+++ b/www/mediawiki18/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details
diff --git a/www/mediawiki19/Makefile b/www/mediawiki19/Makefile
index 287230dc6875..c4581fd6665c 100644
--- a/www/mediawiki19/Makefile
+++ b/www/mediawiki19/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.6.7
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -15,27 +14,20 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The wiki engine used by Wikipedia
 
-CONFLICTS=	mediawiki-1.[0-57-9].*
+CONFLICTS=	mediawiki-1.[0-68-9].*
 
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib readline
+USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	323
+USE_PHP=	iconv mbstring pcre session xml zlib readline mysql
+IGNORE_WITH_PHP=	4
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL (not funtional)" off \
-		LDAP "Use LDAP authentication" off
+OPTIONS=	LDAP "Use LDAP authentication" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-IGNORE=		the table definitions for PostgreSQL install are out of date.\
-		PostgreSQL support may return in later releases, pending appropriate patches.\
-		Use www/mediawiki15 for while
-.else
-USE_PHP+=	mysql
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
diff --git a/www/mediawiki19/distinfo b/www/mediawiki19/distinfo
index 048ea3a7bb47..b50a5be915b6 100644
--- a/www/mediawiki19/distinfo
+++ b/www/mediawiki19/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediawiki-1.6.7.tar.gz) = cbcba609339abb5688068e5dc379110b
-SHA256 (mediawiki-1.6.7.tar.gz) = 0b88551c6637a75ea271e46698ea1a1838a6f4fce83a749ad09a7a6c6ae65ff3
-SIZE (mediawiki-1.6.7.tar.gz) = 2728980
+MD5 (mediawiki-1.7.1.tar.gz) = 50b74e2b5c86fb94c7201b72d2037662
+SHA256 (mediawiki-1.7.1.tar.gz) = c1b921faedddc14befe1c9593cba80cf6acfe86f21d9eca48617f7a95461bdd2
+SIZE (mediawiki-1.7.1.tar.gz) = 3256428
diff --git a/www/mediawiki19/pkg-message b/www/mediawiki19/pkg-message
index d991a956ce47..d98978fe6903 100644
--- a/www/mediawiki19/pkg-message
+++ b/www/mediawiki19/pkg-message
@@ -4,4 +4,8 @@ Remember to check
 
 %%MEDIAWIKIDIR%%/INSTALL
 
+and
+
+%%MEDIAWIKIDIR%%/UPGRADE
+
 for details