Page MenuHomeFreeBSD
Files F149207722

D13889.id38327.diff
No OneTemporary
Actions

D13889.id38327.diff
View Options

Index: head/www/rubygem-passenger/Makefile
===================================================================
--- head/www/rubygem-passenger/Makefile
+++ head/www/rubygem-passenger/Makefile
@@ -19,14 +19,20 @@
CPE_VENDOR= phusion
CPE_PRODUCT= passenger
+FLAVORS= apache nginx
+FLAVOR?= ${FLAVORS:[1]}
+
+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
+
USE_RUBY= yes
RAKE_BIN= ${LOCALBASE}/bin/rake
USES= cpe gem libtool python:env shebangfix ssl
@@ -46,8 +52,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 \
@@ -59,15 +63,6 @@
SUB_LIST+= GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY}
SUB_FILES= pkg-message
-PLIST_DIRS= ${GEM_LIB_DIR}/buildout/common/libboost_oxt/boost \
- ${GEM_LIB_DIR}/buildout/common/libboost_oxt/oxt \
- ${GEM_LIB_DIR}/buildout/common/libpassenger_common/DataStructures \
- ${GEM_LIB_DIR}/buildout/common/libpassenger_common/MemoryKit \
- ${GEM_LIB_DIR}/buildout/common/libpassenger_common/ServerKit \
- ${GEM_LIB_DIR}/buildout/common/libpassenger_common/Utils \
- ${GEM_LIB_DIR}/buildout/common/libpassenger_common/vendor-modified \
- ${GEM_LIB_DIR}/download_cache
-
PLIST_FILES= bin/passenger \
bin/passenger-config \
bin/passenger-install-apache2-module \
@@ -80,6 +75,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 +98,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:
+.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:
( cd ${WRKSRC} && \
@@ -119,9 +115,13 @@
${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:
+ ${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type d -empty -delete
+.if ${FLAVOR} == apache
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
+ ${INSTALL} -lrs ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_passenger.so
+ @${ECHO} "${APACHEMODDIR}/mod_passenger.so" >> ${TMPPLIST}
+.endif
post-install-SYMLINK-on:
${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 24, 12:25 AM (58 m, 42 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30215754
Default Alt Text
D13889.id38327.diff (3 KB)

Event Timeline