From owner-freebsd-ports@FreeBSD.ORG Thu Apr 15 07:17:17 2010 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B08D61065676 for ; Thu, 15 Apr 2010 07:17:17 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 583548FC29 for ; Thu, 15 Apr 2010 07:17:17 +0000 (UTC) Received: (qmail 7108 invoked by uid 399); 15 Apr 2010 07:17:16 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 15 Apr 2010 07:17:16 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4BC6BD7B.4040904@FreeBSD.org> Date: Thu, 15 Apr 2010 00:17:15 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: obrien@freebsd.org References: <20100412222300.GA72952@dragon.NUXI.org> In-Reply-To: <20100412222300.GA72952@dragon.NUXI.org> X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: multipart/mixed; boundary="------------070907060503050804020703" Cc: ports@freebsd.org Subject: Re: [PATCH] upgrade Bash port to version 4.1. X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Apr 2010 07:17:17 -0000 This is a multi-part message in MIME format. --------------070907060503050804020703 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 04/12/10 15:23, David O'Brien wrote: > Hi Folks, > > Bash 4.1 seems stable enough at PL5 to replace version 4.0 in > '/usr/ports/shells/bash'. Agreed, I tested the PL5 with your patch and it seems fine. Please consider the attached patch as well, that adds OPTIONS generally for the knobs already in the port, and a new option to use bash's readline instead of the base version. hth, Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ --------------070907060503050804020703 Content-Type: text/plain; name="bash-options.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="bash-options.diff" diff -ur /usr/local/tmp/bash/Makefile ./Makefile --- /usr/local/tmp/bash/Makefile 2010-04-14 22:26:35.000000000 -0700 +++ ./Makefile 2010-04-14 22:24:48.000000000 -0700 @@ -31,6 +31,15 @@ IGNOREFILES= FAQ +OPTIONS= IMPLICITCD "Use directory name alone to cd into it" on \ + COLONBREAKSWORDS "Colons break words" on \ + HELP "Install the help files" on \ + INST_READL "Use readline from base, otherwise bash's" on \ + NLS "National Language Support" on \ + STATIC_BASH "Compile without shared libs" off + +.include + .if !defined(WITHOUT_IMPLICITCD) EXTRA_PATCHES+= ${PATCHDIR}/xpatch-implicitcd .endif @@ -87,6 +96,10 @@ PLIST_SUB+= NLS="" .endif +.if !defined(WITHOUT_INST_READL) +CONFIGURE_ARGS+= --with-installed-readline +.endif + CPPFLAGS+= ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -95,8 +108,6 @@ LDFLAGS="${LDFLAGS}" \ YACC="bison -y" -.include - post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 Only in .: work --------------070907060503050804020703--