diff options
| author | taca <taca> | 2014-04-12 16:37:46 +0000 |
|---|---|---|
| committer | taca <taca> | 2014-04-12 16:37:46 +0000 |
| commit | 1154894f34b136bef431ecdd70aee324975bc6b1 (patch) | |
| tree | 7774c60463e231a46e52086ed493822694956ca9 | |
| parent | 8332a6ae07200cc0704f212a7d299309f99af79e (diff) | |
| download | pkgsrc-1154894f34b136bef431ecdd70aee324975bc6b1.tar.gz | |
Fix some problems and clean up.
* RUBY_VER dose not take "19" any more.
* Make readline PKG_OPTION work as it should be.
* Always include readline.buildlink3.mk.
Bump PKGREVISION.
| -rw-r--r-- | devel/ruby-readline/Makefile | 3 | ||||
| -rw-r--r-- | devel/ruby-readline/options.mk | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile index 3e42bacf713..0d32cb8a414 100644 --- a/devel/ruby-readline/Makefile +++ b/devel/ruby-readline/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.36 2013/07/15 02:02:21 ryoon Exp $ +# $NetBSD: Makefile,v 1.37 2014/04/12 16:37:46 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL} +PKGREVISION= 1 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 a3abde08091..921fa42550e 100644 --- a/devel/ruby-readline/options.mk +++ b/devel/ruby-readline/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2013/08/21 20:02:50 jperkin Exp $ +# $NetBSD: options.mk,v 1.7 2014/04/12 16:37:46 taca Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.ruby @@ -14,17 +14,19 @@ PKG_SUGGESTED_OPTIONS= ruby-build-ri-db # Since license of Ruby prior to 1.9.3 is incompatible with newer # readline's GPL3, enable it with 1.9.3 and lator. # -.if ${RUBY_VER} != 18 && ${RUBY_VER} != 19 +.if ${RUBY_VER} != 18 PKG_SUGGESTED_OPTIONS+= readline .endif .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mreadline) -. include "../../mk/readline.buildlink3.mk" -. if ${READLINE_TYPE} == "editline" +READLINE_DEFAULT?= readline +.endif +.include "../../mk/readline.buildlink3.mk" + +.if ${READLINE_TYPE} == "editline" CONFIGURE_ARGS+= --enable-libedit -. else +.else CONFIGURE_ARGS+= --disable-libedit -. endif .endif |