- Update to 1.4.0

PR:		ports/80001
Submitted by:	Gerrit Beine <tux@pinguru.net> (maintainer)

32 files changed, 96 insertions, 400 deletions

diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki/distinfo b/www/mediawiki/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki/distinfo
+++ b/www/mediawiki/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki110/Makefile b/www/mediawiki110/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki110/Makefile
+++ b/www/mediawiki110/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki110/distinfo b/www/mediawiki110/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki110/distinfo
+++ b/www/mediawiki110/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki111/Makefile b/www/mediawiki111/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki111/Makefile
+++ b/www/mediawiki111/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki111/distinfo b/www/mediawiki111/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki111/distinfo
+++ b/www/mediawiki111/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki112/Makefile b/www/mediawiki112/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki112/Makefile
+++ b/www/mediawiki112/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki112/distinfo b/www/mediawiki112/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki112/distinfo
+++ b/www/mediawiki112/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki113/Makefile b/www/mediawiki113/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki113/Makefile
+++ b/www/mediawiki113/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki113/distinfo b/www/mediawiki113/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki113/distinfo
+++ b/www/mediawiki113/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki114/Makefile b/www/mediawiki114/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki114/Makefile
+++ b/www/mediawiki114/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki114/distinfo b/www/mediawiki114/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki114/distinfo
+++ b/www/mediawiki114/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki115/Makefile b/www/mediawiki115/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki115/Makefile
+++ b/www/mediawiki115/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki115/distinfo b/www/mediawiki115/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki115/distinfo
+++ b/www/mediawiki115/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki116/Makefile b/www/mediawiki116/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki116/Makefile
+++ b/www/mediawiki116/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki116/distinfo b/www/mediawiki116/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki116/distinfo
+++ b/www/mediawiki116/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki118/Makefile b/www/mediawiki118/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki118/Makefile
+++ b/www/mediawiki118/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki118/distinfo b/www/mediawiki118/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki118/distinfo
+++ b/www/mediawiki118/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki12/Makefile b/www/mediawiki12/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki12/Makefile
+++ b/www/mediawiki12/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki12/distinfo b/www/mediawiki12/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki12/distinfo
+++ b/www/mediawiki12/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki14/Makefile b/www/mediawiki14/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki14/Makefile
+++ b/www/mediawiki14/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki14/distinfo b/www/mediawiki14/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki14/distinfo
+++ b/www/mediawiki14/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki15/Makefile b/www/mediawiki15/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki15/Makefile
+++ b/www/mediawiki15/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki15/distinfo b/www/mediawiki15/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki15/distinfo
+++ b/www/mediawiki15/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki16/Makefile b/www/mediawiki16/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki16/Makefile
+++ b/www/mediawiki16/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki16/distinfo b/www/mediawiki16/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki16/distinfo
+++ b/www/mediawiki16/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki17/Makefile b/www/mediawiki17/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki17/Makefile
+++ b/www/mediawiki17/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki17/distinfo b/www/mediawiki17/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki17/distinfo
+++ b/www/mediawiki17/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki18/Makefile b/www/mediawiki18/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki18/Makefile
+++ b/www/mediawiki18/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki18/distinfo b/www/mediawiki18/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki18/distinfo
+++ b/www/mediawiki18/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413
diff --git a/www/mediawiki19/Makefile b/www/mediawiki19/Makefile
index 3b3aa99b726f..b036c13c51cf 100644
--- a/www/mediawiki19/Makefile
+++ b/www/mediawiki19/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.3.12
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -14,32 +14,13 @@ MASTER_SITE_SUBDIR=	wikipedia
 MAINTAINER=	tux@pinguru.net
 COMMENT=	The wiki enginge used by Wikipedia
 
+CONFLICTS=	mediawiki-1.3.*
+
 NO_BUILD=	yes
-USE_PHP=	iconv mbstring pcre session xml zlib imagick readline
+USE_PHP=	mysql session zlib
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/data-dist/mediawiki
 
-OPTIONS=	PGSQL "Use PostgreSQL instead of MySQL" off \
-		LDAP "Use LDAP authentication" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if defined(WITH_LDAP)
-USE_PHP+=	ldap
-.endif
-
 do-install:
 	-${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	@${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki19/distinfo b/www/mediawiki19/distinfo
index e084e5db91c0..4991ae679d18 100644
--- a/www/mediawiki19/distinfo
+++ b/www/mediawiki19/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.3.12.tar.gz) = 97003e0860cf05075dd84efdb675defb
-SIZE (mediawiki-1.3.12.tar.gz) = 1577784
+MD5 (mediawiki-1.4.0.tar.gz) = d1bbfe6db13c902ee12188f8fbe18f35
+SIZE (mediawiki-1.4.0.tar.gz) = 1874413