188084 – ports-mgmt/portupgrade : not working without ruby-bdb

no flags

When upgrading my ruby stack to ruby 2.1, I disconvered that ruby-bdb
	is utterly broken with recent versions of ruby (ports/188083).
	Trying to use portupgrade without ruby-bdb gave me

: /usr/local/lib/ruby/site_ruby/2.1/pkgtools/pkgdbtools.rb:104:in `rescue in db_driver=': uninitialized constant PkgDBTools::DBError (NameError)
:         from /usr/local/lib/ruby/site_ruby/2.1/pkgtools/pkgdbtools.rb:63:in `db_driver='
:         from /usr/local/lib/ruby/site_ruby/2.1/pkgtools/portsdb.rb:168:in `setup'
:         from /usr/local/lib/ruby/site_ruby/2.1/pkgtools/pkgtools.rb:242:in `init_pkgtools_global'
:         from /usr/local/sbin/portupgrade:530:in `block in main'
:         from /usr/local/lib/ruby/2.1/optparse.rb:880:in `initialize'
:         from /usr/local/sbin/portupgrade:237:in `new'
:         from /usr/local/sbin/portupgrade:237:in `main'
:         from /usr/local/sbin/portupgrade:2371:in `<main>'

	so I set out to integrate yet another dbm into portupgrade.
	I happened to choose qdbm, which may not have been such a good idea,
	as ruby-qdbm itself is quite behind current ruby and needed
	patching, too (ports/188079).
	I'm proposing three patches:
	 1. do not try to use databases/ruby-bdb when on ruby 2.1 (it's already
	    blacklisted for ruby 2.0)
     2. explicitly stringify port_info when inserting it @db
        (portsdb.rb l.598) - some databases do not do that implicitly
     3. switch pkgtools to using qdbm (even as a default).
        I'm open to discussion and suggestions on this one (what DBM
        does the ruby community prefer these days?), as I'm not feeling
        too good about qdbm myself (see above).
        For the same reason I've not added ruby-qdbm as a dependency
        to portupgrade's Makefile.

Fix: Part 1, blacklist ruby-bdb for ruby 2.1:
Patches to be applied to the pkgtools source (not the port):
Part 2, explicitly stringify port_info:
Part 3, switch to qdbm:


Any thought?


Best Regards,
Christoph--ujbzuCUEguqUaBHdEscZ1GbCq2PIk6HZn7MexgJgdcpllO39
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: Makefile
===================================================================

--- Makefile	(revision 349592)
+++ Makefile	(working copy)
@@ -38,8 +38,8 @@
 INSTALL_TARGET+=	install-doc
 .endif
 
-# Reported that ruby-bdb is BROKEN with 2.0
-.if ${RUBY_VER} != 2.0
+# Reported that ruby-bdb is BROKEN with 2.0 and 2.1
+.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1
 # For PKG_DBDRIVER={bdb_btree,bdb_hash}
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 .endif