[pkgsrc/pkgsrc-2005Q2]: pkgsrc/shells/bash2 Pullup ticket 580 - requested by ...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/573dbc2986a0
branches:  pkgsrc-2005Q2
changeset: 495857:573dbc2986a0
user:      snj <snj%pkgsrc.org@localhost>
date:      Sat Jul 02 07:02:07 2005 +0000

description:
Pullup ticket 580 - requested by Min Sik Kim
portability fix for bash2

Revision pulled up:
- pkgsrc/shells/bash2/Makefile  1.64

    Module Name:     pkgsrc
    Committed By:    minskim
    Date:            Fri Jul  1 16:11:05 UTC 2005

    Modified Files:
        pkgsrc/shells/bash2: Makefile

    Log Message:
    Use devel/readline instead of the included readline library.  Bump
    PKGREVISION due to the added dependency.

    While here, set BUILDLINK_DEPMETHOD of dependent libraries to "build"
    when the "static" option is enabled.

    Approved by the maintainer (wiz@).

diffstat:

 shells/bash2/Makefile |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 03a4b0b7e5f5 -r 573dbc2986a0 shells/bash2/Makefile
--- a/shells/bash2/Makefile     Sat Jul 02 06:58:37 2005 +0000
+++ b/shells/bash2/Makefile     Sat Jul 02 07:02:07 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.63 2005/05/31 10:01:39 dillo Exp $
+# $NetBSD: Makefile,v 1.63.2.1 2005/07/02 07:02:07 snj Exp $
 #
 
 DISTNAME=      bash-2.05b
 PKGNAME=       bash-2.05.2.7
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_GNU:=bash/} \
                ftp://ftp.cwru.edu/pub/bash/
@@ -20,8 +20,10 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
+USE_GNU_READLINE=      yes
 USE_PKGINSTALL=                yes
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-installed-readline
 MAKE_ENV+=             INSTALL_SCRIPT='${INSTALL_SCRIPT}'
 TEST_TARGET=           test
 
@@ -43,6 +45,8 @@
 ##
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=       --enable-static-link
+BUILDLINK_DEPMETHOD.gettext=   build
+BUILDLINK_DEPMETHOD.readline=  build
 .endif
 
 ##
@@ -52,9 +56,13 @@
 CONFIGURE_ENV+=        ac_cv_type_wctype_t=no
 .endif
 
+BUILDLINK_DEPENDS.readline+=   readline>=4.3
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+
 post-install:
        ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${PREFIX}/man/man1
        ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/man/man1
 
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"