diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-07-15 02:02:17 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-07-15 02:02:17 +0000 |
| commit | 818a5e8745dff4beadc0fe8aa4f56c71c53ea650 (patch) | |
| tree | 7082cd8bccd6e4c222c7d1017f6c4896abcadef6 /shells | |
| parent | e221de4390166c39bc8b5b1a7496333f0650a731 (diff) | |
| download | pkgsrc-818a5e8745dff4beadc0fe8aa4f56c71c53ea650.tar.gz | |
* .include "../../devel/readline/buildlink3.mk" with USE_GNU_READLINE=yes
are replaced with .include "../../devel/readline/buildlink3.mk", and
USE_GNU_READLINE are removed,
* .include "../../devel/readline/buildlink3.mk" without USE_GNU_READLINE
are replaced with .include "../../mk/readline.buildlink3.mk".
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash/Makefile | 4 | ||||
| -rw-r--r-- | shells/bash2/Makefile | 3 | ||||
| -rw-r--r-- | shells/rc/Makefile | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 80ca41ae0c9..85adb087aa1 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2013/06/09 18:12:14 bsiegert Exp $ +# $NetBSD: Makefile,v 1.59 2013/07/15 02:02:28 ryoon Exp $ BASH_VERSION= 4.2 @@ -79,9 +79,7 @@ CONFIGURE_ARGS+= --enable-job-control .if ${OPSYS} == "Darwin" CONFIGURE_ARGS+= --with-installed-readline -USE_GNU_READLINE= yes BUILDLINK_API_DEPENDS.readline+= readline>=6.0 - .include "../../devel/readline/buildlink3.mk" .endif diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 1a8cfd942b6..ae1ac930752 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2013/02/12 23:27:24 tcort Exp $ +# $NetBSD: Makefile,v 1.84 2013/07/15 02:02:28 ryoon Exp $ # DISTNAME= bash-2.05b @@ -20,7 +20,6 @@ CONFLICTS= static-bash-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_GNU_READLINE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-installed-readline MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} diff --git a/shells/rc/Makefile b/shells/rc/Makefile index 94a44287947..e15026cd1a6 100644 --- a/shells/rc/Makefile +++ b/shells/rc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2012/09/11 23:25:09 asau Exp $ +# $NetBSD: Makefile,v 1.28 2013/07/15 02:02:28 ryoon Exp $ DISTNAME= rc-1.7 PKGREVISION= 1 @@ -22,7 +22,6 @@ PKG_SUPPORTED_OPTIONS= readline .if !empty(PKG_OPTIONS:Mreadline) .include "../../devel/readline/buildlink3.mk" CONFIGURE_ARGS+= --with-readline -USE_GNU_READLINE= YES .endif .include "../../mk/bsd.pkg.mk" |