From owner-svn-ports-head@freebsd.org Mon Jan 22 19:12:15 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07F3CED0B8D; Mon, 22 Jan 2018 19:12:15 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D61F869999; Mon, 22 Jan 2018 19:12:14 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31E521E492; Mon, 22 Jan 2018 19:12:14 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0MJCEf4098744; Mon, 22 Jan 2018 19:12:14 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0MJCED5098743; Mon, 22 Jan 2018 19:12:14 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201801221912.w0MJCED5098743@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Mon, 22 Jan 2018 19:12:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459684 - head/www/rubygem-passenger X-SVN-Group: ports-head X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: head/www/rubygem-passenger X-SVN-Commit-Revision: 459684 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2018 19:12:15 -0000 Author: dvl Date: Mon Jan 22 19:12:13 2018 New Revision: 459684 URL: https://svnweb.freebsd.org/changeset/ports/459684 Log: Introduce FLAVORS for apache (default) and nginx. Reviewed by: osa (maintainer) Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D13889 Modified: head/www/rubygem-passenger/Makefile Modified: head/www/rubygem-passenger/Makefile ============================================================================== --- head/www/rubygem-passenger/Makefile Mon Jan 22 18:13:50 2018 (r459683) +++ head/www/rubygem-passenger/Makefile Mon Jan 22 19:12:13 2018 (r459684) @@ -19,14 +19,20 @@ BUILD_DEPENDS= rake:devel/rubygem-rake 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 @@ SHEBANG_FILES= \ 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 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} 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= PASSENGER_INSTALL_DIR="${PREFIX}/${G 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 @@ pre-patch-DEBUG-off: '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 @@ post-install: ${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}