CVS commit: pkgsrc/www

["Sergey A. Osokin" <osa%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   osa
Date:           Wed May 25 13:57:03 UTC 2022

Modified Files:
        pkgsrc/www/nginx: Makefile options.mk
        pkgsrc/www/nginx-devel: Makefile distinfo options.mk

Log Message:
www/nginx*: cross merging

The third-party upload module has been add to www/nginx-devel.
Merge pcre/pcre2 functional from www/nginx-devel to www/nginx.

I'm going to review patches for the both ports.

Bump PKGREVISIONs.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.81 -r1.82 pkgsrc/www/nginx-devel/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/www/nginx-devel/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/nginx-devel/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.116 pkgsrc/www/nginx/Makefile:1.117
--- pkgsrc/www/nginx/Makefile:1.116     Wed May 25 10:48:47 2022
+++ pkgsrc/www/nginx/Makefile   Wed May 25 13:57:02 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.116 2022/05/25 10:48:47 osa Exp $
+# $NetBSD: Makefile,v 1.117 2022/05/25 13:57:02 osa Exp $
 
 DISTNAME=      nginx-1.22.0
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://nginx.org/download/
 DISTFILES=     ${DEFAULT_DISTFILES}

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.80 pkgsrc/www/nginx/options.mk:1.81
--- pkgsrc/www/nginx/options.mk:1.80    Wed May 25 10:48:47 2022
+++ pkgsrc/www/nginx/options.mk Wed May 25 13:57:02 2022
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.80 2022/05/25 10:48:47 osa Exp $
+# $NetBSD: options.mk,v 1.81 2022/05/25 13:57:02 osa Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
 PKG_SUPPORTED_OPTIONS+=        dso echo encrypted-session flv form-input
 PKG_SUPPORTED_OPTIONS+=        geoip geoip2 gtools gzip headers-more http2
 PKG_SUPPORTED_OPTIONS+=        image-filter luajit mail-proxy memcache
-PKG_SUPPORTED_OPTIONS+=        naxsi njs pcre perl push realip rtmp
+PKG_SUPPORTED_OPTIONS+=        naxsi njs perl push realip rtmp
 PKG_SUPPORTED_OPTIONS+=        secure-link set-misc slice ssl status
 PKG_SUPPORTED_OPTIONS+=        stream-ssl-preread sub upload uwsgi
 
@@ -14,6 +14,9 @@ PKG_SUGGESTED_OPTIONS+=       slice status ssl
 
 PKG_OPTIONS_LEGACY_OPTS+=      v2:http2
 
+PKG_OPTIONS_OPTIONAL_GROUPS=   pcre
+PKG_OPTIONS_GROUP.pcre=                pcre pcre2
+
 PLIST_VARS+=           arrayvar cprg dav dso echo encses forminput geoip2
 PLIST_VARS+=           headmore imagefilter lua mail naxsi nchan ndk njs
 PLIST_VARS+=           perl rtmp setmisc stream uwsgi
@@ -58,12 +61,26 @@ SUBST_NOOP_OK.fix-ssl=      yes
 
 .if !empty(PKG_OPTIONS:Mpcre)
 .include "../../devel/pcre/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-pcre
+CONFIGURE_ARGS+=       --without-pcre2
 SUBST_CLASSES+=                fix-pcre
 SUBST_STAGE.fix-pcre=  pre-configure
 SUBST_FILES.fix-pcre=  auto/lib/pcre/conf
 SUBST_SED.fix-pcre=    -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre},g'
 SUBST_NOOP_OK.fix-pcre=        yes
-.else
+.endif
+
+.if !empty(PKG_OPTIONS:Mpcre2)
+.include "../../devel/pcre2/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-pcre
+SUBST_CLASSES+=                fix-pcre2
+SUBST_STAGE.fix-pcre2= pre-configure
+SUBST_FILES.fix-pcre2= auto/lib/pcre/conf
+SUBST_SED.fix-pcre2=   -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre2},g'
+SUBST_NOOP_OK.fix-pcre2=yes
+.endif
+
+.if empty(PKG_OPTIONS:Mpcre) && empty(PKG_OPTIONS:Mpcre2)
 CONFIGURE_ARGS+=       --without-pcre
 CONFIGURE_ARGS+=       --without-http_rewrite_module
 .endif

Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.81 pkgsrc/www/nginx-devel/Makefile:1.82
--- pkgsrc/www/nginx-devel/Makefile:1.81        Wed May 25 11:02:14 2022
+++ pkgsrc/www/nginx-devel/Makefile     Wed May 25 13:57:02 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2022/05/25 11:02:14 osa Exp $
+# $NetBSD: Makefile,v 1.82 2022/05/25 13:57:02 osa Exp $
 
 DISTNAME=      nginx-1.22.0
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://nginx.org/download/
 DISTFILES=     ${DEFAULT_DISTFILES}

Index: pkgsrc/www/nginx-devel/distinfo
diff -u pkgsrc/www/nginx-devel/distinfo:1.77 pkgsrc/www/nginx-devel/distinfo:1.78
--- pkgsrc/www/nginx-devel/distinfo:1.77        Wed May 25 11:02:14 2022
+++ pkgsrc/www/nginx-devel/distinfo     Wed May 25 13:57:02 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.77 2022/05/25 11:02:14 osa Exp $
+$NetBSD: distinfo,v 1.78 2022/05/25 13:57:02 osa Exp $
 
 BLAKE2s (array-var-nginx-module-0.05.tar.gz) = 2f9af1e0eb209b7c20aa58cd8ec2afb1eb1cc122c5f4ea169e34131c463c1c26
 SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
@@ -33,6 +33,9 @@ Size (nginx-dav-ext-module-3.0.0.tar.gz)
 BLAKE2s (nginx-rtmp-module-1.2.2.tar.gz) = 5de03b71bb16b4129f1a2a99446f65ef6eeb3fd48bfc925e94fc27e99da3c069
 SHA512 (nginx-rtmp-module-1.2.2.tar.gz) = 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
 Size (nginx-rtmp-module-1.2.2.tar.gz) = 519934 bytes
+BLAKE2s (nginx-upload-module-2.3.0.tar.gz) = cf47b0c86487450473223a5ec793e294b1dd3dcf8a22a02c2a7a0014aff25545
+SHA512 (nginx-upload-module-2.3.0.tar.gz) = a0da355888398f86a6b5d065e58c05f9e057589ee785be9f515d77d7a020ae5a7b0656f5af30fb3b026f457326db2e26f4fed29026221ec5fc8156ef8586da25
+Size (nginx-upload-module-2.3.0.tar.gz) = 40139 bytes
 BLAKE2s (ngx_cache_purge-2.5.1.tar.gz) = f89badfa0dbc3c338129291d7c56f978d6db0348d5aaa0d723000881ae9b7b8d
 SHA512 (ngx_cache_purge-2.5.1.tar.gz) = 3ad37b4a251fb85a9a384f87fea5ca640166e3d7173c6ed9a857b191ae5f2e93819483b5d423fcafe8a10239b571677b342cc2d2d5d62315816f1316d7d5bb76
 Size (ngx_cache_purge-2.5.1.tar.gz) = 16614 bytes

Index: pkgsrc/www/nginx-devel/options.mk
diff -u pkgsrc/www/nginx-devel/options.mk:1.6 pkgsrc/www/nginx-devel/options.mk:1.7
--- pkgsrc/www/nginx-devel/options.mk:1.6       Wed May 25 11:02:14 2022
+++ pkgsrc/www/nginx-devel/options.mk   Wed May 25 13:57:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2022/05/25 11:02:14 osa Exp $
+# $NetBSD: options.mk,v 1.7 2022/05/25 13:57:02 osa Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx-devel
 PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
@@ -7,7 +7,7 @@ PKG_SUPPORTED_OPTIONS+= geoip geoip2 gto
 PKG_SUPPORTED_OPTIONS+=        image-filter luajit mail-proxy memcache
 PKG_SUPPORTED_OPTIONS+=        naxsi njs perl push realip rtmp
 PKG_SUPPORTED_OPTIONS+=        secure-link set-misc slice ssl status
-PKG_SUPPORTED_OPTIONS+=        stream-ssl-preread sub uwsgi
+PKG_SUPPORTED_OPTIONS+=        stream-ssl-preread sub upload uwsgi
 
 PKG_SUGGESTED_OPTIONS= auth-request gzip http2 memcache pcre realip
 PKG_SUGGESTED_OPTIONS+=        slice status ssl uwsgi
@@ -339,6 +339,16 @@ NJS_SUBDIR=                /nginx
 PLIST.njs=             yes
 .endif
 
+.if !empty(PKG_OPTIONS:Mupload) || make(makesum) || make(mdi) || make(distclean)
+UPLOAD_VERSION=                2.3.0
+UPLOAD_DISTNAME=               nginx-upload-module-${UPLOAD_VERSION}
+UPLOAD_DISTFILE=               ${UPLOAD_DISTNAME}.tar.gz
+SITES.${UPLOAD_DISTFILE}=      -${MASTER_SITE_GITHUB:=vkholodkov/nginx-upload-module/archive/refs/tags/}${UPLOAD_VERSION}.tar.gz
+DISTFILES+=            ${UPLOAD_DISTFILE}
+DSO_EXTMODS+=          upload
+PLIST.upload=          yes
+.endif
+
 .for mod in ${DSO_BASEMODS}
 CONFIGURE_ARGS+=       --with-${mod}${_addbasemod}
 .endfor