Previous versions of ruby.port.mk added NO_REGRESS=Yes if a
do-regress target was not present and MODRUBY_REGRESS was not
used. I removed that recently because I think it can incorrectly
mark some ports as NO_REGRESS (ports that depend on ruby but use
a regular Makefile-based build/installation/regress). This adds
NO_REGRESS back, but only for extconf/gem/setup ports.
There were a few ruby ports setting NO_REGRESS when they should
just leave it to ruby.port.mk, those fixes are included here as well.
OK?
Jeremy
Index: ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.48
diff -u -p -r1.48 ruby.port.mk
--- ruby.port.mk 17 Nov 2011 15:24:01 -0000 1.48
+++ ruby.port.mk 17 Nov 2011 17:33:32 -0000
@@ -157,6 +157,14 @@ MODRUBY_BIN_RSPEC = ${LOCALBASE}/bin/rsp
!${MODRUBY_REGRESS:L:Mruby} && !${MODRUBY_REGRESS:L:Mtestrb}
ERRORS += "Fatal: Unsupported MODRUBY_REGRESS value: ${MODRUBY_REGRESS}"
.else
+. if ${CONFIGURE_STYLE:L:Mextconf} || ${CONFIGURE_STYLE:L:Mgem} || \
+ ${CONFIGURE_STYLE:L:Msetup}
+. if !target(do-regress)
+# Disable regress for extconf, gem, and setup based ports, since they
+# won't use make check for regress.
+NO_REGRESS = Yes
+. endif
+. endif
MODRUBY_REGRESS?=
.endif
Index: ./databases/ruby-activerecord/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-activerecord/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- ./databases/ruby-activerecord/Makefile 16 Sep 2011 08:48:04 -0000
1.34
+++ ./databases/ruby-activerecord/Makefile 17 Nov 2011 17:41:15 -0000
@@ -23,7 +23,4 @@ RUN_DEPENDS = devel/ruby-activesupport,
CONFIGURE_STYLE = ruby gem
-# Upstream doesn't ship the Rakefile or test files in the gem
-NO_REGRESS = Yes
-
.include <bsd.port.mk>
Index: ./devel/ruby-ffi/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-ffi/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- ./devel/ruby-ffi/Makefile 17 Nov 2011 16:08:00 -0000 1.8
+++ ./devel/ruby-ffi/Makefile 17 Nov 2011 18:01:03 -0000
@@ -30,9 +30,7 @@ CONFIGURE_STYLE = ruby gem ext
post-install:
rm -r ${GEM_ABS_PATH}/gems/${DISTNAME}/ext
-# Doesn't ship with libtest directory, which is necessary for
-# regress
-NO_REGRESS = Yes
+# Doesn't ship with libtest directory, which is necessary for regress
#REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
#MODRUBY_REGRESS = rspec2
#MODRUBY_REGRESS_ENV = RUBYLIB=$$(dirname `${GEM} which ffi.rb`) \
Index: ./devel/ruby-ncurses/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-ncurses/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- ./devel/ruby-ncurses/Makefile 16 Sep 2011 09:24:57 -0000 1.32
+++ ./devel/ruby-ncurses/Makefile 17 Nov 2011 17:42:03 -0000
@@ -26,8 +26,6 @@ CONFIGURE_STYLE= ruby extconf
INSTALL_TARGET= site-install
-NO_REGRESS= Yes
-
DOC_DIR= ${MODRUBY_DOCDIR}/ncurses
SAMPLE_DIR= ${MODRUBY_EXAMPLEDIR}/ncurses
Index: ./devel/ruby-systemtimer/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-systemtimer/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- ./devel/ruby-systemtimer/Makefile 17 Nov 2011 16:08:00 -0000 1.12
+++ ./devel/ruby-systemtimer/Makefile 17 Nov 2011 18:01:28 -0000
@@ -21,7 +21,6 @@ CONFIGURE_STYLE=ruby gem ext
# which is dead upstream and won't be imported. You can
# manually install the gem if you want to run the regress
# tests.
-NO_REGRESS = Yes
#REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \
# devel/ruby-mocha,${MODRUBY_FLAVOR}
#MODRUBY_REGRESS = ruby
Index: ./net/ruby-pcap/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-pcap/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- ./net/ruby-pcap/Makefile 16 Sep 2011 11:13:40 -0000 1.41
+++ ./net/ruby-pcap/Makefile 17 Nov 2011 17:43:05 -0000
@@ -21,8 +21,6 @@ MASTER_SITES= http://www.goto.info.wase
MODULES= lang/ruby
-NO_REGRESS= Yes
-
CONFIGURE_STYLE= ruby extconf
WRKDIST= ${WRKDIR}/pcap
Index: ./textproc/ruby-prawn/core/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-prawn/core/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- ./textproc/ruby-prawn/core/Makefile 16 Sep 2011 11:41:42 -0000 1.8
+++ ./textproc/ruby-prawn/core/Makefile 17 Nov 2011 17:57:44 -0000
@@ -6,9 +6,9 @@ DISTNAME = prawn-core-${VERSION}
REVISION = 4
MODRUBY_REGRESS = rake
-NO_REGRESS = Yes # untill ruby-test-spec has been imported.
+# Requires the test/spec gem, not imported. You can gem install
+# if if you want to uncomment the tests and run them.
#REGRESS_DEPENDS = devel/ruby-mocha,${MODRUBY_FLAVOR} \
-# devel/ruby-test-spec,${MODRUBY_FLAVOR} \
# textproc/ruby-pdf-reader,${MODRUBY_FLAVOR}
.include <bsd.port.mk>
Index: ./devel/ruby-git/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-git/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- ./devel/ruby-git/Makefile 17 Nov 2011 15:27:39 -0000 1.1.1.1
+++ ./devel/ruby-git/Makefile 17 Nov 2011 18:02:42 -0000
@@ -19,7 +19,4 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem
-# Does not ship with the regress tests.
-NO_REGRESS = Yes
-
.include <bsd.port.mk>
Index: ./devel/ruby-jeweler/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-jeweler/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- ./devel/ruby-jeweler/Makefile 17 Nov 2011 15:28:42 -0000 1.1.1.1
+++ ./devel/ruby-jeweler/Makefile 17 Nov 2011 18:03:01 -0000
@@ -22,9 +22,4 @@ RUN_DEPENDS = devel/ruby-git,${MODRUBY_
devel/ruby-bundler,${MODRUBY_FLAVOR}>=1.0,<2.0 \
${MODRUBY_RAKE_DEPENDS}
-# Jeweler ships with regress tests, but it's a small library
-# with a ton of unported regress dependencies, and not worth the
-# effort to port all of the regress dependencies.
-NO_REGRESS = Yes
-
.include <bsd.port.mk>
