From ba36c8c04dffdea9e6db800a2ed828dca0372f53 Mon Sep 17 00:00:00 2001 From: naddy Date: Sun, 18 Nov 2001 19:45:11 +0000 Subject: [PATCH] * Update to 2.05a. * Add home page. * Take maintainership. --- shells/bash2/Makefile | 22 ++++++++++++------- shells/bash2/distinfo | 6 +++++ shells/bash2/files/md5 | 6 ----- .../bash2/patches/patch-builtins_enable_def | 12 +++++----- shells/bash2/patches/patch-configure | 11 ---------- shells/bash2/pkg/DESCR | 2 ++ shells/bash2/pkg/PLIST | 8 +++---- 7 files changed, 32 insertions(+), 35 deletions(-) create mode 100644 shells/bash2/distinfo delete mode 100644 shells/bash2/files/md5 delete mode 100644 shells/bash2/patches/patch-configure diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 31e0cd32149..e92ed32c00e 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,25 +1,31 @@ -# $OpenBSD: Makefile,v 1.22 2001/10/28 13:05:49 espie Exp $ +# $OpenBSD: Makefile,v 1.23 2001/11/18 19:45:11 naddy Exp $ COMMENT= "GNU Bourne Again Shell" -DISTNAME= bash-2.05 +DISTNAME= bash-2.05a CATEGORIES= shells -NEED_VERSION= 1.392 +NEED_VERSION= 1.499 +HOMEPAGE= http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html +MAINTAINER= Christian Weisgerber + +# GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= bash -DISTFILES= ${DISTNAME}.tar.gz ${DISTNAME:S/-/-doc-/}.tar.gz +MASTER_SITES= ${MASTER_SITE_GNU} +MASTER_SITE_SUBDIR= bash +DISTFILES= ${DISTNAME}.tar.gz ${DISTNAME:S/-/-doc-/}.tar.gz FLAVORS= static FLAVOR?= -CONFIGURE_STYLE= gnu dest -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/support +SEPARATE_BUILD= concurrent + +CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/support .if ${FLAVOR:L} == "static" CONFIGURE_ARGS= --enable-static-link diff --git a/shells/bash2/distinfo b/shells/bash2/distinfo new file mode 100644 index 00000000000..647fa9a0da3 --- /dev/null +++ b/shells/bash2/distinfo @@ -0,0 +1,6 @@ +MD5 (bash-2.05a.tar.gz) = eeabc3f624861c4a8a687f7701db3d06 +MD5 (bash-doc-2.05a.tar.gz) = c86e07eb43c3a1a9b2c830b6bff1331d +RMD160 (bash-2.05a.tar.gz) = 136302f57bf56668f042938de8de0174d51ddbf9 +RMD160 (bash-doc-2.05a.tar.gz) = 0d4a471bdb180b0bda3eea6166cbebf21644e493 +SHA1 (bash-2.05a.tar.gz) = 1a74a4a4e4f771484cbf22786689fe33ab6d36d3 +SHA1 (bash-doc-2.05a.tar.gz) = d1434a7620832bfbf17906f195be49c9379072a7 diff --git a/shells/bash2/files/md5 b/shells/bash2/files/md5 deleted file mode 100644 index 9f493092967..00000000000 --- a/shells/bash2/files/md5 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (bash-2.05.tar.gz) = fe40d1633203c1ca6f2a6dfc6d097c48 -MD5 (bash-doc-2.05.tar.gz) = 9bb3026e0a7cafcf592eea8f357e9f14 -RMD160 (bash-2.05.tar.gz) = 79a3cbb1edebe803150dd728c07e59a5921d8ed2 -RMD160 (bash-doc-2.05.tar.gz) = 4c61658ef8227c13804b584b8417c2b16a43e43a -SHA1 (bash-2.05.tar.gz) = 4418655ddc7bf6172f885bd3a54e7bfec77fec91 -SHA1 (bash-doc-2.05.tar.gz) = c07174e6f59730a925634a173541b4dbfcd5fdc1 diff --git a/shells/bash2/patches/patch-builtins_enable_def b/shells/bash2/patches/patch-builtins_enable_def index b6d7fe1649f..ca842485e1b 100644 --- a/shells/bash2/patches/patch-builtins_enable_def +++ b/shells/bash2/patches/patch-builtins_enable_def @@ -1,16 +1,16 @@ -$OpenBSD: patch-builtins_enable_def,v 1.1 2001/04/10 15:32:56 naddy Exp $ ---- builtins/enable.def.orig Wed Feb 14 23:09:05 2001 -+++ builtins/enable.def Tue Apr 10 16:22:20 2001 -@@ -305,9 +305,16 @@ dyn_load_builtin (list, flags, filename) +$OpenBSD: patch-builtins_enable_def,v 1.2 2001/11/18 19:45:11 naddy Exp $ +--- builtins/enable.def.orig Sun Nov 18 18:39:15 2001 ++++ builtins/enable.def Sun Nov 18 18:41:20 2001 +@@ -307,9 +307,16 @@ dyn_load_builtin (list, flags, filename) name = list->word->word; size = strlen (name); +#ifdef __ELF__ - struct_name = xmalloc (size + 8); + struct_name = (char *)xmalloc (size + 8); strcpy (struct_name, name); strcpy (struct_name + size, "_struct"); +#else -+ struct_name = xmalloc (size + 9); ++ struct_name = (char *)xmalloc (size + 9); + *struct_name = '_'; + strcpy (struct_name + 1, name); + strcpy (struct_name + size + 1, "_struct"); diff --git a/shells/bash2/patches/patch-configure b/shells/bash2/patches/patch-configure deleted file mode 100644 index 09dea6df1bf..00000000000 --- a/shells/bash2/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-configure,v 1.1 2001/04/10 15:32:56 naddy Exp $ ---- configure.orig Tue Jan 23 18:57:28 2001 -+++ configure Mon Apr 9 23:17:06 2001 -@@ -764,6 +764,7 @@ mips-irix6*) opt_bash_malloc=no ;; # nee - m68k-sysv) opt_bash_malloc=no ;; # fixes file descriptor leak in closedir - sparc-linux*) opt_bash_malloc=no ;; # sparc running linux; requires ELF - #*-freebsd*) opt_bash_malloc=no ;; # they claim it's better -+*-openbsd*) opt_bash_malloc=no ;; # needs 8-byte alignment for one thing - *-aix*) opt_bash_malloc=no ;; # AIX machines - *-nextstep*) opt_bash_malloc=no ;; # NeXT machines running NeXTstep - *-macos*) opt_bash_malloc=no ;; # Apple MacOS X diff --git a/shells/bash2/pkg/DESCR b/shells/bash2/pkg/DESCR index a86a4888fb4..fb7f307f490 100644 --- a/shells/bash2/pkg/DESCR +++ b/shells/bash2/pkg/DESCR @@ -5,3 +5,5 @@ features from the Korn and C shells (ksh and csh). Bash is intended to be a conformant implementation of the IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). + +WWW: ${HOMEPAGE} diff --git a/shells/bash2/pkg/PLIST b/shells/bash2/pkg/PLIST index 96705c703e2..af0585c3afd 100644 --- a/shells/bash2/pkg/PLIST +++ b/shells/bash2/pkg/PLIST @@ -1,11 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.9 2001/04/10 17:10:37 espie Exp $ +@comment $OpenBSD: PLIST,v 1.10 2001/11/18 19:45:12 naddy Exp $ +@unexec install-info --delete --info-dir=%D/info %D/info/bash.info bin/bash bin/bashbug +info/bash.info 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 share/doc/bash/article.ps share/doc/bash/article.txt share/doc/bash/bash.html @@ -15,3 +14,4 @@ share/doc/bash/bashref.html share/doc/bash/bashref.ps share/doc/bash/builtins.ps @dirrm share/doc/bash +@exec install-info --info-dir=%D/info %D/info/bash.info