diff options
Diffstat (limited to '')
| -rw-r--r-- | www/freenginx/Makefile | 22 | ||||
| -rw-r--r-- | www/freenginx/Makefile.extmod | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile index 95e0d6837f14..981f1552dffa 100644 --- a/www/freenginx/Makefile +++ b/www/freenginx/Makefile @@ -1,10 +1,9 @@ -PORTNAME= nginx -PORTVERSION= 1.26.0 -PORTREVISION?= 22 +PORTNAME= freenginx +PORTVERSION= 1.28.0 +PORTREVISION?= 3 CATEGORIES= www MASTER_SITES= https://freenginx.org/download/ \ LOCAL/joneum -PKGNAMEPREFIX= free DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= joneum@FreeBSD.org @@ -16,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= nginx nginx-devel -PORTSCOUT= limit:^1\.26\.[0-9]* +PORTSCOUT= limit:^1\.28\.[0-9]* USES= cpe @@ -245,11 +244,12 @@ CFLAGS+= -DNDEBUG CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14" .endif -.if empty(PORT_OPTIONS:MMODSECURITY3) && empty(PORT_OPTIONS:MPASSENGER) +.if empty(PORT_OPTIONS:MMODSECURITY3) CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib" .else -CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre" -LIB_DEPENDS+= libpcre.so:devel/pcre + +ONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre2-8" +IB_DEPENDS+= libpcre2-8.so:devel/pcre2 .endif .if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML) @@ -376,9 +376,9 @@ post-install: ${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist 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) + ${MKDIR} ${STAGEDIR}${PREFIX}/www/freenginx-dist + (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/freenginx-dist && \ + ${TOUCH} ${STAGEDIR}${PREFIX}/www/freenginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING) .endif .include <bsd.port.post.mk> diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod index 009a84ac09ca..b55a58c8cd14 100644 --- a/www/freenginx/Makefile.extmod +++ b/www/freenginx/Makefile.extmod @@ -239,7 +239,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi-libinjection__sqli_c \ ${PATCHDIR}/extra-patch-naxsi_config -NJS_GH_TUPLE= nginx:njs:0.8.5:njs +NJS_GH_TUPLE= nginx:njs:0.9.3:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx NJS_IMPLIES= STREAM |