From nobody Tue Jun 25 05:00:02 2024 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 4W7Xh26ZNfz5Nhjp; Tue, 25 Jun 2024 05:00:02 +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 4W7Xh24Tynz4nvL; Tue, 25 Jun 2024 05:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719291602; 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=Qgv92jC6Qc4ZcZyejvU4HZ8DBv8YjTjGgnrx9z2RmgY=; b=Lfnigj29xKDYKwLaTlUEAIjpHpfuCygzPkSVYowaaI6xPxSnsOVK5jUi2NLORZ+WoLqOjN EyvDReWCPxKuuakGvMqbAIpW1mv+A7DRjMp13WcKF8BvF6NvBFni62aqLzzdIMO+K1GPak RP6kPlbYOnkMC+We5UJruZSGvKQaOG1YlwlaSeJuNJ7TsXuOBzyjUY06zG72ekCAVHmVg7 ap/1tjalW3L5GeoICM0q6WR8UTD3vvT3rhc15C8en5WYAqagCYlPP5+IqPBtMhjtyOxtM2 qQPhP2nfYh+WnlMy5tw11q/xP5mdOtt3M1pWfg6AfYLQqKSxWRXLn6qQhb/kBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719291602; a=rsa-sha256; cv=none; b=cYZnaz+4gE+jOJfta65kclXweaLoV6wC/jREEKUq8f1YQQ3fyeGP093LQiC28l04L+lX/4 nCS8xlopdEOU/PyamZaqMh3AOOSCuPmn7sg/R/nTX895Z+MpCY3+tQZ4WtQiTerT19FuCN VnO5T8dbAvj47IHFeT98awwQpZE4mQKeze2F4yL9e8O4Dkb/MR99lJKpWzSTmxjiwY3POp qZaw0xZ+QyVZT4ZY6ZmzGsjs6diJOB5gieEycBTzyB6mfyt1LJd4jloUWiJPnOv/ek44Jz 7xDbXnz3Vo+u5j9LNOBoFp+K8OXSjDIx7mtvTFChqR7wgSj5OekJf7luKIEurQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719291602; 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=Qgv92jC6Qc4ZcZyejvU4HZ8DBv8YjTjGgnrx9z2RmgY=; b=omgKgT5Ft+ozfEaGRJzMeN0wSpIMEoC6dPG/NjwIkmcbquYkJ1AFL21XvdvSL2ALkh+CgL 67UvTieq4FTkSrIU8vuBTcDm6Fx+bplEdn5O/KshFlIhAr8JpMTnzNZV79dOr4ugD3sSW+ DmlfS59GlBq66G5hGAS33IR15ljq4SEk/HM/ZEdMlzHis1IJkJrvLcyjbjuHJajEk4J/++ 0UkYQ5laoWKpTZCy/Imqy7To1/dhqcMM55abxbYwDWOsS5dumm2U6kb2vVk7AYjHLLjCqj mL1rs3qT9fOJO8HmvHBNvms+5C4NqUMd1HYsPrj4uA0kScLSdg+VpCtGVM2rbQ== 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 4W7Xh23PfNznhq; Tue, 25 Jun 2024 05:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45P502rH041301; Tue, 25 Jun 2024 05:00:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45P502N2041291; Tue, 25 Jun 2024 05:00:02 GMT (envelope-from git) Date: Tue, 25 Jun 2024 05:00:02 GMT Message-Id: <202406250500.45P502N2041291@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 06687520ed51 - main - Revert "Framework: Introduce bsd.sponsor.mk" 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06687520ed513a8825926fdaefae2cec61f88c80 Auto-Submitted: auto-generated The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=06687520ed513a8825926fdaefae2cec61f88c80 commit 06687520ed513a8825926fdaefae2cec61f88c80 Author: Mathieu Arnold AuthorDate: 2024-06-25 04:58:43 +0000 Commit: Mathieu Arnold CommitDate: 2024-06-25 04:59:34 +0000 Revert "Framework: Introduce bsd.sponsor.mk" This reverts commit 274cd4df4dcce0a9aa78da47bb6e35ab3dbcbf8c. --- Mk/bsd.port.mk | 2 - Mk/bsd.sponsor.db.mk | 9 ----- Mk/bsd.sponsor.mk | 112 --------------------------------------------------- 3 files changed, 123 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c9b657230c25..1604a1c7fd3d 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1994,8 +1994,6 @@ ERROR+= "Unknown USES=${f:C/\:.*//}" . endif . endif -.include "${PORTSDIR}/Mk/bsd.sponsor.mk" - . if defined(USE_LOCALE) WRK_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} . endif diff --git a/Mk/bsd.sponsor.db.mk b/Mk/bsd.sponsor.db.mk deleted file mode 100644 index bf8ac051db2a..000000000000 --- a/Mk/bsd.sponsor.db.mk +++ /dev/null @@ -1,9 +0,0 @@ -Sponsor_db_Include_MAINTAINER= portmgr@FreeBSD.org - -# -# bsd.sponsor.db.mk - Sponsorship info database for FreeBSD Ports commiters -# -# Please keep descriptions sorted alphabetically by variable name. - -arrowd_at_freebsd_org_SPONSORSHIP_PLATFORMS= CARDANO -arrowd_at_freebsd_org_CARDANO_SPONSOR_HANDLE= addr1qy95v6rlgjchrqc7cae9g7vtrmsevdaty8hnl9p5kv0xtajpts7278jw0y9nh9n26y0dfa97j0zkjxxnut8ahg3hs02sth533h diff --git a/Mk/bsd.sponsor.mk b/Mk/bsd.sponsor.mk deleted file mode 100644 index 9fa916ecb894..000000000000 --- a/Mk/bsd.sponsor.mk +++ /dev/null @@ -1,112 +0,0 @@ -# These variables are used in Ports framework to define the ways to support -# port maintainers. -# -# SPONSORSHIP_PLATFORMS - List of ways to endorse the port's maintainer -# Currently supported values are: -# BOOSTY -# CARDANO -# GITHUB -# OPENCOLLECTIVE -# PATREON -# -# Each platform may have ":upstream" suffix to allow -# sponsoring project's upstream instead of a -# downstream maintainer. -# -# To define an additional platform the following -# vars should be defined: -# ${plat}_SPONSOR_HANDLE - Account name or some other handle for the -# given platform -# ${plat}_UPSTREAM_SPONSOR_HANDLE - The same as ${plat}_SPONSOR_HANDLE for -# the ":upstream" case. -# ${plat}_SPONSOR_URL - URL leading to the site that allows to make -# to make a donation -# -# Variables listed above may be either put into a port's Makefile directly or -# set automatically based on the MAINTAINER knob value and the data from -# bsd.sponsor.db.mk -# -# An auxiliary "make sponsor" target points the user to appropriate web page. -# An auxiliary "make sponsor-describe" target prints a machine-readable description -# of the sponsorship data. - -.if !defined(SPONSORMKINCLUDED) -SPONSORMKINCLUDED= bsd.sponsor.mk - -BOOSTY_SPONSOR_URL= https://boosty.to/%%HANDLE%% -CARDANO_SPONSOR_URL= https://cexplorer.io/address/%%HANDLE%% -GITHUB_SPONSOR_URL= https://github.com/sponsors/%%HANDLE%% -OPENCOLLECTIVE_SPONSOR_URL= https://opencollective.com/%%HANDLE%% -PATREON_SPONSOR_URL= https://www.patreon.com/%%HANDLE%% - -GITHUB_SPONSOR_HANDLE?= ${GH_PROJECT} -GITHUB_UPSTREAM_SPONSOR_HANDLE?= ${GH_PROJECT} - -.include "${PORTSDIR}/Mk/bsd.sponsor.db.mk" -_MAINTAINER_KEY= ${MAINTAINER:S/@FreeBSD.org/_at_freebsd_org/:S/@freebsd.org/_at_freebsd_org/} -. if defined(${_MAINTAINER_KEY}_SPONSORSHIP_PLATFORMS) -SPONSORSHIP_PLATFORMS+= ${${_MAINTAINER_KEY}_SPONSORSHIP_PLATFORMS} -. for plat in ${SPONSORSHIP_PLATFORMS} -. if defined(${_MAINTAINER_KEY}_${plat}_SPONSOR_HANDLE) -${plat}_SPONSOR_HANDLE= ${${_MAINTAINER_KEY}_${plat}_SPONSOR_HANDLE} -. endif -. endfor -. endif - -. for plat in ${SPONSORSHIP_PLATFORMS} -. for plat_w_u plat_wo_u in ${plat:S/:upstream/_UPSTREAM/} ${plat:S/:upstream//} -. if !defined(${plat_w_u}_SPONSOR_HANDLE) || empty(${plat_w_u}_SPONSOR_HANDLE) -.error Missing ${plat_w_u}_SPONSOR_HANDLE value -. endif -. if !defined(${plat_wo_u}_SPONSOR_URL) || empty(${plat_wo_u}_SPONSOR_URL) -.error Missing ${plat_wo_u}_SPONSOR_URL value -. endif -. endfor -. endfor - -SPONSOR_DIALOG= ${DIALOG} --backtitle "Sponsorship options" \ - --menu "Support options for ${PORTNAME}" 0 0 0 - -. for plat in ${SPONSORSHIP_PLATFORMS} -. for plat_w_u plat_wo_u in ${plat:S/:upstream/_UPSTREAM/} ${plat:S/:upstream//} -SPONSOR_DIALOG_ARGS+= ${plat_w_u} "${${plat_wo_u}_SPONSOR_URL:S/%%HANDLE%%/${${plat_w_u}_SPONSOR_HANDLE}/}" -PKG_NOTE_sponsor+= ${plat_w_u:tl}=${${plat_wo_u}_SPONSOR_URL:S/%%HANDLE%%/${${plat_w_u}_SPONSOR_HANDLE}/} -. endfor -. endfor - -. if exists(${LOCALBASE}/bin/xdg-open) -SPONSOR_CMD= ${LOCALBASE}/bin/xdg-open %%URL%% -. else -SPONSOR_CMD= ${ECHO_CMD} To sponsor the ${PORTNAME} project visit %%URL%% -. endif - -. if !empty(SPONSORSHIP_PLATFORMS) -PKG_NOTES+= sponsor - -sponsor: - @(_selected_platform_w_u=$$( { ${SPONSOR_DIALOG} ${SPONSOR_DIALOG_ARGS} 2>&1 >&3; } 3>&2 ) 2>&1 ;\ - _selected_platform_wo_u=$$(${ECHO_CMD} $$_selected_platform_w_u | sed 's/_UPSTREAM//') ;\ - _url=$$(${MAKE} -C ${.CURDIR} -v $${_selected_platform_wo_u}_SPONSOR_URL) ;\ - _handle=$$(${MAKE} -C ${.CURDIR} -v $${_selected_platform_w_u}_SPONSOR_HANDLE) ;\ - _url=$$(${ECHO_CMD} $$_url | sed "s|%%HANDLE%%|$$_handle|") ;\ - `${ECHO_CMD} ${SPONSOR_CMD} | sed "s|%%URL%%|$$_url|"` ;\ - ) -. else -sponsor: - @${ECHO_CMD} No sponsorship platforms defined for ${PORTNAME} maintainer - @${FALSE} -. endif - -# The format is -# distribution-name|maintainer|sponsorship_platform|sponsorship_type|sponsorship_url -sponsor-describe: ${SPONSORSHIP_PLATFORMS:tl:S/:upstream/-upstream/:S/^/sponsor-describe-/} - @${DO_NADA} - -. for plat in ${SPONSORSHIP_PLATFORMS} -. for plat_w_u plat_wo_u in ${plat:S/:upstream/_UPSTREAM/} ${plat:S/:upstream//} -sponsor-describe-${plat:tl:S/:upstream/-upstream/}: - @${ECHO_CMD} "${PKGNAME}|${MAINTAINER}|${plat_wo_u}|${"${plat_w_u:M*_UPSTREAM}":?Upstream:Maintainer}|${${plat_wo_u}_SPONSOR_URL:S/%%HANDLE%%/${${plat_w_u}_SPONSOR_HANDLE}/}" -. endfor -. endfor - -.endif