[pkgsrc/trunk]: pkgsrc/devel/ruby-readline Don't enable "readline" option def...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d7086715ee3a
branches:  trunk
changeset: 603182:d7086715ee3a
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Apr 29 16:43:49 2012 +0000

description:
Don't enable "readline" option default if RUBY_VER is prior to 193.

Ruby 1.9.3 changes its license and solve the problem with GPL3 of readline
license.  But Ruby 1.9.2/1.8.7 dosen't solve this problem.

If you want to use ruby-readline with GNU readline on ruby18 or ruby192,
please explictly set "readline" PKG_OPTION.

Fix PR pkg/41943.

Bump PKGREVISION.

diffstat:

 devel/ruby-readline/Makefile   |   5 +++--
 devel/ruby-readline/options.mk |  13 ++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r 1fa1a371ea80 -r d7086715ee3a devel/ruby-readline/Makefile
--- a/devel/ruby-readline/Makefile      Sun Apr 29 16:39:02 2012 +0000
+++ b/devel/ruby-readline/Makefile      Sun Apr 29 16:43:49 2012 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2012/02/18 06:55:15 taca Exp $
+# $NetBSD: Makefile,v 1.32 2012/04/29 16:43:49 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}
@@ -27,7 +28,7 @@
 .endfor
 
 .include "options.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../lang/ruby/modules.mk"
 .include "../../lang/ruby/Makefile.common"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1fa1a371ea80 -r d7086715ee3a devel/ruby-readline/options.mk
--- a/devel/ruby-readline/options.mk    Sun Apr 29 16:39:02 2012 +0000
+++ b/devel/ruby-readline/options.mk    Sun Apr 29 16:43:49 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2009/09/13 01:51:05 taca Exp $
+# $NetBSD: options.mk,v 1.2 2012/04/29 16:43:49 taca Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ruby
@@ -7,9 +7,16 @@
 #
 # GNU readline supports multi bytes characters.
 #
-PKG_SUGGESTED_OPTIONS= readline ruby-build-ri-db
+PKG_SUGGESTED_OPTIONS= ruby-build-ri-db
+
+.include "../../lang/ruby/rubyversion.mk"
 
-.include "../../mk/bsd.options.mk"
+# 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
+PKG_SUGGESTED_OPTIONS+=        readline
+.endif
 
 .if !empty(PKG_OPTIONS:Mreadline)
 USE_BUILTIN.readline=  no