svn commit: r310391 - in head/shells: bash-devel bash-static-devel

[Emanuel Haupt]

Author: ehaupt
Date: Mon Jan 14 14:59:07 2013
New Revision: 310391
URL: http://svnweb.freebsd.org/changeset/ports/310391

Log:
  Use pre-defined knob for the static build option (STATIC_BASH -> STATIC).

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

Modified: head/shells/bash-devel/Makefile
==============================================================================
--- head/shells/bash-devel/Makefile	Mon Jan 14 14:57:47 2013	(r310390)
+++ head/shells/bash-devel/Makefile	Mon Jan 14 14:59:07 2013	(r310391)
@@ -26,12 +26,11 @@ COMMENT=		The GNU Project's Bourne Again
 
 IGNOREFILES=		FAQ
 
-OPTIONS_DEFINE=	IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC_BASH SYSLOG DOCS
+OPTIONS_DEFINE=	IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS
 OPTIONS_DEFAULT=IMPLICITCD COLONBREAKSWORDS HELP NLS
 IMPLICITCD_DESC=	Use directory name alone to cd into it
 COLONBREAKSWORDS_DESC=	Colons break words
 HELP_DESC=		Install the help files
-STATIC_BASH_DESC=	Compile without shared libs
 SYSLOG_DESC=		Compile with syslog support
 
 .include <bsd.port.pre.mk>
@@ -62,7 +61,7 @@ CONFIGURE_ARGS=		--without-bash-malloc \
 			--disable-rpath \
 			--enable-disabled-builtins
 
-.if ${PORT_OPTIONS:MSTATIC_BASH} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no")
+.if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no")
 .if empty(PORT_OPTIONS:MNLS)
 WITHOUT_NLS=yes
 .endif

Modified: head/shells/bash-static-devel/Makefile
==============================================================================
--- head/shells/bash-static-devel/Makefile	Mon Jan 14 14:57:47 2013	(r310390)
+++ head/shells/bash-static-devel/Makefile	Mon Jan 14 14:59:07 2013	(r310391)
@@ -3,6 +3,6 @@
 
 MASTERDIR=	${.CURDIR}/../../shells/bash-devel
 
-OPTIONS_SET=	STATIC_BASH
+OPTIONS_SET=	STATIC
 
 .include "${MASTERDIR}/Makefile"