Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id DFFA11A9239 for ; Fri, 14 Jan 2022 16:14:36 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 20C0C84F3C; Fri, 14 Jan 2022 16:14:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4D5B484F39 for ; Fri, 14 Jan 2022 16:14:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id om_DDSTdA1re for ; Fri, 14 Jan 2022 16:14:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9EAE584D72 for ; Fri, 14 Jan 2022 16:14:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9B62BFB24; Fri, 14 Jan 2022 16:14:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1642176874259520" MIME-Version: 1.0 Date: Fri, 14 Jan 2022 16:14:34 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/lang/ruby26-base To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20220114161434.9B62BFB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1642176874259520 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Fri Jan 14 16:14:34 UTC 2022 Modified Files: pkgsrc/lang/ruby26-base: Makefile PLIST Log Message: lang/ruby26-base: take in ruby-fiddle pacakge Stop separating ruby-fiddle package and take in it since devel/ruby-fiddle lacks its rubygem's meta data and I have no idea to add them to it. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/ruby26-base/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ruby26-base/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1642176874259520 Content-Disposition: inline Content-Length: 3242 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ruby26-base/Makefile diff -u pkgsrc/lang/ruby26-base/Makefile:1.15 pkgsrc/lang/ruby26-base/Makefile:1.16 --- pkgsrc/lang/ruby26-base/Makefile:1.15 Fri Jan 14 15:42:08 2022 +++ pkgsrc/lang/ruby26-base/Makefile Fri Jan 14 16:14:34 2022 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2022/01/14 15:42:08 taca Exp $ +# $NetBSD: Makefile,v 1.16 2022/01/14 16:14:34 taca Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} +PKGREVISION= 1 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} @@ -9,6 +10,8 @@ MAINTAINER= taca@NetBSD.org HOMEPAGE= ${RUBY_HOMEPAGE} COMMENT= Ruby ${RUBY_VERSION} release minimum base package +CONFLICTS+= ${RUBY_PKGPREFIX}-fiddle-[0-9]* + RUBY_VERSIONS_ACCEPTED= 26 MAKE_JOBS_SAFE= no @@ -75,7 +78,6 @@ NOT_PAX_MPROTECT_SAFE+= bin/${RUBY_NAME} pre-configure: ${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb - ${RM} -f ${WRKSRC}/ext/fiddle/extconf.rb ${RM} -f ${WRKSRC}/ext/readline/extconf.rb ${TOUCH} ${WRKSRC}/prelude.c ${CHMOD} -x ${WRKSRC}/sample/test.rb @@ -111,6 +113,7 @@ post-install: .include "../../mk/bdb.buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/libffi/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/libyaml/buildlink3.mk" Index: pkgsrc/lang/ruby26-base/PLIST diff -u pkgsrc/lang/ruby26-base/PLIST:1.6 pkgsrc/lang/ruby26-base/PLIST:1.7 --- pkgsrc/lang/ruby26-base/PLIST:1.6 Fri Jan 14 15:42:08 2022 +++ pkgsrc/lang/ruby26-base/PLIST Fri Jan 14 16:14:34 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2022/01/14 15:42:08 taca Exp $ +@comment $NetBSD: PLIST,v 1.7 2022/01/14 16:14:34 taca Exp $ bin/bundle${RUBY_SUFFIX} bin/bundler${RUBY_SUFFIX} bin/erb${RUBY_SUFFIX} @@ -308,6 +308,15 @@ ${RUBY_LIB}/e2mmap.rb ${RUBY_LIB}/e2mmap/version.rb ${RUBY_LIB}/erb.rb ${RUBY_LIB}/expect.rb +${RUBY_LIB}/fiddle.rb +${RUBY_LIB}/fiddle/closure.rb +${RUBY_LIB}/fiddle/cparser.rb +${RUBY_LIB}/fiddle/function.rb +${RUBY_LIB}/fiddle/import.rb +${RUBY_LIB}/fiddle/pack.rb +${RUBY_LIB}/fiddle/struct.rb +${RUBY_LIB}/fiddle/types.rb +${RUBY_LIB}/fiddle/value.rb ${RUBY_LIB}/fileutils.rb ${RUBY_LIB}/fileutils/version.rb ${RUBY_LIB}/find.rb @@ -1087,6 +1096,7 @@ ${RUBY_ARCHLIB}/enc/windows_31j.${RUBY_D ${RUBY_ARCHLIB}/etc.${RUBY_DLEXT} ${RUBY_ARCHLIB}/fcntl.${RUBY_DLEXT} ${RUBY_ARCHLIB}/fiber.${RUBY_DLEXT} +${RUBY_ARCHLIB}/fiddle.${RUBY_DLEXT} ${PLIST.io}${RUBY_ARCHLIB}/io/console.${RUBY_DLEXT} ${PLIST.io}${RUBY_ARCHLIB}/io/nonblock.${RUBY_DLEXT} ${PLIST.io}${RUBY_ARCHLIB}/io/wait.${RUBY_DLEXT} @@ -1427,6 +1437,7 @@ ${GEM_HOME}/specifications/default/dbm-$ ${GEM_HOME}/specifications/default/e2mmap-${RUBY_E2MMAP_VER}.gemspec ${GEM_HOME}/specifications/default/etc-${RUBY_ETC_VER}.gemspec ${GEM_HOME}/specifications/default/fcntl-${RUBY_FCNTL_VER}.gemspec +${GEM_HOME}/specifications/default/fiddle-${RUBY_FIDDLE_VER}.gemspec ${GEM_HOME}/specifications/default/fileutils-${RUBY_FILEUTILS_VER}.gemspec ${GEM_HOME}/specifications/default/forwardable-${RUBY_FORWARDABLE_VER}.gemspec ${PLIST.io}${GEM_HOME}/specifications/default/io-console-${RUBY_IO_CONSOLE_VER}.gemspec --_----------=_1642176874259520--