Attachment 153172 Details for Bug 197818 – bash-pkgname.diff

[patch] bash-pkgname.diff

bash-pkgname.diff (text/plain), 1.03 KB, created by Mathieu Arnold on 2015-02-19 12:55:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2015-02-19 12:55:53 UTC

Size: 1.03 KB

patch

obsolete

>Index: shells/bash/Makefile
>===================================================================
>--- shells/bash/Makefile	(revision 379341)
>+++ shells/bash/Makefile	(working copy)
>@@ -56,6 +56,12 @@
> 			--disable-rpath \
> 			--enable-disabled-builtins
> 
>+.if empty(PKGNAMESUFFIX)
>+CONFLICTS+=		bash-static-[0-9]*
>+.else
>+CONFLICTS+=		bash-[0-9]*
>+.endif
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MIMPORTFUNCTIONS}
>@@ -66,11 +72,8 @@
> 
> .if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no")
> CONFIGURE_ARGS+=	--enable-static-link
>-PKGNAMESUFFIX=		-static
>-CONFLICTS+=		bash-[0-9]*
> .else
> CONFIGURE_ARGS+=	--disable-static-link
>-CONFLICTS+=		bash-static-[0-9]*
> .endif
> 
> post-patch:
>Index: shells/bash-static/Makefile
>===================================================================
>--- shells/bash-static/Makefile	(revision 379341)
>+++ shells/bash-static/Makefile	(working copy)
>@@ -5,4 +5,6 @@
> 
> OPTIONS_SLAVE=	STATIC
> 
>+PKGNAMESUFFIX=		-static
>+
> .include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 197818: 153172