From owner-dev-commits-ports-all@freebsd.org Thu May 6 23:56:53 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 74FC0631ED1; Thu, 6 May 2021 23:56:53 +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 4Fbr8j2tY5z3DV7; Thu, 6 May 2021 23:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4BA9D21540; Thu, 6 May 2021 23:56:53 +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 146NurCg086374; Thu, 6 May 2021 23:56:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 146Nur21086373; Thu, 6 May 2021 23:56:53 GMT (envelope-from git) Date: Thu, 6 May 2021 23:56:53 GMT Message-Id: <202105062356.146Nur21086373@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?Vmluw61jaXVzIFphdmFt?= Subject: git: 73059f063ec1 - main - net/pacemaker1: fix DBUS config option, and its REINPLACE_ARGS MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: egypcio X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73059f063ec124bb34540a609f7b6306045e9bd0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2021 23:56:53 -0000 The branch main has been updated by egypcio: URL: https://cgit.FreeBSD.org/ports/commit/?id=73059f063ec124bb34540a609f7b6306045e9bd0 commit 73059f063ec124bb34540a609f7b6306045e9bd0 Author: Vinícius Zavam AuthorDate: 2021-05-06 23:50:05 +0000 Commit: Vinícius Zavam CommitDate: 2021-05-06 23:50:05 +0000 net/pacemaker1: fix DBUS config option, and its REINPLACE_ARGS - 'post-patch-common' never used was DBUS_VARS_OFF really set; - REPLACE_ARGS renamed to REPLACE_CMD_ARGS; - REPLACE_ARGS_OCF and REPLACE_ARGS_DBUS append into REPLACE_ARGS. while here, * mark port as broken if OSVERSION>=1300000 PR: 254653 Reported by: masamory7 % gmail.com --- net/pacemaker1/Makefile | 5 +++++ net/pacemaker1/Makefile.common | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/net/pacemaker1/Makefile b/net/pacemaker1/Makefile index 81bbb8ce86b8..da2a3734e572 100644 --- a/net/pacemaker1/Makefile +++ b/net/pacemaker1/Makefile @@ -1,6 +1,7 @@ # Created by: David Shane Holden PORTVERSION= 1.1.24 +PORTREVISION= 1 PKGNAMESUFFIX= 1 .include "${.CURDIR}/Makefile.common" @@ -23,6 +24,10 @@ REPLACE_ARGS_GETOPT= -e 's,getopt,${LOCALBASE}/bin/getopt,' .include +.if ${OSVERSION} >= 1300000 +BROKEN= "includes which is deprecated" +.endif + .if ${PYTHON_SUFFIX} > 36 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-cts_remote.py \ ${PATCHDIR}/extra-patch-cts_watcher.py diff --git a/net/pacemaker1/Makefile.common b/net/pacemaker1/Makefile.common index a49355190113..ca702b94b28e 100644 --- a/net/pacemaker1/Makefile.common +++ b/net/pacemaker1/Makefile.common @@ -56,15 +56,12 @@ sh_OLD_CMD= ${SH} sh_CMD= ${LOCALBASE}/bin/bash SHEBANG_FILES= extra/resources/* -REPLACE_ARGS_OCF= -e 's,/usr/lib/ocf,${PREFIX}/lib/ocf,' - OPTIONS_DEFINE= DBUS DOCS MANPAGES SNMP - OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus -DBUS_VARS_OFF= REPLACE_ARGS+="-e 's/HAVE_dbus=1/HAVE_dbus=0/'" +DBUS_VARS_OFF= REPLACE_ARGS_DBUS="-e 's/HAVE_dbus=1/HAVE_dbus=0/'" DOCS_BUILD_DEPENDS= asciidoc:textproc/asciidoc @@ -76,6 +73,9 @@ SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_WITH= snmp SNMP_USES= ssl +REPLACE_CMD_ARGS= -e 's,/usr/lib/ocf,${PREFIX}/lib/ocf,' \ + ${REPLACE_ARGS_DBUS} + # python default version must be set to 2.7 to generate a # correct pkg-plist maintainer-plist: stage @@ -89,4 +89,4 @@ maintainer-plist: stage > pkg-plist post-patch-common: - @${REINPLACE_CMD} ${REPLACE_ARGS_OCF} ${WRKSRC}/configure.ac + @${REINPLACE_CMD} ${REPLACE_CMD_ARGS} ${WRKSRC}/configure.ac