- Update to 1.5.2

- Use background options handling from Porter's Handbook

PR:		ports/88651
Submitted by:	maintainer

30 files changed, 75 insertions, 165 deletions

diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki/distinfo b/www/mediawiki/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki/distinfo
+++ b/www/mediawiki/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki110/Makefile b/www/mediawiki110/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki110/Makefile
+++ b/www/mediawiki110/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki110/distinfo b/www/mediawiki110/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki110/distinfo
+++ b/www/mediawiki110/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki111/Makefile b/www/mediawiki111/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki111/Makefile
+++ b/www/mediawiki111/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki111/distinfo b/www/mediawiki111/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki111/distinfo
+++ b/www/mediawiki111/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki112/Makefile b/www/mediawiki112/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki112/Makefile
+++ b/www/mediawiki112/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki112/distinfo b/www/mediawiki112/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki112/distinfo
+++ b/www/mediawiki112/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki113/Makefile b/www/mediawiki113/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki113/Makefile
+++ b/www/mediawiki113/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki113/distinfo b/www/mediawiki113/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki113/distinfo
+++ b/www/mediawiki113/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki114/Makefile b/www/mediawiki114/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki114/Makefile
+++ b/www/mediawiki114/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki114/distinfo b/www/mediawiki114/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki114/distinfo
+++ b/www/mediawiki114/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki115/Makefile b/www/mediawiki115/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki115/Makefile
+++ b/www/mediawiki115/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki115/distinfo b/www/mediawiki115/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki115/distinfo
+++ b/www/mediawiki115/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki116/Makefile b/www/mediawiki116/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki116/Makefile
+++ b/www/mediawiki116/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki116/distinfo b/www/mediawiki116/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki116/distinfo
+++ b/www/mediawiki116/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki118/Makefile b/www/mediawiki118/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki118/Makefile
+++ b/www/mediawiki118/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki118/distinfo b/www/mediawiki118/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki118/distinfo
+++ b/www/mediawiki118/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki12/Makefile b/www/mediawiki12/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki12/Makefile
+++ b/www/mediawiki12/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki12/distinfo b/www/mediawiki12/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki12/distinfo
+++ b/www/mediawiki12/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki15/Makefile b/www/mediawiki15/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki15/Makefile
+++ b/www/mediawiki15/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki15/distinfo b/www/mediawiki15/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki15/distinfo
+++ b/www/mediawiki15/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki16/Makefile b/www/mediawiki16/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki16/Makefile
+++ b/www/mediawiki16/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki16/distinfo b/www/mediawiki16/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki16/distinfo
+++ b/www/mediawiki16/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki17/Makefile b/www/mediawiki17/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki17/Makefile
+++ b/www/mediawiki17/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki17/distinfo b/www/mediawiki17/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki17/distinfo
+++ b/www/mediawiki17/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki18/Makefile b/www/mediawiki18/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki18/Makefile
+++ b/www/mediawiki18/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki18/distinfo b/www/mediawiki18/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki18/distinfo
+++ b/www/mediawiki18/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374
diff --git a/www/mediawiki19/Makefile b/www/mediawiki19/Makefile
index 4a7f0337123b..d42624bdd984 100644
--- a/www/mediawiki19/Makefile
+++ b/www/mediawiki19/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediawiki
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
@@ -24,13 +24,7 @@ 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
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_PGSQL)
 USE_PHP+=	pgsql
@@ -54,4 +48,4 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
 	@${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mediawiki19/distinfo b/www/mediawiki19/distinfo
index 24725bb5f1f1..8543e6933c94 100644
--- a/www/mediawiki19/distinfo
+++ b/www/mediawiki19/distinfo
@@ -1,2 +1,2 @@
-MD5 (mediawiki-1.5.1.tar.gz) = f2030d3302a899f4e4f2e6d9f3842067
-SIZE (mediawiki-1.5.1.tar.gz) = 2292603
+MD5 (mediawiki-1.5.2.tar.gz) = 3aedde46937494bc21a5e493ea6a8ffd
+SIZE (mediawiki-1.5.2.tar.gz) = 2290374