aboutsummaryrefslogtreecommitdiffstats
path: root/shells/bash
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-09-13 08:43:09 +0800
committerobrien <obrien@FreeBSD.org>2002-09-13 08:43:09 +0800
commit5f967ce2d5c3602aea0415809af328249b0afe65 (patch)
treed03dbab7f309742b6f50f921edf668a5481e815c /shells/bash
parent2fb95f2ea2cf52bec5974e034fe515fb6cf38fb6 (diff)
downloadfreebsd-ports-gnome-5f967ce2d5c3602aea0415809af328249b0afe65.tar.gz
freebsd-ports-gnome-5f967ce2d5c3602aea0415809af328249b0afe65.tar.zst
freebsd-ports-gnome-5f967ce2d5c3602aea0415809af328249b0afe65.zip
Use offical vendor patches 1-4.
Diffstat (limited to 'shells/bash')
-rw-r--r--shells/bash/Makefile10
-rw-r--r--shells/bash/distinfo3
-rw-r--r--shells/bash/files/patch-bind.c16
3 files changed, 9 insertions, 20 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 643a522d66bd..44a36b0f1bf2 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -7,23 +7,25 @@
#
PORTNAME= bash
-PORTVERSION= 2.05b
-PORTREVISION?= 1
+PORTVERSION= 2.05b.004
+PORTREVISION?= 0
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.cwru.edu/pub/bash/
MASTER_SITE_SUBDIR= bash
.if !defined(NOPORTDOCS)
-DISTFILES= bash-${PORTVERSION}.tar.gz bash-doc-${PORTVERSION}.tar.gz
+DISTFILES= bash-${PORTVERSION:C/\....$//}.tar.gz \
+ bash-doc-${PORTVERSION:C/\....$//}.tar.gz
.endif
PATCH_SITES= ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/
-PATCHFILES= bash205b-003
+PATCHFILES= bash205b-001 bash205b-002 bash205b-003 bash205b-004
MAINTAINER= obrien@FreeBSD.org
.include <bsd.port.pre.mk>
+WRKSRC= ${WRKDIR}/bash-${PORTVERSION:C/\....$//}
GNU_CONFIGURE= Yes
CONFIGURE_ARGS= --with-installed-readline
CONFIGURE_ENV= LDFLAGS=-static
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 6d4f0fbcdc85..9935773137b2 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,3 +1,6 @@
MD5 (bash-2.05b.tar.gz) = 5238251b4926d778dfe162f6ce729733
MD5 (bash-doc-2.05b.tar.gz) = 511b2d07f0f401f686e8edc551a8e47f
+MD5 (bash205b-001) = 94e520fa0272b06fb03fc46042095b62
+MD5 (bash205b-002) = 2957bbe5f6db1830d649d1071baba63c
MD5 (bash205b-003) = 2828e78563927b806246e2b4806ee0f5
+MD5 (bash205b-004) = 6bf89831209ba6d208943d2ebaa7fe3a
diff --git a/shells/bash/files/patch-bind.c b/shells/bash/files/patch-bind.c
deleted file mode 100644
index f2e14e4e0cc4..000000000000
--- a/shells/bash/files/patch-bind.c
+++ /dev/null
@@ -1,16 +0,0 @@
-*** lib/readline/bind.c.orig Thu Jan 24 11:15:52 2002
---- lib/readline/bind.c Wed Jul 31 09:11:18 2002
-***************
-*** 312,316 ****
- and the function bound to `a' to be executed when the user
- types `abx', leaving `bx' in the input queue. */
-! if (k.function /* && k.type == ISFUNC */)
- {
- map[ANYOTHERKEY] = k;
---- 312,316 ----
- and the function bound to `a' to be executed when the user
- types `abx', leaving `bx' in the input queue. */
-! if (k.function && ((k.type == ISFUNC && k.function != rl_do_lowercase_version) || k.type == ISMACR))
- {
- map[ANYOTHERKEY] = k;
-