I'd like to build the ruby19 FLAVOR of following ruby ports by default:

  audio/ruby-vorbis_comment
  converters/ruby-json
  databases/ruby-mysqlplus
  devel/ruby-kgio
  devel/ruby-prof
  devel/ruby-subset_sum
  graphics/ruby-rmagick
  net/ruby-eventmachine
  security/ruby-bcrypt
  textproc/ruby-fast-stemmer
  textproc/ruby-hpricot
  textproc/ruby-rdiscount
  textproc/ruby-redcloth
  www/ruby-thin

I added/fixed regress tests in many of these ports as well, see included
diff.  I've bumped the REVISION for fast-stemmer in the diff for safety,
as I got a plist warning for the ruby19 FLAVOR.

Tested on amd64.  Looking for OKs.

Jeremy

Index: converters/ruby-json/Makefile
===================================================================
RCS file: /cvs/ports/converters/ruby-json/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- converters/ruby-json/Makefile       6 Jan 2011 04:24:22 -0000       1.12
+++ converters/ruby-json/Makefile       23 Mar 2011 22:13:34 -0000
@@ -19,5 +19,10 @@ MODULES=             lang/ruby
 CONFIGURE_STYLE=       ruby gem ext
 
 MODRUBY_REGRESS=       rake
+REGRESS_DEPENDS =      ${FULLPKGNAME}:${BUILD_PKGPATH}
+
+do-regress:
+       cd ${WRKSRC} && /usr/bin/env -i ${MAKE_ENV} RUBYOPT=-rubygems \
+               JSON=ext ${MODRUBY_BIN_TESTRB} tests/*.rb
 
 .include <bsd.port.mk>
Index: databases/ruby-mysqlplus/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-mysqlplus/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- databases/ruby-mysqlplus/Makefile   6 Jan 2011 04:24:22 -0000       1.3
+++ databases/ruby-mysqlplus/Makefile   24 Mar 2011 16:40:56 -0000
@@ -31,6 +31,6 @@ REGRESS_DEPENDS=databases/mysql,-server 
 MODRUBY_REGRESS=rake
 do-regress:
        cd ${WRKSRC} && \
-               RUBYLIB=test:$(dirname `gem which mysqlplus`) rake test
+               RUBYLIB=test:$(dirname `gem which mysqlplus`) ${RAKE} test
 
 .include <bsd.port.mk>
Index: net/ruby-eventmachine/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-eventmachine/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- net/ruby-eventmachine/Makefile      6 Jan 2011 04:24:24 -0000       1.10
+++ net/ruby-eventmachine/Makefile      24 Mar 2011 19:03:29 -0000
@@ -20,4 +20,9 @@ WANTLIB=      crypto ssl stdc++
 
 CONFIGURE_STYLE=ruby gem ext
 
+MODRUBY_REGRESS =      rake
+
+do-regress:
+       cd ${WRKSRC} && RUBYOPT=-Ilib:. ${RAKE} default
+
 .include <bsd.port.mk>
Index: textproc/ruby-fast-stemmer/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-fast-stemmer/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- textproc/ruby-fast-stemmer/Makefile 20 Dec 2010 18:15:48 -0000      1.1.1.1
+++ textproc/ruby-fast-stemmer/Makefile 24 Mar 2011 21:53:42 -0000
@@ -3,6 +3,7 @@
 COMMENT=               fast Porter stemmer for ruby
 
 DISTNAME=              fast-stemmer-1.0.0
+REVISION =             0
 CATEGORIES=            textproc
 
 HOMEPAGE=              http://github.com/romanbsd/fast-stemmer
@@ -20,6 +21,6 @@ CONFIGURE_STYLE=      ruby gem ext
 MODRUBY_REGRESS=       rake
 REGRESS_DEPENDS=       ${FULLPKGNAME}:${BUILD_PKGPATH}
 do-regress:
-       cd ${WRKSRC} && RUBYOPT=-rubygems ${RAKE} test
+       cd ${WRKSRC} && RUBYOPT="-I. -rubygems" ${RAKE} test
 
 .include <bsd.port.mk>
Index: textproc/ruby-hpricot/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-hpricot/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- textproc/ruby-hpricot/Makefile      24 Nov 2010 21:35:15 -0000      1.11
+++ textproc/ruby-hpricot/Makefile      24 Mar 2011 21:55:22 -0000
@@ -23,7 +23,7 @@ CONFIGURE_STYLE=      ruby gem ext
 REGRESS_DEPENDS=       ${FULLPKGNAME}:${BUILD_PKGPATH}
 
 do-regress:
-       @cd ${WRKSRC} && /usr/local/bin/ruby -rubygems -Ilib:test:lib \
+       @cd ${WRKSRC} && ${RUBY} -rubygems -Ilib:test \
                -e "ARGV.each { |f| load f unless f =~ /^-/  }" \
                "test/test_preserved.rb" "test/test_paths.rb" \
                "test/test_xml.rb" "test/test_parser.rb" "test/test_alter.rb" \
Index: textproc/ruby-redcloth/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-redcloth/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- textproc/ruby-redcloth/Makefile     6 Jan 2011 04:24:24 -0000       1.11
+++ textproc/ruby-redcloth/Makefile     24 Mar 2011 22:35:10 -0000
@@ -20,5 +20,6 @@ MODULES =     lang/ruby
 CONFIGURE_STYLE = ruby gem ext
 
 MODRUBY_REGRESS =      rspec
+REGRESS_DEPENDS =      ${FULLPKGNAME}:${BUILD_PKGPATH}
 
 .include <bsd.port.mk>
Index: www/ruby-thin/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-thin/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- www/ruby-thin/Makefile      14 Mar 2011 17:58:06 -0000      1.10
+++ www/ruby-thin/Makefile      24 Mar 2011 22:43:04 -0000
@@ -22,4 +22,9 @@ RUN_DEPENDS = www/ruby-rack,${MODRUBY_FL
                devel/ruby-daemons,${MODRUBY_FLAVOR}>=1.0.9 \
                net/ruby-eventmachine,${MODRUBY_FLAVOR}>=0.12.6
 
+MODRUBY_REGRESS =      rspec
+REGRESS_DEPENDS =      ${FULLPKGNAME}:${BUILD_PKGPATH}
+do-regress:
+       cd ${WRKSRC} && RUBYOPT=-I. ${RSPEC} spec/*_spec.rb
+
 .include <bsd.port.mk>

Reply via email to