pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/shells/bash Don't enforce using the "readline" package...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1304c0629eed
branches: trunk
changeset: 496664:1304c0629eed
user: tron <tron%pkgsrc.org@localhost>
date: Thu Jul 07 21:30:54 2005 +0000
description:
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:
shells/bash/Makefile | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diffs (49 lines):
diff -r 24562450ecce -r 1304c0629eed shells/bash/Makefile
--- a/shells/bash/Makefile Thu Jul 07 21:29:11 2005 +0000
+++ b/shells/bash/Makefile Thu Jul 07 21:30:54 2005 +0000
@@ -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 @@
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 @@
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"
Home |
Main Index |
Thread Index |
Old Index