diff options
| -rw-r--r-- | shells/bash/Makefile | 10 | ||||
| -rw-r--r-- | shells/bash/distinfo | 2 | ||||
| -rw-r--r-- | shells/bash/files/patch-subst.c | 16 |
3 files changed, 10 insertions, 18 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 56ae9d2cda35..20cb20152e65 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -20,7 +20,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= ftp://ftp.cwru.edu/pub/%SUBDIR%/:bash PATCH_SITE_SUBDIR= ${PORTNAME}/${DISTNAME}-patches/:bash -.for patch in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 +.for patch in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 PATCHFILES+= ${PORTNAME}${PORTVERSION:R:S/.//g}-0${patch}:bash PATCHLEVEL= ${patch} .endfor @@ -83,6 +83,12 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 600006 +CONFIGURE_ARGS+= --with-installed-readline +.endif + post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 @@ -114,4 +120,4 @@ post-install: @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/shells/bash/distinfo b/shells/bash/distinfo index c00b548eb2b9..25e126124406 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -30,4 +30,6 @@ MD5 (bash/bash30-014) = d4b531e02b6a0287cffdbf527134ca29 SIZE (bash/bash30-014) = 1165 MD5 (bash/bash30-015) = adc1ab952b42ed0c0f53d1c308a32101 SIZE (bash/bash30-015) = 1480 +MD5 (bash/bash30-016) = a3bb09a185e4c6a813227f3e84e4f6e5 +SIZE (bash/bash30-016) = 2453 MD5 (bash/FAQ) = IGNORE diff --git a/shells/bash/files/patch-subst.c b/shells/bash/files/patch-subst.c deleted file mode 100644 index b55b2f5fa123..000000000000 --- a/shells/bash/files/patch-subst.c +++ /dev/null @@ -1,16 +0,0 @@ -# -# Fix broken array expansion -# -# http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00097.html -# ---- subst.c.orig Thu Aug 12 13:36:17 2004 -+++ subst.c Thu Sep 9 11:54:22 2004 -@@ -4900,7 +4900,7 @@ - case VT_ARRAYVAR: - a = (ARRAY *)value; - /* For arrays, the first value deals with array indices. */ -- len = array_max_index (a); /* arrays index from 0 to n - 1 */ -+ len = array_max_index (a) + 1; /* arrays index from 0 to n - 1 */ - break; - #endif - } |