From nobody Wed Sep 21 11:24:15 2022 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 4MXbf73sq6z4d78W; Wed, 21 Sep 2022 11:24:15 +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 4MXbf73SzXz3wFD; Wed, 21 Sep 2022 11:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663759455; 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=ClsIZEM6XS/I6ZJYMYbcod43SeIVMonpdDSim9BxNkU=; b=YR7IHRLNUe2rp1IXNp+dHOfjGggXTT6grT5doKRT+DuzcwxoPtWjyNapAYpF4gicz7ucM1 l4Dy0LYKE/ABWYwqZ1hpoHGHeNRKYATO4zu6kePNXQ443/yITCqhVmMY3rXWVRzSDLckCz 9NDwaY20OOHgDVEYvSRTpHWjoZwgo41Gh9DTTTzHTTbJVGrH3doCBX2vgdS/XDRgV6uJ9F 2uVnyOrKxJtSwdAJ/+2oRfxT9sFBlHvNlzJUvWaS+oMWvFXDRkMXpAPnuMJzJbNDsdNqg9 jUwowFKWE61sdV/WP+bNhqk5FO1bzVBEiZqo+D+aaTABamrTVzqEM2kPFnqptg== 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 4MXbf72ZQDz133J; Wed, 21 Sep 2022 11:24:15 +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 28LBOFgo001668; Wed, 21 Sep 2022 11:24:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LBOFXM001667; Wed, 21 Sep 2022 11:24:15 GMT (envelope-from git) Date: Wed, 21 Sep 2022 11:24:15 GMT Message-Id: <202209211124.28LBOFXM001667@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: 45530097ae37 - main - Mk/bsd.port.mk: support multiple URLs in WWW 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45530097ae3725e7265e8bac2bde48766f3f4f09 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663759455; 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=ClsIZEM6XS/I6ZJYMYbcod43SeIVMonpdDSim9BxNkU=; b=SGaxwmLDsvi7vlj6nuwTjplovcxZoYHYDozF45LxGB/53XDz8nMffVa55xAUCzWGKiw+SF gs92n0TY+l5koqrbKNrdRJZ87049hbxNbr/++Wp3tCCRzd3r861ifVD0SkEKmeK8FfDPry RUNGGlfQxBHSFu78wKKJL9OOl57go1ZXW6nx99cNFno++9yPCmjoVsKkAHP1s4+81jhyON SMWXRXj0wdrrdC9DSMv/FiB8NGicV2rGua2r6aMIchAUiVSp22K3gBnGPNBd7LX4vWgzU6 peGl5gxuLa2Pyad/lH0zErP9MucAhONhzx9CJaNeQmBfLPsMTSGwP+Kc+3rjtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663759455; a=rsa-sha256; cv=none; b=yPvWtjmJjN0VH/uP+9Ln6fLNzotnVRAIDoysS16PvAht971ulO8PnPcMh+aIdpyj1/Bueq rCDWtarM7VOrjcHOg2yx6nCkpvAcl5FuYBHLYzwtX1sY2CTeSmOspjLDP0NtAeYdvjJYVA P0/tb8Fa/uV6RHG2XAmqrK6CALawCeY9VuTSsx5v8dhOsAkyve1o89Bzm2WFU9Glc8GM+k Jh2mqzKXwQohYBKzIwEMLYLq56RaJ2oE+LPdGq/YaOI8BX7I8Ry3p6BYzOMZDTjvvvEOzu r6j7BFOkxAq/ysqbNBwRCU5jv4oJOTP3NRYq0LGZqNYL7qoni3sGS8BVkD/xPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=45530097ae3725e7265e8bac2bde48766f3f4f09 commit 45530097ae3725e7265e8bac2bde48766f3f4f09 Author: Stefan Eßer AuthorDate: 2022-09-21 11:18:28 +0000 Commit: Stefan Eßer CommitDate: 2022-09-21 11:23:44 +0000 Mk/bsd.port.mk: support multiple URLs in WWW The WWW macro was supposewd to hold only one URL pointing to the most useful starting point for a user searching for additional information, configuration examples, etc. Some port maintainers have set the WWW macro to a list of URLs, breaking assumptions by scripts and tools in the ports system and of external users of the ports system. This change allows WWW to hold a list of URLs by only considering the first list element in places where only a single URL is supported. This mirrors the previous behavior of only using the first line tagged with "WWW: " in the pkg-descr file. Approved by: portmgr (tcberner) Differential Revision: https://reviews.freebsd.org/D36558 --- Mk/Scripts/create-manifest.sh | 6 ++++-- Mk/bsd.port.mk | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Mk/Scripts/create-manifest.sh b/Mk/Scripts/create-manifest.sh index 118483cecddf..2f68f0e9d436 100644 --- a/Mk/Scripts/create-manifest.sh +++ b/Mk/Scripts/create-manifest.sh @@ -52,7 +52,7 @@ licenselogic: ${dp_LICENSE_COMB:-single} EOT # Then, the optional bits -[ -z "${dp_WWW}" ] || echo "www: \"${dp_WWW}\"" +[ -z "${dp_WWW}" ] || echo "www: \"${dp_WWW%% *}\"" [ -z "${dp_LICENSE}" ] || echo "licenses: [ ${dp_LICENSE} ]" [ -z "${dp_USERS}" ] || echo "users: [ ${dp_USERS} ]" [ -z "${dp_GROUPS}" ] || echo "groups: [ ${dp_GROUPS} ]" @@ -89,7 +89,9 @@ fi cp ${dp_DESCR} ${dp_METADIR}/+DESC if [ -n "${dp_WWW}" ] && ! grep -q '^WWW: ' ${dp_DESCR}; then echo >> ${dp_METADIR}/+DESC - echo "WWW: ${dp_WWW}" >> ${dp_METADIR}/+DESC + for www in ${dp_WWW}; do + echo "WWW: ${www}" >> ${dp_METADIR}/+DESC + done fi # Concatenate all the scripts diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 2bb318263c83..c582ca50bb32 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3567,6 +3567,8 @@ create-users-groups: . endif . endif +_WWW= ${WWW:[1]} + . if !defined(DISABLE_SECURITY_CHECK) . if !target(security-check) security-check: ${TMPPLIST} @@ -4287,7 +4289,7 @@ create-manifest: dp_PORT_OPTIONS='${PORT_OPTIONS}' \ dp_PREFIX='${PREFIX}' \ dp_USERS='${USERS:u:S/$/,/}' \ - dp_WWW='${_WWW}' \ + dp_WWW='${WWW}' \ ${PKG_NOTES_ENV} \ ${SH} ${SCRIPTSDIR}/create-manifest.sh @@ -4351,7 +4353,6 @@ _FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C _LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} _BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} _RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} -_WWW=${WWW} . if exists(${DESCR}) _DESCR=${DESCR} . else