svn commit: r439844 - in head/www: nginx nginx-devel
Sergey A. Osokin
osa at FreeBSD.org
Sun Apr 30 20:56:10 UTC 2017
Author: osa
Date: Sun Apr 30 20:56:08 2017
New Revision: 439844
URL: https://svnweb.freebsd.org/changeset/ports/439844
Log:
Add IPV6 support knob back.
Remove obsolete third-party modules:
o) http_accesskey;
o) xrid_header. (*)
Bump PORTREVISION.
PR: 218956 (*)
Modified:
head/www/nginx-devel/Makefile
head/www/nginx/Makefile
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Sun Apr 30 20:47:16 2017 (r439843)
+++ head/www/nginx-devel/Makefile Sun Apr 30 20:56:08 2017 (r439844)
@@ -3,6 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.13.0
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
MASTER_SITES+= LOCAL/osa
@@ -26,6 +27,7 @@ OPTIONS_DEFINE= \
DEBUG \
DEBUGLOG \
FILE_AIO \
+ IPV6 \
GOOGLE_PERFTOOLS \
HTTP \
HTTP_ADDITION \
@@ -69,7 +71,6 @@ OPTIONS_DEFINE= \
FASTDFS \
HEADERS_MORE \
HTTP_ACCEPT_LANGUAGE \
- HTTP_ACCESSKEY \
HTTP_AUTH_DIGEST \
HTTP_AUTH_KRB5 \
HTTP_AUTH_LDAP \
@@ -122,7 +123,6 @@ OPTIONS_DEFINE= \
SMALL_LIGHT \
SRCACHE \
X11 \
- XRID_HEADER \
XSS
OPTIONS_DEFAULT?=DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
@@ -136,6 +136,7 @@ DSO_DESC= Enable dynamic modules suppo
DEBUG_DESC= Build with debugging support
DEBUGLOG_DESC= Enable debug log (--with-debug)
FILE_AIO_DESC= Enable file aio
+IPV6_DESC= Enable IPv6 support
GOOGLE_PERFTOOLS_DESC= Enable google perftools module
HTTP_DESC= Enable HTTP module
HTTP_ADDITION_DESC= Enable http_addition module
@@ -179,7 +180,6 @@ ECHO_DESC= 3rd party echo module
FASTDFS_DESC= 3rd party fastdfs module
HEADERS_MORE_DESC= 3rd party headers_more module
HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module
-HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module
HTTP_AUTH_DIGEST_DESC= 3rd party http_authdigest module
HTTP_AUTH_KRB5_DESC= 3rd party http_auth_gss module
HTTP_AUTH_LDAP_DESC= 3rd party http_auth_ldap module
@@ -232,7 +232,6 @@ SLOWFS_CACHE_DESC= 3rd party slowfs_cac
SMALL_LIGHT_DESC= 3rd party small_light module
SRCACHE_DESC= 3rd party srcache module
X11_DESC= graphics/ImageMagick[-nox11] dependency
-XRID_HEADER_DESC= 3rd party x-rid header module
XSS_DESC= 3rd party xss module
VIDEO_DESC= Video module support
@@ -307,6 +306,12 @@ CONFIGURE_ARGS+=--with-debug
CONFIGURE_ARGS+=--with-file-aio
.endif
+.if empty(PORT_OPTIONS:MIPV6)
+CONFIGURE_ARGS+=--with-cc-opt="-DNGX_HAVE_INET6=0"
+.else
+CATEGORIES+= ipv6
+.endif
+
.if ${PORT_OPTIONS:MGOOGLE_PERFTOOLS}
LIB_DEPENDS+= libprofiler.so:devel/google-perftools
CONFIGURE_ARGS+=--with-google_perftools_module
@@ -328,14 +333,6 @@ GH_TAGNAME+= ${GIT_ACCEPT_LANGUAGE_VERSI
CONFIGURE_ARGS+=--add-module=${WRKSRC_accept_language}
.endif
-.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
-NGINX_ACCESSKEY_VERSION= 2.0.3
-MASTER_SITES+= LOCAL/osa:accesskey
-DISTFILES+= nginx-accesskey-${NGINX_ACCESSKEY_VERSION}.tar.gz:accesskey
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}
-IGNORE= ACCESSKEY: a patch requires
-.endif
-
.if ${PORT_OPTIONS:MHTTP_ADDITION}
CONFIGURE_ARGS+=--with-http_addition_module
.endif
@@ -1025,14 +1022,6 @@ GH_TAGNAME+= v${NGINX_SRCACHE_VERSION}:s
CONFIGURE_ARGS+=--add-module=${WRKSRC_srcache}
.endif
-.if ${PORT_OPTIONS:MXRID_HEADER}
-GIT_XRID_VERSION= 0daa3cc
-GH_ACCOUNT+= gabor:xrid
-GH_PROJECT+= nginx-x-rid-header:xrid
-GH_TAGNAME+= ${GIT_XRID_VERSION}:xrid
-CONFIGURE_ARGS+=--add-module=${WRKSRC_xrid}
-.endif
-
.if ${PORT_OPTIONS:MXSS}
NGINX_XSS_VERSION= 0.05
GH_ACCOUNT+= openresty:xss
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Sun Apr 30 20:47:16 2017 (r439843)
+++ head/www/nginx/Makefile Sun Apr 30 20:56:08 2017 (r439844)
@@ -3,6 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.12.0
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
@@ -26,6 +27,7 @@ OPTIONS_DEFINE= \
DEBUG \
DEBUGLOG \
FILE_AIO \
+ IPV6 \
GOOGLE_PERFTOOLS \
HTTP \
HTTP_ADDITION \
@@ -69,7 +71,6 @@ OPTIONS_DEFINE= \
FASTDFS \
HEADERS_MORE \
HTTP_ACCEPT_LANGUAGE \
- HTTP_ACCESSKEY \
HTTP_AUTH_DIGEST \
HTTP_AUTH_KRB5 \
HTTP_AUTH_LDAP \
@@ -122,7 +123,6 @@ OPTIONS_DEFINE= \
SMALL_LIGHT \
SRCACHE \
X11 \
- XRID_HEADER \
XSS
OPTIONS_DEFAULT?=DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
@@ -136,6 +136,7 @@ DSO_DESC= Enable dynamic modules suppo
DEBUG_DESC= Build with debugging support
DEBUGLOG_DESC= Enable debug log (--with-debug)
FILE_AIO_DESC= Enable file aio
+IPV6_DESC= Enable IPv6 support
GOOGLE_PERFTOOLS_DESC= Enable google perftools module
HTTP_DESC= Enable HTTP module
HTTP_ADDITION_DESC= Enable http_addition module
@@ -179,7 +180,6 @@ ECHO_DESC= 3rd party echo module
FASTDFS_DESC= 3rd party fastdfs module
HEADERS_MORE_DESC= 3rd party headers_more module
HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module
-HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module
HTTP_AUTH_DIGEST_DESC= 3rd party http_authdigest module
HTTP_AUTH_KRB5_DESC= 3rd party http_auth_gss module
HTTP_AUTH_LDAP_DESC= 3rd party http_auth_ldap module
@@ -232,7 +232,6 @@ SLOWFS_CACHE_DESC= 3rd party slowfs_cac
SMALL_LIGHT_DESC= 3rd party small_light module
SRCACHE_DESC= 3rd party srcache module
X11_DESC= graphics/ImageMagick[-nox11] dependency
-XRID_HEADER_DESC= 3rd party x-rid header module
XSS_DESC= 3rd party xss module
VIDEO_DESC= Video module support
@@ -307,6 +306,12 @@ CONFIGURE_ARGS+=--with-debug
CONFIGURE_ARGS+=--with-file-aio
.endif
+.if empty(PORT_OPTIONS:MIPV6)
+CONFIGURE_ARGS+=--with-cc-opt="-DNGX_HAVE_INET6=0"
+.else
+CATEGORIES+= ipv6
+.endif
+
.if ${PORT_OPTIONS:MGOOGLE_PERFTOOLS}
LIB_DEPENDS+= libprofiler.so:devel/google-perftools
CONFIGURE_ARGS+=--with-google_perftools_module
@@ -328,14 +333,6 @@ GH_TAGNAME+= ${GIT_ACCEPT_LANGUAGE_VERSI
CONFIGURE_ARGS+=--add-module=${WRKSRC_accept_language}
.endif
-.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
-NGINX_ACCESSKEY_VERSION= 2.0.3
-MASTER_SITES+= LOCAL/osa:accesskey
-DISTFILES+= nginx-accesskey-${NGINX_ACCESSKEY_VERSION}.tar.gz:accesskey
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}
-IGNORE= ACCESSKEY: a patch requires
-.endif
-
.if ${PORT_OPTIONS:MHTTP_ADDITION}
CONFIGURE_ARGS+=--with-http_addition_module
.endif
@@ -1025,14 +1022,6 @@ GH_TAGNAME+= v${NGINX_SRCACHE_VERSION}:s
CONFIGURE_ARGS+=--add-module=${WRKSRC_srcache}
.endif
-.if ${PORT_OPTIONS:MXRID_HEADER}
-GIT_XRID_VERSION= 0daa3cc
-GH_ACCOUNT+= gabor:xrid
-GH_PROJECT+= nginx-x-rid-header:xrid
-GH_TAGNAME+= ${GIT_XRID_VERSION}:xrid
-CONFIGURE_ARGS+=--add-module=${WRKSRC_xrid}
-.endif
-
.if ${PORT_OPTIONS:MXSS}
NGINX_XSS_VERSION= 0.05
GH_ACCOUNT+= openresty:xss
More information about the svn-ports-head
mailing list