4 files changed, 55 insertions, 77 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index b4940ff7aa83..8e1a7b686c61 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=		bash
 PATCHLEVEL=		17
-PORTVERSION=		3.1.${PATCHLEVEL:S/^0//g}
+PORTVERSION=		3.2.${PATCHLEVEL:S/^0//g}
 CATEGORIES=		shells
 MASTER_SITES=		${MASTER_SITE_GNU:S/$/:bash/} \
 			ftp://ftp.cwru.edu/pub/%SUBDIR%/:faq
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 8da2ba3c5669..3bf7d74a185a 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,56 +1,56 @@
-MD5 (bash/bash-3.1.tar.gz) = ef5304c4b22aaa5088972c792ed45d72
-SHA256 (bash/bash-3.1.tar.gz) = d6952b2c38f9bf417559dd3b071860e1099ddfb8a12c0228f22afaf47f79d3b9
-SIZE (bash/bash-3.1.tar.gz) = 2533934
-MD5 (bash/bash31-001) = c0d33bdfed6e4e6a9ae9200b77cd5c99
-SHA256 (bash/bash31-001) = 3b6d9151ca7a45dbcf43ebd1c6a647ef90c4b8eb54a245936fd6ffadc61fe727
-SIZE (bash/bash31-001) = 2708
-MD5 (bash/bash31-002) = 0c9be3bad344d04b79c4eac9eb39624c
-SHA256 (bash/bash31-002) = ecd248b1ca027368dae967502af5b28019eeee8fa3ee8d6a0210677789658f08
-SIZE (bash/bash31-002) = 7169
-MD5 (bash/bash31-003) = 04750485f335972f7a980a1bfe048dba
-SHA256 (bash/bash31-003) = 96cb8a42162a5876b2392b76fbfc78d073f50735e1e8a14e67e03b6e9c2b215d
-SIZE (bash/bash31-003) = 1324
-MD5 (bash/bash31-004) = 0c2856794ab16a4c224223c1964140c2
-SHA256 (bash/bash31-004) = a50ecd3f51e9a79f34855c68c61c9523fccb66da0870eade936cc1f64ba04415
-SIZE (bash/bash31-004) = 1470
-MD5 (bash/bash31-005) = 943233d7227071fa040c8b9eb016fa0c
-SHA256 (bash/bash31-005) = 3b057498f01cb2b528a154b9043261cb059846b23222409f7de95a7971dc6664
-SIZE (bash/bash31-005) = 1322
-MD5 (bash/bash31-006) = 68a41a9da7c669b4358837d06556a06f
-SHA256 (bash/bash31-006) = d155030ed49de27812d9ae01211283f7afe5e718ea4ed9babe1f121d25acf778
-SIZE (bash/bash31-006) = 1561
-MD5 (bash/bash31-007) = f6ca4950256fefd88d49c5702338e501
-SHA256 (bash/bash31-007) = fa89a6c808490e07cd7350ecb3390ce0ae6dc71d634c61c62991aafab97962c4
-SIZE (bash/bash31-007) = 3254
-MD5 (bash/bash31-008) = 4fd01140cb5875fe020939aab02791f0
-SHA256 (bash/bash31-008) = c30fe9da56261c7100c5b6794d4341b6b1fb6aa0ecc25b1010ac4ac25b07d1c7
-SIZE (bash/bash31-008) = 1422
-MD5 (bash/bash31-009) = 37aad0d5aa57881742ec6419faf9e480
-SHA256 (bash/bash31-009) = cfdc6dd92d0f47988ee59e2a26e8e62a87558e03908a26ee33dd0394228ac255
-SIZE (bash/bash31-009) = 2000
-MD5 (bash/bash31-010) = 91c52d2a51d41d4b6907758952aa0554
-SHA256 (bash/bash31-010) = 7ba8186d5e7de76c5b4e7c8905ad82b3d7cf459141eedc4ebcc6a0ca3b23cfc4
-SIZE (bash/bash31-010) = 5218
-MD5 (bash/bash31-011) = 37ace691fc4bd386fb764b5f53cde4a1
-SHA256 (bash/bash31-011) = 09cfa96d03b4a12bb85687e61797214222e188c4002f51962dffa51ab12ed998
-SIZE (bash/bash31-011) = 1462
-MD5 (bash/bash31-012) = cd5d17f0729a6da39a60039f2730e408
-SHA256 (bash/bash31-012) = b28bf4a491658879c43d4150cf0be1c48db97a594b6657c1cdeceabc226b8231
-SIZE (bash/bash31-012) = 1212
-MD5 (bash/bash31-013) = 31317d6a80bed2eb9b6fd3d12d304259
-SHA256 (bash/bash31-013) = 8b9a49bd03994f789198269c80b544b04e9056973bd75f843c05e40873c97088
-SIZE (bash/bash31-013) = 1133
-MD5 (bash/bash31-014) = 7f4aef181659265d822c48e774834975
-SHA256 (bash/bash31-014) = 48086c8572efebfab3535dfbd4767d95eaf98e7dcb7d1dd13698a16ab0580319
-SIZE (bash/bash31-014) = 2818
-MD5 (bash/bash31-015) = 1c05456b278235f578009b8fb2454a9a
-SHA256 (bash/bash31-015) = 3070548adf1c6ce481000b6bb96db7511637d6aef52276fe2f83e2bcb078865c
-SIZE (bash/bash31-015) = 3089
-MD5 (bash/bash31-016) = fbc981edfff97a0940487937db3fb202
-SHA256 (bash/bash31-016) = 2438b71c7fadf2971141e6854d317804e143d86eefd6d7b4479d62afd385ebad
-SIZE (bash/bash31-016) = 1295
-MD5 (bash/bash31-017) = b08ffabafce3a967e3a7e0a5b29d8331
-SHA256 (bash/bash31-017) = 8fb3ac54b9536ad1ba829f229f1ab906ab2af005f2bfa733f2687245e1569407
-SIZE (bash/bash31-017) = 3640
+MD5 (bash/bash-3.2.tar.gz) = 00bfa16d58e034e3c2aa27f390390d30
+SHA256 (bash/bash-3.2.tar.gz) = 26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4
+SIZE (bash/bash-3.2.tar.gz) = 2529838
+MD5 (bash/bash32-001) = d8e10c754f477e3f3a581af566b89301
+SHA256 (bash/bash32-001) = beda60ce6186fafa36cd0a98db9ced42cff68daee4342cca73167fb0f2f43eaa
+SIZE (bash/bash32-001) = 1539
+MD5 (bash/bash32-002) = d38a5288b2f0ea6c9ac76b66cc74ef7d
+SHA256 (bash/bash32-002) = a0ca49a3c47678ad074c990bdc871fcec680749b7f04f2def6527f04c589c40a
+SIZE (bash/bash32-002) = 1524
+MD5 (bash/bash32-003) = 0b90d37911827d8cb95f3b4353cc225e
+SHA256 (bash/bash32-003) = 7ec9e5e7e402e43b12bfd3a9237f4f171029fc7f58e59335abf3ccb455a5a84d
+SIZE (bash/bash32-003) = 4599
+MD5 (bash/bash32-004) = 8062f3a59631f58d78b180d83759b68a
+SHA256 (bash/bash32-004) = 3de0938673637089c3b0f0f355de377bb2be2d3fca68053dda267ca11b5998f2
+SIZE (bash/bash32-004) = 2585
+MD5 (bash/bash32-005) = 585b5943fadf0875ced243b245adde58
+SHA256 (bash/bash32-005) = e7fecdecb12320cd6fe9aca83fab1828b76aeb5313b991883764cb9139d845b7
+SIZE (bash/bash32-005) = 5910
+MD5 (bash/bash32-006) = 1d5732e01ea938aeed42f3def131fa4d
+SHA256 (bash/bash32-006) = 8f14f81ced32bc057bc10abf6842f4a5ac172816631f2b87a5a3be4f01c0847d
+SIZE (bash/bash32-006) = 1298
+MD5 (bash/bash32-007) = dcd0cc5d801607827f7c851e72b0eabc
+SHA256 (bash/bash32-007) = 6863a712e5a68eccfb77162a9f947ffd80af648f0124c38f795ebba2be12eff8
+SIZE (bash/bash32-007) = 1375
+MD5 (bash/bash32-008) = bb3c7dd11198c0ab93d0e960bebf6256
+SHA256 (bash/bash32-008) = ccf303b4d199d89d5efc659235f8a645376e86d294260dda4becbb61ec06667b
+SIZE (bash/bash32-008) = 1302
+MD5 (bash/bash32-009) = 434a6f29b0ca5f1ab784b2437ae8eaed
+SHA256 (bash/bash32-009) = ef30c579419106b4b4a2d0064ef7e57ceee6cdf657f4ccd7b89c8e4fd70560d8
+SIZE (bash/bash32-009) = 1882
+MD5 (bash/bash32-010) = 2efff04dd246fcf63bd4b99f77c9a081
+SHA256 (bash/bash32-010) = bb7df9fefe88d62ee371353edf62402a667cffba6ea202aa1c8b220308a0c612
+SIZE (bash/bash32-010) = 6293
+MD5 (bash/bash32-011) = 1dd104342f6920dfaf5efb3131e922e0
+SHA256 (bash/bash32-011) = 85bf656cfc49b1447b061341a4b1cb93ba89a41d8d1699a65aa971d1853ba472
+SIZE (bash/bash32-011) = 4776
+MD5 (bash/bash32-012) = 4f24b696ab78bdfae4f9cb7eb59b835d
+SHA256 (bash/bash32-012) = 45ef4ad98f2f218aa3acec15842ae1b833769c1dbe2f90c9bba00bbe4949fc43
+SIZE (bash/bash32-012) = 2555
+MD5 (bash/bash32-013) = 7c40addbf1187a26ae1c8373ed383442
+SHA256 (bash/bash32-013) = 9fbf893c383f45d25e5bc5c9eae8d2b349521f288945b3bd21c781784b81f693
+SIZE (bash/bash32-013) = 1852
+MD5 (bash/bash32-014) = 28e88c9f8679e99ac590d4a4a8227c56
+SHA256 (bash/bash32-014) = 62bb1a4d70f6f7938ca70a6aa7fe6f4b377ab5f450c7756b22b41de3bbd98ed6
+SIZE (bash/bash32-014) = 8141
+MD5 (bash/bash32-015) = 7c17d29675bd0d49470f162774385f80
+SHA256 (bash/bash32-015) = de40425e83628eb7431f39340ac09b42b5fcf484a565352851961b3e917d8771
+SIZE (bash/bash32-015) = 2293
+MD5 (bash/bash32-016) = a1edaa98b4449fe2205fa75448b7b105
+SHA256 (bash/bash32-016) = 7abf66bbba3ebd6b6428190f3ebca59abdc0bfa3957f1a725489de7391c2d9f1
+SIZE (bash/bash32-016) = 1620
+MD5 (bash/bash32-017) = 889ed119bbf9d363660b9a0127f35efa
+SHA256 (bash/bash32-017) = 951aa2a07b38db8eea8e7368d3ac36af60af7f5ade455215006229ce3815dfe0
+SIZE (bash/bash32-017) = 2611
 MD5 (bash/FAQ) = IGNORE
 SHA256 (bash/FAQ) = IGNORE
diff --git a/shells/bash/files/patch-builtins::Makefile.in b/shells/bash/files/patch-builtins::Makefile.in
deleted file mode 100644
index 6ff8ae5d6d75..000000000000
--- a/shells/bash/files/patch-builtins::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- builtins/Makefile.in.orig	Wed Dec 28 19:49:25 2005
-+++ builtins/Makefile.in	Wed Dec 28 19:50:01 2005
-@@ -178,7 +178,7 @@
- 
- install-help:
- 	@-if test -n "${HELPDIR}" && test -d helpfiles ; then \
--		test -d ${HELPDIR} || ${SHELL} ${MKDIRS} $(DESTDIR)$(HELPDIR) ;\
-+		test -d ${DESTDIR}${HELPDIR} || ${SHELL} ${MKDIRS} $(DESTDIR)$(HELPDIR) ;\
- 		( for f in helpfiles/*; do \
- 			echo installing $$f; \
- 			${INSTALL_DATA} $$f $(DESTDIR)$(HELPDIR); \
diff --git a/shells/bash/files/patch-support::mkversion.sh b/shells/bash/files/patch-support::mkversion.sh
deleted file mode 100644
index 0f8b460281cb..000000000000
--- a/shells/bash/files/patch-support::mkversion.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- support/mkversion.sh.orig	Sat Sep 11 11:08:31 2004
-+++ support/mkversion.sh	Wed Dec 28 20:15:34 2005
-@@ -67,7 +67,7 @@
- # increment the build version if that's what's required
- 
- if [ -n "$inc_build" ]; then
--	build_ver=`expr $build_ver + 1`
-+	build_ver=`expr 1 + $build_ver`
- fi
- 
- # what's the patch level?