www/unit: fixes with pkglint(1) usage.

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

Module Name:	pkgsrc-wip
Committed By:	Sergey A. Osokin <osa%FreeBSD.org@localhost>
Pushed By:	osa
Date:		Tue Nov 17 16:59:01 2020 -0500
Changeset:	6b924c07615f661338448a6a9d1c88ad1a04db72

Modified Files:
	unit/Makefile
	unit/Makefile.common
	unit/PLIST
	unit/distinfo
	unit/ext.mk
	unit/options.mk
	unit/patches/patch-auto-modules-php
	unit/unitversion.mk

Log Message:
www/unit: fixes with pkglint(1) usage.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6b924c07615f661338448a6a9d1c88ad1a04db72

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

diffstat:
 unit/Makefile                       |  1 +
 unit/Makefile.common                | 12 +++++-------
 unit/PLIST                          |  2 +-
 unit/distinfo                       |  2 +-
 unit/ext.mk                         | 11 ++++-------
 unit/options.mk                     |  2 +-
 unit/patches/patch-auto-modules-php |  4 ++++
 unit/unitversion.mk                 |  6 ++++--
 8 files changed, 21 insertions(+), 19 deletions(-)

diffs:
diff --git a/unit/Makefile b/unit/Makefile
index ac9011a4b7..1f7b8997f2 100644
--- a/unit/Makefile
+++ b/unit/Makefile
@@ -9,3 +9,4 @@ MAINTAINER=	osa%FreeBSD.org@localhost
 RCD_SCRIPTS=	unit
 
 .include "../../www/unit/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/unit/Makefile.common b/unit/Makefile.common
index 39b4a9a3dd..3ef5108801 100644
--- a/unit/Makefile.common
+++ b/unit/Makefile.common
@@ -28,9 +28,9 @@ UNIT_TMPDIR?=		${VARBASE}/tmp
 BUILD_DEFS+=		UNIT_DATADIR UNIT_LOGDIR UNIT_PIDDIR VARBASE
 
 PKG_USERS_VARS+=	UNIT_USER
-PKG_GROUPS_VARS+=       UNIT_GROUP
-PKG_GROUPS=             ${UNIT_GROUP}
-PKG_USERS=              ${UNIT_USER}:${UNIT_GROUP}
+PKG_GROUPS_VARS+=	UNIT_GROUP
+PKG_GROUPS=		${UNIT_GROUP}
+PKG_USERS=		${UNIT_USER}:${UNIT_GROUP}
 
 PKG_GECOS.${UNIT_USER}=	NGINX Unit server user
 PKG_HOME.${UNIT_USER}=	${UNIT_DATADIR}
@@ -41,7 +41,7 @@ HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--ld-opt=-L${PREFIX}/lib
 CONFIGURE_ARGS+=	--log=${UNIT_LOGDIR}/unit.log
-CONFIGURE_ARGS+=	--modules=libexec/unit/modules
+CONFIGURE_ARGS+=	--modules=${UNIT_EXTENSION_DIR}
 CONFIGURE_ARGS+=	--pid=${UNIT_PIDDIR}/unit.pid
 CONFIGURE_ARGS+=	--state=libexec/unit
 CONFIGURE_ARGS+=	--control=unix:${UNIT_RUNDIR}/control.unit.sock
@@ -62,12 +62,10 @@ USE_LANGUAGES=	c
 
 post-build:
 .if !empty(PKG_OPTIONS:Mdevkit)
-	@cd ${WRKSRC} && ${MAKE} build/libunit.a
+	cd ${WRKSRC} && ${MAKE} build/libunit.a
 .endif
 
 post-install:
 .if !empty(PKG_OPTIONS:Mdevkit)
 	${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${DESTDIR}
 .endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/unit/PLIST b/unit/PLIST
index 374d1a10db..14a6add275 100644
--- a/unit/PLIST
+++ b/unit/PLIST
@@ -1,11 +1,11 @@
 @comment $NetBSD$
+${PLIST.devkit}include/nxt_unit.h
 ${PLIST.devkit}include/nxt_unit_field.h
 ${PLIST.devkit}include/nxt_unit_request.h
 ${PLIST.devkit}include/nxt_unit_response.h
 ${PLIST.devkit}include/nxt_unit_sptr.h
 ${PLIST.devkit}include/nxt_unit_typedefs.h
 ${PLIST.devkit}include/nxt_unit_websocket.h
-${PLIST.devkit}include/nxt_unit.h
 ${PLIST.devkit}include/nxt_version.h
 ${PLIST.devkit}include/nxt_websocket_header.h
 ${PLIST.devkit}lib/libunit.a
diff --git a/unit/distinfo b/unit/distinfo
index 2819071556..38c3b15c8f 100644
--- a/unit/distinfo
+++ b/unit/distinfo
@@ -4,4 +4,4 @@ SHA1 (unit-1.20.0.tar.gz) = f4a2d2a6b622742acd138a66008407b5f674b08f
 RMD160 (unit-1.20.0.tar.gz) = 8964e056dbe19e659b157a89d1cf39f213ffd952
 SHA512 (unit-1.20.0.tar.gz) = dd68103795acbdcd87a951c92c72f3cb74b5e622eca4e687194508b55a592ac4312de3a8ff7ddb9a5df9750363b24dca9e1b48c7ef42c78aca3a18aca6a51f42
 Size (unit-1.20.0.tar.gz) = 787607 bytes
-SHA1 (patch-auto-modules-php) = 4386e6adaf806d83af88de8da9ad0a9a83eeac8f
+SHA1 (patch-auto-modules-php) = 14623de8f1d212178b34daaca2e9a7a66cb36074
diff --git a/unit/ext.mk b/unit/ext.mk
index ec257ce876..8297f8c9fd 100644
--- a/unit/ext.mk
+++ b/unit/ext.mk
@@ -24,21 +24,18 @@ PLIST_SUBST+=	UNIT_EXTENSION_DIR=${UNIT_EXTENSION_DIR}
 
 PLIST_SRC+=	${.CURDIR}/../../www/unit/PLIST.module
 
+INSTALLATION_DIRS+=	${UNIT_EXTENSION_DIR}
+
 .if ${OBJECT_FMT} == "SOM"
 SHLIB_SUFFIX=		sl
 .else
 SHLIB_SUFFIX=		so
 .endif
 
-do-build: do-module-build
-
-do-module-build:
+do-build:
 	cd ${WRKSRC} && ${MAKE} ${MODNAME}
 
-do-install: do-module-install
-
-do-module-install:
-	${MKDIR} ${DESTDIR}${PREFIX}/${UNIT_EXTENSION_DIR}
+do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/${PKGMODNAME}.${SHLIB_SUFFIX} \
 		${DESTDIR}${PREFIX}/${UNIT_EXTENSION_DIR}
 
diff --git a/unit/options.mk b/unit/options.mk
index 09e30a977f..aada995527 100644
--- a/unit/options.mk
+++ b/unit/options.mk
@@ -17,7 +17,7 @@ PLIST.devkit=		yes
 .endif
 
 .if empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=--no-ipv6
+CONFIGURE_ARGS+=	--no-ipv6
 .endif
 
 .if !empty(PKG_OPTIONS:Mssl)
diff --git a/unit/patches/patch-auto-modules-php b/unit/patches/patch-auto-modules-php
index 902832760d..7ef4b208e9 100644
--- a/unit/patches/patch-auto-modules-php
+++ b/unit/patches/patch-auto-modules-php
@@ -1,3 +1,7 @@
+$NetBSD$
+
+This patch fixes build of php module.
+
 --- auto/modules/php.orig	2020-10-09 11:15:55.011861773 -0400
 +++ auto/modules/php	2020-10-09 11:16:18.986144628 -0400
 @@ -112,7 +112,7 @@
diff --git a/unit/unitversion.mk b/unit/unitversion.mk
index 34fae3846d..fb9c9bf663 100644
--- a/unit/unitversion.mk
+++ b/unit/unitversion.mk
@@ -1,3 +1,5 @@
+# $NetBSD$
+#
 # UNIT_EXTENSION_DIR
 #	Relative path to ${PREFIX} for NGINX Unit's modules.
 #
@@ -7,10 +9,10 @@
 #
 
 .if !defined(UNITVERSION_MK)
-UNITVERSION_MK=  defined
+UNITVERSION_MK=	defined
 
 # Define NGINX Unit's version.
-UNIT_VERSION=  1.20.0
+UNIT_VERSION=	1.20.0
 
 # Define NGINX Unit's modules directory
 UNIT_EXTENSION_DIR=	libexec/unit/modules