Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_149615399131750"
MIME-Version: 1.0
Date: Tue, 30 May 2017 14:19:51 +0000
From: "Takahiro Kambe" <taca@netbsd.org>
Subject: CVS commit: pkgsrc/devel/ruby-readline
To: pkgsrc-changes@NetBSD.org
Reply-To: taca@netbsd.org
Message-Id: <20170530141951.37221FBEE@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_149615399131750
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	taca
Date:		Tue May 30 14:19:51 UTC 2017

Modified Files:
	pkgsrc/devel/ruby-readline: Makefile options.mk

Log Message:
* Remove code for ruby18.
* Drop setting RUBY_VERSIONS_ACCEPTED since it is now default value.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/ruby-readline/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ruby-readline/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_149615399131750
Content-Disposition: inline
Content-Length: 2132
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/ruby-readline/Makefile
diff -u pkgsrc/devel/ruby-readline/Makefile:1.44 pkgsrc/devel/ruby-readline/Makefile:1.45
--- pkgsrc/devel/ruby-readline/Makefile:1.44	Sat Apr 22 18:27:04 2017
+++ pkgsrc/devel/ruby-readline/Makefile	Tue May 30 14:19:51 2017
@@ -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 @@ MAINTAINER=		taca@NetBSD.org
 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 @@ INSTALLATION_DIRS=	${RUBY_DOC}/readline
 .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

Index: pkgsrc/devel/ruby-readline/options.mk
diff -u pkgsrc/devel/ruby-readline/options.mk:1.7 pkgsrc/devel/ruby-readline/options.mk:1.8
--- pkgsrc/devel/ruby-readline/options.mk:1.7	Sat Apr 12 16:37:46 2014
+++ pkgsrc/devel/ruby-readline/options.mk	Tue May 30 14:19:51 2017
@@ -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"
 

--_----------=_149615399131750--