From nobody Sat Sep 30 15:10:33 2023 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 4RyVyf1P8Bz4wBkZ; Sat, 30 Sep 2023 15:10:34 +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 4RyVyf0YC4z4NFZ; Sat, 30 Sep 2023 15:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696086634; 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=AGQMXrF0tERikvky8HFaL9Y5W0i2mX5UfgRKhhBTd58=; b=WTcWzKkmrxh5eDqtOP1zfGKOR0USq4IfPw5vQVkWUk7FeickskJF/6D9du7MTpYxS0Nk9l vWOfXjT1KjBLAbDt7i02k9zmwqvG94nr8Nugg0tS1Gzo4cz3uPicjBeX/UJoBwmH6YPMqw BX6wA7PpX7pKbvmm2lW/fpcT2YPjxrK8oP4e7cBpXniVP3+iD71mzXzkFXZSyxzaAZf23O RrMl5teCoGSljh3rzMqCLyj1zXBht52JlHqy2mvakqrfUfeWYgqbBqIfrIQNvhvR1vXNWi qr9H+RNq/gLwWALCGyTy5op1SLMtyd7QpP5b/QpNipGxCYHZ+gCu6GeAELZtXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696086634; a=rsa-sha256; cv=none; b=AJGrrNnk//G1CD+mLKGkyWDNM1rSGunGkz+YCs3A3CxubjqesZm9hdj3t86KElqlA4VrLP lTz2MMpm5q+sGm63xkpaUk6vao7eTETijlXupsd5iLKgitp8KfcMldSc2kpJHhefcXihfN cMzAh1TPkabF+b4MPB4DNQJLqy29pYRKVGxAw5TsBTNm8q4zwdy6fBZrdoHawAcSpK1YBz C56GdQMqTm3FhWWC67mJMAfO6nxxvGJbq/N3f26fSu7Lx9I0OKxt0ggtOKyoVsCThv9yZi PYaFehoDMSWPHFud/bSsX6EI76G3cjR6G38wEmiyLArOde0qgiqh8keRrTFNXA== 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=1696086634; 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=AGQMXrF0tERikvky8HFaL9Y5W0i2mX5UfgRKhhBTd58=; b=uYoIVU1HgR7Zxhop+yC7hjTCN4jwI+o+ZUxfg5RQImwLEzz6yKBuguQdRKeoZI3MFPz9+j +0yeaQdLxSkxrg4LoKVpyKuqbTlTQhQXaHUZ5NdEyU/wQ8sPWgI+Jy51QrmcCTMOeidbkZ xNaM4K2saxCSK/gJxTTjyehtI45+bO72drsUWjlVQIA7hPeenYFqRom7YtoqLWKfafzqBe 8PRkxu6DDtuTS3x/QcfVHcgUeUUmYhRhlijRJLnaO5bxbokstc9eOgyBF8wADNFkYIWDdu aZMujL31p+tC1cjQDv/229krgqrxfoogkVXXhzJ7RjojA28kgQLjisLgoy225w== 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 4RyVyd6jf0zrlY; Sat, 30 Sep 2023 15:10:33 +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 38UFAX9R070381; Sat, 30 Sep 2023 15:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38UFAXwt070378; Sat, 30 Sep 2023 15:10:33 GMT (envelope-from git) Date: Sat, 30 Sep 2023 15:10:33 GMT Message-Id: <202309301510.38UFAXwt070378@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: de9c50e72c35 - main - net/pacemaker1: Remove PYTHON_SUFFIX Conditionals 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de9c50e72c3542c29b9a12aecb9f736bc3cf45e5 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=de9c50e72c3542c29b9a12aecb9f736bc3cf45e5 commit de9c50e72c3542c29b9a12aecb9f736bc3cf45e5 Author: Muhammad Moinur Rahman AuthorDate: 2023-09-30 13:02:35 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-09-30 15:10:20 +0000 net/pacemaker1: Remove PYTHON_SUFFIX Conditionals At the moment the minimum supported Python version is 3.8 and later so remove the PYTHON_SUFFIX conditionals for greater than version 3.6 as all version satisfies this conditions. Approved by: portmgr (blanket) --- net/pacemaker1/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/pacemaker1/Makefile b/net/pacemaker1/Makefile index 0ed8bdd696c3..b978cea40f88 100644 --- a/net/pacemaker1/Makefile +++ b/net/pacemaker1/Makefile @@ -22,6 +22,9 @@ SHEBANG_FILES+= cts/cts \ REPLACE_ARGS_GETOPT= -e 's,getopt,${LOCALBASE}/bin/getopt,' +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-cts_remote.py \ + ${PATCHDIR}/extra-patch-cts_watcher.py + .include # Fix building it with clang 11 @@ -29,11 +32,6 @@ REPLACE_ARGS_GETOPT= -e 's,getopt,${LOCALBASE}/bin/getopt,' CFLAGS+= -fcommon .endif -.if ${PYTHON_SUFFIX} > 36 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-cts_remote.py \ - ${PATCHDIR}/extra-patch-cts_watcher.py -.endif - post-patch: post-patch-common @${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_failcount @${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_master