summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MOVED1
-rw-r--r--shells/Makefile2
-rw-r--r--shells/bash3/Makefile78
-rw-r--r--shells/bash3/distinfo2
-rw-r--r--shells/bash3/files/patch-arrayfunc.c16
-rw-r--r--shells/bash3/files/patch-braces.c15
-rw-r--r--shells/bash3/pkg-deinstall17
-rw-r--r--shells/bash3/pkg-descr7
-rw-r--r--shells/bash3/pkg-install16
-rw-r--r--shells/bash3/pkg-plist80
10 files changed, 2 insertions, 232 deletions
diff --git a/MOVED b/MOVED
index 46dbc933c0c8..3869ede3dfc7 100644
--- a/MOVED
+++ b/MOVED
@@ -1225,3 +1225,4 @@ audio/p5-dapple|audio/p5-Net-DAAP-Client|2004-08-09|Module renamed
audio/p5-Net-DAAP-Client-Auth||2004-08-09|Obsoleted
x11-servers/XFree86-4-Server-snap|x11-servers/XFree86-4-Server|2004-08-09|Obsoleted by XFree86-4-Server update
net/ntp-devel||2004-08-10|Cleanup, NTP development branch has been dormant for a long while.
+shells/bash3|shells/bash|2004-08-11|move latest stable version to unnumbered directory
diff --git a/shells/Makefile b/shells/Makefile
index c2f3f16d64b8..b14a8e6288b3 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -4,10 +4,10 @@
COMMENT = Shells
SUBDIR += 44bsd-csh
+ SUBDIR += bash
SUBDIR += bash-completion
SUBDIR += bash1
SUBDIR += bash2
- SUBDIR += bash3
SUBDIR += es
SUBDIR += esh
SUBDIR += fd
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
deleted file mode 100644
index 567a2d564228..000000000000
--- a/shells/bash3/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# New ports collection makefile for: bash3
-# Date created: 30 Jul 2004
-# Whom: Oliver Eikemeier
-#
-# $FreeBSD$
-#
-
-PORTNAME= bash
-PORTVERSION= 3.0
-PORTREVISION= 2
-CATEGORIES= shells
-MASTER_SITES= ${MASTER_SITE_GNU} \
- ftp://ftp.cwru.edu/pub/%SUBDIR%/
-MASTER_SITE_SUBDIR= bash
-
-MAINTAINER= eik@FreeBSD.org
-COMMENT= The GNU Project's Bourne Again SHell
-
-CONFLICTS= bash-[0-24-9].*
-LATEST_LINK= ${PKGNAMEPREFIX}bash3${PKGNAMESUFFIX}
-
-USE_REINPLACE= yes
-
-MAN1= bash.1 bashbug.1
-INFO= bash
-
-USE_REINPLACE= yes
-GNU_CONFIGURE= yes
-
-.if !defined(NOPORTDOCS)
-PORTDOCS= CHANGES COMPAT NEWS POSIX RBASH
-.endif
-
-CONFIGURE_ARGS= --without-bash-malloc
-
-.if defined(WITHOUT_HELP)
-CONFIGURE_ARGS+= --disable-help-builtin
-PLIST_SUB+= HELP="@comment "
-.elif defined(WITH_INTEGRATED_HELPFILES)
-PLIST_SUB+= HELP="@comment "
-.else
-CONFIGURE_ARGS+= --enable-separate-helpfiles
-PLIST_SUB+= HELP=""
-.endif
-
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
-.endif
-
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-CPPFLAGS+= ${PTHREAD_CFLAGS} \
- -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-
-post-patch:
- @${REINPLACE_CMD} -e "s| /bin| ${PREFIX}/bin|g" ${WRKSRC}/doc/bash.1
-
-pre-install:
- @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \
-
-post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @for d in ${PORTDOCS}; do \
- ${INSTALL_DATA} ${WRKSRC}/$${d} ${DESTDIR}${DOCSDIR}; \
- done
-.endif
- @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; \
-
-.include <bsd.port.mk>
diff --git a/shells/bash3/distinfo b/shells/bash3/distinfo
deleted file mode 100644
index a2436bdddd95..000000000000
--- a/shells/bash3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (bash-3.0.tar.gz) = 26c4d642e29b3533d8d754995bc277b3
-SIZE (bash-3.0.tar.gz) = 2418293
diff --git a/shells/bash3/files/patch-arrayfunc.c b/shells/bash3/files/patch-arrayfunc.c
deleted file mode 100644
index fbccb3cfc528..000000000000
--- a/shells/bash3/files/patch-arrayfunc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Fix segfault when accessing an unset array
-#
-# http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00026.html
-#
---- arrayfunc.c.orig Fri Dec 19 00:03:09 2003
-+++ arrayfunc.c Sun Aug 1 20:43:00 2004
-@@ -611,7 +611,7 @@
- var = find_variable (t);
-
- free (t);
-- return var;
-+ return (var == 0 || invisible_p (var)) ? (SHELL_VAR *)0 : var;
- }
-
- /* Return a string containing the elements in the array and subscript
diff --git a/shells/bash3/files/patch-braces.c b/shells/bash3/files/patch-braces.c
deleted file mode 100644
index 591d58ef3888..000000000000
--- a/shells/bash3/files/patch-braces.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Fix nested brace vs. variable expansion
-#
-# http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00056.html
-#
---- braces.c.orig Tue Aug 04 14:32:33 2004
-+++ braces.c Tue Aug 04 15:15:36 2004
-@@ -402,6 +402,7 @@
- {
- pass_next = 1;
- i++;
-+ level++;
- continue;
- }
- #endif
diff --git a/shells/bash3/pkg-deinstall b/shells/bash3/pkg-deinstall
deleted file mode 100644
index 11ee3aff420d..000000000000
--- a/shells/bash3/pkg-deinstall
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-case $2 in
-DEINSTALL)
- if [ `id -u` -eq 0 ]; then
- TMPSHELLS=`mktemp -t shells`
- grep -v "^${PKG_PREFIX-/usr/local}/bin/bash\$" /etc/shells > "$TMPSHELLS"
- cat "$TMPSHELLS" > /etc/shells
- rm "$TMPSHELLS"
- elif grep -qs "^${PKG_PREFIX-/usr/local}/bin/bash\$" /etc/shells; then
- echo "Not root, please remove ${PKG_PREFIX-/usr/local}/bin/bash from /etc/shells manually"
- fi
- ;;
-esac
diff --git a/shells/bash3/pkg-descr b/shells/bash3/pkg-descr
deleted file mode 100644
index 03f1dc88912b..000000000000
--- a/shells/bash3/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This is GNU Bash, version 3.0. Bash is the GNU Project's Bourne
-Again SHell, a complete implementation of the POSIX.2 shell spec,
-but also with interactive command line editing, job control on
-architectures that support it, csh-like features such as history
-substitution and brace expansion, and a slew of other features.
-
-WWW: http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
diff --git a/shells/bash3/pkg-install b/shells/bash3/pkg-install
deleted file mode 100644
index b234a4db0e0a..000000000000
--- a/shells/bash3/pkg-install
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-case $2 in
-POST-INSTALL)
- if ! grep -qs "^${PKG_PREFIX-/usr/local}/bin/bash\$" /etc/shells; then
- if [ `id -u` -eq 0 ]; then
- echo "${PKG_PREFIX-/usr/local}/bin/bash" >> /etc/shells
- else
- echo "Not root, please add ${PKG_PREFIX-/usr/local}/bin/bash to /etc/shells manually"
- fi
- fi
- ;;
-esac
diff --git a/shells/bash3/pkg-plist b/shells/bash3/pkg-plist
deleted file mode 100644
index 153c903a7ad9..000000000000
--- a/shells/bash3/pkg-plist
+++ /dev/null
@@ -1,80 +0,0 @@
-@comment $FreeBSD$
-bin/bash
-bin/bashbug
-%%NLS%%share/locale/en@boldquot/LC_MESSAGES/bash.mo
-%%NLS%%share/locale/en@quot/LC_MESSAGES/bash.mo
-@comment gettext owns share/locale/en@boldquot/LC_MESSAGES
-@comment gettext owns share/locale/en@quot/LC_MESSAGES
-%%HELP%%%%DATADIR%%/alias
-%%HELP%%%%DATADIR%%/arith
-%%HELP%%%%DATADIR%%/arith_for
-%%HELP%%%%DATADIR%%/bg
-%%HELP%%%%DATADIR%%/bind
-%%HELP%%%%DATADIR%%/break
-%%HELP%%%%DATADIR%%/builtin
-%%HELP%%%%DATADIR%%/caller
-%%HELP%%%%DATADIR%%/case
-%%HELP%%%%DATADIR%%/cd
-%%HELP%%%%DATADIR%%/colon
-%%HELP%%%%DATADIR%%/command
-%%HELP%%%%DATADIR%%/compgen
-%%HELP%%%%DATADIR%%/complete
-%%HELP%%%%DATADIR%%/conditional
-%%HELP%%%%DATADIR%%/continue
-%%HELP%%%%DATADIR%%/declare
-%%HELP%%%%DATADIR%%/dirs
-%%HELP%%%%DATADIR%%/disown
-%%HELP%%%%DATADIR%%/dot
-%%HELP%%%%DATADIR%%/echo
-%%HELP%%%%DATADIR%%/enable
-%%HELP%%%%DATADIR%%/eval
-%%HELP%%%%DATADIR%%/exec
-%%HELP%%%%DATADIR%%/exit
-%%HELP%%%%DATADIR%%/export
-%%HELP%%%%DATADIR%%/false
-%%HELP%%%%DATADIR%%/fc
-%%HELP%%%%DATADIR%%/fg
-%%HELP%%%%DATADIR%%/fg_percent
-%%HELP%%%%DATADIR%%/for
-%%HELP%%%%DATADIR%%/function
-%%HELP%%%%DATADIR%%/getopts
-%%HELP%%%%DATADIR%%/grouping_braces
-%%HELP%%%%DATADIR%%/hash
-%%HELP%%%%DATADIR%%/help
-%%HELP%%%%DATADIR%%/history
-%%HELP%%%%DATADIR%%/if
-%%HELP%%%%DATADIR%%/jobs
-%%HELP%%%%DATADIR%%/kill
-%%HELP%%%%DATADIR%%/let
-%%HELP%%%%DATADIR%%/local
-%%HELP%%%%DATADIR%%/logout
-%%HELP%%%%DATADIR%%/popd
-%%HELP%%%%DATADIR%%/printf
-%%HELP%%%%DATADIR%%/pushd
-%%HELP%%%%DATADIR%%/pwd
-%%HELP%%%%DATADIR%%/read
-%%HELP%%%%DATADIR%%/readonly
-%%HELP%%%%DATADIR%%/return
-%%HELP%%%%DATADIR%%/select
-%%HELP%%%%DATADIR%%/set
-%%HELP%%%%DATADIR%%/shift
-%%HELP%%%%DATADIR%%/shopt
-%%HELP%%%%DATADIR%%/source
-%%HELP%%%%DATADIR%%/suspend
-%%HELP%%%%DATADIR%%/test
-%%HELP%%%%DATADIR%%/test_bracket
-%%HELP%%%%DATADIR%%/time
-%%HELP%%%%DATADIR%%/times
-%%HELP%%%%DATADIR%%/trap
-%%HELP%%%%DATADIR%%/true
-%%HELP%%%%DATADIR%%/type
-%%HELP%%%%DATADIR%%/typeset
-%%HELP%%%%DATADIR%%/ulimit
-%%HELP%%%%DATADIR%%/umask
-%%HELP%%%%DATADIR%%/unalias
-%%HELP%%%%DATADIR%%/unset
-%%HELP%%%%DATADIR%%/until
-%%HELP%%%%DATADIR%%/variable_help
-%%HELP%%%%DATADIR%%/wait
-%%HELP%%%%DATADIR%%/while
-%%HELP%%@dirrm %%DATADIR%%
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-17 11:35:58 +0000