Page MenuHomeFreeBSD

D13889.id38101.diff
No OneTemporary

D13889.id38101.diff

Index: www/rubygem-passenger/Makefile
===================================================================
--- www/rubygem-passenger/Makefile
+++ www/rubygem-passenger/Makefile
@@ -19,13 +19,24 @@
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
+OPTIONS_EXCLUDE=DOCS
SYMLINK_DESC= Create passenger symlink
-OPTIONS_DEFAULT= APACHE22
+
+.if ${FLAVOR} == apache
+USE_APACHE= 22+
+.endif
+
+.if ${FLAVOR} == nginx
+# nothing yet.
+.endif
USE_RUBY= yes
RAKE_BIN= ${LOCALBASE}/bin/rake
@@ -46,8 +57,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 \
@@ -80,6 +89,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; \
@@ -97,21 +112,16 @@
'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:
- (cd ${WRKSRC} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx)
+.if ${FLAVOR} == nginx
+ (CC=${CC} CXX=${CXX} ${WRKSRC}/bin/passenger-install-nginx-module --auto)
+.endif
+ ${FIND} ${WRKSRC} -name '*.o' -delete
+ ${FIND} ${WRKSRC} -name '*.bak' -delete
post-install:
( cd ${WRKSRC} && \
@@ -119,9 +129,9 @@
${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:
+.if ${FLAVOR} == apache
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so
+.endif
post-install-SYMLINK-on:
${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 1, 3:43 PM (9 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37835356
Default Alt Text
D13889.id38101.diff (2 KB)

Event Timeline