git: 51f7c04073bc - main - www/angie: Update 1.9.1 => 1.10.0

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=51f7c04073bc0c5e0f691b409e198e126cbb8020

commit 51f7c04073bc0c5e0f691b409e198e126cbb8020
Author:     Sebastian Oswald <sko@rostwald.de>
AuthorDate: 2025-07-12 01:26:11 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-07-12 01:26:11 +0000

    www/angie: Update 1.9.1 => 1.10.0
    
    Changelog:
    https://en.angie.software/angie/docs/oss_changes/#angie-1-10-0
    
    Improve port:
    - Add the ACME module as a default port option. This module provides
      automated certificate retreival via the ACME protocol:
    https://en.angie.software/angie/docs/configuration/modules/http/http_acme/#acme-client
    - Replace ${PREFIX}/etc/angie with ${ETCDIR}.
    - Reduce the number of times mkdir is run during do-install.
    - Align nexted if/for for improving code readability (non-functional
      changes).
    
    PR:             288100
    Approved by:    Oleg A. Mamontov <oleg@mamontov.net> (maintainer, implicit - inactive for more than 9 months)
    Co-authored-by: vvd
---
 www/angie/Makefile  | 45 ++++++++++++++++++++++++++++-----------------
 www/angie/distinfo  |  6 +++---
 www/angie/pkg-plist |  1 +
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/www/angie/Makefile b/www/angie/Makefile
index 85409be0f36d..2e03d5450392 100644
--- a/www/angie/Makefile
+++ b/www/angie/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	angie
-DISTVERSION=	1.9.1
+DISTVERSION=	1.10.0
 CATEGORIES+=	www
 MASTER_SITES+=	https://download.angie.software/files/:angie
 DISTNAME=	angie-${DISTVERSIONFULL}
@@ -32,8 +32,8 @@ USES+=		localbase:ldflags ssl
 USE_GITHUB=	nodefault
 
 HAS_CONFIGURE?=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}/etc/angie \
-		--conf-path=${PREFIX}/etc/angie/angie.conf \
+CONFIGURE_ARGS=	--prefix=${ETCDIR} \
+		--conf-path=${ETCDIR}/angie.conf \
 		--error-log-path=${LOGDIR}/error.log \
 		--http-log-path=${LOGDIR}/access.log \
 		--lock-path=${RUNDIR}/angie.lock \
@@ -112,6 +112,14 @@ OPTIONS_DEFAULT?=	DEBUG
 OPTIONS_SUB=		yes
 DEBUG_DESC?=		Include debug version
 
+.if ${PORTNAME} == angie
+OPTIONS_DEFINE+=	ACME
+OPTIONS_DEFAULT+=	ACME
+ACME_DESC=		ACME client module
+ACME_CONFIGURE_ON=	--with-http_acme_module \
+			--http-acme-client-path=${ETCDIR}/acme-client
+.endif
+
 .include <bsd.port.options.mk>
 
 post-patch-DEBUG-on:
@@ -140,13 +148,16 @@ post-build-DEBUG-on:
 
 .if ${PORTNAME} == angie
 do-install:
-	${MKDIR} ${STAGEDIR}${CACHEDIR}
-	${MKDIR} ${STAGEDIR}${DBDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${ETCDIR}/http.d
-	${MKDIR} ${STAGEDIR}${ETCDIR}/stream.d
-	${MKDIR} ${STAGEDIR}${MODDIR}
-	${MKDIR} ${STAGEDIR}${WWWDIR}/html
+	${MKDIR} ${STAGEDIR}${CACHEDIR} \
+		 ${STAGEDIR}${DBDIR} \
+		 ${STAGEDIR}${DOCSDIR} \
+		 ${STAGEDIR}${ETCDIR}/http.d \
+		 ${STAGEDIR}${ETCDIR}/stream.d \
+		 ${STAGEDIR}${MODDIR} \
+		 ${STAGEDIR}${WWWDIR}/html
+.  if ${PORT_OPTIONS:MACME}
+	${MKDIR} ${STAGEDIR}${ETCDIR}/acme-client
+.  endif
 
 	${RLN} ${STAGEDIR}${MODDIR} ${STAGEDIR}${ETCDIR}/modules
 
@@ -156,13 +167,13 @@ do-install:
 	${LN} -fs angie-nodebug ${STAGEDIR}${PREFIX}/sbin/angie
 
 	${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${PREFIX}/share/man/man8
-.for i in CHANGES CHANGES.ru
+.  for i in CHANGES CHANGES.ru
 	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+.  endfor
 
-.for i in fastcgi.conf fastcgi_params mime.types scgi_params uwsgi_params
+.  for i in fastcgi.conf fastcgi_params mime.types scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
-.endfor
+.  endfor
 	${INSTALL_DATA} ${WRKSRC}/conf/prometheus_all.conf \
 	    ${STAGEDIR}${ETCDIR}/prometheus_all.conf.sample
 
@@ -172,13 +183,13 @@ do-install:
 	    ${STAGEDIR}${ETCDIR}/http.d
 	${INSTALL_DATA} ${WRKDIR}/example.conf.sample \
 	    ${STAGEDIR}${ETCDIR}/stream.d
-.for i in 50x.html index.html
+.  for i in 50x.html index.html
 	${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${WWWDIR}/html/${i}
-.endfor
+.  endfor
 
 do-install-DEBUG-on:
 	${INSTALL} ${COPY} -m ${BINMODE} ${WRKSRC_DEBUG}/objs/angie \
 	    ${STAGEDIR}${PREFIX}/sbin/angie-debug
-.endif
+.endif # ${PORTNAME} == angie
 
 .include <bsd.port.mk>
diff --git a/www/angie/distinfo b/www/angie/distinfo
index 0157e256b843..6f9183dbcf5f 100644
--- a/www/angie/distinfo
+++ b/www/angie/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1749050000
-SHA256 (angie-1.9.1.tar.gz) = af11cc06dfebe7c17832375b348a8d786af052cefce5ffafaaa898484e18ce36
-SIZE (angie-1.9.1.tar.gz) = 1723240
+TIMESTAMP = 1751904260
+SHA256 (angie-1.10.0.tar.gz) = 929caf8d86b3b35b0cf0702eaa8b639571ae18199aaec69944f886bf356e1f35
+SIZE (angie-1.10.0.tar.gz) = 1755818
 SHA256 (kjdev-nginx-auth-jwt-0.9.0_GH0.tar.gz) = d7c72634261a053afaacc2cb762eccf9ce4c462ca738ad0c4809eb964ddf3c0c
 SIZE (kjdev-nginx-auth-jwt-0.9.0_GH0.tar.gz) = 75474
 SHA256 (stnoonan-spnego-http-auth-nginx-module-v1.1.3_GH0.tar.gz) = 0e1e54f8ab7d76f922881f13d870edf8b820ef645b19013774c825110d011640
diff --git a/www/angie/pkg-plist b/www/angie/pkg-plist
index d942c89a5322..39de9762a3d9 100644
--- a/www/angie/pkg-plist
+++ b/www/angie/pkg-plist
@@ -9,6 +9,7 @@
 @dir %%CACHEDIR%%
 @dir %%DBDIR%%
 @dir %%MODDIR%%
+%%ACME%%@dir %%ETCDIR%%/acme-client
 
 %%ETCDIR%%/modules