*/wordpress*: Update to 5.8.2

For all languages:
  Make the port portlint(1),portclippy(1) compliant.

For www,french,german,japanese,russian:
  Fix pkg-message.in to only show upgrade message when upgrading.

For www,zh_CN,zh_TW,french,german:
  Use do-install-DOCS-on for documentation.

For zh_CN,zh_TW:
  Add CPE information

PR:		260013
Approved by:	maintainer timeout

19 files changed, 127 insertions, 116 deletions

diff --git a/chinese/wordpress-zh_CN/Makefile b/chinese/wordpress-zh_CN/Makefile
index 70891782dbf0..3b15594c34d0 100644
--- a/chinese/wordpress-zh_CN/Makefile
+++ b/chinese/wordpress-zh_CN/Makefile
@@ -1,10 +1,10 @@
 # Created by: Joe Horn <joehorn@gmail.com>
 
 PORTNAME=	wordpress
-DISTVERSION=	5.8
+DISTVERSION=	5.8.2
 DISTVERSIONSUFFIX=	-zh_CN
 CATEGORIES=	chinese www
-MASTER_SITES=	http://cn.wordpress.org/
+MASTER_SITES=	https://cn.wordpress.org/
 PKGNAMESUFFIX=	-zh_CN
 
 MAINTAINER=	joneum@FreeBSD.org
@@ -13,23 +13,22 @@ COMMENT=	State-of-the-art semantic personal publishing platform
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
 
-USES=		php:web
+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
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
+WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
 NO_ARCH=	yes
 NO_BUILD=	yes
-
+SUB_FILES=	pkg-message
+WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST=		${WRKDIR}/pkg-plist
-WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
-
 PORTDOCS=	readme.html
-
 OPTIONS_DEFINE=	DOCS
 
-SUB_FILES=	pkg-message
-
 pre-everything::
 	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
 	@${ECHO_CMD} ""
@@ -47,7 +46,7 @@ pre-install:
 		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
 
 do-install:
-	${MKDIR} ${STAGEDIR}${WWWDIR}/
+	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
 	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
 	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \;
 
diff --git a/chinese/wordpress-zh_CN/distinfo b/chinese/wordpress-zh_CN/distinfo
index f77645298d6a..7a74235fb04d 100644
--- a/chinese/wordpress-zh_CN/distinfo
+++ b/chinese/wordpress-zh_CN/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630346293
-SHA256 (wordpress-5.8-zh_CN.tar.gz) = 06ee77440210e99e07aa945c3dc042a8db51ca9fcee24e6bcda940212d58d702
-SIZE (wordpress-5.8-zh_CN.tar.gz) = 15785398
+TIMESTAMP = 1637736976
+SHA256 (wordpress-5.8.2-zh_CN.tar.gz) = 2bd6c501d3933e08496643edb8f8e302a13168839ab87ec44bbbcb2939d4791f
+SIZE (wordpress-5.8.2-zh_CN.tar.gz) = 15800400
diff --git a/chinese/wordpress-zh_TW/Makefile b/chinese/wordpress-zh_TW/Makefile
index d646b29ac260..d76e0f5f0f81 100644
--- a/chinese/wordpress-zh_TW/Makefile
+++ b/chinese/wordpress-zh_TW/Makefile
@@ -1,10 +1,10 @@
 # Created by: Joe Horn <joehorn@gmail.com>
 
 PORTNAME=	wordpress
-PORTVERSION=	5.8
+DISTVERSION=	5.8.2
 DISTVERSIONSUFFIX=	-zh_TW
 CATEGORIES=	chinese www
-MASTER_SITES=	http://tw.wordpress.org/
+MASTER_SITES=	https://tw.wordpress.org/
 PKGNAMESUFFIX=	-zh_TW
 
 MAINTAINER=	joneum@FreeBSD.org
@@ -13,25 +13,22 @@ COMMENT=	State-of-the-art semantic personal publishing platform
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-BROKEN=		fails to fetch (checksum mismatch)
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
+RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
 
-USES=		php:web
+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
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
+WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
 NO_ARCH=	yes
 NO_BUILD=	yes
-
+SUB_FILES=	pkg-message
+WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST=		${WRKDIR}/pkg-plist
-WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
-
 PORTDOCS=	readme.html
-
 OPTIONS_DEFINE=	DOCS
 
-SUB_FILES=	pkg-message
-
 pre-everything::
 	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
 	@${ECHO_CMD} ""
@@ -49,7 +46,7 @@ pre-install:
 		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
 
 do-install:
-	${MKDIR} ${STAGEDIR}${WWWDIR}/
+	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
 	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
 	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \;
 
diff --git a/chinese/wordpress-zh_TW/distinfo b/chinese/wordpress-zh_TW/distinfo
index c5f0713ebaf7..9f666ccba2be 100644
--- a/chinese/wordpress-zh_TW/distinfo
+++ b/chinese/wordpress-zh_TW/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630346342
-SHA256 (wordpress-5.8-zh_TW.tar.gz) = 234935e3ce8c1dd11f653295bad9e286b5565bf9046dcc8fe48b0bd01e1cdfc6
-SIZE (wordpress-5.8-zh_TW.tar.gz) = 15807108
+TIMESTAMP = 1637737231
+SHA256 (wordpress-5.8.2-zh_TW.tar.gz) = 42261c2801a9c07af1de570438c92d4fcf16833297cfff8d9a152bb4f6779c48
+SIZE (wordpress-5.8.2-zh_TW.tar.gz) = 15824994
diff --git a/french/wordpress/Makefile b/french/wordpress/Makefile
index 4db8bee98d6c..71bede5c1d2a 100644
--- a/french/wordpress/Makefile
+++ b/french/wordpress/Makefile
@@ -1,34 +1,33 @@
 # Created by: Elvis Chiang <elvis@sslab.cs.ccu.edu.tw>
 
 PORTNAME=	wordpress
-DISTVERSION=	5.8
+DISTVERSION=	5.8.2
 DISTVERSIONSUFFIX=	-fr_FR
 PORTEPOCH=	1
 CATEGORIES=	french www
-MASTER_SITES=	http://fr.wordpress.org/
+MASTER_SITES=	https://fr.wordpress.org/
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	State-of-the-art semantic personal publishing platform
 
 LICENSE=	GPLv2
 
-CONFLICTS_INSTALL=	de-wordpress-[0-9].* ja-wordpress-[0-9].* ru-wordpress-[0-9].*
-
-NO_ARCH=	yes
-NO_BUILD=	yes
-USES=		php:web cpe
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
 RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
+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
 
 pre-everything::
@@ -51,6 +50,8 @@ 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}/
 
diff --git a/french/wordpress/distinfo b/french/wordpress/distinfo
index 0e4b6a2b47bf..ee84aeccc21e 100644
--- a/french/wordpress/distinfo
+++ b/french/wordpress/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630559582
-SHA256 (wordpress-5.8-fr_FR.tar.gz) = 89fa2f8f006c27c25e166a50d59a19603dbbd03089f51909c9dc5567ab7592f9
-SIZE (wordpress-5.8-fr_FR.tar.gz) = 15815650
+TIMESTAMP = 1641446775
+SHA256 (wordpress-5.8.2-fr_FR.tar.gz) = 294d6535a06c43eb2ad235d57bfa6d3874cb1d667502b0fc6c491479a45143f2
+SIZE (wordpress-5.8.2-fr_FR.tar.gz) = 15815185
diff --git a/french/wordpress/files/pkg-message.in b/french/wordpress/files/pkg-message.in
index a3d0617e38e0..013f76dfc0e7 100644
--- a/french/wordpress/files/pkg-message.in
+++ b/french/wordpress/files/pkg-message.in
@@ -4,7 +4,12 @@
 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.
-If you are upgrading from 1.x or 2.x or 3.x to 4.x, please run
+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/Makefile b/german/wordpress/Makefile
index afe53b472b83..3b6dcb58d278 100644
--- a/german/wordpress/Makefile
+++ b/german/wordpress/Makefile
@@ -1,10 +1,10 @@
 # Created by: miwi
 
 PORTNAME=	wordpress
-DISTVERSION=	5.8
+DISTVERSION=	5.8.2
 DISTVERSIONSUFFIX=	-de_DE
 CATEGORIES=	german www
-MASTER_SITES=	http://de.wordpress.org/
+MASTER_SITES=	https://de.wordpress.org/
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	State-of-the-art semantic personal publishing platform
@@ -13,24 +13,22 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-CONFLICTS_INSTALL=	wordpress-[0-9].* ja-wordpress-[0-9].* ru-wordpress-[0-9].*
-
-NO_ARCH=	yes
-NO_BUILD=	yes
-USES=		php:web cpe
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
 RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
-CPE_LANG=	de
+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
 
 pre-everything::
@@ -53,6 +51,8 @@ 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}/
 
diff --git a/german/wordpress/distinfo b/german/wordpress/distinfo
index 6ffd0aecf6e7..d53741e6b15e 100644
--- a/german/wordpress/distinfo
+++ b/german/wordpress/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631253311
-SHA256 (wordpress-5.8-de_DE.tar.gz) = 37be737372b737b62cf4e270ab443262bfefaca25a97913a0e270334f8e5dc27
-SIZE (wordpress-5.8-de_DE.tar.gz) = 15814535
+TIMESTAMP = 1641446807
+SHA256 (wordpress-5.8.2-de_DE.tar.gz) = 19408d09f62ea414ac5a134ea68b4d154314ea70f608c4137b0b5f98a5f58df1
+SIZE (wordpress-5.8.2-de_DE.tar.gz) = 15829055
diff --git a/german/wordpress/files/pkg-message.in b/german/wordpress/files/pkg-message.in
index a3d0617e38e0..013f76dfc0e7 100644
--- a/german/wordpress/files/pkg-message.in
+++ b/german/wordpress/files/pkg-message.in
@@ -4,7 +4,12 @@
 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.
-If you are upgrading from 1.x or 2.x or 3.x to 4.x, please run
+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/Makefile b/japanese/wordpress/Makefile
index 19792158e26c..b868c3d19e5e 100644
--- a/japanese/wordpress/Makefile
+++ b/japanese/wordpress/Makefile
@@ -1,38 +1,34 @@
 # Created by: Takefu
 
 PORTNAME=	wordpress
-DISTVERSION=	5.8
+DISTVERSION=	5.8.2
 DISTVERSIONSUFFIX=	-ja
 CATEGORIES=	japanese www
-MASTER_SITES=	http://ja.wordpress.org/
+MASTER_SITES=	https://ja.wordpress.org/
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	State-of-the-art semantic personal publishing platform
 
-BROKEN=		fails to fetch (checksum mismatch)
-
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-CONFLICTS_INSTALL=	wordpress-[0-9].* de-wordpress-[0-9].* ru-wordpress-[0-9].*
-
-NO_ARCH=	yes
-NO_BUILD=	yes
-USES=		cpe php:web
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
 RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
-CPE_LANG=	ja
+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
 
 pre-everything::
diff --git a/japanese/wordpress/distinfo b/japanese/wordpress/distinfo
index 139e0fcb01e6..2b7e3f000626 100644
--- a/japanese/wordpress/distinfo
+++ b/japanese/wordpress/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630559657
-SHA256 (wordpress-5.8-ja.tar.gz) = 60fe501c6c6a0e325a9c126a6606c3b3ca9316154606411c6a0ce1eda9ad650d
-SIZE (wordpress-5.8-ja.tar.gz) = 15819092
+TIMESTAMP = 1641447844
+SHA256 (wordpress-5.8.2-ja.tar.gz) = 2f8c2a479106e32ff44cc94e7bee9631ca4a511c130620a24e17ce138f857878
+SIZE (wordpress-5.8.2-ja.tar.gz) = 15832214
diff --git a/japanese/wordpress/files/pkg-message.in b/japanese/wordpress/files/pkg-message.in
index 92426c987e83..013f76dfc0e7 100644
--- a/japanese/wordpress/files/pkg-message.in
+++ b/japanese/wordpress/files/pkg-message.in
@@ -9,8 +9,8 @@ EOM
 { type: upgrade
   maximum_version: 3
   message: <<EOM
-If you are upgrading from 1.x or 2.x to 3.x, please run
-http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 3.x
+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/Makefile b/russian/wordpress/Makefile
index d8abb92efcda..a71732c2305f 100644
--- a/russian/wordpress/Makefile
+++ b/russian/wordpress/Makefile
@@ -1,10 +1,10 @@
 # Created by: Mihail Timofeev <9267096@gmail.com>
 
 PORTNAME=	wordpress
-DISTVERSION=	5.8
+DISTVERSION=	5.8.2
 DISTVERSIONSUFFIX=	-ru_RU
 CATEGORIES=	russian www
-MASTER_SITES=	http://ru.wordpress.org/
+MASTER_SITES=	https://ru.wordpress.org/
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	State-of-the-art semantic personal publishing platform
@@ -12,24 +12,22 @@ COMMENT=	State-of-the-art semantic personal publishing platform
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-CONFLICTS_INSTALL=	wordpress-[0-9].* de-wordpress-[0-9].* ja-wordpress-[0-9].*
-
-NO_ARCH=	yes
-NO_BUILD=	yes
-USES=		php:web cpe
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
 RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
-CPE_LANG=	ru
+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
 
 pre-everything::
@@ -49,12 +47,12 @@ pre-install:
 		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${WWWDIR}/
+	${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}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/russian/wordpress/distinfo b/russian/wordpress/distinfo
index 6ef55ff6853c..bfa0d6e0058a 100644
--- a/russian/wordpress/distinfo
+++ b/russian/wordpress/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630559728
-SHA256 (wordpress-5.8-ru_RU.tar.gz) = 0d89a72a14187d8f5a13b2c79be9cf9b519ce2907e0cfba3971f6de2cd703203
-SIZE (wordpress-5.8-ru_RU.tar.gz) = 15896352
+TIMESTAMP = 1641446849
+SHA256 (wordpress-5.8.2-ru_RU.tar.gz) = 60a703d8d0d6310e2c7bd2622157d0e11edf14c0bc231ad9f87693fc890f3c12
+SIZE (wordpress-5.8.2-ru_RU.tar.gz) = 15889202
diff --git a/russian/wordpress/files/pkg-message.in b/russian/wordpress/files/pkg-message.in
index 1ed45373bff3..013f76dfc0e7 100644
--- a/russian/wordpress/files/pkg-message.in
+++ b/russian/wordpress/files/pkg-message.in
@@ -4,8 +4,13 @@
 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.
-If you are upgrading from 1.x or 2.x to 3.x, please run
-http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 3.x
+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/www/wordpress/Makefile b/www/wordpress/Makefile
index 0ccaed4ebcbf..8f0a433187cb 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -1,33 +1,31 @@
 # Created by: Elvis Chiang <elvis@sslab.cs.ccu.edu.tw>
 
 PORTNAME=	wordpress
-DISTVERSION=	5.8
+DISTVERSION=	5.8.2
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	http://wordpress.org/
+MASTER_SITES=	https://wordpress.org/
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	State-of-the-art semantic personal publishing platform
 
 LICENSE=	GPLv2
 
-CONFLICTS_INSTALL=	de-wordpress-[0-9].* ja-wordpress-[0-9].* ru-wordpress-[0-9].*
-
-NO_ARCH=	yes
-NO_BUILD=	yes
-USES=		php:web cpe
-USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
 RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
+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-[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
 
 pre-everything::
@@ -50,6 +48,8 @@ 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}/
 
diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo
index a1280e93b017..e0f2108eebde 100644
--- a/www/wordpress/distinfo
+++ b/www/wordpress/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630559841
-SHA256 (wordpress-5.8.tar.gz) = d29813ab55361318f519f2a8fa6631126a0a8f91ac30f62cb6002c108577e87f
-SIZE (wordpress-5.8.tar.gz) = 15073609
+TIMESTAMP = 1637736902
+SHA256 (wordpress-5.8.2.tar.gz) = a3d29e4e66574c7b6a6bf67628ea359fa815085ba76b8d9d16bbdff4e042f2ff
+SIZE (wordpress-5.8.2.tar.gz) = 15085301
diff --git a/www/wordpress/files/pkg-message.in b/www/wordpress/files/pkg-message.in
index a3d0617e38e0..013f76dfc0e7 100644
--- a/www/wordpress/files/pkg-message.in
+++ b/www/wordpress/files/pkg-message.in
@@ -4,7 +4,12 @@
 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.
-If you are upgrading from 1.x or 2.x or 3.x to 4.x, please run
+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
 }