diff options
| author | sbd <sbd@pkgsrc.org> | 2012-05-13 08:37:03 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-05-13 08:37:03 +0000 |
| commit | c678e7cadba6d6936b4f152b5546abd4a98b1f0f (patch) | |
| tree | 05d6a95dae2ef06e17627dcb5bb3a3b2a3161bec /devel | |
| parent | 191ca50830d8ff9a8edf7ee2dd8af2a51acdaaad (diff) | |
| download | pkgsrc-c678e7cadba6d6936b4f152b5546abd4a98b1f0f.tar.gz | |
To use the options framework bsd.options.mk must be include.
Also only add '--enable-libedit' to the configure args if the builtin
readline is libedit.
Bump PKGREVISION.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ruby-readline/Makefile | 4 | ||||
| -rw-r--r-- | devel/ruby-readline/options.mk | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile index cc002438478..876a296a28b 100644 --- a/devel/ruby-readline/Makefile +++ b/devel/ruby-readline/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.32 2012/04/29 16:43:49 taca Exp $ +# $NetBSD: Makefile,v 1.33 2012/05/13 08:37:03 sbd Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL} -PKGREVISION= 1 +PKGREVISION= 2 RUBY_EXTNAME= readline CATEGORIES= devel ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/devel/ruby-readline/options.mk b/devel/ruby-readline/options.mk index f45d6e8d39f..2b921dba0fc 100644 --- a/devel/ruby-readline/options.mk +++ b/devel/ruby-readline/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2012/04/29 16:43:49 taca Exp $ +# $NetBSD: options.mk,v 1.3 2012/05/13 08:37:03 sbd Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.ruby @@ -18,9 +18,16 @@ PKG_SUGGESTED_OPTIONS= ruby-build-ri-db PKG_SUGGESTED_OPTIONS+= readline .endif +.include "../../mk/bsd.options.mk" + .if !empty(PKG_OPTIONS:Mreadline) USE_BUILTIN.readline= no CONFIGURE_ARGS+= --disable-libedit .else +CHECK_BUILTIN.readline:= yes +. include "../../devel/readline/builtin.mk" +CHECK_BUILTIN.readline:= no +. if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) CONFIGURE_ARGS+= --enable-libedit +. endif .endif |