diff options
Diffstat (limited to 'www/nginx-devel/Makefile')
| -rw-r--r-- | www/nginx-devel/Makefile | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 48be6ed2ab12..c2ef0c8d2134 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,12 +1,15 @@ PORTNAME?= nginx -PORTVERSION= 1.28.0 -PORTREVISION= 1 +PORTVERSION= 1.29.0 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa PKGNAMESUFFIX?= -devel DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +PATCH_SITES= https://github.com/nginx/nginx/commit/ +PATCHFILES= 0bb7489cb2fcc60ce24fae2d5581c7441bfa0931.patch:-p1 + MAINTAINER?= osa@FreeBSD.org COMMENT?= Robust and small WWW server WWW= https://nginx.com/ @@ -18,7 +21,7 @@ CONFLICTS_INSTALL= nginx PORTSCOUT= limit:^1\.2[8-9]\.[0-9]* -USES= cpe +USES= cpe compiler:env CPE_VENDOR= f5 CPE_PRODUCT= nginx @@ -72,7 +75,7 @@ OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \ HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \ HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \ HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \ - HTTPV3_QTLS + HTTPV3_OSSL35 OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL @@ -173,15 +176,15 @@ HTTPV3_CONFIGURE_ON= --with-http_v3_module HTTPV3_BORING_BUILD_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl HTTPV3_BORING_RUN_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl HTTPV3_BORING_IMPLIES= HTTPV3 -HTTPV3_BORING_PREVENTS= HTTPV3_LSSL HTTPV3_QTLS +HTTPV3_BORING_PREVENTS= HTTPV3_LSSL HTTPV3_OSSL35 HTTPV3_LSSL_BUILD_DEPENDS= ${LOCALBASE}/include/tls.h:security/libressl-devel HTTPV3_LSSL_RUN_DEPENDS= ${LOCALBASE}/include/tls.h:security/libressl-devel HTTPV3_LSSL_IMPLIES= HTTPV3 -HTTPV3_LSSL_PREVENTS= HTTPV3_BORING HTTPV3_QTLS -HTTPV3_QTLS_BUILD_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls -HTTPV3_QTLS_RUN_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls -HTTPV3_QTLS_IMPLIES= HTTPV3 -HTTPV3_QTLS_PREVENTS= HTTPV3_BORING HTTPV3_LSSL +HTTPV3_LSSL_PREVENTS= HTTPV3_BORING HTTPV3_OSSL35 +HTTPV3_OSSL35_BUILD_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl35 +HTTPV3_OSSL35_RUN_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl35 +HTTPV3_OSSL35_IMPLIES= HTTPV3 +HTTPV3_OSSL35_PREVENTS= HTTPV3_BORING HTTPV3_LSSL MAIL_VARS= DSO_BASEMODS+=mail MAIL_IMAP_CONFIGURE_OFF= --without-mail_imap_module MAIL_POP3_CONFIGURE_OFF= --without-mail_pop3_module @@ -236,6 +239,10 @@ IGNORE= required at least GSSAPI_HEIMDAL or \ 'make config' again .endif +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 191 +CFLAGS+= -Wno-error=cast-function-type-mismatch +.endif + .if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG) CONFIGURE_ENV+= OPTIMIZE="yes" CFLAGS+= -DNDEBUG @@ -251,7 +258,7 @@ LIB_DEPENDS+= libpcre.so:devel/pcre .endif .if ${PORT_OPTIONS:MNJS} -NJS_CONFIGURE_ARGS= --cc-opt="-I${LOCALBASE}/include/quickjs" \ +NJS_CONFIGURE_ARGS= --cc-opt="${CFLAGS} -I${LOCALBASE}/include/quickjs" \ --ld-opt="-L${LOCALBASE}/lib" \ --with-quickjs .endif |