Up to [cvs.NetBSD.org] / pkgsrc / lang / ruby
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
ruby: Pull in libiconv.
ruby: make sure there isn't already a ruby in buildlink before linking
Fix indentation in buildlink3.mk files. The actual fix as been done by "pkglint -F */*/buildlink3.mk", and was reviewed manually. There are some .include lines that still are indented with zero spaces although the surrounding .if is indented. This is existing practice.
Refelect change of RUBY_SRCDIR.
Set BUILDLINK_API_DEPENDS correctly (with +=, not ?=)
Set BUILDLINK_ABI_DEPENDS correctly (with +=, not ?=) It turns out there were a lot of these.
Overhaul buildlink3 processing of Ruby. * Don't buildlink in ruby/rubyversion.mk any more but define RUBY_USE_PTHREAD (use of pthread). * In ruby/buildlink3.mk, buildlink via mk/pthread.buildlink3.mk as to RUBY_USE_PTHREAD. * Also the same logic in ruby/Makefile.common. * Buildlink of bdb, libiconv, zlib, openssl in each ruby*-base/Makefile.
Use RUBY_VERSION instead of RUBY_REQD.
Pullup ticket #3361 - requested by taca archivers/ruby-libarchive: dependence update comms/ruby-termios: dependence update converters/ruby-uconv: dependence update databases/ruby-do_sqlite3: dependence update databases/ruby-ldap: dependence update databases/ruby-mysql: dependence update databases/ruby-odbc: dependence update databases/ruby-pg: dependence update databases/ruby-postgresql: dependence update databases/ruby-qdbm: dependence update databases/ruby-sqlite: dependence update databases/ruby-sqlite3: dependence update databases/ruby-tokyocabinet: dependence update devel/ruby-SDL: dependence update devel/ruby-debug-base: dependence update devel/ruby-eet: dependence update devel/ruby-eventmachine: dependence update devel/ruby-ffi: dependence update devel/ruby-gnome2-atk: dependence update devel/ruby-gnome2-bonobo: dependence update devel/ruby-gnome2-bonoboui: dependence update devel/ruby-gnome2-gconf: dependence update devel/ruby-gnome2-gio: dependence update devel/ruby-gnome2-glib: dependence update devel/ruby-gnome2-libglade: dependence update devel/ruby-gnome2-pango: dependence update devel/ruby-linecache: dependence update devel/ruby-memcache: dependence update devel/ruby-ncurses: dependence update devel/ruby-priority-queue: dependence update devel/ruby-racc: dependence update devel/ruby-rbtree: dependence update devel/ruby-rcov: dependence update devel/ruby-rcsparse: dependence update devel/ruby-subversion: dependence update devel/ruby-thrift: dependence update graphics/ruby-RMagick: dependence update graphics/ruby-clutter-cairo: dependence update graphics/ruby-clutter-core: dependence update graphics/ruby-clutter-gtk: dependence update graphics/ruby-gd: dependence update graphics/ruby-gnome2-gdkpixbuf: dependence update graphics/ruby-gnome2-gnomecanvas: dependence update graphics/ruby-gnome2-goocanvas: dependence update graphics/ruby-gnome2-gtkglext: dependence update graphics/ruby-gnome2-libart: dependence update graphics/ruby-gnome2-rsvg: dependence update graphics/ruby-imlib2: dependence update graphics/ruby-opengl: dependence update graphics/ruby-rcairo: dependence update inputmethod/ruby-zinnia: dependence update lang/ruby: dependence update lang/ruby18-base: security update lang/ruby19-base: security update mail/ruby-tmail: dependence update math/ruby-rb-gsl: dependence update multimedia/ruby-clutter-gst: dependence update multimedia/ruby-gnome2-gstreamer: dependence update multimedia/ruby-ming: dependence update print/ruby-gnome2-gnomeprint: dependence update print/ruby-gnome2-gnomeprintui: dependence update print/ruby-gnome2-poppler: dependence update security/ruby-password: dependence update security/ruby-tcpwrap: dependence update sysutils/ruby-quota: dependence update textproc/ruby-bluecloth: dependence update textproc/ruby-cabocha: dependence update textproc/ruby-eruby: dependence update textproc/ruby-ferret: dependence update textproc/ruby-hpricot: dependence update textproc/ruby-itex2MML: dependence update textproc/ruby-json: dependence update textproc/ruby-libxml: dependence update textproc/ruby-mecab: dependence update textproc/ruby-native-hyperestraier: dependence update textproc/ruby-nokogiri: dependence update textproc/ruby-oniguruma: dependence update textproc/ruby-redcloth: dependence update textproc/ruby-sary: dependence update textproc/ruby-xmlparser: dependence update textproc/ruby-xslt: dependence update textproc/ruby-yamcha: dependence update www/mongrel: dependence update www/ruby-clearsilver: dependence update www/ruby-fcgi: dependence update www/ruby-gnome2-gtkhtml2: dependence update www/ruby-gnome2-gtkmozembed: dependence update www/ruby-patron: dependence update www/thin: dependence update x11/ruby-gnome2-gnome: dependence update x11/ruby-gnome2-gtk: dependence update x11/ruby-gnome2-gtksourceview: dependence update x11/ruby-gnome2-gtksourceview2: dependence update x11/ruby-gnome2-panelapplet: dependence update x11/ruby-gnome2-vte: dependence update Revisions pulled up: - archivers/ruby-libarchive/Makefile 1.2 - comms/ruby-termios/Makefile 1.23 - converters/ruby-uconv/Makefile 1.19 - databases/ruby-do_sqlite3/Makefile 1.2 - databases/ruby-ldap/Makefile 1.7 - databases/ruby-mysql/Makefile 1.34 via patch - databases/ruby-odbc/Makefile 1.10 via patch - databases/ruby-pg/Makefile 1.6 - databases/ruby-postgresql/Makefile 1.37 - databases/ruby-qdbm/Makefile 1.12 - databases/ruby-sqlite/Makefile 1.3 - databases/ruby-sqlite3/Makefile 1.15 - databases/ruby-tokyocabinet/Makefile 1.24 - devel/ruby-SDL/Makefile 1.9 via patch - devel/ruby-debug-base/Makefile 1.7 - devel/ruby-eet/Makefile 1.8 - devel/ruby-eventmachine/Makefile 1.7 - devel/ruby-ffi/Makefile 1.3 - devel/ruby-gnome2-atk/Makefile 1.8 - devel/ruby-gnome2-bonobo/Makefile patch - devel/ruby-gnome2-bonoboui/Makefile patch - devel/ruby-gnome2-gconf/Makefile patch - devel/ruby-gnome2-gio/Makefile 1.3 via patch - devel/ruby-gnome2-glib/Makefile 1.11 - devel/ruby-gnome2-libglade/Makefile patch - devel/ruby-gnome2-pango/Makefile 1.18 via patch - devel/ruby-linecache/Makefile 1.5 - devel/ruby-memcache/Makefile 1.4 - devel/ruby-ncurses/Makefile 1.9 - devel/ruby-priority-queue/Makefile 1.6 - devel/ruby-racc/Makefile 1.18 - devel/ruby-rbtree/Makefile 1.6 - devel/ruby-rcov/Makefile 1.5 - devel/ruby-rcsparse/Makefile 1.10 - devel/ruby-subversion/Makefile 1.28 - devel/ruby-thrift/Makefile 1.4 via patch - graphics/ruby-RMagick/Makefile 1.76 via patch - graphics/ruby-clutter-cairo/Makefile 1.8 via patch - graphics/ruby-clutter-core/Makefile 1.11 via patch - graphics/ruby-clutter-gtk/Makefile 1.8 via patch - graphics/ruby-gd/Makefile 1.34 via patch - graphics/ruby-gnome2-gdkpixbuf/Makefile 1.20 via patch - graphics/ruby-gnome2-gnomecanvas/Makefile patch - graphics/ruby-gnome2-goocanvas/Makefile 1.12 via patch - graphics/ruby-gnome2-gtkglext/Makefile patch - graphics/ruby-gnome2-libart/Makefile patch - graphics/ruby-gnome2-rsvg/Makefile 1.21 va patch - graphics/ruby-imlib2/Makefile 1.24 va patch - graphics/ruby-opengl/Makefile 1.31 - graphics/ruby-rcairo/Makefile 1.22 via patch - inputmethod/ruby-zinnia/Makefile 1.3 - lang/ruby/buildlink3.mk 1.13 - lang/ruby/rubyversion.mk 1.58-1.59 - lang/ruby18-base/distinfo 1.47 - lang/ruby19-base/DEINSTALL 1.2 - lang/ruby19-base/Makefile 1.7 - lang/ruby19-base/PLIST 1.4 - lang/ruby19-base/distinfo 1.4 - lang/ruby19-base/patches/patch-string.c 1.1 - mail/ruby-tmail/Makefile 1.19 - math/ruby-rb-gsl/Makefile 1.9 - multimedia/ruby-clutter-gst/Makefile 1.9 via patch - multimedia/ruby-gnome2-gstreamer/Makefile 1.7 - multimedia/ruby-ming/Makefile 1.15 via patch - print/ruby-gnome2-gnomeprint/Makefile patch - print/ruby-gnome2-gnomeprintui/Makefile patch - print/ruby-gnome2-poppler/Makefile 1.19 via patch - security/ruby-password/Makefile 1.5 - security/ruby-tcpwrap/Makefile 1.18 - sysutils/ruby-quota/Makefile 1.21 - textproc/ruby-bluecloth/Makefile 1.5 - textproc/ruby-cabocha/Makefile 1.3 - textproc/ruby-eruby/Makefile 1.26 - textproc/ruby-ferret/Makefile 1.6 - textproc/ruby-hpricot/Makefile 1.8 - textproc/ruby-itex2MML/Makefile 1.7 - textproc/ruby-json/Makefile 1.9 - textproc/ruby-libxml/Makefile 1.7 - textproc/ruby-mecab/Makefile 1.6 - textproc/ruby-native-hyperestraier/Makefile 1.6 - textproc/ruby-nokogiri/Makefile 1.4 - textproc/ruby-oniguruma/Makefile 1.6 - textproc/ruby-redcloth/Makefile 1.14 - textproc/ruby-sary/Makefile 1.7 - textproc/ruby-xmlparser/Makefile 1.15 - textproc/ruby-xslt/Makefile 1.7 - textproc/ruby-yamcha/Makefile 1.3 - www/mongrel/Makefile 1.13 via patch - www/ruby-clearsilver/Makefile 1.15 - www/ruby-fcgi/Makefile 1.15 - www/ruby-gnome2-gtkhtml2/Makefile patch - www/ruby-gnome2-gtkmozembed/Makefile 1.17 via patch - www/ruby-patron/Makefile 1.5 - www/thin/Makefile 1.8 via patch - x11/ruby-gnome2-gtk/Makefile 1.25 via patch - x11/ruby-gnome2-gtksourceview/Makefile patch via 1.12 - x11/ruby-gnome2-gtksourceview2/Makefile patch - x11/ruby-gnome2-panelapplet/Makefile patch - x11/ruby-gnome2-vte/Makefile 1.16 via patch --- Module Name: pkgsrc Module Name: pkgsrc Committed By: taca Date: Mon Feb 21 14:31:06 UTC 2011 Modified Files: pkgsrc/lang/ruby: rubyversion.mk Log Message: * Start upate of ruby18 and ruby19 packags. * Remove redundant GEM_HOME definition from PLIST. --- Module Name: pkgsrc Module Name: pkgsrc Committed By: taca Date: Mon Feb 21 14:35:38 UTC 2011 Modified Files: pkgsrc/lang/ruby18-base: distinfo Log Message: Update ruby18-base package to 1.8.7.334 (Ruby 1.8.7p334). * The FileUtils Vulnerability http://www.ruby-lang.org/en/news/2011/02/18/fileutils-is-vulnerable-to-symlink-race-attacks/ * The $SAFE Vulnerability Fri Feb 18 21:18:55 2011 Shugo Maeda <shugo@ruby-lang.org> * test/ruby/test_exception.rb (TestException::test_to_s_taintness_propagation): Test for below. Fri Feb 18 21:18:55 2011 URABE Shyouhei <shyouhei@ruby-lang.org> * error.c (exc_to_s): untainted strings can be tainted via Exception#to_s, which enables attackers to overwrite sane strings. Reported by: Yusuke Endoh <mame at tsg.ne.jp>. * error.c (name_err_to_s): ditto. Fri Feb 18 21:17:22 2011 Shugo Maeda <shugo@ruby-lang.org> * lib/fileutils.rb (FileUtils::remove_entry_secure): there is a race condition in the case where the given path is a directory, and some other user can move that directory, and create a symlink while this method is executing. Reported by: Nicholas Jefferson <nicholas at pythonic.com.au> Fri Feb 18 19:46:46 2011 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (init_stdhandle): backport mistake of r29382. some code are needless in ruby 1.8. [ruby-core:34579] Fri Feb 18 19:22:17 2011 URABE Shyouhei <shyouhei@ruby-lang.org> * configure.in: revert revision r29854. This revision introduced binary incompatibilities on some circumstances. The bug that revision was fixing gets reopened by this reversion. [ruby-dev:43152] cf. [Bug #2553] --- Module Name: pkgsrc Module Name: pkgsrc Committed By: taca Date: Mon Feb 21 14:44:11 UTC 2011 Modified Files: pkgsrc/lang/ruby19-base: DEINSTALL Makefile PLIST distinfo Added Files: pkgsrc/lang/ruby19-base/patches: patch-string.c Log Message: Update ruby19-base package to 1.9.2pl180 (Ruby 1.9.2 p180). * The FileUtils Vulnerability http://www.ruby-lang.org/en/news/2011/02/18/fileutils-is-vulnerable-to-symlink-race-attacks/ * Add a patch r30779 from repository; a bug of utf-8 string handling. For more detail changes of Ruby 1.9.2pl180, please refer: http://svn.ruby-lang.org/repos/ruby/tags/v1_9_2_180/ChangeLog --- Module Name: pkgsrc Module Name: pkgsrc Committed By: taca Date: Mon Feb 21 15:00:34 UTC 2011 Modified Files: pkgsrc/lang/ruby: buildlink3.mk rubyversion.mk Log Message: Introduce RUBY_ABI_VERSION and use it BUILDLINK_ABI_DEPENDS. There are ABI incompatibility amaong Ruby 1.8.7 patchlevel 302, 330 and 334, So it would be handle if such problem in future. --- Module Name: pkgsrc Module Name: pkgsrc Committed By: taca Date: Mon Feb 21 16:01:24 UTC 2011 Modified Files: pkgsrc/archivers/ruby-libarchive: Makefile pkgsrc/comms/ruby-termios: Makefile pkgsrc/converters/ruby-uconv: Makefile pkgsrc/databases/ruby-do_sqlite3: Makefile pkgsrc/databases/ruby-ldap: Makefile pkgsrc/databases/ruby-mysql: Makefile pkgsrc/databases/ruby-odbc: Makefile pkgsrc/databases/ruby-pg: Makefile pkgsrc/databases/ruby-postgresql: Makefile pkgsrc/databases/ruby-qdbm: Makefile pkgsrc/databases/ruby-sqlite: Makefile pkgsrc/databases/ruby-sqlite3: Makefile pkgsrc/databases/ruby-tokyocabinet: Makefile pkgsrc/devel/ruby-SDL: Makefile pkgsrc/devel/ruby-debug-base: Makefile pkgsrc/devel/ruby-eet: Makefile pkgsrc/devel/ruby-eventmachine: Makefile pkgsrc/devel/ruby-ffi: Makefile pkgsrc/devel/ruby-gnome2-atk: Makefile pkgsrc/devel/ruby-gnome2-gio: Makefile pkgsrc/devel/ruby-gnome2-glib: Makefile pkgsrc/devel/ruby-gnome2-pango: Makefile pkgsrc/devel/ruby-linecache: Makefile pkgsrc/devel/ruby-memcache: Makefile pkgsrc/devel/ruby-ncurses: Makefile pkgsrc/devel/ruby-priority-queue: Makefile pkgsrc/devel/ruby-racc: Makefile pkgsrc/devel/ruby-rbtree: Makefile pkgsrc/devel/ruby-rcov: Makefile pkgsrc/devel/ruby-rcsparse: Makefile pkgsrc/devel/ruby-subversion: Makefile pkgsrc/devel/ruby-thrift: Makefile pkgsrc/graphics/ruby-RMagick: Makefile pkgsrc/graphics/ruby-clutter-cairo: Makefile pkgsrc/graphics/ruby-clutter-core: Makefile pkgsrc/graphics/ruby-clutter-gtk: Makefile pkgsrc/graphics/ruby-gd: Makefile pkgsrc/graphics/ruby-gnome2-gdkpixbuf: Makefile pkgsrc/graphics/ruby-gnome2-goocanvas: Makefile pkgsrc/graphics/ruby-gnome2-rsvg: Makefile pkgsrc/graphics/ruby-imlib2: Makefile pkgsrc/graphics/ruby-opengl: Makefile pkgsrc/graphics/ruby-rcairo: Makefile pkgsrc/inputmethod/ruby-zinnia: Makefile pkgsrc/mail/ruby-tmail: Makefile pkgsrc/math/ruby-rb-gsl: Makefile pkgsrc/multimedia/ruby-clutter-gst: Makefile pkgsrc/multimedia/ruby-gnome2-gstreamer: Makefile pkgsrc/multimedia/ruby-ming: Makefile pkgsrc/print/ruby-gnome2-poppler: Makefile pkgsrc/security/ruby-password: Makefile pkgsrc/security/ruby-tcpwrap: Makefile pkgsrc/sysutils/ruby-quota: Makefile pkgsrc/textproc/ruby-bluecloth: Makefile pkgsrc/textproc/ruby-cabocha: Makefile pkgsrc/textproc/ruby-eruby: Makefile pkgsrc/textproc/ruby-ferret: Makefile pkgsrc/textproc/ruby-hpricot: Makefile pkgsrc/textproc/ruby-itex2MML: Makefile pkgsrc/textproc/ruby-json: Makefile pkgsrc/textproc/ruby-libxml: Makefile pkgsrc/textproc/ruby-mecab: Makefile pkgsrc/textproc/ruby-native-hyperestraier: Makefile pkgsrc/textproc/ruby-nokogiri: Makefile pkgsrc/textproc/ruby-oniguruma: Makefile pkgsrc/textproc/ruby-redcloth: Makefile pkgsrc/textproc/ruby-sary: Makefile pkgsrc/textproc/ruby-xmlparser: Makefile pkgsrc/textproc/ruby-xslt: Makefile pkgsrc/textproc/ruby-yamcha: Makefile pkgsrc/www/mongrel: Makefile pkgsrc/www/ruby-clearsilver: Makefile pkgsrc/www/ruby-fcgi: Makefile pkgsrc/www/ruby-gnome2-gtkmozembed: Makefile pkgsrc/www/ruby-patron: Makefile pkgsrc/www/thin: Makefile pkgsrc/x11/ruby-gnome2-gtk: Makefile pkgsrc/x11/ruby-gnome2-gtksourceview2: Makefile pkgsrc/x11/ruby-gnome2-vte: Makefile Log Message: Bump PKGREVISION due to ABI change of ruby18-base.
Introduce RUBY_ABI_VERSION and use it BUILDLINK_ABI_DEPENDS. There are ABI incompatibility amaong Ruby 1.8.7 patchlevel 302, 330 and 334, So it would be handle if such problem in future.
Use RUBY_API_VERSION for BUILDLINK_ABI_DEPENDS instead of RUBY_VERSION.
cleanup: replaced _PKG_SILENT and _PKG_DEBUG with RUN.
Simply and speed up buildlink3.mk files and processing. This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time.
Change the format of BUILDLINK_ORDER to contain depth information as well, and add a new helper target and script, "show-buildlink3", that outputs a listing of the buildlink3.mk files included as well as the depth at which they are included. For example, "make show-buildlink3" in fonts/Xft2 displays: zlib fontconfig iconv zlib freetype2 expat freetype2 Xrender renderproto
Track information in a new variable BUILDLINK_ORDER that informs us of the order in which buildlink3.mk files are (recursively) included by a package Makefile.
Over 1200 files touched but no revisions bumped :) RECOMMENDED is removed. It becomes ABI_DEPENDS. BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo. BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo. BUILDLINK_DEPENDS does not change. IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS which defaults to "yes". Added to obsolete.mk checking for IGNORE_RECOMMENDED. I did not manually go through and fix any aesthetic tab/spacing issues. I have tested the above patch on DragonFly building and packaging subversion and pkglint and their many dependencies. I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I have used IGNORE_RECOMMENDED for a long time). I have been an active user of IGNORE_RECOMMENDED since it was available. As suggested, I removed the documentation sentences suggesting bumping for "security" issues. As discussed on tech-pkg. I will commit to revbump, pkglint, pkg_install, createbuildlink separately. Note that if you use wip, it will fail! I will commit to pkgsrc-wip later (within day).
Added BUILDLINK_RECOMMENDED with current version of ruby.
Buildlink ${RUBY} to ${BUILDLINK_DIR}/bin/ruby. It may help some configure scripts to detect ruby executable. This codes are kindly provided by jlam@.
Correct content to really buildlink3.mk; fix many mistakes.
Remove includeing ncurses's buildlinke3.mk file. It was added while creating new framework and completely obsoleted by separating ruby-curses package.
- set RUBY_REQD proper value. - use RUBY_REQD in buildlink3.mk. Fix RUBY_REQD undefined in some case.
Importing files for Ruby's new framework.
Initial revision