diff options
| author | tron <tron> | 2005-07-07 21:30:54 +0000 |
|---|---|---|
| committer | tron <tron> | 2005-07-07 21:30:54 +0000 |
| commit | 06af3e1eb5e160c474f6fef91f7fc5fbd388a38b (patch) | |
| tree | dd5aaf72e168d1958e6f485544d777934ae501d9 /shells | |
| parent | 9b5bd4adba677d2ba42f0b26a22aca6953f14cac (diff) | |
| download | pkgsrc-06af3e1eb5e160c474f6fef91f7fc5fbd388a38b.tar.gz | |
Don't enforce using the "readline" package on every platform just
because Darwin needs it (which is probably not true either). Bump package
revision after the damage from the previous revision has been fixed.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 7d38d010721..d307b6138de 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2005/07/01 16:14:39 minskim Exp $ -# +# $NetBSD: Makefile,v 1.10 2005/07/07 21:30:54 tron Exp $ DISTNAME= bash-3.0 PKGNAME= bash-3.0pl16 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \ ftp://ftp.cwru.edu/pub/bash/ @@ -22,12 +21,10 @@ CONFLICTS= static-bash-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_GNU_READLINE= yes USE_MAKEINFO= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-installed-readline MAKE_ENV+= INSTALL_SCRIPT='${INSTALL_SCRIPT}' TEST_TARGET= test @@ -76,13 +73,19 @@ BUILDLINK_DEPMETHOD.readline= build CONFIGURE_ENV+= ac_cv_type_wctype_t=no .endif +# Use "readline" package on Darwin to avoid link erros. +.if ${OPSYS} == "Darwin" +CONFIGURE_ARGS+= --with-installed-readline + +USE_GNU_READLINE= yes BUILDLINK_DEPENDS.readline+= readline>=4.3 -.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" +.endif 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" |