Install the bash documentation in a separate package. This removes any

dependency on texinfo should the base system not have it.  Bump the
PKGREVISION.

4 files changed, 26 insertions, 44 deletions

diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 0eb6d975e4c..c9299ed1f22 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.34 2002/08/25 21:50:50 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2002/09/26 22:06:29 jlam Exp $
 #
 
-V=		2.05
-DV=		2.05
-DISTNAME=	bash-${V}
-PKGREVISION=	1
+DISTNAME=	bash-2.05
+PKGREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://slc2.ins.cwru.edu/pub/dist/
-DISTFILES=      bash-${V}.tar.gz bash-doc-${DV}.tar.gz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
@@ -38,7 +35,7 @@ GETTEXT_PREFIX_DEFAULT=	${LOCALBASE}
 # Remove -I$(includedir) from the INCLUDES passed to the compiler.  We
 # want the build to be completely self-contained.
 #
-post-patch:
+pre-build:
 	cd ${WRKSRC};							\
 	files="Makefile.in";						\
 	for file in $${files}; do					\
@@ -58,24 +55,13 @@ pre-configure:
 	done
 
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/man/man1
 	${TOUCH} /etc/shells
 	${CP} /etc/shells /etc/shells.bak
 	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak || ${TRUE}; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells
 	${RM} /etc/shells.bak
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bash
-	${INSTALL_MAN}  \
-		${WRKDIR}/doc/article.ps  \
-		${WRKDIR}/doc/bashref.ps  \
-		${WRKDIR}/doc/article.txt  \
-		${PREFIX}/share/doc/bash
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/bash
-	${INSTALL_MAN} \
-		${WRKDIR}/doc/bash.html  \
-		${WRKDIR}/doc/bashref.html  \
-		${PREFIX}/share/doc/html/bash
-	${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
 
 CPPFLAGS:=	-I${GETTEXTDIR}/include ${CPPFLAGS}
diff --git a/shells/bash2/PLIST b/shells/bash2/PLIST
index 96d4a861729..26f9e75a3b9 100644
--- a/shells/bash2/PLIST
+++ b/shells/bash2/PLIST
@@ -1,17 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:40 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/09/26 22:06:30 jlam Exp $
 bin/bash
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells
 bin/bashbug
-man/man1/bash.1.gz
-man/man1/bashbug.1.gz
-@unexec ${INSTALL_INFO} --delete %D/info/bash.info %D/info/dir
-info/bash.info
-@exec ${INSTALL_INFO} %D/info/bash.info %D/info/dir
-share/doc/bash/article.ps.gz
-share/doc/bash/article.txt
-share/doc/bash/bashref.ps.gz
-share/doc/html/bash/bash.html
-share/doc/html/bash/bashref.html
-@dirrm share/doc/html/bash
-@dirrm share/doc/bash
+man/man1/bash.1
+man/man1/bashbug.1
diff --git a/shells/bash2/distinfo b/shells/bash2/distinfo
index c1d1eacfad1..c08518648af 100644
--- a/shells/bash2/distinfo
+++ b/shells/bash2/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/08/30 13:56:27 mrg Exp $
+$NetBSD: distinfo,v 1.5 2002/09/26 22:06:30 jlam Exp $
 
 SHA1 (bash-2.05.tar.gz) = 4418655ddc7bf6172f885bd3a54e7bfec77fec91
 Size (bash-2.05.tar.gz) = 1792319 bytes
-SHA1 (bash-doc-2.05.tar.gz) = c07174e6f59730a925634a173541b4dbfcd5fdc1
-Size (bash-doc-2.05.tar.gz) = 880715 bytes
-SHA1 (patch-ab) = ea7d1d5e063a839445cb4c7937ba79234a0596bf
+SHA1 (patch-ab) = 619adf5e1bbdf425b629f2675c37d3053d877d72
 SHA1 (patch-ac) = 41248ac10e116980aee59a790c73a71b91829e9e
 SHA1 (patch-ad) = 5e3207818583a7c93a65ccebf6c77cfe5fd9be5a
 SHA1 (patch-ae) = f55a728f9f8ce8896a7097100de80db1d1cf752f
diff --git a/shells/bash2/patches/patch-ab b/shells/bash2/patches/patch-ab
index cc5fd2bbb28..aa4cb194980 100644
--- a/shells/bash2/patches/patch-ab
+++ b/shells/bash2/patches/patch-ab
@@ -1,13 +1,21 @@
-$NetBSD: patch-ab,v 1.7 2001/08/04 06:58:24 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2002/09/26 22:06:31 jlam Exp $
 
---- Makefile.in.orig	Tue Apr  3 21:03:24 2001
-+++ Makefile.in	Mon Apr 16 12:44:31 2001
-@@ -599,7 +599,7 @@
+--- Makefile.in.orig	Tue Apr  3 12:03:24 2001
++++ Makefile.in
+@@ -595,15 +595,10 @@ TAGS:	$(SOURCES) $(BUILTIN_C_SRC) $(LIBR
+ installdirs:
+ 	@${SHELL} $(SUPPORT_SRC)mkdirs $(bindir)
+ 	@${SHELL} $(SUPPORT_SRC)mkdirs $(man1dir) $(man3dir)
+-	@${SHELL} $(SUPPORT_SRC)mkdirs $(infodir)
  
  install:	.made installdirs
  	$(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(bindir)/$(Program)
 -	$(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(bindir)/bashbug
+-	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
+-		man1dir=$(man1dir) man1ext=$(man1ext) \
+-		man3dir=$(man3dir) man3ext=$(man3ext) \
+-		infodir=$(infodir) htmldir=$(htmldir) $@ )
 +	$(INSTALL_SCRIPT) $(INSTALLMODE2) bashbug $(bindir)/bashbug
- 	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
- 		man1dir=$(man1dir) man1ext=$(man1ext) \
- 		man3dir=$(man3dir) man3ext=$(man3ext) \
+ 
+ install-strip:
+ 	$(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \