[PATCH] upgrade Bash port to version 4.1.

[Doug Barton]

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/

-------------- next part --------------
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 <bsd.port.pre.mk>
+
 .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 <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
 
Only in .: work