Attachment 224361 Details for Bug 254653 – net/pacemaker1: fix the use of REPLACE_ARGS and REPLACE_ARGS_OCF

[patch] net/pacemaker1: fix the use of REPLACE_ARGS and REPLACE_ARGS_OCF

PR254653.patch (text/plain), 1.48 KB, created by Vinícius Zavam on 2021-04-22 19:05:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vinícius Zavam

Created: 2021-04-22 19:05:04 UTC

Size: 1.48 KB

patch

obsolete

>diff --git a/net/pacemaker1/Makefile b/net/pacemaker1/Makefile
>index 81bbb8ce8..b50585f1d 100644
>--- a/net/pacemaker1/Makefile
>+++ b/net/pacemaker1/Makefile
>@@ -1,6 +1,7 @@
> # Created by: David Shane Holden <dpejesh@yahoo.com>
> 
> PORTVERSION=		1.1.24
>+PORTREVISION=		1
> PKGNAMESUFFIX=		1
> 
> .include "${.CURDIR}/Makefile.common"
>diff --git a/net/pacemaker1/Makefile.common b/net/pacemaker1/Makefile.common
>index a49355190..ca702b94b 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

Actions: View | Diff

Attachments on bug 254653: 224361