From owner-svn-ports-head@freebsd.org Thu Mar 29 21:28:38 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65468F78366; Thu, 29 Mar 2018 21:28:38 +0000 (UTC) (envelope-from joneum@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 1765885EFE; Thu, 29 Mar 2018 21:28:38 +0000 (UTC) (envelope-from joneum@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 126951F859; Thu, 29 Mar 2018 21:28:38 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2TLSbWI039787; Thu, 29 Mar 2018 21:28:37 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2TLSb4x039785; Thu, 29 Mar 2018 21:28:37 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201803292128.w2TLSb4x039785@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 29 Mar 2018 21:28:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465931 - head/www/nginx X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: head/www/nginx X-SVN-Commit-Revision: 465931 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: Thu, 29 Mar 2018 21:28:38 -0000 Author: joneum Date: Thu Mar 29 21:28:37 2018 New Revision: 465931 URL: https://svnweb.freebsd.org/changeset/ports/465931 Log: Move dynamic modules to pkg-plist Fix WWW + HTTP options - WWW implies HTTP - Move to post-install-WWW-on target - Drop WWWDATA variable Modified: head/www/nginx/Makefile head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Thu Mar 29 21:16:56 2018 (r465930) +++ head/www/nginx/Makefile Thu Mar 29 21:28:37 2018 (r465931) @@ -98,7 +98,7 @@ OPTIONS_SUB= yes ${opt}_IMPLIES= MAIL .endfor -.for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} +.for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW ${opt}_IMPLIES= HTTP .endfor @@ -117,8 +117,6 @@ FILE_AIO_CONFIGURE_ON= --with-file-aio IPV6_CONFIGURE_OFF= --with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include" IPV6_CATEGORIES= ipv6 THREADS_CONFIGURE_ON= --with-threads -WWW_PLIST_SUB= WWWDATA="" -WWW_PLIST_SUB_OFF= WWWDATA="@comment " # Bundled modules GOOGLE_PERFTOOLS_LIB_DEPENDS= libprofiler.so:devel/google-perftools @@ -130,7 +128,6 @@ HTTP_CONFIGURE_ON= --http-client-body-temp-path=${NGI --http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \ --http-log-path=${NGINX_ACCESSLOG} HTTP_CONFIGURE_OFF= --without-http -HTTP_PLIST_SUB= WWWDATA="@comment " HTTP_ADDITION_CONFIGURE_ON= --with-http_addition_module HTTP_AUTH_REQ_CONFIGURE_ON= --with-http_auth_request_module HTTP_CACHE_CONFIGURE_OFF= --without-http-cache @@ -314,13 +311,6 @@ do-install: .for i in fastcgi_params mime.types scgi_params uwsgi_params ${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}-dist .endfor -.if ${PORT_OPTIONS:MHTTP} && ${PORT_OPTIONS:MWWW} - ${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist -.for i in index.html 50x.html - ${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${PREFIX}/www/nginx-dist -.endfor - ${ECHO_CMD} "" >>${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING -.endif do-install-HTTP_PERL-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx @@ -350,8 +340,9 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 ${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist -post-install-DSO-on: - (cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S|${PREFIX}/||} \ - ! -type d >>${TMPPLIST}) +post-install-WWW-on: + ${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist + (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \ + ${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING) .include Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Thu Mar 29 21:16:56 2018 (r465930) +++ head/www/nginx/pkg-plist Thu Mar 29 21:28:37 2018 (r465931) @@ -8,13 +8,60 @@ %%ETCDIR%%/win-utf @sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types @sample %%ETCDIR%%/nginx.conf-dist %%ETCDIR%%/nginx.conf -%%WWWDATA%%@postexec mkdir -p -m 755 %D/www/nginx-dist -%%WWWDATA%%@postexec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi -%%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING -%%WWWDATA%%www/nginx-dist/index.html -%%WWWDATA%%www/nginx-dist/50x.html -%%WWWDATA%%@postexec chmod a-w %D/www/nginx-dist -%%WWWDATA%%@postunexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi +%%ARRAYVAR%%libexec/nginx/ngx_http_array_var_module.so +%%AWS_AUTH%%libexec/nginx/ngx_http_aws_auth_module.so +%%BROTLI%%libexec/nginx/ngx_http_brotli_filter_module.so +%%BROTLI%%libexec/nginx/ngx_http_brotli_static_module.so +%%CLOJURE%%libexec/nginx/ngx_http_clojure_module.so +%%CT%%libexec/nginx/ngx_ssl_ct_module.so +%%CT%%libexec/nginx/ngx_http_ssl_ct_module.so +%%ECHO%%libexec/nginx/ngx_http_echo_module.so +%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_dynamic_upstream_module.so +%%DEVEL_KIT%%libexec/nginx/ndk_http_module.so +%%ENCRYPTSESSION%%libexec/nginx/ngx_http_encrypted_session_module.so +%%FASTDFS%%libexec/nginx/ngx_http_fastdfs_module.so +%%FORMINPUT%%libexec/nginx/ngx_http_form_input_module.so +%%HEADERS_MORE%%libexec/nginx/ngx_http_headers_more_filter_module.so +%%HTTP_AUTH_DIGEST%%libexec/nginx/ngx_http_auth_digest_module.so +%%HTTP_AUTH_KRB5%%libexec/nginx/ngx_http_auth_spnego_module.so +%%HTTP_AUTH_LDAP%%libexec/nginx/ngx_http_auth_ldap_module.so +%%HTTP_AUTH_PAM%%libexec/nginx/ngx_http_auth_pam_module.so +%%HTTP_EVAL%%libexec/nginx/ngx_http_eval_module.so +%%HTTP_FANCYINDEX%%libexec/nginx/ngx_http_fancyindex_module.so +%%HTTP_GEOIP%%libexec/nginx/ngx_http_geoip_module.so +%%HTTP%%%%HTTP_GEOIP2%%libexec/nginx/ngx_http_geoip2_module.so +%%STREAM%%%%HTTP_GEOIP2%%libexec/nginx/ngx_stream_geoip2_module.so +%%HTTP_IMAGE_FILTER%%libexec/nginx/ngx_http_image_filter_module.so +%%HTTP_PERL%%libexec/nginx/ngx_http_perl_module.so +%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so +%%HTTP_REDIS%%libexec/nginx/ngx_http_redis_module.so +%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so +%%HTTP_UPLOAD%%libexec/nginx/ngx_http_upload_module.so +%%HTTP_UPLOAD_PROGRESS%%libexec/nginx/ngx_http_uploadprogress_module.so +%%HTTP_UPSTREAM_FAIR%%libexec/nginx/ngx_http_upstream_fair_module.so +%%HTTP_XSLT%%libexec/nginx/ngx_http_xslt_filter_module.so +%%ICONV%%libexec/nginx/ngx_http_iconv_module.so +%%LUA%%libexec/nginx/ngx_http_lua_module.so +%%MAIL%%libexec/nginx/ngx_mail_module.so +%%MEMC%%libexec/nginx/ngx_http_memc_module.so +%%NAXSI%%libexec/nginx/ngx_http_naxsi_module.so +%%HTTP%%%%NJS%%libexec/nginx/ngx_http_js_module.so +%%STREAM%%%%NJS%%libexec/nginx/ngx_stream_js_module.so +%%PASSENGER%%libexec/nginx/ngx_http_passenger_module.so +%%REDIS2%%libexec/nginx/ngx_http_redis2_module.so +%%RTMP%%libexec/nginx/ngx_rtmp_module.so +%%SET_MISC%%libexec/nginx/ngx_http_set_misc_module.so +%%SHIBBOLETH%%libexec/nginx/ngx_http_shibboleth_module.so +%%SMALL_LIGHT%%libexec/nginx/ngx_http_small_light_module.so +%%SRCACHE%%libexec/nginx/ngx_http_srcache_filter_module.so +%%STREAM%%libexec/nginx/ngx_stream_module.so +%%WWW%%@postexec mkdir -p -m 755 %D/www/nginx-dist +%%WWW%%@postexec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi +%%WWW%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING +%%WWW%%www/nginx-dist/index.html +%%WWW%%www/nginx-dist/50x.html +%%WWW%%@postexec chmod a-w %D/www/nginx-dist +%%WWW%%@postunexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi sbin/nginx share/vim/vimfiles/ftdetect/nginx.vim share/vim/vimfiles/ftplugin/nginx.vim