Tue May 30 14:19:51 2017 UTC ()
* Remove code for ruby18.
* Drop setting RUBY_VERSIONS_ACCEPTED since it is now default value.


(taca)
diff -r1.44 -r1.45 pkgsrc/devel/ruby-readline/Makefile
diff -r1.7 -r1.8 pkgsrc/devel/ruby-readline/options.mk
cvs diff -r1.44 -r1.45 pkgsrc/devel/ruby-readline/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ruby-readline/Makefile 2017/04/22 18:27:04 1.44
+++ pkgsrc/devel/ruby-readline/Makefile 2017/05/30 14:19:51 1.45
@@ -1,37 +1,33 @@ @@ -1,37 +1,33 @@
1# $NetBSD: Makefile,v 1.44 2017/04/22 18:27:04 taca Exp $ 1# $NetBSD: Makefile,v 1.45 2017/05/30 14:19:51 taca Exp $
2# 2#
3 3
4DISTNAME= ${RUBY_DISTNAME} 4DISTNAME= ${RUBY_DISTNAME}
5PKGNAME= ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL} 5PKGNAME= ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL}
6PKGREVISION= 1 6PKGREVISION= 1
7RUBY_EXTNAME= readline 7RUBY_EXTNAME= readline
8CATEGORIES= devel ruby 8CATEGORIES= devel ruby
9MASTER_SITES= ${MASTER_SITE_RUBY} 9MASTER_SITES= ${MASTER_SITE_RUBY}
10 10
11MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
12HOMEPAGE= ${RUBY_HOMEPAGE} 12HOMEPAGE= ${RUBY_HOMEPAGE}
13COMMENT= Ruby extension to readline library 13COMMENT= Ruby extension to readline library
14 14
15RUBY_VERSIONS_ACCEPTED= 23 22 21 
16USE_RUBY_EXTCONF= yes 15USE_RUBY_EXTCONF= yes
17EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/readline 16EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/readline \
 17 ${RUBY_DISTNAME}/include ${RUBY_DISTNAME}/internal.h
18WRKSRC= ${RUBY_WRKSRC}/ext/readline 18WRKSRC= ${RUBY_WRKSRC}/ext/readline
19MAKE_ENV+= top_srcdir=../.. 19MAKE_ENV+= top_srcdir=../..
20 20
21RUBY_DOCS= README README.ja 21RUBY_DOCS= README README.ja
22INSTALLATION_DIRS= ${RUBY_DOC}/readline 22INSTALLATION_DIRS= ${RUBY_DOC}/readline
23 23
24.include "options.mk" 24.include "options.mk"
25.include "../../lang/ruby/modules.mk" 25.include "../../lang/ruby/modules.mk"
26 26
27.if ${RUBY_VER} != "18" 
28EXTRACT_ELEMENTS+= ${RUBY_DISTNAME}/include ${RUBY_DISTNAME}/internal.h 
29.endif 
30 
31post-install: 27post-install:
32.for f in ${RUBY_DOCS} 28.for f in ${RUBY_DOCS}
33 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/readline 29 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/readline
34.endfor 30.endfor
35 31
36.include "../../lang/ruby/Makefile.common" 32.include "../../lang/ruby/Makefile.common"
37.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/devel/ruby-readline/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/ruby-readline/options.mk 2014/04/12 16:37:46 1.7
+++ pkgsrc/devel/ruby-readline/options.mk 2017/05/30 14:19:51 1.8
@@ -1,32 +1,19 @@ @@ -1,32 +1,19 @@
1# $NetBSD: options.mk,v 1.7 2014/04/12 16:37:46 taca Exp $ 1# $NetBSD: options.mk,v 1.8 2017/05/30 14:19:51 taca Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.ruby 4PKG_OPTIONS_VAR= PKG_OPTIONS.ruby
5PKG_SUPPORTED_OPTIONS= readline ruby-build-ri-db 5PKG_SUPPORTED_OPTIONS= readline ruby-build-ri-db
6 6PKG_SUGGESTED_OPTIONS= ruby-build-ri-db readline
7# 
8# GNU readline supports multi bytes characters. 
9# 
10PKG_SUGGESTED_OPTIONS= ruby-build-ri-db 
11 
12.include "../../lang/ruby/rubyversion.mk" 
13 
14# Since license of Ruby prior to 1.9.3 is incompatible with newer 
15# readline's GPL3, enable it with 1.9.3 and lator. 
16# 
17.if ${RUBY_VER} != 18 
18PKG_SUGGESTED_OPTIONS+= readline 
19.endif 
20 7
21.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
22 9
23.if !empty(PKG_OPTIONS:Mreadline) 10.if !empty(PKG_OPTIONS:Mreadline)
24READLINE_DEFAULT?= readline 11READLINE_DEFAULT?= readline
25.endif 12.endif
26.include "../../mk/readline.buildlink3.mk" 13.include "../../mk/readline.buildlink3.mk"
27 14
28.if ${READLINE_TYPE} == "editline" 15.if ${READLINE_TYPE} == "editline"
29CONFIGURE_ARGS+= --enable-libedit 16CONFIGURE_ARGS+= --enable-libedit
30.else 17.else
31CONFIGURE_ARGS+= --disable-libedit 18CONFIGURE_ARGS+= --disable-libedit
32.endif 19.endif