Fixes for freebsd,ELF,-current

Upgrade docs to 2.03

5 files changed, 44 insertions, 15 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 06bb9923e1d1..cce525db6d9e 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.32 1999/01/27 07:41:27 fenner Exp $
+# $Id: Makefile,v 1.33 1999/04/19 08:42:20 cracauer Exp $
 #
 
 DISTNAME=       bash-2.03
@@ -12,13 +12,12 @@ MASTER_SITES=   ${MASTER_SITE_GNU} \
 		ftp://slc2.ins.cwru.edu/pub/dist/
 MASTER_SITE_SUBDIR=	bash
 .if !defined(NOPORTDOCS)
-DISTFILES=      bash-2.03.tar.gz bash-doc-2.02.tar.gz
+DISTFILES=      bash-2.03.tar.gz bash-doc-2.03.tar.gz
 .endif
 
 MAINTAINER=	ache@FreeBSD.ORG
 
 GNU_CONFIGURE=	Yes
-CONFIGURE_ENV=	LDFLAGS=-static
 MAN1=		bash.1 bashbug.1
 
 pre-install:
@@ -33,16 +32,11 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/bash
 	${INSTALL_MAN}  \
-		${WRKDIR}/bash-doc-2.02/doc/article.ps  \
-		${WRKDIR}/bash-doc-2.02/doc/bashref.ps  \
+		${WRKDIR}/doc/article.ps  \
+		${WRKDIR}/doc/bashref.ps  \
 		${PREFIX}/share/doc/bash
 	${INSTALL_MAN}  \
-		${WRKDIR}/bash-doc-2.02/doc/bash.html  \
-		${WRKDIR}/bash-doc-2.02/doc/bashref.html  \
-		${WRKDIR}/bash-doc-2.02/doc/bashref_toc.html  \
-		${PREFIX}/share/doc/bash
-	${INSTALL_MAN}  \
-		${WRKDIR}/bash-doc-2.02/doc/article.txt  \
+		${WRKDIR}/doc/article.txt  \
 		${PREFIX}/share/doc/bash
 	${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
 .endif
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 49e37c0fcb18..89ba5a024bb4 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,2 +1,2 @@
 MD5 (bash-2.03.tar.gz) = 70e356eae4fed395c9a0fc35b752f711
-MD5 (bash-doc-2.02.tar.gz) = 94f7e06b0c73264f9ca7fb446007b5f0
+MD5 (bash-doc-2.03.tar.gz) = ede603422b9f6cf2ef70ee1a029987f0
diff --git a/shells/bash/files/patch-ac b/shells/bash/files/patch-ac
new file mode 100644
index 000000000000..86e8472b2263
--- /dev/null
+++ b/shells/bash/files/patch-ac
@@ -0,0 +1,20 @@
+--- configure.orig	Thu Feb 18 21:12:00 1999
++++ configure	Fri May 28 04:35:33 1999
+@@ -733,7 +733,7 @@
+ sparc-netbsd*)	opt_gnu_malloc=no ;;	# needs 8-byte alignment
+ mips-irix6*)	opt_gnu_malloc=no ;;	# needs 8-byte alignment
+ sparc-linux*)	opt_gnu_malloc=no ;;	# sparc running linux; requires ELF
+-#*-freebsd*)	opt_gnu_malloc=no ;;	# they claim it's better
++*-freebsd*)     opt_gnu_malloc=no ;;    # they claim it's better
+ *-aix*)		opt_gnu_malloc=no ;;	# AIX machines
+ *-nextstep*)	opt_gnu_malloc=no ;;	# NeXT machines running NeXTstep
+ *-rhapsody*)	opt_gnu_malloc=no ;;	# Apple Rhapsody
+@@ -7086,7 +7086,7 @@
+ then
+ 	echo $ac_n "checking shared object configuration for loadable builtins""... $ac_c" 1>&6
+ echo "configure:7089: checking shared object configuration for loadable builtins" >&5
+-	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C ${CC} -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
++	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
+ 	
+ 	
+ 	
diff --git a/shells/bash/files/patch-ad b/shells/bash/files/patch-ad
new file mode 100644
index 000000000000..b24eada42810
--- /dev/null
+++ b/shells/bash/files/patch-ad
@@ -0,0 +1,18 @@
+--- support/shobj-conf.bak	Tue Dec 29 23:05:29 1998
++++ support/shobj-conf	Fri May 28 04:34:07 1999
+@@ -86,13 +86,13 @@
+ 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ 	;;
+ 
+-freebsd3*)
++freebsd[34]*)
+ 	SHOBJ_CFLAGS=-fpic
+ 	SHOBJ_LD='${CC}'
+ 	SHOBJ_LDFLAGS='-shared'
+ 
+ 	SHLIB_XLDFLAGS='-R$(libdir)'
+-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
++	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
+ 	;;
+ 
+ linux*)
diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist
index d2a7ab495398..cc0addc5710d 100644
--- a/shells/bash/pkg-plist
+++ b/shells/bash/pkg-plist
@@ -7,8 +7,5 @@ info/bash.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 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