From nobody Wed Sep 21 11:24:14 2022 X-Original-To: dev-commits-ports-all@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 4MXbf63QR3z4d72k; Wed, 21 Sep 2022 11:24:14 +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 4MXbf62yG1z3wGy; Wed, 21 Sep 2022 11:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663759454; 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=cWQ+o13QovVJsmZZcEHz3v39EhDO2nS+8UlThMCMvQA=; b=HTpJzioC8uIaD74eAXepmFy5anksiAm0+Hm4Fr568etVpOfq/KMEM3smuZ4iNaDfn6EPx8 aFrnq9Xxwzx+mN6Y9Ws8RfL69vdnmPUoAapSHd3udKSJ8IrtjVq98uYlI0IIEPzM+a9CRF JAvkQ1GgDlZSQH0onLUHCbc8uHK1xYiPKDxtVIA900r3RPYuOYzjQnhOWUqRbFCyz4vap4 KS6GtoC8k7WooCBbVcOHXNkaQeFTtKO3B8k8+un0GvOD9PDYrqLeWCO1J0opRNE33yM+RC qc5BlxYtlAo/FD1FcwXuWRELNOSITlsJQTZpx2IgwYsLkVoX+TeRWEdcBc+4ew== 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 4MXbf620lZz131P; Wed, 21 Sep 2022 11:24:14 +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 28LBOEDt001638; Wed, 21 Sep 2022 11:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LBOE8v001637; Wed, 21 Sep 2022 11:24:14 GMT (envelope-from git) Date: Wed, 21 Sep 2022 11:24:14 GMT Message-Id: <202209211124.28LBOE8v001637@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: 5dccc48cd792 - main - Mk/bsd.sites.mk: fall back to default WWW URLs for specific ports List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 5dccc48cd79223d380ec932ba861296dbab114cf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663759454; 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=cWQ+o13QovVJsmZZcEHz3v39EhDO2nS+8UlThMCMvQA=; b=vXyj7eGO55EkWR5Pjc8qWCSMsP0NzoHQ3y5+GCPiJzXq+Lh3hhkSAZ9Qvgohy4OxfI+t8U JU6e021/tTkvNCoGp7/3/AHOGA29sZANIMMBWS0wC7hjtbrtoOAlvWoSQRA9WwnTJMCvVT m6OXCPSVAzsD0C/zL/iGDG7K5kaG2hk3NPQ+5QxgTXEFFR4grkyZ3VGI5oKvpLf8bjv3GW KCBZBCmnj4N0LFTNQdTziHjQdPpgq8BbMmIE5OMxRYm+L9gYduTJYr18v3tl27zKyYbDNT 42hdwlYS9d+t3aNCDkUvzDGhVO5IwlxxQFV4jvzPdJu5S3O4CzboAymcNWmTkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663759454; a=rsa-sha256; cv=none; b=t8QCv4kHOr9md3vZx/7tZts14eNUyarLnVzbAue05WPWB4n9bbM+uuF4JuONP7iSvW+/M0 qPYGDnHM+8So8aDhOgAMgbrowPjniMEoYbXp8MIICOFK/Za+Hc7jblkM298efvTjYQUciv 6GDa/YJLzlXloYMs1Rdcb9P+8upznO2FVR58xtFBwRYO6dAsPXRu2fsQQNGuPpjHhY9t6x omu9rUEAxxzv4nV4ANULvNol44atVFmD/ow8uc+Mn+CdpoqL4uyrFwTP0Uw1L1btgZ9aG7 7Qfkr1Q+DVk3/dIDa2xajp/a5ApckRPWda3UQPblL/GBBav1G/ob/t8xw6R6kQ== 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=5dccc48cd79223d380ec932ba861296dbab114cf commit 5dccc48cd79223d380ec932ba861296dbab114cf Author: Stefan Eßer AuthorDate: 2022-09-21 08:21:40 +0000 Commit: Stefan Eßer CommitDate: 2022-09-21 11:23:44 +0000 Mk/bsd.sites.mk: fall back to default WWW URLs for specific ports This change has been accepted as part of review D36558. A follow-up commit will apply the reminder of the patches in that review. A separate commit is used since providing default values for certain ports is logically different than support for multiple URLs in WWW. This commit adds default WWW values if the following conditions are met: 1) no value assigned to the WWW macro by the port 2) at least one of USE_GITHUB, USE_GITLAB, or USES=pear is used in the port Further defaults for USES cases could be added at a later time. The following values are used as default URLs: USES=pear: https://pear.php.net/package/${PORTNAME}/ USE_GITHUB: https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/ USE_GITLAB: https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/ If both a USES case and USE_GITHUB or USE_GITLAB apply, the default URL of the USES case takes precedence. Approved by: portmgr (tcberner) --- Mk/Uses/pear.mk | 2 ++ Mk/bsd.sites.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk index e9188f309c50..d18d2b20e9ab 100644 --- a/Mk/Uses/pear.mk +++ b/Mk/Uses/pear.mk @@ -40,6 +40,8 @@ MASTER_SITES?= http://pear.php.net/get/ EXTRACT_SUFX?= .tgz DIST_SUBDIR?= PEAR +WWW?= https://pear.php.net/package/${PORTNAME}/ + . if empty(php_ARGS:Mphpize) NO_BUILD= yes . endif diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index 48cba97dbbca..22e0f586135d 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -449,6 +449,7 @@ git-clone-${_group}: ${_GITHUB_CLONE_DIR} . endif convert-to-gh-tuple: @${ECHO_MSG} ${GH_ACCOUNT}:${GH_PROJECT}:${GH_TAGNAME} ${_GH_TUPLE_OUT:S/\/$//} +WWW?= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/ . endif # defined(USE_GITHUB) .endif # !defined(IGNORE_MASTER_SITE_GITHUB) @@ -579,6 +580,7 @@ git-clone-${_group}: ${_GITLAB_CLONE_DIR} @${ECHO_MSG} "Cloned the ${_group} GitLab repository into ${_GITLAB_CLONE_DIR}/${GL_PROJECT_${_group}}" | ${FMT_80} . endfor . endif +WWW?= https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/ . endif # defined(USE_GITLAB) .endif # !defined(IGNORE_MASTER_SITE_GITLAB)