Remove bash1 port. This has been entirely superseded by bash2.

Chet doesn't maintain it any longer.  It smells funny.
This commit is contained in:
naddy 2003-08-22 16:38:12 +00:00
parent 17b9c8527a
commit df0cbee649
17 changed files with 1 additions and 307 deletions

View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2001/07/12 20:41:44 naddy Exp $
# $OpenBSD: Makefile,v 1.12 2003/08/22 16:38:12 naddy Exp $
# $FreeBSD: Makefile,v 1.13 1997/01/03 00:40:55 max Exp $
#
SUBDIR += ast-ksh
SUBDIR += ast-ksh,static
SUBDIR += bash
SUBDIR += bash,static
SUBDIR += bash2
SUBDIR += bash2,static
SUBDIR += es

View File

@ -1,32 +0,0 @@
# $OpenBSD: Makefile,v 1.24 2002/10/28 18:56:43 naddy Exp $
COMMENT= "GNU Bourne Again Shell"
DISTNAME= bash-1.14.7
PKGNAME= ${DISTNAME}p1
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU:=bash/}
HOMEPAGE= http://www.gnu.org/software/bash/
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
FLAVORS= static
FLAVOR?=
.if ${FLAVOR:L} == "static"
MAKE_ENV= CPP_DEFINES="-DSYSDEP_LDFLAGS=-static"
.endif
REGRESS_TARGET= tests
post-install:
${INSTALL_MAN} ${WRKSRC}/documentation/builtins.1 \
${PREFIX}/man/man1/bash_builtins.1
@strip ${PREFIX}/bin/bash
.include <bsd.port.mk>

View File

@ -1,3 +0,0 @@
MD5 (bash-1.14.7.tar.gz) = 2ba8f27c9861d57826e695278a240a04
RMD160 (bash-1.14.7.tar.gz) = 62b41d57a346dd7d94013c11457cdb259a89176a
SHA1 (bash-1.14.7.tar.gz) = 928439926a4c637c2a32dbf87bebe7034c085213

View File

@ -1,11 +0,0 @@
--- Makefile.orig Sun Jun 11 11:41:48 1995
+++ Makefile Wed Aug 13 00:41:35 1997
@@ -10,7 +10,7 @@
# If you haven't read README, now might be a good time.
# Include some boilerplate Gnu makefile definitions.
-prefix = /usr/local
+prefix = $(PREFIX)
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
srcdir = .

View File

@ -1,36 +0,0 @@
--- cpp-Makefile.orig Sun Jun 11 14:44:05 1995
+++ cpp-Makefile Thu Nov 25 17:38:29 1999
@@ -133,7 +133,9 @@
/usr/include. Then it will break.) */
CC = gcc -traditional -I/usr/include $(GCC_EXTRAS)
# else /* HAVE_FIXED_INCLUDES */
+#ifndef __OpenBSD__
CC = gcc $(GCC_EXTRAS)
+#endif
# endif /* HAVE_FIXED_INCLUDES */
#else /* !HAVE_GCC */
CC = CPP_CC
@@ -151,8 +153,13 @@
AR = ar
INSTALL = $(SUPPORT_SRC)install.sh
+#ifndef __OpenBSD__
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
COMPRESS = gzip
COMPRESS_EXT = .gz
@@ -300,7 +307,9 @@
/**/# 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 __OpenBSD__
CFLAGS = -O -g
+#endif
SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \
$(GROUPS) $(RESOURCE) $(PARAM) $(SIGHANDLER) $(SYSDEP) $(WAITH) \

View File

@ -1,25 +0,0 @@
--- lib/readline/readline.c.orig Wed May 24 10:43:28 1995
+++ lib/readline/readline.c Thu Nov 25 17:18:33 1999
@@ -958,7 +958,7 @@
static void
readline_initialize_everything ()
{
- char *t;
+ char *t, *t1;
/* Find out if we are running in Emacs. */
running_in_emacs = getenv ("EMACS") != (char *)0;
@@ -993,8 +993,11 @@
/* Check for LC_CTYPE and use its value to decide the defaults for
8-bit character input and output. */
t = getenv ("LC_CTYPE");
- if (t && (strcmp (t, "iso-8859-1") == 0 || strcmp (t, "iso_8859_1") == 0 ||
- strcmp (t, "ISO-8859-1") == 0))
+ t1 = getenv ("LANG");
+ if (t && (strstr (t, "8859-1") != NULL || strstr (t, "8859_1") != NULL ||
+ strstr (t, "KOI8-R") != NULL || strstr (t, "koi8-r") != NULL) ||
+ t1 && (strstr (t1, "8859-1") != NULL || strstr (t1, "8859_1") != NULL ||
+ strstr (t1, "KOI8-R") != NULL || strstr (t1, "koi8-r") != NULL))
{
_rl_meta_flag = 1;
_rl_convert_meta_chars_to_ascii = 0;

View File

@ -1,11 +0,0 @@
--- documentation/Makefile.orig Tue Jan 16 20:22:19 2001
+++ documentation/Makefile Tue Jan 16 20:22:37 2001
@@ -49,7 +49,7 @@
$(RM) $@
${NROFF} -man $< > $@
-all: ps info dvi text
+all: info # ps dvi text
ps: bash.ps readline.ps article.ps
dvi: features.dvi features.ps

View File

@ -1,10 +0,0 @@
--- documentation/builtins.1.orig Fri Sep 17 16:06:53 1993
+++ documentation/builtins.1 Thu Nov 25 17:18:34 1999
@@ -10,6 +10,6 @@
unset, until, wait, while \- bash built-in commands, see \fBbash\fR(1)
.SH BASH BUILTIN COMMANDS
.nr zZ 1
-.so bash.1
+.so man1/bash.1
.SH SEE ALSO
bash(1), sh(1)

View File

@ -1,14 +0,0 @@
--- siglist.h.orig Sun Jan 25 21:02:16 1998
+++ siglist.h Sun Jan 25 21:03:19 1998
@@ -29,9 +29,9 @@
#if !defined (Solaris) && !defined (Linux) && !defined (__BSD_4_4__) && \
!defined (Minix) && !defined (NetBSD) && !defined (FreeBSD) && \
- !defined (BSD_OS)
+ !defined (__OpenBSD__) &&!defined (BSD_OS)
extern char *sys_siglist[];
-#endif /* !Solaris && !Linux && !__BSD_4_4__ && !Minix && !NetBSD && !FreeBSD && !BSD_OS */
+#endif /* !Solaris && !Linux && !__BSD_4_4__ && !Minix && !NetBSD && !FreeBSD && !__OpenBSD__ && !BSD_OS */
#if !defined (strsignal) && !defined (Solaris) && !defined (NetBSD)
# define strsignal(sig) (char *)sys_siglist[sig]

View File

@ -1,13 +0,0 @@
--- documentation/features.texi.orig Fri Aug 5 04:26:21 1994
+++ documentation/features.texi Mon Jun 16 19:16:56 1997
@@ -2,6 +2,10 @@
@c %**start of header
@setfilename features.info
@settitle Bash Features
+@dircategory Shells
+@direntry
+* Bash: (bash). GNU Bourne-Again SHell.
+@end direntry
@c %**end of header
@ignore

View File

@ -1,11 +0,0 @@
--- machines.h.orig Mon Dec 18 14:13:22 1995
+++ machines.h Thu Nov 25 17:18:36 1999
@@ -63,7 +63,7 @@
some machines, our malloc () cannot be used (because of library
conflicts, for example), and for those, you should specifically
#undef USE_GNU_MALLOC in the machine description. */
-#define USE_GNU_MALLOC
+#undef USE_GNU_MALLOC
/* This causes the Gnu malloc library (from glibc) to be used. */
/* #define USE_GNU_MALLOC_LIBRARY */

View File

@ -1,11 +0,0 @@
--- support/bashbug.sh.orig Tue Jan 16 14:47:19 2001
+++ support/bashbug.sh Tue Jan 16 14:47:46 2001
@@ -15,7 +15,7 @@
PATH=/bin:/usr/bin:usr/local/bin:$PATH
export PATH
-TEMP=/tmp/bashbug.$$
+TEMP=`/bin/mktemp /tmp/bashbug.XXXXXX`
BUGADDR=${1-bug-bash@prep.ai.mit.edu}

View File

@ -1,33 +0,0 @@
--- execute_cmd.c.orig Thu Jun 8 11:29:00 1995
+++ execute_cmd.c Tue Jan 16 16:30:39 2001
@@ -2714,10 +2714,11 @@
{
WORD_DESC *redirectee = redirect->redirectee.filename;
int redir_fd = redirect->redirectee.dest;
- int fd, redirector = redirect->redirector;
+ int fd = -1, redirector = redirect->redirector;
char *redirectee_word;
enum r_instruction ri = redirect->instruction;
REDIRECT *new_redirect;
+ mode_t um;
if (ri == r_duplicating_input_word || ri == r_duplicating_output_word)
{
@@ -2938,11 +2939,14 @@
pid_t pid = getpid ();
/* Make the filename for the temp file. */
- sprintf (filename, "/tmp/t%d-sh", pid);
+ sprintf (filename, "/tmp/t-sh-XXXXXX", pid);
- fd = open (filename, O_TRUNC | O_WRONLY | O_CREAT, 0666);
- if (fd < 0)
+ fd = mkstemp (filename);
+ if (fd != -1)
return (errno);
+ um = umask (022);
+ umask (um);
+ fchmod (fd, 0666 & ~um);
errno = 0; /* XXX */
if (redirectee->word)

View File

@ -1,22 +0,0 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:23 brad Exp $
#
# bash de-installation
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
if grep -q ${PREFIX}/bin/bash /etc/shells; then
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you need to edit"
echo "| /etc/shells and remove this line:"
echo "|"
echo "| ${PREFIX}/bin/bash"
echo "|"
echo "+---------------"
echo
fi
exit 0

View File

@ -1,12 +0,0 @@
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.
Flavors:
static - Build with statically linked binaries.
WWW: ${HOMEPAGE}

View File

@ -1,52 +0,0 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.2 2000/07/04 21:30:17 brad Exp $
#
# Pre/post-installation setup of bash
# exit on errors, use a sane path and install prefix
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
# Function: tell the user what s/he needs to do to use the port just installed
#
do_notice()
{
echo
echo "+---------------"
echo "| For proper use of $1 you should notify the system"
echo "| that ${PREFIX}/bin/bash is a valid shell by adding it to the"
echo "| the file /etc/shells. If you are unfamiliar with this file"
echo "| consult the shells(5) manual page"
echo "+---------------"
echo
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
: nothing to pre-install for this port
;;
POST-INSTALL)
if grep -q ${PREFIX}/bin/bash /etc/shells; then
:
else
do_notice $1
fi
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
;;
esac
exit 0

View File

@ -1,8 +0,0 @@
@comment $OpenBSD: PLIST,v 1.7 2001/04/10 17:10:37 espie Exp $
bin/bash
bin/bashbug
man/man1/bash.1
man/man1/bash_builtins.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