pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/ruby-readline * Remove code for ruby18.
details: https://anonhg.NetBSD.org/pkgsrc/rev/5b0f6d954eac
branches: trunk
changeset: 363005:5b0f6d954eac
user: taca <taca%pkgsrc.org@localhost>
date: Tue May 30 14:19:51 2017 +0000
description:
* Remove code for ruby18.
* Drop setting RUBY_VERSIONS_ACCEPTED since it is now default value.
diffstat:
devel/ruby-readline/Makefile | 10 +++-------
devel/ruby-readline/options.mk | 17 ++---------------
2 files changed, 5 insertions(+), 22 deletions(-)
diffs (60 lines):
diff -r 73099bacc919 -r 5b0f6d954eac devel/ruby-readline/Makefile
--- a/devel/ruby-readline/Makefile Tue May 30 14:08:26 2017 +0000
+++ b/devel/ruby-readline/Makefile Tue May 30 14:19:51 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2017/04/22 18:27:04 taca Exp $
+# $NetBSD: Makefile,v 1.45 2017/05/30 14:19:51 taca Exp $
#
DISTNAME= ${RUBY_DISTNAME}
@@ -12,9 +12,9 @@
HOMEPAGE= ${RUBY_HOMEPAGE}
COMMENT= Ruby extension to readline library
-RUBY_VERSIONS_ACCEPTED= 23 22 21
USE_RUBY_EXTCONF= yes
-EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/readline
+EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/readline \
+ ${RUBY_DISTNAME}/include ${RUBY_DISTNAME}/internal.h
WRKSRC= ${RUBY_WRKSRC}/ext/readline
MAKE_ENV+= top_srcdir=../..
@@ -24,10 +24,6 @@
.include "options.mk"
.include "../../lang/ruby/modules.mk"
-.if ${RUBY_VER} != "18"
-EXTRACT_ELEMENTS+= ${RUBY_DISTNAME}/include ${RUBY_DISTNAME}/internal.h
-.endif
-
post-install:
.for f in ${RUBY_DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/readline
diff -r 73099bacc919 -r 5b0f6d954eac devel/ruby-readline/options.mk
--- a/devel/ruby-readline/options.mk Tue May 30 14:08:26 2017 +0000
+++ b/devel/ruby-readline/options.mk Tue May 30 14:19:51 2017 +0000
@@ -1,22 +1,9 @@
-# $NetBSD: options.mk,v 1.7 2014/04/12 16:37:46 taca Exp $
+# $NetBSD: options.mk,v 1.8 2017/05/30 14:19:51 taca Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.ruby
PKG_SUPPORTED_OPTIONS= readline ruby-build-ri-db
-
-#
-# GNU readline supports multi bytes characters.
-#
-PKG_SUGGESTED_OPTIONS= ruby-build-ri-db
-
-.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
-PKG_SUGGESTED_OPTIONS+= readline
-.endif
+PKG_SUGGESTED_OPTIONS= ruby-build-ri-db readline
.include "../../mk/bsd.options.mk"
Home |
Main Index |
Thread Index |
Old Index