From owner-svn-ports-head@FreeBSD.ORG  Mon Jan 14 14:59:08 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4E8B6731;
 Mon, 14 Jan 2013 14:59:08 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 40B02DC5;
 Mon, 14 Jan 2013 14:59:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0EEx8W3018558;
 Mon, 14 Jan 2013 14:59:08 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0EEx7uJ018556;
 Mon, 14 Jan 2013 14:59:07 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201301141459.r0EEx7uJ018556@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Mon, 14 Jan 2013 14:59:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310391 - in head/shells: bash-devel bash-static-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Jan 2013 14:59:08 -0000

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"