Index: www/rubygem-passenger/Makefile
===================================================================
--- www/rubygem-passenger/Makefile
+++ www/rubygem-passenger/Makefile
@@ -18,22 +18,39 @@
 CPE_VENDOR=	phusion
 CPE_PRODUCT=	passenger
 
+FLAVOR?=	${FLAVORS:[1]}
+
+FLAVORS=	apache nginx
+
+apache_PKGNAMESUFFIX=	-apache
+nginx_PKGNAMESUFFIX=	-nginx
+
 OPTIONS_DEFINE=	DEBUG SYMLINK
 OPTIONS_SINGLE=	SERVER
 OPTIONS_SINGLE_SERVER=	APACHE22 NGINX
 APACHE22_DESC=	Build with apache22 support
 NGINX_DESC=	Build with nginx support
 SYMLINK_DESC=	Create passenger symlink
+OPTIONS_DEFAULT?=	APACHE22
+
+.if ${FLAVOR} == apache
 OPTIONS_DEFAULT=	APACHE22
+.endif
+
+.if ${FLAVOR} == nginx
+OPTIONS_DEFAULT=	NGINX
+.endif
 
 USE_RUBY=	yes
 RAKE_BIN=	${LOCALBASE}/bin/rake
-USES=		cpe gem libtool shebangfix ssl
+USES=		cpe gem libtool python:run shebangfix ssl
 SHEBANG_FILES=	\
 	src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py \
 	dev/vagrant/nginx_start \
 	dev/vagrant/provision.sh \
 	dev/ci/run-tests-with-docker \
+	dev/ci/tests/debian/run \
+	dev/ci/tests/rpm/run \
 	dev/ci/scripts/setup-host-natively.sh \
 	dev/ci/scripts/docker-entrypoint-stage2.sh \
 	dev/ci/scripts/inituidgid \