Index: www/rubygem-passenger/Makefile
===================================================================
--- www/rubygem-passenger/Makefile
+++ www/rubygem-passenger/Makefile
@@ -18,22 +18,34 @@
 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
+USES+=	APACHE=22+
+.endif
+
+.if ${FLAVOR} == nginx
+# nothing yet.
+.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 \
@@ -43,8 +55,6 @@
 	dev/ci/run-tests-natively \
 	dev/ci/setup-host
 
-APACHE22_USE=	APACHE=22+
-
 LIB_DEPENDS+=	libuv.so:devel/libuv \
 		libcurl.so:ftp/curl \
 		libunwind.so:devel/libunwind \
@@ -77,6 +87,12 @@
 SYMLINK_SUB_LIST_OFF=	PASSENGER_INSTALL_DIR="${PREFIX}/${GEM_LIB_DIR}"
 
 pre-patch:
+.if ${FLAVOR} == nginx
+	@${ECHO_CMD}
+	@${ECHO_CMD} "Do not forget compile www/nginx"
+	@${ECHO_CMD} "with PASSENGER_MODULE support"
+	@${ECHO_CMD}
+.endif
 	@${REINPLACE_CMD} \
 		's!-Wall!!g; \
 		s!gcc!${CC}!g; \
@@ -94,32 +110,28 @@
 		's!-DPASSENGER_DEBUG!-DNDEBUG!g' \
 		${WRKSRC}/build/basics.rb
 
-pre-patch-NGINX-on:
-	@${ECHO_CMD}
-	@${ECHO_CMD} "Do not forget compile www/nginx"
-	@${ECHO_CMD} "with PASSENGER_MODULE support"
-	@${ECHO_CMD}
-
 post-build:
-	${FIND} ${WRKSRC} -name '*.o' -delete
-	${FIND} ${WRKSRC} -name '*.bak' -delete
-
-post-build-APACHE22-on:
+.if ${FLAVOR} == apache
 	(CC=${CC} CXX=${CXX} ${WRKSRC}/bin/passenger-install-apache2-module --auto)
+.endif
 
-post-build-NGINX-on:
+.if ${FLAVOR} == nginx
 	(cd ${WRKSRC} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx)
+.endif
+	${FIND} ${WRKSRC} -name '*.o' -delete
+	${FIND} ${WRKSRC} -name '*.bak' -delete
+
 
 post-install:
+.if ${FLAVOR} == apache
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so
+.endif
 	( cd ${WRKSRC} && \
 	${COPYTREE_SHARE} buildout ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION} )
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION}/buildout/support-binaries/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/ruby/*/passenger_native_support.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/support-binaries/PassengerAgent
 
-post-install-APACHE22-on:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so
-
 post-install-SYMLINK-on:
 	${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}