5 files changed, 49 insertions, 61 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index c3428d3a60db..04a9218b42cb 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,18 +1,19 @@
 # New ports collection makefile for:	bash
-# Version required:     1.14.7
+# Version required:     2.0
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.18 1996/12/27 06:01:29 obrien Exp $
+# $Id: Makefile,v 1.19 1996/12/27 06:26:05 obrien Exp $
 #
 
-DISTNAME=       bash-1.14.7
+DISTNAME=       bash-2.0
 CATEGORIES=	shells
 MASTER_SITES=   ftp://slc2.ins.cwru.edu/pub/dist/
 
 MAINTAINER=     ache@FreeBSD.ORG
 
-NOMANCOMPRESS=	"Don't compress manpages or .so does not work."
-MAN1=		bash.1 bash_builtins.1
+GNU_CONFIGURE=  Yes
+
+MAN1=           bash.1 bashbug.1
 
 .include <bsd.port.mk>
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 721cbbd91ab6..fb1544e5a3a1 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1 +1 @@
-MD5 (bash-1.14.7.tar.gz) = 2ba8f27c9861d57826e695278a240a04
+MD5 (bash-2.0.tar.gz) = b88fd6607a6b9b5ebee34ff283c5ba63
diff --git a/shells/bash/files/patch-aa b/shells/bash/files/patch-aa
new file mode 100644
index 000000000000..34865eecc333
--- /dev/null
+++ b/shells/bash/files/patch-aa
@@ -0,0 +1,24 @@
+*** configure.bak	Wed Dec 18 23:01:41 1996
+--- configure	Fri Dec 27 14:07:59 1996
+***************
+*** 694,699 ****
+--- 694,700 ----
+  sparc-svr4*)	opt_gnu_malloc=no ;;	# sparc SVR4, SVR4.2
+  sparc-netbsd*)	opt_gnu_malloc=no ;;	# needs 8-byte alignment
+  sparc-linux*)	opt_gnu_malloc=no ;;	# sparc running linux; requires ELF
++ *-freebsd*)     opt_gnu_malloc=no ;;    # has faster malloc
+  *-aix*)		opt_gnu_malloc=no ;;	# AIX machines
+  *-nextstep*)	opt_gnu_malloc=no ;;	# NeXT machines running NeXTstep
+  *-dgux*)	opt_gnu_malloc=no ;;	# DG/UX machines
+*** configure.in.bak	Tue Dec 17 20:49:09 1996
+--- configure.in	Fri Dec 27 14:07:59 1996
+***************
+*** 36,41 ****
+--- 36,42 ----
+  sparc-svr4*)	opt_gnu_malloc=no ;;	# sparc SVR4, SVR4.2
+  sparc-netbsd*)	opt_gnu_malloc=no ;;	# needs 8-byte alignment
+  sparc-linux*)	opt_gnu_malloc=no ;;	# sparc running linux; requires ELF
++ *-freebsd*)     opt_gnu_malloc=no ;;    # has faster malloc
+  *-aix*)		opt_gnu_malloc=no ;;	# AIX machines
+  *-nextstep*)	opt_gnu_malloc=no ;;	# NeXT machines running NeXTstep
+  *-dgux*)	opt_gnu_malloc=no ;;	# DG/UX machines
diff --git a/shells/bash/files/patch-ab b/shells/bash/files/patch-ab
index 908154888e5c..46c5e4f858c3 100644
--- a/shells/bash/files/patch-ab
+++ b/shells/bash/files/patch-ab
@@ -1,56 +1,19 @@
-*** cpp-Makefile.orig	Sun Jun 11 22:44:05 1995
---- cpp-Makefile	Wed Jul 19 20:17:18 1995
+*** Makefile.in.bak	Wed Dec 18 22:57:21 1996
+--- Makefile.in	Fri Dec 27 14:20:11 1996
 ***************
-*** 133,139 ****
---- 133,143 ----
-     /usr/include.  Then it will break.) */
-  CC = gcc -traditional -I/usr/include $(GCC_EXTRAS)
-  #  else /* HAVE_FIXED_INCLUDES */
-+ #ifdef __FreeBSD__
-+ CC += $(GCC_EXTRAS)
-+ #else
-  CC = gcc $(GCC_EXTRAS)
-+ #endif
-  #  endif /* HAVE_FIXED_INCLUDES */
-  #else /* !HAVE_GCC */
-  CC = CPP_CC
-***************
-*** 151,158 ****
---- 155,167 ----
-  AR = ar
-  
-  INSTALL = $(SUPPORT_SRC)install.sh
-+ #ifndef __FreeBSD__
-  INSTALL_PROGRAM = $(INSTALL) -c
-  INSTALL_DATA = $(INSTALL) -c -m 644
-+ #else
-+ INSTALL_PROGRAM = install -c -o bin -g bin -m 555
-+ INSTALL_DATA = install -c -o bin -g bin -m 644
-+ #endif
+*** 499,505 ****
   
-  COMPRESS = gzip
-  COMPRESS_EXT = .gz
-***************
-*** 300,306 ****
---- 309,317 ----
-  /**/# The GNU coding standards don't recognize the possibility that
-  /**/# other information besides optimization and debugging might be
-  /**/# passed to cc.  A different name should have been used.
-+ #ifndef __FreeBSD__
-  CFLAGS = -O -g
-+ #endif
+  install:	.made installdirs
+  	$(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program)
+! 	$(INSTALL_PROGRAM) bashbug $(bindir)/bashbug
+  	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
+  		man1dir=$(man1dir) man1ext=$(man1ext) \
+  		man3dir=$(man3dir) man3ext=$(man3ext) \
+--- 499,505 ----
   
-  SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \
-         $(GROUPS) $(RESOURCE) $(PARAM) $(SIGHANDLER) $(SYSDEP) $(WAITH) \
-***************
-*** 308,313 ****
---- 319,327 ----
-         $(VARARGSH) $(STRCHR) $(STRCASE) $(DEVFD) \
-         -D$(Machine) -D$(OS)
-  LDFLAGS	= $(NOSHARE) $(SYSDEP_LD) $(EXTRA_LD_PATH) $(PROFILE_FLAGS) $(CFLAGS)
-+ #ifdef __FreeBSD__
-+ LDFLAGS += -s
-+ #endif
-  CCFLAGS	= $(PROFILE_FLAGS) $(SYSTEM_FLAGS) -DSHELL $(ALLOCA_CFLAGS) \
-  	  $(MALLOC_CFLAGS) $(CFLAGS)
-  CPPFLAGS= -I. -I$(srcdir) -I$(LIBSRC)
+  install:	.made installdirs
+  	$(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program)
+! 	$(INSTALL) -m 555 bashbug $(bindir)/bashbug
+  	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
+  		man1dir=$(man1dir) man1ext=$(man1ext) \
+  		man3dir=$(man3dir) man3ext=$(man3ext) \
diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist
index 1824684a3b09..84a9302c4918 100644
--- a/shells/bash/pkg-plist
+++ b/shells/bash/pkg-plist
@@ -2,6 +2,6 @@ bin/bash
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
 bin/bashbug
-man/man1/bash.1
-man/man1/bash_builtins.1
+man/man1/bash.1.gz
+man/man1/bashbug.1.gz
 info/bash.info