git: 6684134299d5 - main - */*unit*: update NGINX Unit: 1.29.1 -> 1.30.0

From: Sergey A. Osokin <osa_at_FreeBSD.org>
Date: Fri, 12 May 2023 14:36:24 UTC
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6684134299d5750fc4c390646a4410e13497e51d

commit 6684134299d5750fc4c390646a4410e13497e51d
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2023-05-12 14:35:33 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2023-05-12 14:36:16 +0000

    */*unit*: update NGINX Unit: 1.29.1 -> 1.30.0
    
    <ChangeLog>
    
    *) Change: remove Unix domain listen sockets upon reconfiguration.
    
    *) Feature: basic URI rewrite support.
    
    *) Feature: NJS loadable modules support.
    
    *) Feature: per-application logging.
    
    *) Feature: conditional logging of route selection.
    
    *) Feature: support the keys API on the request objects in NJS.
    
    *) Feature: default values for 'make install' pathnames such as prefix;
       this allows to './configure && make && sudo make install'.
    
    *) Feature: "server_version" setting to omit the version token from
       "Server" header field.
    
    *) Bugfix: request header field values could be corrupted in some cases;
       the bug had appeared in 1.29.0.
    
    *) Bugfix: PHP error handling (added missing 403 and 404 errors).
    
    *) Bugfix: Perl applications crash on second responder call.
    
    </ChangeLog>
---
 devel/libunit/Makefile   |  2 +-
 www/unit-java/distinfo   |  6 +++---
 www/unit-perl/Makefile   |  2 +-
 www/unit-php/Makefile    |  2 +-
 www/unit-python/Makefile |  2 +-
 www/unit-ruby/Makefile   |  2 +-
 www/unit/Makefile        | 12 ++++++++----
 www/unit/distinfo        |  6 +++---
 www/unit/version.mk      |  2 +-
 www/unitc/distinfo       |  6 +++---
 10 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/devel/libunit/Makefile b/devel/libunit/Makefile
index e424961a2640..5dbb6e8683fd 100644
--- a/devel/libunit/Makefile
+++ b/devel/libunit/Makefile
@@ -37,7 +37,7 @@ PLIST_FILES+=	include/nxt_auto_config.h \
 		lib/libunit.a
 
 do-build:
-	@cd ${WRKSRC} && ${MAKE} build/libunit.a
+	@cd ${WRKSRC} && ${MAKE} build/lib/libunit.a
 
 do-install:
 	${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${STAGEDIR}
diff --git a/www/unit-java/distinfo b/www/unit-java/distinfo
index 2099d5ed57fb..46a8fb8fc501 100644
--- a/www/unit-java/distinfo
+++ b/www/unit-java/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1677692680
-SHA256 (unit-1.29.1.tar.gz) = 7d756cff8c1a40b38c313fdbe8748333ffce034a3916fa1b502d63cc10623437
-SIZE (unit-1.29.1.tar.gz) = 906654
+TIMESTAMP = 1683838848
+SHA256 (unit-1.30.0.tar.gz) = 129ba1b3c4e33dfadbd38683f0634152d8ecf770cacf3af50ee50b5683dc498b
+SIZE (unit-1.30.0.tar.gz) = 894843
 SHA256 (classgraph-4.8.151.jar) = 4541dde48ed085345efaa5734f7bc7495c5843589a9c0a4cb9594d9c81735cec
 SIZE (classgraph-4.8.151.jar) = 559654
 SHA256 (ecj-3.26.0.jar) = ac0ba5876eaf7ebb47749a0d1be179c51f194b9dd0b875d1c09e1b530f5a2db5
diff --git a/www/unit-perl/Makefile b/www/unit-perl/Makefile
index 7766b6c2394d..d24b5506ca0c 100644
--- a/www/unit-perl/Makefile
+++ b/www/unit-perl/Makefile
@@ -26,7 +26,7 @@ do-build:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
-	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
+	${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
diff --git a/www/unit-php/Makefile b/www/unit-php/Makefile
index 08e2431f6a96..34bd9a876100 100644
--- a/www/unit-php/Makefile
+++ b/www/unit-php/Makefile
@@ -27,7 +27,7 @@ do-build:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
-	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
+	${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
diff --git a/www/unit-python/Makefile b/www/unit-python/Makefile
index 217184094274..4bedca571065 100644
--- a/www/unit-python/Makefile
+++ b/www/unit-python/Makefile
@@ -28,7 +28,7 @@ do-build:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
-	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
+	${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
diff --git a/www/unit-ruby/Makefile b/www/unit-ruby/Makefile
index 3f2dc4bc7824..cea2e9dd1252 100644
--- a/www/unit-ruby/Makefile
+++ b/www/unit-ruby/Makefile
@@ -30,7 +30,7 @@ do-build:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
-	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
+	${INSTALL_LIB} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
diff --git a/www/unit/Makefile b/www/unit/Makefile
index df85abe9fd58..018e336e7b0f 100644
--- a/www/unit/Makefile
+++ b/www/unit/Makefile
@@ -51,10 +51,12 @@ UNIT_TMPDIR?=	${UNIT_VARDIR}/tmp/unit
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--ld-opt="-L${LOCALBASE}/lib" \
 		--log=${UNIT_LOGFILE} \
-		--modules=libexec/unit/modules \
+		--logdir=${UNIT_LOGDIR} \
+		--modulesdir=${PREFIX}/libexec/unit/modules \
 		--pid=${UNIT_PIDFILE} \
-		--state=${UNIT_DBDIR} \
-		--tmp=${UNIT_TMPDIR} \
+		--runstatedir=${UNIT_RUNDIR} \
+		--statedir=${UNIT_DBDIR} \
+		--tmpdir=${UNIT_TMPDIR} \
 		--user=${WWWOWN} --group=${WWWGRP}
 
 USERS?=	${WWWOWN}
@@ -84,6 +86,7 @@ CONFIGURE_ARGS+=--no-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MNJS}
+USES+=	pkgconfig
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libnjs.a:devel/libnjs
 CONFIGURE_ARGS+=--njs \
 	--cc-opt="-I${LOCALBASE}/include" \
@@ -132,7 +135,8 @@ post-install:
 	${ECHO_CMD} @dir ${UNIT_RUNDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_TMPDIR} >> ${TMPPLIST}
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules
-	${INSTALL_MAN} ${WRKSRC}/build/unitd.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8
+	${INSTALL_MAN} ${WRKSRC}/build/share/man/man8/unitd.8 \
+		${STAGEDIR}${MAN8PREFIX}/share/man/man8
 .endif
 
 .include "../../www/unit/version.mk"
diff --git a/www/unit/distinfo b/www/unit/distinfo
index 9f8623349734..1f2da79c10fb 100644
--- a/www/unit/distinfo
+++ b/www/unit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677622904
-SHA256 (unit-1.29.1.tar.gz) = 7d756cff8c1a40b38c313fdbe8748333ffce034a3916fa1b502d63cc10623437
-SIZE (unit-1.29.1.tar.gz) = 906654
+TIMESTAMP = 1683828429
+SHA256 (unit-1.30.0.tar.gz) = 129ba1b3c4e33dfadbd38683f0634152d8ecf770cacf3af50ee50b5683dc498b
+SIZE (unit-1.30.0.tar.gz) = 894843
diff --git a/www/unit/version.mk b/www/unit/version.mk
index d39edbc53d7a..9b269d2d71b3 100644
--- a/www/unit/version.mk
+++ b/www/unit/version.mk
@@ -2,6 +2,6 @@
 UNITVERSION_MK= defined
 
 # Define NGINX Unit's version.
-UNIT_VERSION=   1.29.1
+UNIT_VERSION=   1.30.0
 
 .endif	# UNITVERSION_MK
diff --git a/www/unitc/distinfo b/www/unitc/distinfo
index 9f8623349734..2a373c720e8f 100644
--- a/www/unitc/distinfo
+++ b/www/unitc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677622904
-SHA256 (unit-1.29.1.tar.gz) = 7d756cff8c1a40b38c313fdbe8748333ffce034a3916fa1b502d63cc10623437
-SIZE (unit-1.29.1.tar.gz) = 906654
+TIMESTAMP = 1683845953
+SHA256 (unit-1.30.0.tar.gz) = 129ba1b3c4e33dfadbd38683f0634152d8ecf770cacf3af50ee50b5683dc498b
+SIZE (unit-1.30.0.tar.gz) = 894843