From 44499a41cb98ade21314a290e1ca67c5da8e778a Mon Sep 17 00:00:00 2001
From: marc <marc@openbsd.org>
Date: Mon, 30 Mar 1998 22:03:43 +0000
Subject: [PATCH] upgrade to bash-2.01.1;  Make "check /etc/shells" message
 stand out; update DESC; update PLIST so a package can be generated; verify
 package add and delete work correctly.

---
 shells/bash2/Makefile         | 29 ++++++++++++++---------------
 shells/bash2/files/md5        |  2 +-
 shells/bash2/patches/patch-aa | 21 ---------------------
 shells/bash2/patches/patch-ab | 19 -------------------
 shells/bash2/patches/patch-ac | 19 -------------------
 shells/bash2/patches/patch-ae | 16 ----------------
 shells/bash2/pkg/DESCR        | 16 ++++++++--------
 shells/bash2/pkg/PLIST        | 17 ++++++++++++++++-
 8 files changed, 39 insertions(+), 100 deletions(-)
 delete mode 100644 shells/bash2/patches/patch-aa
 delete mode 100644 shells/bash2/patches/patch-ab
 delete mode 100644 shells/bash2/patches/patch-ac
 delete mode 100644 shells/bash2/patches/patch-ae

diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index a7c77d99e92..16c862b682b 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,17 +1,16 @@
 # OpenBSD makefile for:	bash
-# Version required:     2.01
+# Version required:     2.01.1
 # Date created:		17 November 1997
 # Whom:			gene
 #
-# $OpenBSD: Makefile,v 1.4 1997/12/13 00:07:24 gene Exp $
+# $OpenBSD: Makefile,v 1.5 1998/03/30 22:03:43 marc Exp $
 #
 
-DISTNAME=       bash-2.01
+DISTNAME=       bash-2.01.1
 CATEGORIES=	shells
-MASTER_SITES=	ftp://slc2.ins.cwru.edu/pub/dist/  \
-		${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU}
 .if !defined(NOPORTDOCS)
-DISTFILES=      bash-2.01.tar.gz bash-doc-2.01.tar.gz
+DISTFILES=      bash-2.01.1.tar.gz bash-doc-2.01.tar.gz
 .endif
 
 MAINTAINER=	gene@OpenBSD.ORG
@@ -19,9 +18,6 @@ MAINTAINER=	gene@OpenBSD.ORG
 GNU_CONFIGURE=	Yes
 MAN1=		bash.1 bashbug.1
 
-post-patch:
-	$(CP) /usr/include/fnmatch.h ${WRKSRC}/lib/glob/fnmatch.h
-
 pre-install:
 	if [ ! -s ${PREFIX}/info/dir ]; then \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
@@ -44,11 +40,14 @@ post-install:
 		${PREFIX}/share/doc/bash
 	${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
 .endif
-	@$(ECHO) "Finished installing $(DISTNAME)"
-	@$(ECHO) "To complete the install, you should notify the system"
-	@$(ECHO) "that $(PREFIX)/bin/bash is a valid shell by adding it to"
-	@$(ECHO) "/etc/shells."
-	@$(ECHO) "If you are unfamiliar with this file, consult the shells(5)"
-	@$(ECHO) "manual page."
+	@${ECHO} ""
+	@${ECHO} "*** Finished installing $(DISTNAME)"
+	@${ECHO} "*** To complete the install, you should notify the system"
+	@${ECHO} "*** that $(PREFIX)/bin/bash is a valid shell by adding it to"
+	@${ECHO} "*** the file /etc/shells."
+	@${ECHO} "***"
+	@${ECHO} "*** If you are unfamiliar with this file, consult the"
+	@${ECHO} "*** shells(5) manual page."
+	@${ECHO} ""
 
 .include <bsd.port.mk>
diff --git a/shells/bash2/files/md5 b/shells/bash2/files/md5
index 79d2c265685..591457c9464 100644
--- a/shells/bash2/files/md5
+++ b/shells/bash2/files/md5
@@ -1,2 +1,2 @@
-MD5 (bash-2.01.tar.gz) = 51837bb4662144b64bd874585c057752
+MD5 (bash-2.01.1.tar.gz) = 556e0b6c98c1fdb88b25a5d783f4a655
 MD5 (bash-doc-2.01.tar.gz) = 5f2f59032f9dd63dde0e464af5b5346c
diff --git a/shells/bash2/patches/patch-aa b/shells/bash2/patches/patch-aa
deleted file mode 100644
index 16d0302deba..00000000000
--- a/shells/bash2/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-*** doc/Makefile.in.bak	Fri Jan 31 00:12:33 1997
---- doc/Makefile.in	Sat Jun 28 02:23:01 1997
-***************
-*** 155,161 ****
-  	-$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info
-  # run install-info if it is present to update the info directory
-  	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-! 		install-info --dir-file=$(infodir)/dir $(infodir)/bash.info; \
-  	else true; fi
-  
-  uninstall:
---- 155,163 ----
-  	-$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info
-  # run install-info if it is present to update the info directory
-  	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-! 		install-info \
-! 		--defentry="* BASH: (bash).                 Bash Reference Manual." \
-! 		--dir-file=$(infodir)/dir $(infodir)/bash.info; \
-  	else true; fi
-  
-  uninstall:
diff --git a/shells/bash2/patches/patch-ab b/shells/bash2/patches/patch-ab
deleted file mode 100644
index 46c5e4f858c..00000000000
--- a/shells/bash2/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.in.bak	Wed Dec 18 22:57:21 1996
---- Makefile.in	Fri Dec 27 14:20:11 1996
-***************
-*** 499,505 ****
-  
-  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 ----
-  
-  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/bash2/patches/patch-ac b/shells/bash2/patches/patch-ac
deleted file mode 100644
index 69790098164..00000000000
--- a/shells/bash2/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-*** lib/glob/Makefile.in.orig	Fri Oct  4 19:02:34 1996
---- lib/glob/Makefile.in	Tue May 27 01:48:43 1997
-***************
-*** 45,51 ****
-  # The header files for this library.
-  HSOURCES = $(srcdir)/fnmatch.h
-  
-! OBJECTS = glob.o fnmatch.o
-  
-  # The texinfo files which document this library.
-  DOCSOURCE = doc/glob.texi
---- 45,51 ----
-  # The header files for this library.
-  HSOURCES = $(srcdir)/fnmatch.h
-  
-! OBJECTS = glob.o #fnmatch.o
-  
-  # The texinfo files which document this library.
-  DOCSOURCE = doc/glob.texi
diff --git a/shells/bash2/patches/patch-ae b/shells/bash2/patches/patch-ae
deleted file mode 100644
index d29f6b5493c..00000000000
--- a/shells/bash2/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
---- builtins/enable.def~        Wed Oct  2 13:47:05 1996
-+++ builtins/enable.def Tue May  6 14:18:09 1997
-@@ -284,9 +284,10 @@
-       name = list->word->word;
-
-       size = strlen (name);
--      struct_name = xmalloc (size + 8);
--      strcpy (struct_name, name);
--      strcpy (struct_name + size, "_struct");
-+      struct_name = xmalloc (size + 9);
-+      *struct_name = '_';
-+      strcpy (struct_name + 1, name);
-+      strcpy (struct_name + size + 1, "_struct");
-
-       b = (struct builtin *)dlsym (handle, struct_name);
-       if (b == 0)
diff --git a/shells/bash2/pkg/DESCR b/shells/bash2/pkg/DESCR
index 497fcff47de..33918c37f7f 100644
--- a/shells/bash2/pkg/DESCR
+++ b/shells/bash2/pkg/DESCR
@@ -1,8 +1,8 @@
-Bash is the GNU Project's Bourne
-Again SHell, an interactive shell with Bourne shell syntax (/bin/sh);
-but also with interactive command line editing, job control on
-architectures that support it, Csh-like history features and brace
-expansion, and a slew of other stuff.  For more information on the
-features of Bash that are new to this type of shell, see the file
-`documentation/features.texi'.  There is also a processed DVI file
-there, as well as a large man page.
+Bash is the GNU Project's Bourne Again SHell, an interactive shell
+with Bourne shell syntax (/bin/sh);  but also with interactive command
+line editing, job control on architectures that support it, Csh-like
+history features and brace expansion, and a slew of other stuff.
+
+For more information on the features of Bash that are new to this type
+of shell, see the file `documentation/features.texi'.  There is also a
+processed DVI file there, as well as a large man page.
diff --git a/shells/bash2/pkg/PLIST b/shells/bash2/pkg/PLIST
index 3da47bd5d8d..fdf8ece4bdd 100644
--- a/shells/bash2/pkg/PLIST
+++ b/shells/bash2/pkg/PLIST
@@ -1,12 +1,27 @@
 bin/bash
-@unexec echo "Don't forget to remove bash from /etc/shells"
 bin/bashbug
 man/man1/bash.1
 man/man1/bashbug.1
+@unexec install-info --delete %D/info/bash.info %D/info/dir
 info/bash.info
+@exec install-info  %D/info/bash.info %D/info/dir
+@exec if [ ! -d %D/share/doc/bash ]; then mkdir -p %D/share/doc/bash; fi
 share/doc/bash/article.ps.gz
 share/doc/bash/bashref.ps.gz
 share/doc/bash/bash.html
 share/doc/bash/bashref.html
 share/doc/bash/bashref_toc.html
 share/doc/bash/article.txt
+@dirrm share/doc/bash
+@exec echo ""
+@exec echo "*** Finished installing bash-2.01.1."
+@exec echo "*** To complete the install, you should notify the system"
+@exec echo "*** that %D/bin/bash is a valid shell by adding it to"
+@exec echo "*** the file /etc/shells."
+@exec echo "***"
+@exec echo "*** If you are unfamiliar with this file, consult the"
+@exec echo "*** shells(5) manual page."
+@exec echo ""
+@unexec echo ""
+@unexec echo "*** Don't forget to remove bash from /etc/shells"
+@unexec echo ""