svn commit: r379349 - in head/shells: bash bash-static

[Emanuel Haupt]

Author: ehaupt
Date: Thu Feb 19 15:59:54 2015
New Revision: 379349
URL: https://svnweb.freebsd.org/changeset/ports/379349
QAT: https://qat.redports.org/buildarchive/r379349/

Log:
  Ports should not change their pkgname depending on options. Change the way how
  the slave port is handled.
  
  PR:		197818
  Submitted by:	mat

Modified:
  head/shells/bash-static/Makefile
  head/shells/bash/Makefile

Modified: head/shells/bash-static/Makefile
==============================================================================
--- head/shells/bash-static/Makefile	Thu Feb 19 15:09:35 2015	(r379348)
+++ head/shells/bash-static/Makefile	Thu Feb 19 15:59:54 2015	(r379349)
@@ -5,4 +5,6 @@ MASTERDIR=	${.CURDIR}/../../shells/bash
 
 OPTIONS_SLAVE=	STATIC
 
+PKGNAMESUFFIX=	-static
+
 .include "${MASTERDIR}/Makefile"

Modified: head/shells/bash/Makefile
==============================================================================
--- head/shells/bash/Makefile	Thu Feb 19 15:09:35 2015	(r379348)
+++ head/shells/bash/Makefile	Thu Feb 19 15:59:54 2015	(r379349)
@@ -56,6 +56,12 @@ CONFIGURE_ARGS+=	--without-bash-malloc \
 			--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 @@ CFLAGS+=	-DIMPORT_FUNCTIONS_DEF=0
 
 .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: