> 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.
Maybe we could use something like that, to avoid returning here
each time new Ruby version became the default? Won't help for
the situations when new Ruby version hit the tree, though - maybe
we could have something like MODRUBY_ALL_FLAVORS, that ports
could reuse?..
--
WBR,
Vadim Zhukov
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- Makefile 21 Sep 2014 14:00:16 -0000 1.61
+++ Makefile 3 Oct 2014 22:01:36 -0000
@@ -74,8 +74,11 @@ SUBSTFILES= conf/nginx.conf
NAXSIDISTFILES+= naxsi-0.53-1.tar.gz{0.53-1.tar.gz}:1
.if ${FLAVOR:Mpassenger}
+MODULES+= lang/ruby
+MODRUBY_BUILDDEP= No
+MODRUBY_RUNDEP= No
CONFIGURE_ARGS+=
--add-module=${LOCALBASE}/lib/phusion-passenger20/ext/nginx
-BUILD_DEPENDS+= ruby20-passenger-*:www/ruby-passenger,-main
+BUILD_DEPENDS+=
${MODRUBY_FLAVOR}-passenger-*:www/ruby-passenger,-main
RUN_DEPENDS+=
ruby-passenger-*|ruby19-passenger-*|ruby20-passenger-*|ruby21-passenger-*:www/ruby-passenger,-main
WANTLIB+= m pthread stdc++
.endif
@@ -85,7 +88,7 @@ CONFIGURE_ARGS+= --add-module=${WRKSRC}/
CONFIGURE_ARGS+= --add-module=${WRKSRC}/lua-nginx-module
CONFIGURE_ENV+= MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \
MODLUA_LIB=${MODLUA_LIB}
-MODULES= lang/lua
+MODULES+= lang/lua
WANTLIB+= ${MODLUA_WANTLIB} m
PATCH_LIST= patch-* lua-*
SUBSTFILES+= lua-nginx-module/config
