From nobody Wed Mar 06 20:46:01 2024 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 4Tqkwn5pqbz5DHWd; Wed, 6 Mar 2024 20:46:01 +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 4Tqkwn5CM3z4JK7; Wed, 6 Mar 2024 20:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709757961; 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=28aRCJJZxat9RIpe9YYh9R+USc4RKa9eMg44rjZKI4Q=; b=qE/yqDmnNX5llX8oOofQGgg5YoaU9f52sQWBZPDyds9jZLRuc+fsC3qRUvnIve664GaRkc UAO2UjqAzLv2jEU7z8GK0sjQeG/87iK3JnREtUwRkCj/Jhx3StIP4x4d1MzGDZFbyKZiHj GXzSfeF/I3A/Fe1V3I1w+GnhdSVRyw+hLtcFXqiZXTo3dPZKd1ZqU54fNR/+DL/lH66W2d SXLzvFGl/1KbQhW2vnBC2v3tJyM8AbKJW3xZtAaStJ/2qQG6xeyPF4tpaFbSD8JzqHtw1+ IfYcCR5xZ1XF/6SEwlrULlPja2MsEDrGKUHVSFoEU4ERiIQj3odrmvb3y5sjqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709757961; a=rsa-sha256; cv=none; b=y3jUqhhNCkLa/Wq4TJ0L8KacnBH6U5Eooyt6MWFH8vWe+z6g79qXjRyLNOgNudl6OAnziS gsOPOeqUkC90AtVOnN9nNOOj6TLs9FdS8wo7ZxsH8CggX1/wcLiOLK+XUgOV3sos1itKHn NrxhKJAVsOOlCL3sbXmXqpcXV1kyPgiHx/ZjXfbPpSmQFAG8rnXX82TtPMkLCrE6cUZ253 Ncs8FzLMi/0AMszTJISzax8QnQNgKG+VcmNRrSaBhejf07Of7V0+6KOJtSAl0rF2VuVZ91 osKd8tADQ3fG14CqbEJ3bGq1G7AoLSVFF2GE7Whz4dGxpylIpWzDWH7SkeMmtw== 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=1709757961; 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=28aRCJJZxat9RIpe9YYh9R+USc4RKa9eMg44rjZKI4Q=; b=PZUYAeEie74MtoJZCDebHskFBxr3RmL/1qP5+6GzRVvUTeJXiYup2N531NxfzEm4Fx5Uj6 AKVHv5zHBPHlI/YOg0msOVo6XLbmT4Gn4pSMo5e3FHOvxNdZc/FZI3yJb36F8/BJFvs36h IzwM+aXwuDEZkwM+YxK+gKmZhRsPvOhzXSf9r+glQqVdYJLidFxORz2n2kYEoFZpJjhZ7Y YYdFwn5ymLgRq2j+A2qG3wBL+ovPlRGoMn41OYvIJaPNyBZPZN4BEhz+mT2B/890bBcMe9 nmFWmMYFk6uF51HK9o5UO6Syjx3p+qvn6MSEZuQx9zTfKtKjfj8EDb4af0xFZw== 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 4Tqkwn4hFHz14vk; Wed, 6 Mar 2024 20:46:01 +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 426Kk14j065792; Wed, 6 Mar 2024 20:46:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426Kk1Ti065789; Wed, 6 Mar 2024 20:46:01 GMT (envelope-from git) Date: Wed, 6 Mar 2024 20:46:01 GMT Message-Id: <202403062046.426Kk1Ti065789@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 755d190db121 - main - ports-mgmt/portmaster: Avoid make -D flag 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: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 755d190db121778a25b45950c397163325d8e797 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=755d190db121778a25b45950c397163325d8e797 commit 755d190db121778a25b45950c397163325d8e797 Author: Tijl Coosemans AuthorDate: 2024-03-06 20:38:58 +0000 Commit: Tijl Coosemans CommitDate: 2024-03-06 20:44:44 +0000 ports-mgmt/portmaster: Avoid make -D flag Both FreeBSD make and GNU make pass command line flags to sub-makes through the MAKEFLAGS environment variable, but the flags aren't compatible and GNU make 4.4 exits with an error when it encounters flags it doesn't understand, e.g. -D. Avoid using the flag for now until ports run gmake with SETENVI. PR: 272216, 277492 --- ports-mgmt/portmaster/Makefile | 2 +- ports-mgmt/portmaster/files/patch-portmaster | 71 ++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 12308d1999c3..b5e0d0347c42 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -1,6 +1,6 @@ PORTNAME= portmaster PORTVERSION= 3.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster new file mode 100644 index 000000000000..693eaadff047 --- /dev/null +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -0,0 +1,71 @@ +--- 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