diff --git a/chinese/wordpress-zh_CN/Makefile b/chinese/wordpress-zh_CN/Makefile
index 54657bcb75ff..f1b807a90d69 100644
--- a/chinese/wordpress-zh_CN/Makefile
+++ b/chinese/wordpress-zh_CN/Makefile
@@ -1,60 +1,12 @@
-PORTNAME=	wordpress
-DISTVERSION=	6.1.1
-DISTVERSIONSUFFIX=	-zh_CN
-CATEGORIES=	chinese www
+CATEGORIES=	chinese
 MASTER_SITES=	https://cn.wordpress.org/
-PKGNAMESUFFIX=	-zh_CN
-
-MAINTAINER=	joneum@FreeBSD.org
-COMMENT=	State-of-the-art semantic personal publishing platform
-WWW=		https://cn.wordpress.org/
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/license.txt
-
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
-
-USES=		cpe php:web
-.if ${DISTVERSION:N*.*.*}
-CPE_VERSION=	${DISTVERSION}.0
-.endif
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
-
-CONFLICTS_INSTALL=	de-wordpress fr-wordpress ru-wordpress wordpress \
-			zh-wordpress-zh_TW # share/doc/wordpress/readme.html
 
 WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
-NO_ARCH=	yes
-NO_BUILD=	yes
-SUB_FILES=	pkg-message
-WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST=		${WRKDIR}/pkg-plist
-PORTDOCS=	readme.html
-OPTIONS_DEFINE=	DOCS
-
-pre-everything::
-	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
-	@${ECHO_CMD} ""
-.  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
-	@sleep 1
-.  endif
 
-pre-install:
-	${ECHO_CMD} '@owner www' > ${PLIST}
-	${ECHO_CMD} '@group www' >> ${PLIST}
-	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST}
-	${ECHO_CMD} '@owner' >> ${PLIST}
-	${ECHO_CMD} '@group' >> ${PLIST}
-	if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \
-		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
+WORDPRESS_LANG=	zh_CN
 
-do-install:
-	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
-	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
-	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \;
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
+MASTERDIR=	${.CURDIR}/../../www/wordpress
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/chinese/wordpress-zh_CN/files/pkg-message.in b/chinese/wordpress-zh_CN/files/pkg-message.in
deleted file mode 100644
index 709c4c2d5de2..000000000000
--- a/chinese/wordpress-zh_CN/files/pkg-message.in
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please read following note for installation steps before the first use of WordPress.
-
-1. Copy wp-config-sample.php to wp-config.php
-   in %%WWWDIR%% .
-
-2. Modify it to fit your MySQL.
-
-3. Modify your web server configuration.
-
-
-If you are upgrading from prior version, please browse this URL :
-
-  http://[WORDPRESS_URL]/wp-admin/upgrade.php
-EOM
-}
-]
diff --git a/chinese/wordpress-zh_CN/pkg-descr b/chinese/wordpress-zh_CN/pkg-descr
deleted file mode 100644
index 08c64952b2c8..000000000000
--- a/chinese/wordpress-zh_CN/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-WordPress is a state-of-the-art semantic personal publishing platform
-with a focus on aesthetics, web standards, and usability.
-
-More simply, Wordpress is what you use when you want to work
-with your blogging software, not fight it.
diff --git a/chinese/wordpress-zh_TW/Makefile b/chinese/wordpress-zh_TW/Makefile
index 3f042cd17c96..7ef254ac3a8a 100644
--- a/chinese/wordpress-zh_TW/Makefile
+++ b/chinese/wordpress-zh_TW/Makefile
@@ -1,61 +1,12 @@
-PORTNAME=	wordpress
-DISTVERSION=	6.1.1
-DISTVERSIONSUFFIX=	-zh_TW
-CATEGORIES=	chinese www
-MASTER_SITES=	https://tw.wordpress.org/
-PKGNAMESUFFIX=	-zh_TW
-
-MAINTAINER=	joneum@FreeBSD.org
-COMMENT=	State-of-the-art semantic personal publishing platform
-WWW=		https://tw.wordpress.org/
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/license.txt
-
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
-
-USES=		cpe php:web
-.if ${DISTVERSION:N*.*.*}
-CPE_VERSION=	${DISTVERSION}.0
-.endif
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
-
-CONFLICTS_INSTALL=	ja-wordpress wordpress # share/doc/wordpress/readme.html
-CONFLICTS_INSTALL=	de-wordpress fr-wordpress ru-wordpress wordpress \
-			zh-wordpress-zh_CN # share/doc/wordpress/readme.html
+CATEGORIES=	chinese
+MASTER_SITES=	https://cn.wordpress.org/
 
 WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
-NO_ARCH=	yes
-NO_BUILD=	yes
-SUB_FILES=	pkg-message
-WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST=		${WRKDIR}/pkg-plist
-PORTDOCS=	readme.html
-OPTIONS_DEFINE=	DOCS
-
-pre-everything::
-	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
-	@${ECHO_CMD} ""
-.  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
-	@sleep 1
-.  endif
 
-pre-install:
-	${ECHO_CMD} '@owner www' > ${PLIST}
-	${ECHO_CMD} '@group www' >> ${PLIST}
-	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST}
-	${ECHO_CMD} '@owner' >> ${PLIST}
-	${ECHO_CMD} '@group' >> ${PLIST}
-	if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \
-		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
+WORDPRESS_LANG=	zh_TW
 
-do-install:
-	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
-	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
-	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \;
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
+MASTERDIR=	${.CURDIR}/../../www/wordpress
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/chinese/wordpress-zh_TW/files/pkg-message.in b/chinese/wordpress-zh_TW/files/pkg-message.in
deleted file mode 100644
index 709c4c2d5de2..000000000000
--- a/chinese/wordpress-zh_TW/files/pkg-message.in
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please read following note for installation steps before the first use of WordPress.
-
-1. Copy wp-config-sample.php to wp-config.php
-   in %%WWWDIR%% .
-
-2. Modify it to fit your MySQL.
-
-3. Modify your web server configuration.
-
-
-If you are upgrading from prior version, please browse this URL :
-
-  http://[WORDPRESS_URL]/wp-admin/upgrade.php
-EOM
-}
-]
diff --git a/chinese/wordpress-zh_TW/pkg-descr b/chinese/wordpress-zh_TW/pkg-descr
deleted file mode 100644
index 08c64952b2c8..000000000000
--- a/chinese/wordpress-zh_TW/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-WordPress is a state-of-the-art semantic personal publishing platform
-with a focus on aesthetics, web standards, and usability.
-
-More simply, Wordpress is what you use when you want to work
-with your blogging software, not fight it.
diff --git a/french/wordpress/Makefile b/french/wordpress/Makefile
index 0a443b292319..45b2665253b6 100644
--- a/french/wordpress/Makefile
+++ b/french/wordpress/Makefile
@@ -1,57 +1,13 @@
-PORTNAME=	wordpress
-DISTVERSION=	6.1.1
-DISTVERSIONSUFFIX=	-fr_FR
 PORTEPOCH=	1
-CATEGORIES=	french www
+CATEGORIES=	french
 MASTER_SITES=	https://fr.wordpress.org/
 
-MAINTAINER=	joneum@FreeBSD.org
-COMMENT=	State-of-the-art semantic personal publishing platform
-WWW=		https://fr.wordpress.org/
+CONFLICTS_INSTALL=	wordpress de-wordpress ja-wordpress ru-wordpress
 
-LICENSE=	GPLv2
+WORDPRESS_LANG=	fr_FR
 
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
-USES=		cpe php:web
-.if ${DISTVERSION:N*.*.*}
-CPE_VERSION=	${DISTVERSION}.0
-.endif
-CPE_LANG=	fr
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
-CONFLICTS_INSTALL=	^wordpress-[0-9].* de-wordpress-[0-9].* \
-			ja-wordpress-[0-9].* ru-wordpress-[0-9].*
-NO_ARCH=	yes
-NO_BUILD=	yes
-SUB_FILES=	pkg-message
-WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST=		${WRKDIR}/pkg-plist
-PORTDOCS=	license.txt readme.html
-OPTIONS_DEFINE=	DOCS
+MASTERDIR=	${.CURDIR}/../../www/wordpress
 
-pre-everything::
-	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
-	@${ECHO_CMD} ""
-.  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
-	@sleep 1
-.  endif
-
-pre-install:
-	${ECHO_CMD} '@owner www' > ${PLIST}
-	${ECHO_CMD} '@group www' >> ${PLIST}
-	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST}
-	${ECHO_CMD} '@owner' >> ${PLIST}
-	${ECHO_CMD} '@group' >> ${PLIST}
-	if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \
-		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
-
-do-install:
-	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
-	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
-	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \;
-
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/french/wordpress/files/pkg-message.in b/french/wordpress/files/pkg-message.in
deleted file mode 100644
index 013f76dfc0e7..000000000000
--- a/french/wordpress/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
-in %%WWWDIR%% and modify it to fit your MySQL.
-Maybe you need 'mysqladmin create wordpress' first.
-EOM
-}
-{ type: upgrade
-  maximum_version: 3
-  message: <<EOM
-If you are upgrading from 1.x or 2.x to 3.x to 4.x, please run
-http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 4.x
-EOM
-}
-]
diff --git a/french/wordpress/pkg-descr b/french/wordpress/pkg-descr
deleted file mode 100644
index 08c64952b2c8..000000000000
--- a/french/wordpress/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-WordPress is a state-of-the-art semantic personal publishing platform
-with a focus on aesthetics, web standards, and usability.
-
-More simply, Wordpress is what you use when you want to work
-with your blogging software, not fight it.
diff --git a/german/wordpress/Makefile b/german/wordpress/Makefile
index 83334223065e..69d6e448c0e6 100644
--- a/german/wordpress/Makefile
+++ b/german/wordpress/Makefile
@@ -1,58 +1,12 @@
-PORTNAME=	wordpress
-DISTVERSION=	6.1.1
-DISTVERSIONSUFFIX=	-de_DE
-CATEGORIES=	german www
+CATEGORIES=	german
 MASTER_SITES=	https://de.wordpress.org/
 
-MAINTAINER=	joneum@FreeBSD.org
-COMMENT=	State-of-the-art semantic personal publishing platform
-WWW=		https://de.wordpress.org/
+CONFLICTS_INSTALL=	wordpress fr-wordpress ja-wordpress ru-wordpress
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/license.txt
+WORDPRESS_LANG=	de_DE
 
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
-USES=		cpe php:web
-.if ${DISTVERSION:N*.*.*}
-CPE_VERSION=	${DISTVERSION}.0
-.endif
-CPE_LANG=	de
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
-CONFLICTS_INSTALL=	^wordpress-[0-9].* fr-wordpress-[0-9].* \
-			ja-wordpress-[0-9].* ru-wordpress-[0-9].*
-NO_ARCH=	yes
-NO_BUILD=	yes
-SUB_FILES=	pkg-message
-WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST=		${WRKDIR}/pkg-plist
-PORTDOCS=	license.txt readme.html
-OPTIONS_DEFINE=	DOCS
+MASTERDIR=      ${.CURDIR}/../../www/wordpress
 
-pre-everything::
-	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
-	@${ECHO_CMD} ""
-.  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
-	@sleep 1
-.  endif
-
-pre-install:
-	${ECHO_CMD} '@owner www' > ${PLIST}
-	${ECHO_CMD} '@group www' >> ${PLIST}
-	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST}
-	${ECHO_CMD} '@owner' >> ${PLIST}
-	${ECHO_CMD} '@group' >> ${PLIST}
-	if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \
-		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
-
-do-install:
-	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
-	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
-	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \;
-
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/german/wordpress/files/pkg-message.in b/german/wordpress/files/pkg-message.in
deleted file mode 100644
index 013f76dfc0e7..000000000000
--- a/german/wordpress/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
-in %%WWWDIR%% and modify it to fit your MySQL.
-Maybe you need 'mysqladmin create wordpress' first.
-EOM
-}
-{ type: upgrade
-  maximum_version: 3
-  message: <<EOM
-If you are upgrading from 1.x or 2.x to 3.x to 4.x, please run
-http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 4.x
-EOM
-}
-]
diff --git a/german/wordpress/pkg-descr b/german/wordpress/pkg-descr
deleted file mode 100644
index 08c64952b2c8..000000000000
--- a/german/wordpress/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-WordPress is a state-of-the-art semantic personal publishing platform
-with a focus on aesthetics, web standards, and usability.
-
-More simply, Wordpress is what you use when you want to work
-with your blogging software, not fight it.
diff --git a/japanese/wordpress/Makefile b/japanese/wordpress/Makefile
index 86546cfcbcae..a6ca1c761981 100644
--- a/japanese/wordpress/Makefile
+++ b/japanese/wordpress/Makefile
@@ -1,58 +1,12 @@
-PORTNAME=	wordpress
-DISTVERSION=	6.1.1
-DISTVERSIONSUFFIX=	-ja
-CATEGORIES=	japanese www
-MASTER_SITES=	https://ja.wordpress.org/
+DISTVERSIONSUFFIX=	-${WORDPRESS_LANG}
+CATEGORIES=		japanese
 
-MAINTAINER=	joneum@FreeBSD.org
-COMMENT=	State-of-the-art semantic personal publishing platform
-WWW=		https://ja.wordpress.org/
+CONFLICTS_INSTALL=	wordpress fr-wordpress de-wordpress ru-wordpress
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/license.txt
+WORDPRESS_LANG=		ja
 
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
+DISTINFO_FILE=		${.CURDIR}/distinfo
 
-USES=		cpe php:web
-.if ${DISTVERSION:N*.*.*}
-CPE_VERSION=	${DISTVERSION}.0
-.endif
-CPE_LANG=	ja
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
-CONFLICTS_INSTALL=	^wordpress-[0-9].* fr-wordpress-[0-9].* \
-			de-wordpress-[0-9].* ru-wordpress-[0-9].*
-NO_ARCH=	yes
-NO_BUILD=	yes
-SUB_FILES=	pkg-message
-WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST=		${WRKDIR}/pkg-plist
-PORTDOCS=	license.txt readme.html
-OPTIONS_DEFINE=	DOCS
+MASTERDIR=		${.CURDIR}/../../www/wordpress
 
-pre-everything::
-	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
-	@${ECHO_CMD} ""
-.  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
-	@sleep 1
-.  endif
-
-pre-install:
-	${ECHO_CMD} '@owner www' > ${PLIST}
-	${ECHO_CMD} '@group www' >> ${PLIST}
-	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST}
-	${ECHO_CMD} '@owner' >> ${PLIST}
-	${ECHO_CMD} '@group' >> ${PLIST}
-	if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \
-		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
-
-do-install:
-	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
-	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
-	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \;
-
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/wordpress/files/pkg-message.in b/japanese/wordpress/files/pkg-message.in
deleted file mode 100644
index 013f76dfc0e7..000000000000
--- a/japanese/wordpress/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
-in %%WWWDIR%% and modify it to fit your MySQL.
-Maybe you need 'mysqladmin create wordpress' first.
-EOM
-}
-{ type: upgrade
-  maximum_version: 3
-  message: <<EOM
-If you are upgrading from 1.x or 2.x to 3.x to 4.x, please run
-http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 4.x
-EOM
-}
-]
diff --git a/japanese/wordpress/pkg-descr b/japanese/wordpress/pkg-descr
deleted file mode 100644
index 08c64952b2c8..000000000000
--- a/japanese/wordpress/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-WordPress is a state-of-the-art semantic personal publishing platform
-with a focus on aesthetics, web standards, and usability.
-
-More simply, Wordpress is what you use when you want to work
-with your blogging software, not fight it.
diff --git a/russian/wordpress/Makefile b/russian/wordpress/Makefile
index b526faa43a8f..40456bbf0037 100644
--- a/russian/wordpress/Makefile
+++ b/russian/wordpress/Makefile
@@ -1,57 +1,13 @@
-PORTNAME=	wordpress
-DISTVERSION=	6.1.1
-DISTVERSIONSUFFIX=	-ru_RU
-CATEGORIES=	russian www
-MASTER_SITES=	https://ru.wordpress.org/
-
-MAINTAINER=	joneum@FreeBSD.org
-COMMENT=	State-of-the-art semantic personal publishing platform
-WWW=		https://ru.wordpress.org/
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/license.txt
 
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
-
-USES=		cpe php:web
-.if ${DISTVERSION:N*.*.*}
-CPE_VERSION=	${DISTVERSION}.0
-.endif
-CPE_LANG=	ru
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
-CONFLICTS_INSTALL=	^wordpress-[0-9].* de-wordpress-[0-9].* \
-			fr-wordpress-[0-9].* ja-wordpress-[0-9].*
-NO_ARCH=	yes
-NO_BUILD=	yes
-SUB_FILES=	pkg-message
-WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST=		${WRKDIR}/pkg-plist
-PORTDOCS=	license.txt readme.html
-OPTIONS_DEFINE=	DOCS
+CATEGORIES=	russian
+MASTER_SITES=	https://ru.wordpress.org/
 
-pre-everything::
-	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
-	@${ECHO_CMD} ""
-.  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
-	@sleep 1
-.  endif
+CONFLICTS_INSTALL=	wordpress de-wordpress fr-wordpress ja-wordpress
 
-pre-install:
-	${ECHO_CMD} '@owner www' > ${PLIST}
-	${ECHO_CMD} '@group www' >> ${PLIST}
-	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST}
-	${ECHO_CMD} '@owner' >> ${PLIST}
-	${ECHO_CMD} '@group' >> ${PLIST}
-	if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \
-		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
+WORDPRESS_LANG=	ru_RU
 
-do-install:
-	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
-	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
-	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \;
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
+MASTERDIR=	${.CURDIR}/../../www/wordpress
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/russian/wordpress/files/pkg-message.in b/russian/wordpress/files/pkg-message.in
deleted file mode 100644
index 013f76dfc0e7..000000000000
--- a/russian/wordpress/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
-in %%WWWDIR%% and modify it to fit your MySQL.
-Maybe you need 'mysqladmin create wordpress' first.
-EOM
-}
-{ type: upgrade
-  maximum_version: 3
-  message: <<EOM
-If you are upgrading from 1.x or 2.x to 3.x to 4.x, please run
-http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 4.x
-EOM
-}
-]
diff --git a/russian/wordpress/pkg-descr b/russian/wordpress/pkg-descr
deleted file mode 100644
index 08c64952b2c8..000000000000
--- a/russian/wordpress/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-WordPress is a state-of-the-art semantic personal publishing platform
-with a focus on aesthetics, web standards, and usability.
-
-More simply, Wordpress is what you use when you want to work
-with your blogging software, not fight it.
diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index c7fd852f5e00..b6eea1d69580 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -1,55 +1,77 @@
 PORTNAME=	wordpress
 DISTVERSION=	6.1.1
+.ifndef WORDPRESS_LANG
 PORTEPOCH=	1
-CATEGORIES=	www
 MASTER_SITES=	https://wordpress.org/
+.else
+DISTVERSIONSUFFIX=	-${WORDPRESS_LANG}
+MASTER_SITES?=	https://${WORDPRESS_LANG}.wordpress.org/
+.endif
+CATEGORIES+=	www
+
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	State-of-the-art semantic personal publishing platform
-WWW=		https://wordpress.org/
+WWW=		${MASTER_SITES}	
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/license.txt
 
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
+RUN_DEPENDS=	${IMAGEMAGICK_DEPENDS}
 
 USES=		cpe php:web
 .if ${DISTVERSION:N*.*.*}
 CPE_VERSION=	${DISTVERSION}.0
 .endif
+
+.ifdef WORDPRESS_LANG
+PKGNAMESUFFIX=	-${WORDPRESS_LANG}
+CPE_LANG=	${WORDPRESS_LANG}
+.endif
+
 USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
-CONFLICTS_INSTALL=	de-wordpress-[0-9].* fr-wordpress-[0-9].* \
-			ja-wordpress-[0-9].* ru-wordpress-[0-9].*
+CONFLICTS_INSTALL=	??-wordpress
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST=		${WRKDIR}/pkg-plist
-PORTDOCS=	license.txt readme.html
+PORTDOCS=	readme.html
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.options.mk>
+
+.if !empty(IMAGEMAGICK_DEFAULT:M6) || !empty(IMAGEMAGICK_DEFAULT:M6-*)
+IMAGEMAGICK_DEPENDS=	${PECL_PKGNAMEPREFIX}imagick>=2.2.2:graphics/pecl-imagick@${PHP_FLAVOR}
+.elif !empty(IMAGEMAGICK_DEFAULT:M7) || !empty(IMAGEMAGICK_DEFAULT:M7-*)
+IMAGEMAGICK_DEPENDS=	${PECL_PKGNAMEPREFIX}imagick-im7>=2.2.2:graphics/pecl-imagick-im7@${PHP_FLAVOR}
+.else
+# notreached
+.endif
+
 pre-everything::
 	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
 	@${ECHO_CMD} ""
 .  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
 	@sleep 1
 .  endif
 
 pre-install:
 	${ECHO_CMD} '@owner www' > ${PLIST}
 	${ECHO_CMD} '@group www' >> ${PLIST}
 	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST}
 	${ECHO_CMD} '@owner' >> ${PLIST}
 	${ECHO_CMD} '@group' >> ${PLIST}
 	if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \
 		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
 
 do-install:
 	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
 	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
 	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \;
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/www/wordpress/files/pkg-message.in b/www/wordpress/files/pkg-message.in
index 013f76dfc0e7..8873d7c13574 100644
--- a/www/wordpress/files/pkg-message.in
+++ b/www/wordpress/files/pkg-message.in
@@ -1,16 +1,15 @@
 [
 { type: install
   message: <<EOM
 Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
 in %%WWWDIR%% and modify it to fit your MySQL.
 Maybe you need 'mysqladmin create wordpress' first.
 EOM
 }
 { type: upgrade
-  maximum_version: 3
   message: <<EOM
-If you are upgrading from 1.x or 2.x to 3.x to 4.x, please run
-http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 4.x
+If you are upgrading, please run http://your.site/wordpress/wp-admin/upgrade.php
+to upgrade WordPress.
 EOM
 }
 ]