From nobody Tue Feb 14 18:30:41 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PGVBn3R4Sz3ppH2; Tue, 14 Feb 2023 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PGVBn3Cjyz3ktH; Tue, 14 Feb 2023 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676399441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oYsp0xK/+U8OBKiltjgiCoCpGxVERb9pOPsh7jrRe9k=; b=lxZZNRp2oPrR0EoUVdPjjwU1lga/YogoduqEKyZaeq3oyUsTa5F1qzC18nmnJQRHhG1xo0 9xnA8e5XRLhq3OgaxwHBZcqlibDpl3+DUn0CJBRhoYDDG9m2nndW9AD7phBYZ5SiAPgTLw /n31qfFSmQROTvRTVhcx2bTpXu0ngODBhSHQiE/mdc0y9G75yN9lvYMQdOpX05cKdKMhdu +bez7W762cO7VLanhO/G8URfAdKiedwmsOhGTooZ5RBhP7EfyNRxJKLxqYyiDkXPC+9wdR M4nlmtn2juNz8EtDZ0myekVAP9azU/v4e8lI0GuZebWgsxDiWESUK9iXnzfnAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676399441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oYsp0xK/+U8OBKiltjgiCoCpGxVERb9pOPsh7jrRe9k=; b=NykTVzdAK+eYzboPDDRbIyOwVvzQrSbpqzS7OET9zvADk1LdpVHMcUhdXb2HAdmikakz6s biDKltKx80NHzaXREykUImYNABbkKDhUhSTC24ty8sJKoY/S9cEU25hQzoQz6KB27gA9wa ubvC3JFwIIln9fmq90chaPSQDDEpP+fwttW7GpKORIF/YPzaGJzutjeUX4OniMViVw/3sS Rdz78ZpTBYTfs2VbBljzwdti+K3eOgUk7wVWjKtybbRUj8Hzm9RlWPCYri+wgqIsDdabql 6bXa+kqN7yjDPQdTgGUpLskZ4xb33VBoWz18F6wn9XpFWq7Lc7ADYMjyCFagCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676399441; a=rsa-sha256; cv=none; b=jii0fLG0JkKvZkNdWFE68SGS9r+s3ANsjLE0d0B4+Q7a9iQaarlQtKMG5uovYLrhZaffdc W62drK79KrQtgRT2QTx2RAfYUVj0pTS0uBdBdobRA+7tzQJ/Sgnk0FBnYP+fdpAsLEJTUs jxwQQLX3qh+JsY/xfXdq10mmZo1DUB79z7X5b80VwlMDP3e9Gc8+W8E5wpWcyVD8+GSpOV Hf64CQ08LnEfiynVQRlt/tG+/00f8L78E2/C8y7k5zwJLvRRbKXV7VD2deFU2IP5CQn9wS JVLC6L9QaS+CT7uNDrj3v34S6+pHMI6BoB3Hcgx9cevH/xuiYL4H/qIlmTyQ8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PGVBn2Gg3z18J6; Tue, 14 Feb 2023 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31EIUf4f096785; Tue, 14 Feb 2023 18:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EIUfZl096784; Tue, 14 Feb 2023 18:30:41 GMT (envelope-from git) Date: Tue, 14 Feb 2023 18:30:41 GMT Message-Id: <202302141830.31EIUfZl096784@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 6beccad94e45 - main - www/wordpress: Transform into master port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6beccad94e454e521402d9958bf03d665cb601ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6beccad94e454e521402d9958bf03d665cb601ab commit 6beccad94e454e521402d9958bf03d665cb601ab Author: Bernard Spil AuthorDate: 2023-02-14 18:28:53 +0000 Commit: Bernard Spil CommitDate: 2023-02-14 18:28:53 +0000 www/wordpress: Transform into master port * Simplify language ports * Removes differences in pkg-message and pkg-descr * Reduce files to manage on updates --- chinese/wordpress-zh_CN/Makefile | 58 +++----------------------- chinese/wordpress-zh_CN/files/pkg-message.in | 19 --------- chinese/wordpress-zh_CN/pkg-descr | 5 --- chinese/wordpress-zh_TW/Makefile | 61 +++------------------------- chinese/wordpress-zh_TW/files/pkg-message.in | 19 --------- chinese/wordpress-zh_TW/pkg-descr | 5 --- french/wordpress/Makefile | 56 +++---------------------- french/wordpress/files/pkg-message.in | 16 -------- french/wordpress/pkg-descr | 5 --- german/wordpress/Makefile | 58 +++----------------------- german/wordpress/files/pkg-message.in | 16 -------- german/wordpress/pkg-descr | 5 --- japanese/wordpress/Makefile | 60 ++++----------------------- japanese/wordpress/files/pkg-message.in | 16 -------- japanese/wordpress/pkg-descr | 5 --- russian/wordpress/Makefile | 58 ++++---------------------- russian/wordpress/files/pkg-message.in | 16 -------- russian/wordpress/pkg-descr | 5 --- www/wordpress/Makefile | 36 ++++++++++++---- www/wordpress/files/pkg-message.in | 5 +-- 20 files changed, 68 insertions(+), 456 deletions(-) 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 +.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: < ${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 +.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: < ${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 +.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: < ${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 +.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: < ${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 +.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: < ${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 +.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: < + +.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} "" 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 @@ -7,10 +7,9 @@ Maybe you need 'mysqladmin create wordpress' first. EOM } { type: upgrade - maximum_version: 3 message: <