Page MenuHomeFreeBSD
Files F168392353

D11290.id30180.diff
No OneTemporary
Actions

D11290.id30180.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -9440,3 +9440,4 @@
editors/calligra-l10n-tr||2017-06-12|Merged with editors/calligra
editors/calligra-l10n||2017-06-12|Merged with editors/calligra
www/py-flask-restplus08||2017-06-21|Obsolete and not depended on anymore
+devel/libbrotli|archivers/brotli|2017-06-21|meta project no longer required to build libs
Index: archivers/Makefile
===================================================================
--- archivers/Makefile
+++ archivers/Makefile
@@ -11,6 +11,8 @@
SUBDIR += ark
SUBDIR += atool
SUBDIR += bicom
+ SUBDIR += brotli
+ SUBDIR += brotli-static
SUBDIR += bzip
SUBDIR += bzip2
SUBDIR += cabextract
Index: archivers/brotli-static/Makefile
===================================================================
--- /dev/null
+++ archivers/brotli-static/Makefile
@@ -0,0 +1,12 @@
+# Created by: Bernard Spil <brnrd@FreeBSD.org>
+# $FreeBSD$
+
+PKGNAMESUFFIX= -static
+
+MASTERDIR= ${.CURDIR}/../brotli
+
+OPTIONS_SLAVE= STATIC
+
+CONFLICTS_INSTALL= brotli-[0-9]*
+
+.include "${MASTERDIR}/Makefile"
Index: archivers/brotli/Makefile
===================================================================
--- archivers/brotli/Makefile
+++ archivers/brotli/Makefile
@@ -1,30 +1,34 @@
# Created by: Sergey A. Osokin <osa@FreeBSD.org>
# $FreeBSD$
-PORTNAME= libbrotli
-PORTVERSION= 1.0
-DISTVERSIONPREFIX= ${PORTNAME}-
-PORTREVISION= 6
-CATEGORIES= devel archivers
+PORTNAME= brotli
+PORTVERSION= 0.6.0
+DISTVERSIONPREFIX= v
+PORTEPOCH= 1
+CATEGORIES= archivers devel
MAINTAINER= osa@FreeBSD.org
-COMMENT= Library for generic-purpose lossless compression algorithm
+COMMENT= Generic-purpose lossless compression algorithm
LICENSE= MIT
-BROTLI_VERSION= v0.4.0
+CONFLICTS_INSTALL= brotli-static-[0-9]*
USE_GITHUB= yes
-GH_ACCOUNT= bagder google:brotli
-GH_PROJECT= brotli:brotli
-GH_TAGNAME= ${BROTLI_VERSION}:brotli
-GH_SUBDIR= brotli:brotli
+GH_ACCOUNT= google
-USES= pkgconfig autoreconf libtool compiler:c++0x pathfix
-GNU_CONFIGURE= yes
+OPTIONS_DEFINE= STATIC
+OPTIONS_SUB= yes
+
+USES= cmake:outsource compiler:c++0x pkgconfig
USE_LDCONFIG= yes
-pre-configure:
- cd ${WRKSRC} && ./autogen.sh
+CMAKE_ARGS= -DBUILD_TEST=OFF
+STATIC_CMAKE_ON= -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
+
+post-install:
+ @${LN} -s libbrotlicommon.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlicommon.so.0
+ @${LN} -s libbrotlidec.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlidec.so.0
+ @${LN} -s libbrotlienc.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libbrotlienc.so.0
.include <bsd.port.mk>
Index: archivers/brotli/distinfo
===================================================================
--- archivers/brotli/distinfo
+++ archivers/brotli/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1490788508
-SHA256 (bagder-libbrotli-libbrotli-1.0_GH0.tar.gz) = 5b7c02eb87017e7b3886c07eca685db95fa21f9c8afbb442469370c251a54dc1
-SIZE (bagder-libbrotli-libbrotli-1.0_GH0.tar.gz) = 3116
-SHA256 (google-brotli-v0.4.0_GH0.tar.gz) = 09aeea757c68a39feb0350a1506b5543ec5ce2c09988711d9e4dc1e9907dac7d
-SIZE (google-brotli-v0.4.0_GH0.tar.gz) = 8069842
+TIMESTAMP = 1498054439
+SHA256 (google-brotli-v0.6.0_GH0.tar.gz) = 69cdbdf5709051dd086a2f020f5abf9e32519eafe0ad6be820c667c3a9c9ee0f
+SIZE (google-brotli-v0.6.0_GH0.tar.gz) = 19838761
Index: archivers/brotli/pkg-plist
===================================================================
--- archivers/brotli/pkg-plist
+++ archivers/brotli/pkg-plist
@@ -1,51 +1,20 @@
-include/brotli/dec/bit_reader.h
-include/brotli/dec/context.h
-include/brotli/dec/decode.h
-include/brotli/dec/dictionary.h
-include/brotli/dec/huffman.h
-include/brotli/dec/port.h
-include/brotli/dec/prefix.h
-include/brotli/dec/state.h
-include/brotli/dec/transform.h
-include/brotli/dec/types.h
-include/brotli/enc/backward_references.h
-include/brotli/enc/bit_cost.h
-include/brotli/enc/block_splitter.h
-include/brotli/enc/brotli_bit_stream.h
-include/brotli/enc/cluster.h
-include/brotli/enc/command.h
-include/brotli/enc/context.h
-include/brotli/enc/dictionary.h
-include/brotli/enc/dictionary_hash.h
-include/brotli/enc/encode.h
-include/brotli/enc/encode_parallel.h
-include/brotli/enc/entropy_encode.h
-include/brotli/enc/fast_log.h
-include/brotli/enc/find_match_length.h
-include/brotli/enc/hash.h
-include/brotli/enc/histogram.h
-include/brotli/enc/literal_cost.h
-include/brotli/enc/metablock.h
-include/brotli/enc/port.h
-include/brotli/enc/prefix.h
-include/brotli/enc/ringbuffer.h
-include/brotli/enc/static_dict.h
-include/brotli/enc/static_dict_lut.h
-include/brotli/enc/streams.h
-include/brotli/enc/transform.h
-include/brotli/enc/types.h
-include/brotli/enc/utf8_util.h
-include/brotli/enc/write_bits.h
-include/brotli/enc/compress_fragment.h
-include/brotli/enc/compress_fragment_two_pass.h
-include/brotli/enc/entropy_encode_static.h
-lib/libbrotlidec.a
-lib/libbrotlidec.so
-lib/libbrotlidec.so.1
-lib/libbrotlidec.so.1.0.0
-lib/libbrotlienc.a
-lib/libbrotlienc.so
-lib/libbrotlienc.so.1
-lib/libbrotlienc.so.1.0.0
+bin/bro
+include/brotli/decode.h
+include/brotli/encode.h
+include/brotli/port.h
+include/brotli/types.h
+%%STATIC%%lib/libbrotlicommon.a
+%%NO_STATIC%%lib/libbrotlicommon.so
+%%NO_STATIC%%lib/libbrotlicommon.so.0
+%%NO_STATIC%%lib/libbrotlicommon.so.0.6.0
+%%STATIC%%lib/libbrotlidec.a
+%%NO_STATIC%%lib/libbrotlidec.so
+%%NO_STATIC%%lib/libbrotlidec.so.0
+%%NO_STATIC%%lib/libbrotlidec.so.0.6.0
+%%STATIC%%lib/libbrotlienc.a
+%%NO_STATIC%%lib/libbrotlienc.so
+%%NO_STATIC%%lib/libbrotlienc.so.0
+%%NO_STATIC%%lib/libbrotlienc.so.0.6.0
+libdata/pkgconfig/libbrotlicommon.pc
libdata/pkgconfig/libbrotlidec.pc
libdata/pkgconfig/libbrotlienc.pc
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -1256,7 +1256,6 @@
SUBDIR += libbobcat
SUBDIR += libbonobo
SUBDIR += libbonobo-reference
- SUBDIR += libbrotli
SUBDIR += libbson
SUBDIR += libburn
SUBDIR += libccid
Index: www/nginx-devel/Makefile
===================================================================
--- www/nginx-devel/Makefile
+++ www/nginx-devel/Makefile
@@ -21,12 +21,20 @@
USE_GITHUB= nodefault
NO_OPTIONS_SORT= yes
+OPTIONS_GROUP= MODULES TPMODS
OPTIONS_DEFINE= \
DSO \
DEBUG \
DEBUGLOG \
FILE_AIO \
IPV6 \
+ VOD \
+ X11 \
+ XSS \
+ THREADS \
+ WWW
+
+OPTIONS_GROUP_MODULES= \
GOOGLE_PERFTOOLS \
HTTP \
HTTP_ADDITION \
@@ -59,8 +67,8 @@
STREAM \
STREAM_SSL \
STREAM_SSL_PREREAD \
- THREADS \
- WWW \
+
+OPTIONS_GROUP_TPMODS= \
AJP \
AWS_AUTH \
CACHE_PURGE \
@@ -121,9 +129,6 @@
SLOWFS_CACHE \
SMALL_LIGHT \
SRCACHE \
- VOD \
- X11 \
- XSS
OPTIONS_DEFAULT?=DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
HTTP_DAV HTTP_FLV HTTP_GZIP_STATIC HTTP_GUNZIP_FILTER \
@@ -132,112 +137,83 @@
HTTPV2 MAIL MAIL_SSL STREAM STREAM_SSL STREAM_SSL_PREREAD \
THREADS WWW
-DSO_DESC= Enable dynamic modules support
-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
-HTTP_AUTH_REQ_DESC= Enable http_auth_request module
-HTTP_CACHE_DESC= Enable http_cache module
-HTTP_DAV_DESC= Enable http_webdav module
-HTTP_FLV_DESC= Enable http_flv module
-HTTP_GEOIP_DESC= Enable http_geoip module
-HTTP_GZIP_STATIC_DESC= Enable http_gzip_static module
-HTTP_GUNZIP_FILTER_DESC= Enable http_gunzip_filter module
-HTTP_IMAGE_FILTER_DESC= Enable http_image_filter module
-HTTP_MP4_DESC= Enable http_mp4 module
-HTTP_PERL_DESC= Enable http_perl module
-HTTP_RANDOM_INDEX_DESC= Enable http_random_index module
-HTTP_REALIP_DESC= Enable http_realip module
-HTTP_REWRITE_DESC= Enable http_rewrite module
-HTTP_SECURE_LINK_DESC= Enable http_secure_link module
-HTTP_SLICE_DESC= Enable http_slice module
-HTTP_SSL_DESC= Enable http_ssl module
-HTTP_STATUS_DESC= Enable http_stub_status module
-HTTP_SUB_DESC= Enable http_sub module
-HTTP_XSLT_DESC= Enable http_xslt module
-MAIL_DESC= Enable IMAP4/POP3/SMTP proxy module
-MAIL_IMAP_DESC= Enable IMAP4 proxy module
-MAIL_POP3_DESC= Enable POP3 proxy module
-MAIL_SMTP_DESC= Enable SMTP proxy module
-MAIL_SSL_DESC= Enable mail_ssl module
-HTTPV2_DESC= Enable HTTP/2 protocol support (SSL req.)
-NJS_DESC= Enable http_javascript module
-STREAM_DESC= Enable stream module
-STREAM_SSL_DESC= Enable stream_ssl module (SSL req.)
-STREAM_SSL_PREREAD_DESC= Enable stream_ssl_preread module (SSL req.)
-THREADS_DESC= Enable threads support
-WWW_DESC= Enable html sample files
-AJP_DESC= 3rd party ajp module
-AWS_AUTH_DESC= 3rd party aws auth module
-CACHE_PURGE_DESC= 3rd party cache_purge module
-CLOJURE_DESC= 3rd party clojure module
-CT_DESC= 3rd party cert_transparency module (SSL req.)
-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_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
-HTTP_AUTH_PAM_DESC= 3rd party http_auth_pam module
-HTTP_DAV_EXT_DESC= 3rd party webdav_ext module
-HTTP_EVAL_DESC= 3rd party eval module
-HTTP_FANCYINDEX_DESC= 3rd party http_fancyindex module
-HTTP_FOOTER_DESC= 3rd party http_footer module
-HTTP_GEOIP2_DESC= 3rd party geoip2 module
-HTTP_JSON_STATUS_DESC= 3rd party http_json_status module
-HTTP_MOGILEFS_DESC= 3rd party mogilefs module
-HTTP_MP4_H264_DESC= 3rd party mp4/h264 module
-HTTP_NOTICE_DESC= 3rd party notice module
-HTTP_PUSH_DESC= 3rd party push module
-HTTP_PUSH_STREAM_DESC= 3rd party push stream module
-HTTP_REDIS_DESC= 3rd party http_redis module
-HTTP_RESPONSE_DESC= 3rd party http_response module
-HTTP_SUBS_FILTER_DESC= 3rd party subs filter module
-HTTP_TARANTOOL_DESC= 3rd party tarantool upstream module
-HTTP_UPLOAD_DESC= 3rd party upload module
-HTTP_UPLOAD_PROGRESS_DESC= 3rd party uploadprogress module
-HTTP_UPSTREAM_CHECK_DESC= 3rd party upstream check module
-HTTP_UPSTREAM_FAIR_DESC= 3rd party upstream fair module
-HTTP_UPSTREAM_STICKY_DESC= 3rd party upstream sticky module
-HTTP_VIDEO_THUMBEXTRACTOR_DESC= 3rd party video_thumbextractor module
-HTTP_ZIP_DESC= 3rd party http_zip module
-ARRAYVAR_DESC= 3rd party array_var module
-BROTLI_DESC= 3rd party brotli module
-DRIZZLE_DESC= 3rd party drizzlie module
-DYNAMIC_UPSTREAM_DESC= 3rd party dynamic_upstream module
-ENCRYPTSESSION_DESC= 3rd party encrypted_session module
-FORMINPUT_DESC= 3rd party form_input module
-GRIDFS_DESC= 3rd party gridfs module
-ICONV_DESC= 3rd party iconv module
-LET_DESC= 3rd party let module
-LUA_DESC= 3rd party lua module
-MEMC_DESC= 3rd party memc (memcached) module
-MODSECURITY_DESC= 3rd party mod_security module
-NAXSI_DESC= 3rd party naxsi module
-PASSENGER_DESC= 3rd party passenger module
-POSTGRES_DESC= 3rd party postgres module
-RDS_CSV_DESC= 3rd party rds_csv module
-RDS_JSON_DESC= 3rd party rds_json module
-REDIS2_DESC= 3rd party redis2 module
-RTMP_DESC= 3rd party rtmp module
-SET_MISC_DESC= 3rd party set_misc module
-SFLOW_DESC= 3rd party sflow module
-SHIBBOLETH_DESC= 3rd party shibboleth module
-SLOWFS_CACHE_DESC= 3rd party slowfs_cache module
-SMALL_LIGHT_DESC= 3rd party small_light module
-SRCACHE_DESC= 3rd party srcache module
-VOD_DESC= 3rd party vod module
-X11_DESC= graphics/ImageMagick[-nox11] dependency
-XSS_DESC= 3rd party xss module
-VIDEO_DESC= Video module support
+.include "Makefile.options.desc"
WANT_GNOME= yes
+.for REQ_SSL in HTTPV2 STREAM_SSL CT
+${REQ_SSL}_IMPLIES= HTTP_SSL
+.endfor
+
+
+#_GH_ACCOUNT=
+#_GH_PROJECT=
+#_GH_TAGNAME=
+AJP_GH_ACCOUNT= yaoweibin:ajp
+AJP_GH_PROJECT= nginx_ajp_module:ajp
+AJP_GH_TAGNAME= bf6cd93:ajp
+AJP_CONFIGURE_ON= --add-module=${WRKSRC_ajp}
+AWS_AUTH_GH_ACCOUNT= anomalizer:aws_auth
+AWS_AUTH_GH_PROJECT= ngx_aws_auth:aws_auth
+AWS_AUTH_GH_TAGNAME= 1e62670:aws_auth
+AWS_AUTH_CONFIGURE_ON= --add-module=${WRKSRC_aws_auth}
+CACHE_PURGE_VARS= NGINX_CACHE_PURGE_VERSION=2.3
+CACHE_PURGE_MASTER_SITES= http://labs.frickle.com/files/:cache_purge
+CACHE_PURGE_DISTFILES= ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION}.tar.gz:cache_purge
+CACHE_PURGE_CONFIGURE_ON= --add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION}
+DEBUG_CFLAGS= -g
+DEBUG_VARS= strip=""
+DEBUGLOG_CONFIGURE_ON= --with-debug
+DSO_CONFIGURE_ON= --modules-path=${MODULESDIR}
+GOOGLE_PERFTOOLS_CONFIGURE_ON= --with-google_perftools_module
+GOOGLE_PERFTOOLS_LIB_DEPENDS= libprofiler.so:devel/google-perftools
+HTTP_CONFIGURE_ON= --http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
+ --http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
+ --http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
+ --http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
+ --http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
+ --http-log-path=${NGINX_ACCESSLOG}
+HTTP_ACCEPT_LANGUAGE_CONFIGURE_WITH= --add-module=${WRKSRC_accept_language}
+HTTP_ACCEPT_LANGUAGE_GH_ACCOUNT= giom:accept_language
+HTTP_ACCEPT_LANGUAGE_GH_PROJECT= nginx_accept_language_module:accept_language
+HTTP_ACCEPT_LANGUAGE_GH_TAGNAME= 2f69842:accept_language
+HTTP_ADDITION_MODULE_CONFIGURE_WITH= --with-http_addition_module
+HTTP_AUTH_DIGEST_GH_ACCOUNT= atomx:auth_digest
+HTTP_AUTH_DIGEST_GH_PROJECT= nginx-http-auth-digest:auth_digest
+HTTP_AUTH_DIGEST_GH_TAGNAME= 519dc2a:auth_digest
+HTTP_AUTH_DIGEST_VARS= enabled_mods+=${WRKSRC_auth_digest}
+HTTP_AUTH_KRB5_CONFIGURE_ON= --add-module=${WRKSRC_auth_krb5}
+HTTP_AUTH_KRB5_GH_ACCOUNT= stnoonan:auth_krb5
+HTTP_AUTH_KRB5_GH_PROJECT= spnego-http-auth-nginx-module:auth_krb5
+HTTP_AUTH_KRB5_GH_TAGNAME= 0c6ff3f:auth_krb5
+HTTP_AUTH_LDAP_GH_ACCOUNT= kvspb:http_auth_ldap
+HTTP_AUTH_LDAP_GH_PROJECT= nginx-auth-ldap:http_auth_ldap
+HTTP_AUTH_LDAP_GH_TAGNAME= dbcef31:http_auth_ldap
+HTTP_AUTH_LDAP_USE= openldap=yes
+HTTP_AUTH_LDAP_VARS= enabled_mods+=${WRKSRC_http_auth_ldap}
+HTTP_AUTH_PAM_GH_ACCOUNT= sto:auth_pam
+HTTP_AUTH_PAM_GH_PROJECT= ngx_http_auth_pam_module:auth_pam
+HTTP_AUTH_PAM_GH_TAGNAME= v1.5.1:auth_pam
+HTTP_AUTH_PAM_VARS= enabled_mods+=${WRKSRC_auth_pam}
+HTTP_AUTH_REQ_CONFIGURE_ON= --with-http_auth_request_module
+HTTP_CACHE_CONFIGURE_OFF= --without-http-cache
+HTTP_SSL_USES= ssl
+IPV6_CATEGORIES= ipv6
+IPV6_CONFIGURE_OFF= --with-cc-opt=\"-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include\"
+PASSENGER_BUILD_DEPENDS= ${LOCALBASE}/bin/rake:devel/rubygem-rake
+PASSENGER_CATEGORIES= ruby
+PASSENGER_USE= ruby
+PASSENGER_VARS= RAKE_BIN=${LOCALBASE}/bin/rake
+
+.for MOD in ${ENABLED_MODS}
+DSO_CONFIGURE_ON+= --add-dynamic-module=${MOD}
+DSO_CONFIGURE_OFF+= --add-module=${MOD}
+.endfor
+
+.for OPT in FILE_AIO
+${OPT}_CONFIGURE_ON= --with-${OPT:S/_/-/g:tl}
+.endfor
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MX11}
@@ -246,18 +222,12 @@
IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick-nox11
.endif
-.if ${PORT_OPTIONS:MPASSENGER}
-CATEGORIES+= ruby
-USE_RUBY= yes
-BUILD_DEPENDS+= ${LOCALBASE}/bin/rake:devel/rubygem-rake
-RAKE_BIN= ${LOCALBASE}/bin/rake
-.endif
-
NGINX_VARDIR?= /var
NGINX_LOGDIR?= ${NGINX_VARDIR}/log/nginx
NGINX_RUNDIR?= ${NGINX_VARDIR}/run
NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx
HTTP_PORT?= 80
+MODULESDIR= ${PREFIX}/libexec/${PORTNAME}
NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/access.log
NGINX_ERRORLOG?= ${NGINX_LOGDIR}/error.log
@@ -284,135 +254,11 @@
--error-log-path=${NGINX_ERRORLOG} \
--user=${WWWOWN} --group=${WWWGRP}
-.if !empty(PORT_OPTIONS:MDSO)
-MODULESDIR= ${PREFIX}/libexec/${PORTNAME}
-CONFIGURE_ARGS+=--modules-path=${MODULESDIR}
-.endif
-
.if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL)
IGNORE= requires at least HTTP or MAIL to \
be defined. Please do 'make config' again
.endif
-.if ${PORT_OPTIONS:MDEBUG}
-CFLAGS+= -g
-STRIP= #do not strip if nginx with debug information
-.endif
-
-.if ${PORT_OPTIONS:MDEBUGLOG}
-CONFIGURE_ARGS+=--with-debug
-.endif
-
-.if ${PORT_OPTIONS:MFILE_AIO}
-CONFIGURE_ARGS+=--with-file-aio
-.endif
-
-.if empty(PORT_OPTIONS:MIPV6)
-CONFIGURE_ARGS+=--with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include"
-.else
-CATEGORIES+= ipv6
-.endif
-
-.if ${PORT_OPTIONS:MGOOGLE_PERFTOOLS}
-LIB_DEPENDS+= libprofiler.so:devel/google-perftools
-CONFIGURE_ARGS+=--with-google_perftools_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP}
-CONFIGURE_ARGS+=--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
- --http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
- --http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
- --http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
- --http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
- --http-log-path=${NGINX_ACCESSLOG}
-
-.if ${PORT_OPTIONS:MHTTP_ACCEPT_LANGUAGE}
-GIT_ACCEPT_LANGUAGE_VERSION= 2f69842
-GH_ACCOUNT+= giom:accept_language
-GH_PROJECT+= nginx_accept_language_module:accept_language
-GH_TAGNAME+= ${GIT_ACCEPT_LANGUAGE_VERSION}:accept_language
-CONFIGURE_ARGS+=--add-module=${WRKSRC_accept_language}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_ADDITION}
-CONFIGURE_ARGS+=--with-http_addition_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_AUTH_DIGEST}
-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)
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_auth_digest}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_digest}
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
-GIT_HTTP_AUTH_KRB5_VERSION= 0c6ff3f
-GH_ACCOUNT+= stnoonan:auth_krb5
-GH_PROJECT+= spnego-http-auth-nginx-module:auth_krb5
-GH_TAGNAME+= ${GIT_HTTP_AUTH_KRB5_VERSION}:auth_krb5
-CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_krb5}
-#EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config
-#OPTIONS_RADIO+= GSSAPI
-#OPTIONS_RADIO_GSSAPI+= GSSAPI_HEIMDAL GSSAPI_MIT
-#GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
-#GSSAPI_MIT_USES= gssapi:mit
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_AUTH_LDAP}
-# WWW: https://github.com/kvspb/nginx-auth-ldap
-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)
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_http_auth_ldap}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_http_auth_ldap}
-.endif
-USE_OPENLDAP= yes
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_AUTH_PAM}
-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)
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_auth_pam}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_pam}
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_AUTH_REQ}
-CONFIGURE_ARGS+=--with-http_auth_request_module
-.endif
-
-.if empty(PORT_OPTIONS:MHTTP_CACHE)
-CONFIGURE_ARGS+=--without-http-cache
-.endif
-
-.if ${PORT_OPTIONS:MAJP}
-NGINX_AJP_VERSION= bf6cd93
-GH_ACCOUNT+= yaoweibin:ajp
-GH_PROJECT+= nginx_ajp_module:ajp
-GH_TAGNAME+= ${NGINX_AJP_VERSION}:ajp
-CONFIGURE_ARGS+=--add-module=${WRKSRC_ajp}
-.endif
-
-.if ${PORT_OPTIONS:MAWS_AUTH}
-NGINX_AWS_AUTH_VERSION= 1e62670
-GH_ACCOUNT+= anomalizer:aws_auth
-GH_PROJECT+= ngx_aws_auth:aws_auth
-GH_TAGNAME+= ${NGINX_AWS_AUTH_VERSION}:aws_auth
-CONFIGURE_ARGS+=--add-module=${WRKSRC_aws_auth}
-.endif
-
.if ${PORT_OPTIONS:MCACHE_PURGE}
NGINX_CACHE_PURGE_VERSION= 2.3
MASTER_SITES+= http://labs.frickle.com/files/:cache_purge
@@ -447,8 +293,7 @@
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_ct}
.endif
-NGINX_OPENSSL= yes
-USE_HTTP_SSL= yes
+use_HTTP_SSL= yes
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base
IGNORE= CT option requires OpenSSL 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf
.endif
@@ -1057,7 +902,6 @@
.endif
.if ${PORT_OPTIONS:MHTTPV2}
-NGINX_OPENSSL= yes
USE_HTTP_SSL= yes
CONFIGURE_ARGS+=--with-http_v2_module
.endif
@@ -1080,7 +924,6 @@
CONFIGURE_ARGS+=--with-stream
.endif
.if ${PORT_OPTIONS:MSTREAM_SSL}
-NGINX_OPENSSL= yes
USE_HTTP_SSL= yes
CONFIGURE_ARGS+=--with-stream_ssl_module
.if ${PORT_OPTIONS:MSTREAM_SSL_PREREAD}
@@ -1099,10 +942,11 @@
PLIST_SUB+= WWWDATA="@comment "
.endif
-.else
-CONFIGURE_ARGS+=--without-http
-PLIST_SUB+= WWWDATA="@comment "
-.endif # WITH_HTTP
+
+#.else
+#CONFIGURE_ARGS+=--without-http
+#PLIST_SUB+= WWWDATA="@comment "
+#.endif # WITH_HTTP
.if ${PORT_OPTIONS:MMAIL}
.if !empty(PORT_OPTIONS:MDSO)
@@ -1120,13 +964,11 @@
CONFIGURE_ARGS+=--without-mail_smtp_module
.endif
.if ${PORT_OPTIONS:MMAIL_SSL}
-NGINX_OPENSSL= yes
CONFIGURE_ARGS+=--with-mail_ssl_module
.endif
.endif # WITH_MAIL
.if ${PORT_OPTIONS:MHTTP_SSL} || defined(USE_HTTP_SSL)
-NGINX_OPENSSL= yes
CONFIGURE_ARGS+=--with-http_ssl_module
.endif
@@ -1139,9 +981,8 @@
.endif
.if ${PORT_OPTIONS:MBROTLI}
-NGINX_BROTLI_VERSION= ada972b
-LIB_DEPENDS+= libbrotlidec.so:devel/libbrotli \
- libbrotlienc.so:devel/libbrotli
+NGINX_BROTLI_VERSION= 12529813
+LIB_DEPENDS+= libbrotlicommon.so:archivers/brotli
GH_ACCOUNT+= google:brotli
GH_PROJECT+= ngx_brotli:brotli
GH_TAGNAME+= ${NGINX_BROTLI_VERSION}:brotli
@@ -1175,10 +1016,6 @@
USERS?= ${WWWOWN}
GROUPS?=${WWWGRP}
-.if defined(NGINX_OPENSSL)
-USES+= ssl
-.endif
-
pre-everything::
@${ECHO_MSG}
.if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
Index: www/nginx-devel/distinfo
===================================================================
--- www/nginx-devel/distinfo
+++ www/nginx-devel/distinfo
@@ -125,8 +125,8 @@
SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124
SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280
-SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) = d3d0e22a2629cd017280e05bd3bf05aa7b5c820ebe8c79932ce161243911e776
-SIZE (google-ngx_brotli-ada972b_GH0.tar.gz) = 11128
+SHA256 (google-ngx_brotli-12529813_GH0.tar.gz) = 788b25c4a3285b34d06e48a469fd0d0cb52d43b43edccd2935e22802dcfd2d69
+SIZE (google-ngx_brotli-12529813_GH0.tar.gz) = 10448
SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
Index: www/nginx/Makefile
===================================================================
--- www/nginx/Makefile
+++ www/nginx/Makefile
@@ -1126,9 +1126,8 @@
.endif
.if ${PORT_OPTIONS:MBROTLI}
-NGINX_BROTLI_VERSION= ada972b
-LIB_DEPENDS+= libbrotlidec.so:devel/libbrotli \
- libbrotlienc.so:devel/libbrotli
+NGINX_BROTLI_VERSION= 12529813
+LIB_DEPENDS+= libbrotlicommon.so:archivers/brotli
GH_ACCOUNT+= google:brotli
GH_PROJECT+= ngx_brotli:brotli
GH_TAGNAME+= ${NGINX_BROTLI_VERSION}:brotli
Index: www/nginx/distinfo
===================================================================
--- www/nginx/distinfo
+++ www/nginx/distinfo
@@ -123,8 +123,8 @@
SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124
SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280
-SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) = d3d0e22a2629cd017280e05bd3bf05aa7b5c820ebe8c79932ce161243911e776
-SIZE (google-ngx_brotli-ada972b_GH0.tar.gz) = 11128
+SHA256 (google-ngx_brotli-12529813_GH0.tar.gz) = 788b25c4a3285b34d06e48a469fd0d0cb52d43b43edccd2935e22802dcfd2d69
+SIZE (google-ngx_brotli-12529813_GH0.tar.gz) = 10448
SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 11:44 PM (13 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37488079
Default Alt Text
D11290.id30180.diff (23 KB)

Event Timeline