From nobody Sun Mar 1 22:28:23 2026 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 4fPGtH5bfLz6TmyY for ; Sun, 01 Mar 2026 22:28:23 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPGtH4yRFz4N8D for ; Sun, 01 Mar 2026 22:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772404103; 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=ACxQADK9oMhdRh+dw2VKHgQdwIfiYmBQu16xwC3JyHE=; b=erkI/hXhU29viupfCdnQhSg8dmLgrvad5X9sqGQCbpFqe+vBC04fTDZCQhaFLIO849pBCY ku3HnDPmoRYbeYNHwRODDcGfH1EBTDhIy6zh7gifx7fxWSy5/1XV+TAQgFmhWxAfVP0kOt 0kvn76lCctgpTMCaWLrPYWdjt536clWyV/rqOlIqE8ifhMd5k5wliwTUV9N/l+jfVStDvR vB3IYQTdiRxWjpYNvURwOl0jeZkNdc9mimbu1F1MMZO7F727p+TRZcLZRun591yBgWN0+h r5703cX2Kr+Ef+ymVx/YT0ZRZf17J+QqNCm4aa0TslqwWQREOSToutjP4mmvBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772404103; a=rsa-sha256; cv=none; b=tPxDIeN5+2uFTP8Yqw1DJDhBNhT1YUxzF/n+ZUMmj/M9Swh6SWoUt5L6g2DVSdEC1Ct9LE 19GC/+/sSlSMchrVl3G4xx9RK966OmisfDUxJ/9QgBlrn3f+4zUGrz9eqPJDJ4AtOjq88c gu68d1J+hXgl6IPLSD0PRwlsWA3F95CkFnvkGveKvnbOBD3my8WLN3jHPNcUiSZ6TLKv8v 2fbXPsX2zrsmbNetDUIe/XKZqki30U80pnZhMH22a6YgJ3ZkC/GSlVcIwh4c2t4ya4rYxV DeCcc4gQsEUnfC7SREZkRN3oiOjCtYZ3A6g918DRRltYhr3I9z+Zw0icoyJ3/g== 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=1772404103; 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=ACxQADK9oMhdRh+dw2VKHgQdwIfiYmBQu16xwC3JyHE=; b=eSYRZ/QvC2HLzLDOUYSq95PxFGSZ0+wm/fLkOX1Y5ygiC5JKlNwAgbrrwBd9xDUBIbKbNO J3E6ACUzdCHIBIv9IZTCMS0QlE0Nu+P8a0l8idW2e4Xj67Xi5MswizrNSYCDwGinU6LkIs 02nQXUjtOKXGtWOZCrF74HkGMDRFM1s7BEqzicKImosKZ2cKN5IL0jbjOOCh61l4GfLxFG BX4UYT5buA6doBHR2Emk9g2HuC/PS5dGHa5QtdQ1TC/sX9466sCayP1/TKiV88wS5hYGfB e830f7E4y6VLTgfYoESQmzlJqqMNVhzrZORkNWkhnezqzj0C6jKYNgXekuYC7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fPGtH4PHWz17H5 for ; Sun, 01 Mar 2026 22:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37940 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 22:28:23 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stefa=?utf-8?Q?n E=C3=9Fer?= Subject: git: 21fd81899f90 - main - ports-mgmt/portmaster: update to version 3.32 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 21fd81899f9063be63be566878ea48adc092b325 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 22:28:23 +0000 Message-Id: <69a4bd87.37940.14e4088c@gitrepo.freebsd.org> The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=21fd81899f9063be63be566878ea48adc092b325 commit 21fd81899f9063be63be566878ea48adc092b325 Author: Stefan Eßer AuthorDate: 2026-03-01 22:25:36 +0000 Commit: Stefan Eßer CommitDate: 2026-03-01 22:25:36 +0000 ports-mgmt/portmaster: update to version 3.32 Changes in version 3.31: Avoid use of -D due to an incompatbility with GNU make Ports commit 755d190db121 by tijl (Tijl Coosemans) added a patch that changed all uses of -DMACRO to MACRO=1 on make command lines, since the MAKEFLAGS environment variable is passed to both BSD make and GNU make (where selected) and the latter does not accept the -D option. Changes in version 3.32: Add -q option to --clean-distfiles Fix small issues in the man page. --- ports-mgmt/portmaster/Makefile | 14 +++--- ports-mgmt/portmaster/distinfo | 6 +-- ports-mgmt/portmaster/files/patch-portmaster | 71 ---------------------------- 3 files changed, 9 insertions(+), 82 deletions(-) diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index fa2a2ef1a024..a90d5dd628a4 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -1,5 +1,5 @@ PORTNAME= portmaster -PORTVERSION= 3.30 +PORTVERSION= 3.32 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org @@ -11,24 +11,22 @@ LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= freebsd -OPTIONS_DEFINE= BASH ZSH -OPTIONS_DEFAULT=BASH ZSH +NO_ARCH= yes PLIST_FILES= sbin/portmaster \ etc/portmaster.rc.sample \ share/man/man8/portmaster.8.gz +OPTIONS_DEFINE= BASH ZSH +OPTIONS_DEFAULT=BASH ZSH + BASH_PLIST_FILES= etc/bash_completion.d/portmaster.sh ZSH_PLIST_FILES= share/zsh/site-functions/_portmaster -NO_ARCH= yes - -verify: checksum - do-build: .for file in portmaster files/portmaster.rc.sample files/portmaster.8 @${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ - -e 's#%%PORTVERSION%%#${PKGVERSION}#' ${WRKSRC}/${file} + -e 's#%%PORTVERSION%%#${PORTVERSION}#' ${WRKSRC}/${file} .endfor do-install: diff --git a/ports-mgmt/portmaster/distinfo b/ports-mgmt/portmaster/distinfo index f91c10184077..dfda55c9d32f 100644 --- a/ports-mgmt/portmaster/distinfo +++ b/ports-mgmt/portmaster/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1730492333 -SHA256 (freebsd-portmaster-3.30_GH0.tar.gz) = 9a94a309703cc6ef99fb7e13e5dcf6842d5a495cf90e5835410a7fe78243f303 -SIZE (freebsd-portmaster-3.30_GH0.tar.gz) = 44715 +TIMESTAMP = 1750234544 +SHA256 (freebsd-portmaster-3.32_GH0.tar.gz) = a8885b104fed174249aa57b91ea11c210ac472af8d70fe7cc224dc79af84d545 +SIZE (freebsd-portmaster-3.32_GH0.tar.gz) = 44812 diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster deleted file mode 100644 index 693eaadff047..000000000000 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ /dev/null @@ -1,71 +0,0 @@ ---- portmaster.orig 2023-11-30 10:13:58 UTC -+++ portmaster -@@ -3140,7 +3140,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then - unset argv - - make_target=$(target_part "$1") -- [ "$make_target" != install ] && PM_MAKE_ARGS="-DDISABLE_CONFLICTS $PM_MAKE_ARGS" -+ [ "$make_target" != install ] && PM_MAKE_ARGS="DISABLE_CONFLICTS=1 $PM_MAKE_ARGS" - else - portdir="${1#$pd/}" ; portdir="${portdir%/}" - export_flavor $(flavor_part $portdir) -@@ -3189,7 +3189,7 @@ else - fi - fi - -- PM_MAKE_ARGS="-DDISABLE_CONFLICTS $PM_MAKE_ARGS" -+ PM_MAKE_ARGS="DISABLE_CONFLICTS=1 $PM_MAKE_ARGS" - fi - - if [ -n "$upg_port" -a -z "$portdir" ]; then -@@ -3712,7 +3712,7 @@ if [ -z "$use_package" ]; then - echo "===>>> Logging build to $port_log" - fi - -- [ -n "$PM_NO_MAKE_CONFIG" ] && PM_MAKE_ARGS="$PM_MAKE_ARGS -D_OPTIONS_OK" -+ [ -n "$PM_NO_MAKE_CONFIG" ] && PM_MAKE_ARGS="$PM_MAKE_ARGS _OPTIONS_OK=1" - - # Return flavor for named pkg (must be executed in port directory!) - pkg_flavor () { -@@ -3724,7 +3724,7 @@ pkg_flavor () { - pm_make extract ask-license || fail "make extract ask-license failed for $portdir" - fi - if [ "$make_target" = "extract" -o "$make_target" = "patch" ]; then -- eval pm_make -DNO_DEPENDS $make_target $port_log_args || fail "make $make_target failed for $portdir" -+ eval pm_make NO_DEPENDS=1 $make_target $port_log_args || fail "make $make_target failed for $portdir" - safe_exit - fi - starttime=$(date "+%s") -@@ -3735,7 +3735,7 @@ pkg_flavor () { - pm_sv Running make stage - # Defining NO_DEPENDS ensures that we will control the installation - # of the depends, not bsd.port.mk. -- eval pm_make -DNO_DEPENDS stage $port_log_args || fail "make stage failed for $portdir" -+ eval pm_make NO_DEPENDS=1 stage $port_log_args || fail "make stage failed for $portdir" - [ "$make_target" = "stage" ] && safe_exit - else - [ -z "$local_package" ] && { -@@ -3858,12 +3858,12 @@ if [ -z "$use_package" ]; then - [ "$$" -eq "$PM_PARENT_PID" ] && np_orphan=0 - fi - fi -- [ "${np_orphan:-1}" -eq 1 ] && PM_MAKE_ARGS="${PM_MAKE_ARGS} -DINSTALLS_DEPENDS" -+ [ "${np_orphan:-1}" -eq 1 ] && PM_MAKE_ARGS="${PM_MAKE_ARGS} INSTALLS_DEPENDS=1" - unset np_orphan - # Defining NO_DEPENDS ensures that we will control the installation - # of the depends, not bsd.port.mk. - export_flavor $(flavor_part "$portdir") -- eval pm_make_s -DNO_DEPENDS install $port_log_args || install_failed $new_port -+ eval pm_make_s NO_DEPENDS=1 install $port_log_args || install_failed $new_port - else - [ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All - -@@ -3964,7 +3964,7 @@ if [ -n "$MAKE_PACKAGE" ]; then - if [ -n "$MAKE_PACKAGE" ]; then - if [ -z "$use_package" ]; then - echo "===>>> Creating a package for new version $new_port" -- pm_make_s -D_OPTIONS_OK ${PACKAGE_FORMAT:+PKG_COMPRESSION_FORMAT=$PACKAGE_FORMAT} package >/dev/null || fail "Package creation of $new_port failed" -+ pm_make_s _OPTIONS_OK=1 ${PACKAGE_FORMAT:+PKG_COMPRESSION_FORMAT=$PACKAGE_FORMAT} package >/dev/null || fail "Package creation of $new_port failed" - echo " ===>>> Package saved to $PACKAGES/All" ; echo '' - else - pm_pkg_create $PACKAGES $new_port