From owner-svn-ports-head@freebsd.org Sat Jul 15 20:44:06 2017 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 B0E20B7BB12; Sat, 15 Jul 2017 20:44:06 +0000 (UTC) (envelope-from sunpoet@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 mx1.freebsd.org (Postfix) with ESMTPS id 741D384220; Sat, 15 Jul 2017 20:44:06 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6FKi5ab051584; Sat, 15 Jul 2017 20:44:05 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6FKi5Ku051583; Sat, 15 Jul 2017 20:44:05 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201707152044.v6FKi5Ku051583@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 15 Jul 2017 20:44:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445964 - head/www/rubygem-passenger X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/www/rubygem-passenger X-SVN-Commit-Revision: 445964 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.23 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: Sat, 15 Jul 2017 20:44:06 -0000 Author: sunpoet Date: Sat Jul 15 20:44:05 2017 New Revision: 445964 URL: https://svnweb.freebsd.org/changeset/ports/445964 Log: Convert to options helper Approved by: portmgr (blanket) Modified: head/www/rubygem-passenger/Makefile Modified: head/www/rubygem-passenger/Makefile ============================================================================== --- head/www/rubygem-passenger/Makefile Sat Jul 15 20:44:00 2017 (r445963) +++ head/www/rubygem-passenger/Makefile Sat Jul 15 20:44:05 2017 (r445964) @@ -31,12 +31,8 @@ RAKE_BIN= ${LOCALBASE}/bin/rake USES= cpe gem NOPORTDOCS= yes -.include +APACHE22_USE= APACHE=22+ -.if ${PORT_OPTIONS:MAPACHE22} -USE_APACHE= 22+ -.endif - LIB_DEPENDS+= libuv.so:devel/libuv \ libcurl.so:ftp/curl BUILD_DEPENDS+= rubygem-rack16>=0:www/rubygem-rack16 @@ -52,21 +48,11 @@ PLIST_FILES= bin/passenger \ bin/passenger-status \ bin/passenger-install-nginx-module -.if ${PORT_OPTIONS:MSYMLINK} -PLIST_FILES+= ${GEMS_DIR}/${PORTNAME} -SUB_LIST+= PASSENGER_INSTALL_DIR="${PREFIX}/${GEMS_DIR}/${PORTNAME}" -.else -SUB_LIST+= PASSENGER_INSTALL_DIR="${PREFIX}/${GEM_LIB_DIR}" -.endif +SYMLINK_PLIST_FILES= ${GEMS_DIR}/${PORTNAME} +SYMLINK_SUB_LIST= PASSENGER_INSTALL_DIR="${PREFIX}/${GEMS_DIR}/${PORTNAME}" +SYMLINK_SUB_LIST_OFF= PASSENGER_INSTALL_DIR="${PREFIX}/${GEM_LIB_DIR}" pre-patch: -.if ${PORT_OPTIONS:MNGINX} - @${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; \ @@ -76,30 +62,34 @@ pre-patch: s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \ 166s!true!false!' \ ${WRKSRC}/build/basics.rb -.if ${PORT_OPTIONS:NDEBUG} + +pre-patch-DEBUG-off: @${REINPLACE_CMD} \ 's!-DPASSENGER_DEBUG!-DNDEBUG!g' \ ${WRKSRC}/build/basics.rb -.endif +pre-patch-NGINX-on: + @${ECHO_CMD} + @${ECHO_CMD} "Do not forget compile www/nginx" + @${ECHO_CMD} "with PASSENGER_MODULE support" + @${ECHO_CMD} + post-build: -.if ${PORT_OPTIONS:MAPACHE22} + ${FIND} ${WRKSRC} -name '*.o' -delete + ${FIND} ${WRKSRC} -name '*.bak' -delete + +post-build-APACHE22-on: (CC=${CC} CXX=${CXX} ${WRKSRC}/bin/passenger-install-apache2-module --auto) -.endif -.if ${PORT_OPTIONS:MNGINX} +post-build-NGINX-on: (cd ${WRKSRC} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx) -.endif - ${FIND} ${WRKSRC} -name '*.o' -delete - ${FIND} ${WRKSRC} -name '*.bak' -delete - post-install: ( cd ${WRKSRC} && \ ${COPYTREE_SHARE} buildout ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION} ) ${CHMOD} +x ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION}/buildout/support-binaries/* -.if ${PORT_OPTIONS:MSYMLINK} + +post-install-SYMLINK-on: ${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME} -.endif .include