This changes the www/nginx passenger FLAVOR to build depends on the
default ruby version, instead of ruby 2.0. Likewise, it changes
passenger to build a package for the default ruby version if FLAVOR
is not specified.
This should not affect the package, so bumping should not be
necessary.
Tested on amd64. Will be committing in a couple days unless
I hear objections.
Thanks,
Jeremy
Index: www/nginx/Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- www/nginx/Makefile 21 Sep 2014 14:00:16 -0000 1.61
+++ www/nginx/Makefile 29 Sep 2014 22:22:23 -0000
@@ -74,8 +74,8 @@ SUBSTFILES= conf/nginx.conf
NAXSIDISTFILES+= naxsi-0.53-1.tar.gz{0.53-1.tar.gz}:1
.if ${FLAVOR:Mpassenger}
-CONFIGURE_ARGS+=
--add-module=${LOCALBASE}/lib/phusion-passenger20/ext/nginx
-BUILD_DEPENDS+= ruby20-passenger-*:www/ruby-passenger,-main
+CONFIGURE_ARGS+=
--add-module=${LOCALBASE}/lib/phusion-passenger21/ext/nginx
+BUILD_DEPENDS+=
ruby21-passenger-*:www/ruby-passenger,-main,ruby21
RUN_DEPENDS+=
ruby-passenger-*|ruby19-passenger-*|ruby20-passenger-*|ruby21-passenger-*:www/ruby-passenger,-main
WANTLIB+= m pthread stdc++
.endif
Index: www/ruby-passenger/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-passenger/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- www/ruby-passenger/Makefile 18 Aug 2014 06:53:07 -0000 1.34
+++ www/ruby-passenger/Makefile 28 Sep 2014 18:17:32 -0000
@@ -29,7 +29,7 @@ MODULES = devel/gettext \
lang/ruby
FLAVORS = ruby18 ruby19 ruby20 ruby21
-FLAVOR ?= ruby20
+FLAVOR ?= ruby21
# Fix conflict between subpackages when using ruby21 FLAVOR
.if ${FLAVOR} == ruby21
