From 7985431f24ce58a5422efca9e1c2750e42eda59c Mon Sep 17 00:00:00 2001 From: minskim Date: Fri, 1 Jul 2005 16:11:05 +0000 Subject: 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@). --- shells/bash2/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'shells') diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index b5479e6ae6c..3853b2d3c54 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.63 2005/05/31 10:01:39 dillo Exp $ +# $NetBSD: Makefile,v 1.64 2005/07/01 16:11:05 minskim 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 @@ CONFLICTS= static-bash-[0-9]* 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 @@ PKG_OPTIONS_LEGACY_VARS+= BASH_STATIC:static ## .if !empty(PKG_OPTIONS:Mstatic) CONFIGURE_ARGS+= --enable-static-link +BUILDLINK_DEPMETHOD.gettext= build +BUILDLINK_DEPMETHOD.readline= build .endif ## @@ -52,9 +56,13 @@ CONFIGURE_ARGS+= --enable-static-link 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" -- cgit v1.2.3