kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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.
This commit is contained in:
taca 2012-04-29 16:43:49 +00:00
parent 601296e43e
commit c85bd8a671
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
devel/ruby-readline/Makefile
View file

@ -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 @@ post-install:
.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"

13
devel/ruby-readline/options.mk
View file

@ -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 @@ PKG_SUPPORTED_OPTIONS= readline ruby-build-ri-db
#
# GNU readline supports multi bytes characters.
#
PKG_SUGGESTED_OPTIONS= readline ruby-build-ri-db
PKG_SUGGESTED_OPTIONS= ruby-build-ri-db
.include "../../mk/bsd.options.mk"
.include "../../lang/ruby/rubyversion.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