Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Jul 2002 13:15:33 -0700 (PDT)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/41176: Update port: shells/bash2 to 2.05b
Message-ID:  <200207302015.g6UKFXZ7049893@www.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         41176
>Category:       ports
>Synopsis:       Update port: shells/bash2 to 2.05b
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 30 13:20:05 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.6-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.05b

Remove file:
files/patch-ab

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/shells/bash2/Makefile shells/bash2/Makefile
--- /usr/ports/shells/bash2/Makefile	Fri Mar 29 18:58:34 2002
+++ shells/bash2/Makefile	Wed Jul 24 05:43:28 2002
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	bash
-PORTVERSION=	2.05a
+PORTVERSION=	2.05b
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.cwru.edu/pub/bash/
@@ -19,6 +19,7 @@
 MAINTAINER=	obrien@FreeBSD.org
 
 GNU_CONFIGURE=	Yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-installed-readline
 CONFIGURE_ENV=	LDFLAGS=-static
 MAN1=		bash.1 bashbug.1
@@ -28,15 +29,15 @@
 	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO_CMD} ${PREFIX}/bin/bash) >/etc/shells
 	${RM} /etc/shells.bak
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/bash
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN}  \
 		${WRKDIR}/doc/article.ps  \
 		${WRKDIR}/doc/bashref.ps  \
-		${PREFIX}/share/doc/bash
+		${DOCSDIR}
 	${INSTALL_MAN}  \
 		${WRKDIR}/doc/article.txt  \
-		${PREFIX}/share/doc/bash
-	${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
+		${DOCSDIR}
+	${GZIP_CMD} ${DOCSDIR}/*.ps
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/shells/bash2/distinfo shells/bash2/distinfo
--- /usr/ports/shells/bash2/distinfo	Wed Nov 21 19:21:27 2001
+++ shells/bash2/distinfo	Wed Jul 24 05:36:42 2002
@@ -1,2 +1,2 @@
-MD5 (bash-2.05a.tar.gz) = eeabc3f624861c4a8a687f7701db3d06
-MD5 (bash-doc-2.05a.tar.gz) = c86e07eb43c3a1a9b2c830b6bff1331d
+MD5 (bash-2.05b.tar.gz) = 5238251b4926d778dfe162f6ce729733
+MD5 (bash-doc-2.05b.tar.gz) = 511b2d07f0f401f686e8edc551a8e47f
diff -urN /usr/ports/shells/bash2/files/patch-ab shells/bash2/files/patch-ab
--- /usr/ports/shells/bash2/files/patch-ab	Wed Nov 21 19:21:29 2001
+++ shells/bash2/files/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,24 +0,0 @@
-
-$FreeBSD: ports/shells/bash2/files/patch-ab,v 1.11 2001/11/21 01:40:39 naddy Exp $
-
---- Makefile.in.orig	Mon Nov 12 17:42:45 2001
-+++ Makefile.in	Wed Nov 21 00:08:16 2001
-@@ -59,6 +59,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALLMODE= -m 0755
- INSTALLMODE2 = -m 0555
-@@ -627,8 +628,8 @@
- 	@${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(infodir)
- 
- install:	.made installdirs
--	$(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(DESTDIR)$(bindir)/$(Program)
--	$(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(DESTDIR)$(bindir)/bashbug
-+	$(INSTALL_PROGRAM) $(Program) $(DESTDIR)$(bindir)/$(Program)
-+	$(INSTALL_SCRIPT) bashbug $(DESTDIR)$(bindir)/bashbug
- 	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
- 		man1dir=$(man1dir) man1ext=$(man1ext) \
- 		man3dir=$(man3dir) man3ext=$(man3ext) \
diff -urN /usr/ports/shells/bash2/files/patch-ac shells/bash2/files/patch-ac
--- /usr/ports/shells/bash2/files/patch-ac	Wed Nov 21 19:21:29 2001
+++ shells/bash2/files/patch-ac	Wed Jul 24 23:55:40 2002
@@ -1,14 +1,14 @@
 
 $FreeBSD: ports/shells/bash2/files/patch-ac,v 1.4 2001/11/21 01:40:39 naddy Exp $
 
---- configure.orig	Mon Nov 19 18:27:10 2001
-+++ configure	Mon Nov 19 18:27:17 2001
-@@ -1108,7 +1108,7 @@
+--- configure.orig	Tue Jul 16 22:31:47 2002
++++ configure	Wed Jul 24 23:54:26 2002
+@@ -1132,7 +1132,7 @@
  mips-irix6*)	opt_bash_malloc=no ;;	# needs 8-byte alignment
  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
-+*-freebsd*)	opt_bash_malloc=no ;;	# they claim it's better
+-#*-freebsd*)	opt_bash_malloc=no ;;	# they claim it's better; I disagree
++*-freebsd*)	opt_bash_malloc=no ;;	# they claim it's better; I disagree
  *-openbsd*)	opt_bash_malloc=no ;;	# they claim it needs eight-bit alignment
  *-aix*)		opt_bash_malloc=no ;;	# AIX machines
  *-nextstep*)	opt_bash_malloc=no ;;	# NeXT machines running NeXTstep
diff -urN /usr/ports/shells/bash2/files/patch-bashline.c shells/bash2/files/patch-bashline.c
--- /usr/ports/shells/bash2/files/patch-bashline.c	Mon Mar 25 12:18:52 2002
+++ shells/bash2/files/patch-bashline.c	Wed Jul 24 05:54:22 2002
@@ -1,6 +1,6 @@
---- bashline.c.orig	Mon Nov  5 09:58:59 2001
-+++ bashline.c	Sun Mar 24 19:15:04 2002
-@@ -1724,10 +1724,6 @@
+--- bashline.c.orig	Wed May  8 04:52:42 2002
++++ bashline.c	Wed Jul 24 05:54:07 2002
+@@ -1873,10 +1873,6 @@
      }
  }
  
@@ -11,7 +11,7 @@
  /* If FIGNORE is set, then don't match files with the given suffixes when
     completing filenames.  If only one of the possibilities has an acceptable
     suffix, delete the others, else just return and let the completer
-@@ -1752,10 +1748,15 @@
+@@ -1901,10 +1897,15 @@
  {
    char **newnames;
    int idx, nidx;
@@ -29,7 +29,7 @@
  
    /* If there is only one completion, see if it is acceptable.  If it is
       not, free it up.  In any case, short-circuit and return.  This is a
-@@ -1763,13 +1764,12 @@
+@@ -1912,13 +1913,12 @@
       if there is only one completion; it is the completion itself. */
    if (names[1] == (char *)0)
      {
@@ -49,23 +49,23 @@
        return;
      }
  
-@@ -1778,10 +1778,11 @@
+@@ -1927,10 +1927,11 @@
    for (nidx = 1; names[nidx]; nidx++)
      ;
-   newnames = alloc_array (nidx + 1);
+   newnames = strvec_create (nidx + 1);
 -#ifdef NO_FORCE_FIGNORE
--  oldnames = alloc_array (nidx - 1);
+-  oldnames = strvec_create (nidx - 1);
 -  oidx = 0;
 -#endif
 +  if (no_force_fignore)
 +    {
-+      oldnames = alloc_array (nidx - 1);
++      oldnames = strvec_create (nidx - 1);
 +      oidx = 0;
 +    }
  
    newnames[0] = names[0];
    for (idx = nidx = 1; names[idx]; idx++)
-@@ -1789,11 +1790,10 @@
+@@ -1938,11 +1939,10 @@
        if ((*name_func) (names[idx]))
  	newnames[nidx++] = names[idx];
        else
@@ -81,7 +81,7 @@
      }
  
    newnames[nidx] = (char *)NULL;
-@@ -1801,21 +1801,23 @@
+@@ -1950,21 +1950,23 @@
    /* If none are acceptable then let the completer handle it. */
    if (nidx == 1)
      {
diff -urN /usr/ports/shells/bash2/files/patch-terminal.c shells/bash2/files/patch-terminal.c
--- /usr/ports/shells/bash2/files/patch-terminal.c	Thu Apr 12 01:47:56 2001
+++ shells/bash2/files/patch-terminal.c	Wed Jul 24 05:58:13 2002
@@ -1,14 +1,14 @@
---- lib/readline/terminal.c.orig	Tue Feb  6 12:39:22 2001
-+++ lib/readline/terminal.c	Wed Apr 11 09:43:44 2001
-@@ -297,7 +297,11 @@
+--- lib/readline/terminal.c.orig	Tue Mar  5 02:23:09 2002
++++ lib/readline/terminal.c	Wed Jul 24 05:57:59 2002
+@@ -313,7 +313,11 @@
+   { "ei", &_rl_term_ei },
+   { "ic", &_rl_term_ic },
    { "im", &_rl_term_im },
-   { "kd", &_rl_term_kd },
-   { "kh", &_rl_term_kh },	/* home */
 +#ifdef __FreeBSD__
-+  { "@7", &_rl_term_kH },	/* end */
++  { "@7", &_rl_term_kH },	/* home down ?? */
 +#else
-   { "kH", &_rl_term_kH },	/* end */
+   { "kH", &_rl_term_kH },	/* home down ?? */
 +#endif
-   { "kl", &_rl_term_kl },
-   { "kr", &_rl_term_kr },
-   { "ku", &_rl_term_ku },
+   { "kI", &_rl_term_kI },	/* insert */
+   { "kd", &_rl_term_kd },
+   { "ke", &_rl_term_ke },	/* end keypad mode */

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207302015.g6UKFXZ7049893>