diff options
| author | taca <taca@pkgsrc.org> | 2022-01-14 16:14:34 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2022-01-14 16:14:34 +0000 |
| commit | cc5c6d12b5afc97a6432c5066b7826af13663a23 (patch) | |
| tree | 3000c20c333a4e9d639b2bc5de60800cc5c30ff0 /lang/ruby26-base | |
| parent | 09cf5587fdb2e3a74cdffd44b07db8b5b1b0ccac (diff) | |
| download | pkgsrc-cc5c6d12b5afc97a6432c5066b7826af13663a23.tar.gz | |
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.
Diffstat (limited to 'lang/ruby26-base')
| -rw-r--r-- | lang/ruby26-base/Makefile | 7 | ||||
| -rw-r--r-- | lang/ruby26-base/PLIST | 13 |
2 files changed, 17 insertions, 3 deletions
diff --git a/lang/ruby26-base/Makefile b/lang/ruby26-base/Makefile index d8ea5d14604..5ef19a2fafc 100644 --- a/lang/ruby26-base/Makefile +++ b/lang/ruby26-base/Makefile @@ -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" diff --git a/lang/ruby26-base/PLIST b/lang/ruby26-base/PLIST index eae335dac32..b9d9a5b060a 100644 --- a/lang/ruby26-base/PLIST +++ b/lang/ruby26-base/PLIST @@ -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_DLEXT} ${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-${RUBY_DBM_VER}.gemspec ${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 |