CVS commit: pkgsrc/www/nginx-devel

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb 19 16:55:01 UTC 2025

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

Log Message:
nginx-devel: pkglint cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/www/nginx-devel/Makefile
cvs rdiff -u -r1.39 -r1.40 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-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.144 pkgsrc/www/nginx-devel/Makefile:1.145
--- pkgsrc/www/nginx-devel/Makefile:1.144       Wed Feb  5 19:00:26 2025
+++ pkgsrc/www/nginx-devel/Makefile     Wed Feb 19 16:55:01 2025
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.144 2025/02/05 19:00:26 osa Exp $
+# $NetBSD: Makefile,v 1.145 2025/02/19 16:55:01 wiz Exp $
 
 DISTNAME=      nginx-1.27.4
 PKGNAME=       ${DISTNAME:S/-/-devel-/1}
-PKGREVISION=   0
 CATEGORIES=    www
 MASTER_SITES=  https://nginx.org/download/
 DISTFILES=     ${DEFAULT_DISTFILES}
 
+PATCH_SITES=           https://github.com/freenginx/nginx/commit/
+PATCHFILES=            1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch
+PATCH_DIST_ARGS=       -d ${WRKSRC} -p1
+
 MAINTAINER=    osa%NetBSD.org@localhost
 HOMEPAGE=      https://nginx.org/
 COMMENT=       Lightweight HTTP server and mail proxy server
 LICENSE=       2-clause-bsd
 
-PATCH_SITES=           https://github.com/freenginx/nginx/commit/
-PATCHFILES=            1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch
-PATCH_DIST_ARGS=       -d ${WRKSRC} -p1
-
 CONFLICTS=     nginx-[0-9]*
 
 .include "../../mk/bsd.prefs.mk"
@@ -55,11 +54,11 @@ CONFIGURE_ARGS+=    --http-fastcgi-temp-pat
 CONFIGURE_ARGS+=       --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp
 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
+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
 
 PKG_SYSCONFSUBDIR=     nginx
 

Index: pkgsrc/www/nginx-devel/options.mk
diff -u pkgsrc/www/nginx-devel/options.mk:1.39 pkgsrc/www/nginx-devel/options.mk:1.40
--- pkgsrc/www/nginx-devel/options.mk:1.39      Wed Feb  5 19:00:26 2025
+++ pkgsrc/www/nginx-devel/options.mk   Wed Feb 19 16:55:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.39 2025/02/05 19:00:26 osa Exp $
+# $NetBSD: options.mk,v 1.40 2025/02/19 16:55:01 wiz Exp $
 
 CODELOAD_SITE_GITHUB=          https://codeload.github.com/
 
@@ -120,15 +120,15 @@ CONFIGURE_ARGS+=  --with-http_realip_modu
 .endif
 
 .if !empty(PKG_OPTIONS:Mredis) || make(makesum) || make(mdi) || make(distclean)
-REDIS_GH_ACCOUNT=      osokin
-REDIS_GH_PROJECT=      ngx_http_redis
-REDIS_VERSION=         59eb1c3
-REDIS_DISTNAME=                ${REDIS_GH_PROJECT}-${REDIS_VERSION}
-REDIS_DISTFILE=                ${REDIS_GH_ACCOUNT}-${REDIS_DISTNAME}_GH.tar.gz
-SITES.${REDIS_DISTFILE}=-${CODELOAD_SITE_GITHUB:=${REDIS_GH_ACCOUNT}/${REDIS_GH_PROJECT}/tar.gz/${REDIS_VERSION}?dummy=${REDIS_DISTFILE}}
-DISTFILES+=            ${REDIS_DISTFILE}
-DSO_EXTMODS+=          redis
-PLIST.redis=           yes
+REDIS_GH_ACCOUNT=              osokin
+REDIS_GH_PROJECT=              ngx_http_redis
+REDIS_VERSION=                 59eb1c3
+REDIS_DISTNAME=                        ${REDIS_GH_PROJECT}-${REDIS_VERSION}
+REDIS_DISTFILE=                        ${REDIS_GH_ACCOUNT}-${REDIS_DISTNAME}_GH.tar.gz
+SITES.${REDIS_DISTFILE}=       -${CODELOAD_SITE_GITHUB:=${REDIS_GH_ACCOUNT}/${REDIS_GH_PROJECT}/tar.gz/${REDIS_VERSION}?dummy=${REDIS_DISTFILE}}
+DISTFILES+=                    ${REDIS_DISTFILE}
+DSO_EXTMODS+=                  redis
+PLIST.redis=                   yes
 .endif
 
 # NDK must be added once and before 3rd party modules needing it
@@ -338,25 +338,25 @@ CONFIGURE_ENV+=           NJS_LIBXSLT=NO
 .endif
 
 .if !empty(PKG_OPTIONS:Mupload) || make(makesum) || make(mdi) || make(distclean)
-UPLOAD_VERSION=                2.3.0
+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
+DISTFILES+=                    ${UPLOAD_DISTFILE}
+DSO_EXTMODS+=                  upload
+PLIST.upload=                  yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mgssapi) || make(makesum) || make(mdi) || make(distclean)
-GSSAPI_GH_ACCOUNT=     stnoonan
-GSSAPI_GH_PROJECT=     spnego-http-auth-nginx-module
-GSSAPI_VERSION=                b62dadb
+GSSAPI_GH_ACCOUNT=             stnoonan
+GSSAPI_GH_PROJECT=             spnego-http-auth-nginx-module
+GSSAPI_VERSION=                        b62dadb
 GSSAPI_DISTNAME=               ${GSSAPI_GH_PROJECT}-${GSSAPI_VERSION}
 GSSAPI_DISTFILE=               ${GSSAPI_GH_ACCOUNT}-${GSSAPI_DISTNAME}_GH.tar.gz
 SITES.${GSSAPI_DISTFILE}=      -${CODELOAD_SITE_GITHUB:=${GSSAPI_GH_ACCOUNT}/${GSSAPI_GH_PROJECT}/tar.gz/${GSSAPI_VERSION}?dummy=${GSSAPI_DISTFILE}}
-DISTFILES+=            ${GSSAPI_DISTFILE}
-DSO_EXTMODS+=          gssapi
-PLIST.gssapi=          yes
+DISTFILES+=                    ${GSSAPI_DISTFILE}
+DSO_EXTMODS+=                  gssapi
+PLIST.gssapi=                  yes
 .endif
 
 .if !empty(PKG_OPTIONS:Msts) || make(makesum) || make(mdi) || make(distclean)