svn commit: r453414 - head/www/nginx
Jochen Neumeister
joneum at FreeBSD.org
Fri Nov 3 17:04:44 UTC 2017
Author: joneum
Date: Fri Nov 3 17:04:43 2017
New Revision: 453414
URL: https://svnweb.freebsd.org/changeset/ports/453414
Log:
Do the port clean-up:
-replace '!empty(PORT_OPTIONS:M...)' with '${PORT_OPTIONS:M...}';
-http_accesskey was removed in r439844, cleanup it.
PR: 222337
Reported by: m1cro <rum1cro at yandex.ru>
Approved by: tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D12915
Modified:
head/www/nginx/Makefile
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Fri Nov 3 16:27:30 2017 (r453413)
+++ head/www/nginx/Makefile Fri Nov 3 17:04:43 2017 (r453414)
@@ -292,7 +292,7 @@ CONFIGURE_ARGS+=--prefix=${ETCDIR} \
--error-log-path=${NGINX_ERRORLOG} \
--user=${WWWOWN} --group=${WWWGRP}
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
MODULESDIR= ${PREFIX}/libexec/${PORTNAME}
CONFIGURE_ARGS+=--modules-path=${MODULESDIR}
.endif
@@ -351,7 +351,7 @@ GIT_AUTH_DIGEST_VERSION= 519dc2a
GH_ACCOUNT+= atomx:auth_digest
GH_PROJECT+= nginx-http-auth-digest:auth_digest
GH_TAGNAME+= ${GIT_AUTH_DIGEST_VERSION}:auth_digest
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_auth_digest}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_digest}
@@ -377,7 +377,7 @@ GIT_HTTP_AUTH_LDAP_VERSION= dbcef31
GH_ACCOUNT+= kvspb:http_auth_ldap
GH_PROJECT+= nginx-auth-ldap:http_auth_ldap
GH_TAGNAME+= ${GIT_HTTP_AUTH_LDAP_VERSION}:http_auth_ldap
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_http_auth_ldap}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_http_auth_ldap}
@@ -390,7 +390,7 @@ GIT_HTTP_AUTH_PAM_VERSION= 1.5.1
GH_ACCOUNT+= sto:auth_pam
GH_PROJECT+= ngx_http_auth_pam_module:auth_pam
GH_TAGNAME+= v${GIT_HTTP_AUTH_PAM_VERSION}:auth_pam
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_auth_pam}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_pam}
@@ -449,7 +449,7 @@ GIT_CT_VERSION= 1.3.2
GH_ACCOUNT+= grahamedgecombe:ct
GH_PROJECT+= nginx-ct:ct
GH_TAGNAME+= v${GIT_CT_VERSION}:ct
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_ct}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_ct}
@@ -466,7 +466,7 @@ NGINX_ECHO_VERSION= 46334b3
GH_ACCOUNT+= openresty:echo
GH_PROJECT+= echo-nginx-module:echo
GH_TAGNAME+= ${NGINX_ECHO_VERSION}:echo
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_echo}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_echo}
@@ -495,7 +495,7 @@ NGINX_HEADERS_MORE_VERSION= 84241e4
GH_ACCOUNT+= openresty:headers_more
GH_PROJECT+= headers-more-nginx-module:headers_more
GH_TAGNAME+= ${NGINX_HEADERS_MORE_VERSION}:headers_more
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_headers_more}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_headers_more}
@@ -521,7 +521,7 @@ NGINX_EVAL_VERSION= 342c812
GH_ACCOUNT+= openresty:eval
GH_PROJECT+= nginx-eval-module:eval
GH_TAGNAME+= ${NGINX_EVAL_VERSION}:eval
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_eval}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_eval}
@@ -533,7 +533,7 @@ NGINX_FANCYINDEX_VERSION= 0.4.1
GH_ACCOUNT+= aperezdc:fancyindex
GH_PROJECT+= ngx-fancyindex:fancyindex
GH_TAGNAME+= v${NGINX_FANCYINDEX_VERSION}:fancyindex
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_fancyindex}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_fancyindex}
@@ -555,7 +555,7 @@ GH_ACCOUNT+= leev:geoip2
GH_PROJECT+= ngx_http_geoip2_module:geoip2
GH_TAGNAME+= ${NGINX_HTTP_GEOIP2_VERSION}:geoip2
CFLAGS+= "-I${LOCALBASE}/include"
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_geoip2}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_geoip2}
@@ -576,7 +576,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_json_status}
.endif
.if ${PORT_OPTIONS:MHTTP_GEOIP}
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--with-http_geoip_module=dynamic
.else
CONFIGURE_ARGS+=--with-http_geoip_module
@@ -594,7 +594,7 @@ CONFIGURE_ARGS+=--with-http_gunzip_module
.if ${PORT_OPTIONS:MHTTP_IMAGE_FILTER}
LIB_DEPENDS+= libgd.so:graphics/gd
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--with-http_image_filter_module=dynamic
.else
CONFIGURE_ARGS+=--with-http_image_filter_module
@@ -632,7 +632,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_notic
.if ${PORT_OPTIONS:MHTTP_PERL}
CATEGORIES+= perl5
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--with-http_perl_module=dynamic
.else
CONFIGURE_ARGS+=--with-http_perl_module
@@ -668,7 +668,7 @@ CONFIGURE_ARGS+=--with-http_realip_module
NGINX_REDIS_VERSION= 0.3.8
MASTER_SITES+= LOCAL/osa:redis
DISTFILES+= ngx_http_redis-${NGINX_REDIS_VERSION}.tar.gz:redis
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION}
.else
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION}
@@ -696,7 +696,7 @@ LIB_DEPENDS+= libmsgpuck.so:devel/msgpuck \
GH_ACCOUNT+= tarantool:nginx_tarantool
GH_PROJECT+= nginx_upstream_module:nginx_tarantool
GH_TAGNAME+= 1278ee5:nginx_tarantool
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_tarantool}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool}
@@ -736,7 +736,7 @@ GH_TAGNAME+= v${NGINX_UPLOADPROGRESS_VERSION}:uploadpr
CONFIGURE_ARGS+=--add-module=${WRKSRC_uploadprogress}
.endif
-.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_CHECK)
+.if ${PORT_OPTIONS:MHTTP_UPSTREAM_CHECK}
# WWW: https://github.com/yaoweibin/nginx_upstream_check_module
NGINX_UPSTREAM_CHECK_VERSION= 10782ea
GH_ACCOUNT+= yaoweibin:upstreamcheck
@@ -750,13 +750,13 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-http-modul
${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h
.endif
-.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR)
+.if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
NGINX_UPSTREAM_FAIR_VERSION= b5be36f
GH_ACCOUNT+= cryptofuture:upstreamfair
GH_PROJECT+= nginx-upstream-fair:upstreamfair
GH_TAGNAME+= ${NGINX_UPSTREAM_FAIR_VERSION}:upstreamfair
CONFIGURE_ARGS+=--add-module=${WRKSRC_upstreamfair}
-#.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_CHECK)
+#.if ${PORT_OPTIONS:MHTTP_UPSTREAM_CHECK}
#EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upstream_fair_module.c
#.endif
.endif
@@ -785,7 +785,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_vte}
.if ${PORT_OPTIONS:MHTTP_XSLT}
USE_GNOME+= libxml2 libxslt
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--with-http_xslt_module=dynamic
.else
CONFIGURE_ARGS+=--with-http_xslt_module
@@ -818,7 +818,7 @@ NGINX_DYNAMIC_UPSTREAM_VERSION= 0.1.3
GH_ACCOUNT+= cubicdaiya:dyn_upstream
GH_PROJECT+= ngx_dynamic_upstream:dyn_upstream
GH_TAGNAME+= v${NGINX_DYNAMIC_UPSTREAM_VERSION}:dyn_upstream
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_dyn_upstream}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_dyn_upstream}
@@ -867,7 +867,7 @@ NGINX_LUA_VERSION= 0.10.8
GH_ACCOUNT+= openresty:lua
GH_PROJECT+= lua-nginx-module:lua
GH_TAGNAME+= v${NGINX_LUA_VERSION}:lua
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_lua}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_lua}
@@ -884,7 +884,7 @@ NGINX_MEMC_VERSION= 0.18
GH_ACCOUNT+= openresty:memc
GH_PROJECT+= memc-nginx-module:memc
GH_TAGNAME+= v${NGINX_MEMC_VERSION}:memc
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_memc}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
@@ -935,7 +935,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
PASSENGER_VERSION= 5.1.11
MASTER_SITES+= http://s3.amazonaws.com/phusion-passenger/releases/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module
.else
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module
@@ -996,7 +996,7 @@ NGINX_SET_MISC_VERSION= f808ef4
GH_ACCOUNT+= openresty:setmisc
GH_PROJECT+= set-misc-nginx-module:setmisc
GH_TAGNAME+= ${NGINX_SET_MISC_VERSION}:setmisc
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_setmisc}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_setmisc}
@@ -1035,7 +1035,7 @@ LIB_DEPENDS+= ${IMAGEMAGICK_LIB_DEPENDS} \
GH_ACCOUNT+= cubicdaiya:small_light
GH_PROJECT+= ngx_small_light:small_light
GH_TAGNAME+= v${NGINX_SMALL_LIGHT_VERSION}:small_light
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_small_light}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_small_light}
@@ -1068,7 +1068,7 @@ CONFIGURE_ARGS+=--with-http_v2_module
GH_ACCOUNT+= nginx:njs
GH_PROJECT+= njs:njs
GH_TAGNAME+= 753ebe6:njs
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_njs}/nginx
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_njs}/nginx
@@ -1076,7 +1076,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_njs}/nginx
.endif
.if ${PORT_OPTIONS:MSTREAM}
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--with-stream=dynamic
.else
CONFIGURE_ARGS+=--with-stream
@@ -1107,7 +1107,7 @@ PLIST_SUB+= WWWDATA="@comment "
.endif # WITH_HTTP
.if ${PORT_OPTIONS:MMAIL}
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--with-mail=dynamic
.else
CONFIGURE_ARGS+=--with-mail
@@ -1146,7 +1146,7 @@ LIB_DEPENDS+= libbrotlicommon.so:archivers/brotli
GH_ACCOUNT+= google:brotli
GH_PROJECT+= ngx_brotli:brotli
GH_TAGNAME+= ${NGINX_BROTLI_VERSION}:brotli
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_brotli}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_brotli}
@@ -1203,21 +1203,11 @@ post-patch:
s!%%PREFIX%%!${PREFIX}!; \
s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
${WRKSRC}/conf/nginx.conf
-.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
- @${REINPLACE_CMD} \
- '128s!NGX_OK!NGX_DECLINED!' \
- ${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}/ngx_http_accesskey_module.c
-.endif
.if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
@${REINPLACE_CMD} \
's!%%GSSAPILIBS%%!${GSSAPILIBS}!' \
${WRKSRC_auth_krb5}/config
.endif
-.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
- @${REINPLACE_CMD} \
- 's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
- ${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}/config
-.endif
# linker error acquire if --std=c99 defined, add "static" to inline function
.if ${PORT_OPTIONS:MHTTP_ZIP}
@${REINPLACE_CMD} \
@@ -1297,7 +1287,7 @@ do-build:
do-install:
${MKDIR} ${STAGEDIR}${ETCDIR}
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
${MKDIR} ${STAGEDIR}${MODULESDIR}
.endif
${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
@@ -1309,7 +1299,7 @@ do-install:
.for i in fastcgi_params mime.types scgi_params uwsgi_params
${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}-dist
.endfor
-.if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MWWW)
+.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
@@ -1317,7 +1307,7 @@ do-install:
${ECHO_CMD} "" >>${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
.endif
-.if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL)
+.if ${PORT_OPTIONS:MHTTP} && ${PORT_OPTIONS:MHTTP_PERL}
${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
@@ -1331,7 +1321,7 @@ do-install:
.endif
# Install dynamic modules
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
-exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;)
.endif
@@ -1343,7 +1333,7 @@ do-install:
.endif
post-install:
-.if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL)
+.if ${PORT_OPTIONS:MHTTP} && ${PORT_OPTIONS:MHTTP_PERL}
${ECHO_CMD} ${SITE_ARCH_REL}/auto/nginx/nginx.so >> ${TMPPLIST}
${ECHO_CMD} ${SITE_ARCH_REL}/nginx.pm >> ${TMPPLIST}
.endif
@@ -1358,7 +1348,7 @@ post-install:
.endif
# Add dynamic modules to the plist
-.if !empty(PORT_OPTIONS:MDSO)
+.if ${PORT_OPTIONS:MDSO}
(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S|${PREFIX}/||} \
! -type d >>${TMPPLIST})
.endif
More information about the svn-ports-head
mailing list