Index: www/Makefile
===================================================================
--- www/Makefile
+++ www/Makefile
@@ -2105,6 +2105,8 @@
     SUBDIR += rubygem-ostatus2
     SUBDIR += rubygem-pagerduty
     SUBDIR += rubygem-passenger
+    SUBDIR += rubygem-passenger-apache
+    SUBDIR += rubygem-passenger-nginx
     SUBDIR += rubygem-puma
     SUBDIR += rubygem-puma2
     SUBDIR += rubygem-pusher-client
Index: www/rubygem-passenger-apache/Makefile
===================================================================
--- /dev/null
+++ www/rubygem-passenger-apache/Makefile
@@ -0,0 +1,9 @@
+# Created by: Dan Langille <dvl@FreeBSD.org>
+# $FreeBSD$
+
+MASTERDIR=      ${.CURDIR}/../rubygem-passenger
+PKGNAMESUFFIX=	-apache
+
+OPTIONS_DEFAULT=	APACHE22
+
+.include "${MASTERDIR}/Makefile"
Index: www/rubygem-passenger-nginx/Makefile
===================================================================
--- /dev/null
+++ www/rubygem-passenger-nginx/Makefile
@@ -0,0 +1,9 @@
+# Created by: Dan Langille <dvl@FreeBSD.org>
+# $FreeBSD$
+
+MASTERDIR=      ${.CURDIR}/../rubygem-passenger
+PKGNAMESUFFIX=	-nginx
+
+OPTIONS_DEFAULT=	NGINX
+
+.include "${MASTERDIR}/Makefile"
Index: www/rubygem-passenger/Makefile
===================================================================
--- www/rubygem-passenger/Makefile
+++ www/rubygem-passenger/Makefile
@@ -24,16 +24,18 @@
 APACHE22_DESC=	Build with apache22 support
 NGINX_DESC=	Build with nginx support
 SYMLINK_DESC=	Create passenger symlink
-OPTIONS_DEFAULT=	APACHE22
+OPTIONS_DEFAULT?=	APACHE22
 
 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 \