From flz@xbsd.org  Wed Nov 30 19:38:55 2005
Return-Path: <flz@xbsd.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8DC1F16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Nov 2005 19:38:55 +0000 (GMT)
	(envelope-from flz@xbsd.org)
Received: from smtp.xbsd.org (xbsd.org [82.233.2.192])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 94B5343D6D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Nov 2005 19:38:33 +0000 (GMT)
	(envelope-from flz@xbsd.org)
Received: from localhost (localhost.xbsd.org [127.0.0.1])
	by smtp.xbsd.org (Postfix) with ESMTP id 628821182B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Nov 2005 20:38:32 +0100 (CET)
Received: from smtp.xbsd.org ([127.0.0.1])
 by localhost (srv1.xbsd.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
 id 51918-04 for <FreeBSD-gnats-submit@freebsd.org>;
 Wed, 30 Nov 2005 20:38:26 +0100 (CET)
Received: from cream.xbsd.org (cream.xbsd.org [192.168.42.6])
	by smtp.xbsd.org (Postfix) with SMTP id 1EC2A114A7
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Nov 2005 20:38:25 +0100 (CET)
Received: by cream.xbsd.org (sSMTP sendmail emulation); Wed, 30 Nov 2005 20:37:46 +0000
Message-Id: <20051130193825.1EC2A114A7@smtp.xbsd.org>
Date: Wed, 30 Nov 2005 20:37:46 +0000
From: "Florent Thoumie" <flz@xbsd.org>
Reply-To: Florent Thoumie <flz@xbsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: shells/bash{,2} - Rename WANT_STATIC_BASH to WITH_STATIC_BASH
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         89772
>Category:       ports
>Synopsis:       Update port: shells/bash{,2} - Rename WANT_STATIC_BASH to WITH_STATIC_BASH
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    obrien
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 30 19:40:03 GMT 2005
>Closed-Date:    Mon Dec 05 10:53:02 GMT 2005
>Last-Modified:  Mon Dec 05 10:53:02 GMT 2005
>Originator:     Florent Thoumie
>Release:        FreeBSD 6.0-RELEASE amd64
>Organization:
Xbsd.org
>Environment:
System: FreeBSD cream.xbsd.org 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Mon Nov 14 19:52:46 UTC 2005 root@cream.xbsd.org:/usr/src/sys/amd64/compile/CREAM amd64


	
>Description:

WANT_ prefix is not a user-variable prefix. Use WITH_ instead.

>How-To-Repeat:

N/A

>Fix:

	

--- bash.diff begins here ---
Index: bash/Makefile
===================================================================
RCS file: /home/pcvs/ports/shells/bash/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- bash/Makefile	30 Nov 2005 15:10:12 -0000	1.85
+++ bash/Makefile	30 Nov 2005 19:35:03 -0000
@@ -56,7 +56,7 @@
 			--disable-rpath \
 			--enable-disabled-builtins
 
-.if defined(WANT_STATIC_BASH) || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no")
+.if defined(WITH_STATIC_BASH) || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no")
 .if !defined(WITHOUT_NLS)
 WITHOUT_NLS=yes
 .endif
Index: bash2/Makefile
===================================================================
RCS file: /home/pcvs/ports/shells/bash2/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- bash2/Makefile	16 Oct 2005 05:21:09 -0000	1.77
+++ bash2/Makefile	30 Nov 2005 19:35:03 -0000
@@ -36,7 +36,7 @@
 WRKSRC=		${WRKDIR}/bash-${PORTVERSION:C/\....$//}
 GNU_CONFIGURE=	Yes
 CONFIGURE_ARGS=	--with-installed-readline
-.if defined(WANT_STATIC_BASH) || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ( ${NOSHARED} != "no" && ${NOSHARED} != "NO" ))
+.if defined(WITH_STATIC_BASH) || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ( ${NOSHARED} != "no" && ${NOSHARED} != "NO" ))
 CONFIGURE_ARGS+= --enable-static-link
 .else
 CONFIGURE_ARGS+= --enable-static-link=no
--- bash.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->obrien 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Nov 30 19:42:17 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=89772 
State-Changed-From-To: open->closed 
State-Changed-By: flz 
State-Changed-When: Mon Dec 5 10:53:01 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=89772 
>Unformatted:
