Date: Tue, 09 Dec 2025 20:05:02 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Sebastian Oswald <sko@rostwald.de> Subject: git: 779f158be65a - main - www/angie: Use upstream version numbers for modules Message-ID: <693880ee.2e4ec.1ebd3d0f@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=779f158be65aa25f44b5e557dcd04dba9a99b5a6 commit 779f158be65aa25f44b5e557dcd04dba9a99b5a6 Author: Sebastian Oswald <sko@rostwald.de> AuthorDate: 2025-12-09 19:12:01 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-12-09 19:28:53 +0000 www/angie: Use upstream version numbers for modules Angie modules currently inherit the version number of the angie version they are built against. This makes it hard and opaque to track their actual version. The mechanism used in the Makefile also had the unwanted side-effect of PORTREVISION propagating from modules to the master port, which broke the build (we found out the hard way...) While here reduce number of of MKDIR calls. PR: 291490 Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org> --- www/angie-module-auth-jwt/Makefile | 11 ++++++++--- www/angie-module-auth-spnego/Makefile | 9 ++++++--- www/angie-module-auth-totp/Makefile | 11 ++++++++--- www/angie-module-brotli/Makefile | 9 ++++++--- www/angie-module-cache-purge/Makefile | 9 ++++++--- www/angie-module-dav-ext/Makefile | 9 ++++++--- www/angie-module-echo/Makefile | 9 ++++++--- www/angie-module-enhanced-memcached/Makefile | 10 +++++++--- www/angie-module-eval/Makefile | 10 +++++++--- www/angie-module-geoip2/Makefile | 9 ++++++--- www/angie-module-headers-more/Makefile | 9 ++++++--- www/angie-module-jwt/Makefile | 11 ++++++++--- www/angie-module-keyval/Makefile | 11 ++++++++--- www/angie-module-lua/Makefile | 13 ++++++++----- www/angie-module-ndk/Makefile | 11 ++++++++--- www/angie-module-njs/Makefile | 9 ++++++--- www/angie-module-perl/Makefile | 4 ++-- www/angie-module-postgres/Makefile | 9 ++++++--- www/angie-module-redis2/Makefile | 9 ++++++--- www/angie-module-rtmp/Makefile | 9 ++++++--- www/angie-module-set-misc/Makefile | 9 ++++++--- www/angie-module-subs/Makefile | 5 +++-- www/angie-module-testcookie/Makefile | 6 ++++-- www/angie-module-upload/Makefile | 10 +++++++--- www/angie-module-vod/Makefile | 11 ++++++++--- www/angie/Makefile | 18 ++++++++++++++---- 26 files changed, 172 insertions(+), 78 deletions(-) diff --git a/www/angie-module-auth-jwt/Makefile b/www/angie-module-auth-jwt/Makefile index 6c78be4c6638..5c23ccecc2e3 100644 --- a/www/angie-module-auth-jwt/Makefile +++ b/www/angie-module-auth-jwt/Makefile @@ -1,7 +1,12 @@ PORTNAME= angie-module-auth-jwt -GH_TUPLE= kjdev:nginx-auth-jwt:0.9.0:module +MODULE_VERSION= 0.9.0 +MODULE_PORTREVISION= 0 +GH_TUPLE= kjdev:nginx-auth-jwt:${MODULE_VERSION}:module COMMENT= Angie auth-jwt dynamic module +WWW= https://github.com/kjdev/nginx-auth-jwt/ + +LICENSE= MIT LIB_DEPENDS= libjansson.so:devel/jansson @@ -10,8 +15,8 @@ MASTERDIR= ${.CURDIR}/../../www/angie CONFLICTS= www/angie-module-jwt do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_jwt_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-auth-spnego/Makefile b/www/angie-module-auth-spnego/Makefile index 41803c80b2d9..7ed961af05ca 100644 --- a/www/angie-module-auth-spnego/Makefile +++ b/www/angie-module-auth-spnego/Makefile @@ -1,7 +1,10 @@ PORTNAME= angie-module-auth-spnego -GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:v1.1.3:module +MODULE_VERSION= 1.1.3 +MODULE_PORTREVISION= 0 +GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:v${MODULE_VERSION}:module COMMENT= Angie auth-spnego dynamic module +WWW= https://github.com/stnoonan/spnego-http-auth-nginx-module/ USES= gssapi:mit @@ -12,8 +15,8 @@ pre-configure: ${WRKSRC_module}/config do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_spnego_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-auth-totp/Makefile b/www/angie-module-auth-totp/Makefile index 702a9ba40684..5e626ff767ec 100644 --- a/www/angie-module-auth-totp/Makefile +++ b/www/angie-module-auth-totp/Makefile @@ -1,13 +1,18 @@ PORTNAME= angie-module-auth-totp -GH_TUPLE= 61131:nginx-http-auth-totp:1.1.0:module +MODULE_VERSION= 1.1.0 +MODULE_PORTREVISION= 0 +GH_TUPLE= 61131:nginx-http-auth-totp:${MODULE_VERSION}:module COMMENT= Angie auth-totp dynamic module +WWW= https://github.com/61131/nginx-http-auth-totp/ + +LICENSE= MIT MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_totp_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-brotli/Makefile b/www/angie-module-brotli/Makefile index 2ec4cb655895..051bb40f7b9e 100644 --- a/www/angie-module-brotli/Makefile +++ b/www/angie-module-brotli/Makefile @@ -1,15 +1,18 @@ PORTNAME= angie-module-brotli -GH_TUPLE= google:ngx_brotli:v1.0.0rc:module +MODULE_VERSION= 1.0.0rc +MODULE_PORTREVISION= 0 +GH_TUPLE= google:ngx_brotli:v${MODULE_VERSION}:module COMMENT= Angie Brotli dynamic module +WWW= https://github.com/google/ngx_brotli/ LIB_DEPENDS= libbrotlienc.so:archivers/brotli MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} .for i in ngx_http_brotli_filter_module ngx_http_brotli_static_module ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-cache-purge/Makefile b/www/angie-module-cache-purge/Makefile index b7bdee160341..91b56065bc67 100644 --- a/www/angie-module-cache-purge/Makefile +++ b/www/angie-module-cache-purge/Makefile @@ -1,13 +1,16 @@ PORTNAME= angie-module-cache-purge -GH_TUPLE= nginx-modules:ngx_cache_purge:2.5.4:module +MODULE_VERSION= 2.5.4 +MODULE_PORTREVISION= 0 +GH_TUPLE= nginx-modules:ngx_cache_purge:${MODULE_VERSION}:module COMMENT= Angie cache_purge dynamic module +WWW= https://github.com/nginx-modules/ngx_cache_purge/ MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_cache_purge_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-dav-ext/Makefile b/www/angie-module-dav-ext/Makefile index d403b808d478..09b7d5d9328c 100644 --- a/www/angie-module-dav-ext/Makefile +++ b/www/angie-module-dav-ext/Makefile @@ -1,7 +1,10 @@ PORTNAME= angie-module-dav-ext -GH_TUPLE= arut:nginx-dav-ext-module:v3.0.0:module +MODULE_VERSION= 3.0.0 +MODULE_PORTREVISION= 0 +GH_TUPLE= arut:nginx-dav-ext-module:v${MODULE_VERSION}:module COMMENT= Angie dav-ext dynamic module +WWW= https://github.com/arut/nginx-dav-ext-module/ LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt @@ -9,8 +12,8 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 \ MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_dav_ext_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-echo/Makefile b/www/angie-module-echo/Makefile index 94804caec685..7fdca0e51f20 100644 --- a/www/angie-module-echo/Makefile +++ b/www/angie-module-echo/Makefile @@ -1,13 +1,16 @@ PORTNAME= angie-module-echo -GH_TUPLE= openresty:echo-nginx-module:v0.63:module +MODULE_VERSION= 0.63 +MODULE_PORTREVISION= 0 +GH_TUPLE= openresty:echo-nginx-module:v${MODULE_VERSION}:module COMMENT= Angie echo dynamic module +WWW= https://github.com/openresty/echo-nginx-module/ MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_echo_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-enhanced-memcached/Makefile b/www/angie-module-enhanced-memcached/Makefile index 54e3891d54e4..9f5b1951f811 100644 --- a/www/angie-module-enhanced-memcached/Makefile +++ b/www/angie-module-enhanced-memcached/Makefile @@ -1,15 +1,19 @@ PORTNAME= angie-module-enhanced-memcached -GH_TUPLE= bpaquet:ngx_http_enhanced_memcached_module:v0.3:module +MODULE_VERSION= 0.3 +MODULE_PORTREVISION= 0 +GH_TUPLE= bpaquet:ngx_http_enhanced_memcached_module:v${MODULE_VERSION}:module COMMENT= Angie enhanced memcached dynamic module +WWW= https://github.com/bpaquet/ngx_http_enhanced_memcached_module/ +LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC_module}/README.markdown MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_enhanced_memcached_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-eval/Makefile b/www/angie-module-eval/Makefile index 94a108b14c46..e82c7433ca04 100644 --- a/www/angie-module-eval/Makefile +++ b/www/angie-module-eval/Makefile @@ -1,15 +1,19 @@ PORTNAME= angie-module-eval -GH_TUPLE= openresty:nginx-eval-module:2016.06.10:module +MODULE_VERSION= 2016.06.10 +MODULE_PORTREVISION= 0 +GH_TUPLE= openresty:nginx-eval-module:${MODULE_VERSION}:module COMMENT= Angie eval dynamic module +WWW= https://github.com/openresty/nginx-eval-module/ +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC_module}/LICENCE MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_eval_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-geoip2/Makefile b/www/angie-module-geoip2/Makefile index 7df133590ec7..801ec5c400b4 100644 --- a/www/angie-module-geoip2/Makefile +++ b/www/angie-module-geoip2/Makefile @@ -1,15 +1,18 @@ PORTNAME= angie-module-geoip2 -GH_TUPLE= leev:ngx_http_geoip2_module:3.4:module +MODULE_VERSION= 3.4 +MODULE_PORTREVISION= 0 +GH_TUPLE= leev:ngx_http_geoip2_module:${MODULE_VERSION}:module COMMENT= Angie GeoIP2 dynamic module +WWW= https://github.com/leev/ngx_http_geoip2_module/ LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} .for i in ngx_http_geoip2_module ngx_stream_geoip2_module ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-headers-more/Makefile b/www/angie-module-headers-more/Makefile index b2879e7f6f9f..e031ca750c06 100644 --- a/www/angie-module-headers-more/Makefile +++ b/www/angie-module-headers-more/Makefile @@ -1,15 +1,18 @@ PORTNAME= angie-module-headers-more -GH_TUPLE= openresty:headers-more-nginx-module:v0.39:module +MODULE_VERSION= 0.39 +MODULE_PORTREVISION= 0 +GH_TUPLE= openresty:headers-more-nginx-module:v${MODULE_VERSION}:module COMMENT= Angie headers-more dynamic module +WWW= https://github.com/openresty/headers-more-nginx-module/ LICENSE_FILE= ${WRKSRC_module}/README.markdown MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_headers_more_filter_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-jwt/Makefile b/www/angie-module-jwt/Makefile index 2644023a3c9c..8bc91e84dc0b 100644 --- a/www/angie-module-jwt/Makefile +++ b/www/angie-module-jwt/Makefile @@ -1,7 +1,12 @@ PORTNAME= angie-module-jwt -GH_TUPLE= max-lt:nginx-jwt-module:v3.4.3:module +MODULE_VERSION= 3.4.3 +MODULE_PORTREVISION= 0 +GH_TUPLE= max-lt:nginx-jwt-module:v${MODULE_VERSION}:module COMMENT= Angie JWT dynamic module +WWW= https://github.com/max-lt/nginx-jwt-module/ + +LICENSE= MIT LIB_DEPENDS= libjansson.so:devel/jansson \ libjwt.so:www/libjwt @@ -11,8 +16,8 @@ MASTERDIR= ${.CURDIR}/../../www/angie CONFLICTS= www/angie-module-auth-jwt do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_jwt_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-keyval/Makefile b/www/angie-module-keyval/Makefile index 432310743eb8..838c613e90f7 100644 --- a/www/angie-module-keyval/Makefile +++ b/www/angie-module-keyval/Makefile @@ -1,15 +1,20 @@ PORTNAME= angie-module-keyval -GH_TUPLE= kjdev:nginx-keyval:0.3.0:module +MODULE_VERSION= 0.3.0 +MODULE_PORTREVISION= 0 +GH_TUPLE= kjdev:nginx-keyval:${MODULE_VERSION}:module COMMENT= Angie keyval dynamic module +WWW= https://github.com/kjdev/nginx-keyval/ + +LICENSE= MIT LIB_DEPENDS= libhiredis.so:databases/hiredis MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_keyval_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile index 4dd019336620..bef051ff088e 100644 --- a/www/angie-module-lua/Makefile +++ b/www/angie-module-lua/Makefile @@ -1,9 +1,12 @@ PORTNAME= angie-module-lua -GH_TUPLE= openresty:lua-nginx-module:v0.10.28:lua +MODULE_VERSION= 0.10.28 +MODULE_PORTREVISION= 0 +GH_TUPLE= openresty:lua-nginx-module:v${MODULE_VERSION}:lua GH_TUPLE+= openresty:stream-lua-nginx-module:v0.0.16:lua_stream GH_TUPLE+= vision5:ngx_devel_kit:v0.3.4:ndk COMMENT= Angie Lua dynamic module +WWW= https://github.com/openresty/lua-nginx-module/ LICENSE_FILE= ${WRKSRC_lua}/README.markdown @@ -16,16 +19,16 @@ CONFIGURE_ADD= --add-dynamic-module=${WRKSRC_lua} \ CONFIGURE_ENV= LUAJIT_INC=${LUAJIT_INCDIR} \ LUAJIT_LIB=${LOCALBASE}/lib -RUN_DEPENDS= angie-module-ndk==${PKGVERSION}:www/angie-module-ndk \ - lua-resty-core>=0.1.29:www/lua-resty-core +RUN_DEPENDS= angie-module-ndk>=0.3.4,1:www/angie-module-ndk \ + lua-resty-core>=0.1.31:www/lua-resty-core USES= luajit:luajit-openresty MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} .for i in ngx_http_lua_module ngx_stream_lua_module ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-ndk/Makefile b/www/angie-module-ndk/Makefile index dc0e57861dae..f4a110b02f1b 100644 --- a/www/angie-module-ndk/Makefile +++ b/www/angie-module-ndk/Makefile @@ -1,15 +1,20 @@ PORTNAME= angie-module-ndk -GH_TUPLE= vision5:ngx_devel_kit:v0.3.4:module +MODULE_VERSION= 0.3.4 +MODULE_PORTREVISION= 0 +GH_TUPLE= vision5:ngx_devel_kit:v${MODULE_VERSION}:module COMMENT= Angie NDK dynamic module +WWW= https://github.com/vision5/ngx_devel_kit/ + +LICENSE= BSD3CLAUSE CFLAGS+= -DNDK_SET_VAR -DNDK_UPSTREAM_LIST MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ndk_http_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-njs/Makefile b/www/angie-module-njs/Makefile index f69739a1be2f..4d76c7fbbe2d 100644 --- a/www/angie-module-njs/Makefile +++ b/www/angie-module-njs/Makefile @@ -1,7 +1,10 @@ PORTNAME= angie-module-njs -GH_TUPLE= nginx:njs:0.9.1:module +MODULE_VERSION= 0.9.1 +MODULE_PORTREVISION= 0 +GH_TUPLE= nginx:njs:${MODULE_VERSION}:module COMMENT= Angie NJS dynamic module +WWW= https://github.com/nginx/njs/ LIB_DEPENDS= libxslt.so:textproc/libxslt @@ -13,8 +16,8 @@ CONFIGURE_ADD= --add-dynamic-module=${WRKSRC_module}/nginx MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} .for i in ngx_http_js_module ngx_stream_js_module ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-perl/Makefile b/www/angie-module-perl/Makefile index 68096497aede..0b166cc0598f 100644 --- a/www/angie-module-perl/Makefile +++ b/www/angie-module-perl/Makefile @@ -13,8 +13,8 @@ CFLAGS+= -Wno-compound-token-split-by-macro MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${MODDIR} - ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx + ${MKDIR} ${STAGEDIR}${MODDIR} \ + ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_perl_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-postgres/Makefile b/www/angie-module-postgres/Makefile index b672ce013b86..4f58e611d856 100644 --- a/www/angie-module-postgres/Makefile +++ b/www/angie-module-postgres/Makefile @@ -1,15 +1,18 @@ PORTNAME= angie-module-postgres -GH_TUPLE= FRiCKLE:ngx_postgres:1.0rc7:module +MODULE_VERSION= 1.0rc7 +MODULE_PORTREVISION= 0 +GH_TUPLE= FRiCKLE:ngx_postgres:${MODULE_VERSION}:module COMMENT= Angie postgres dynamic module +WWW= https://github.com/FRiCKLE/ngx_postgres/ USES= pgsql MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_postgres_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-redis2/Makefile b/www/angie-module-redis2/Makefile index 2ab1a5856835..beb8fcff12fa 100644 --- a/www/angie-module-redis2/Makefile +++ b/www/angie-module-redis2/Makefile @@ -1,15 +1,18 @@ PORTNAME= angie-module-redis2 -GH_TUPLE= openresty:redis2-nginx-module:v0.15:module +MODULE_VERSION= 0.15 +MODULE_PORTREVISION= 0 +GH_TUPLE= openresty:redis2-nginx-module:v${MODULE_VERSION}:module COMMENT= Angie redis2 dynamic module +WWW= https://github.com/openresty/redis2-nginx-module/ LICENSE_FILE= ${WRKSRC_module}/README.markdown MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_redis2_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-rtmp/Makefile b/www/angie-module-rtmp/Makefile index 6ed58a3e358a..685ad1359205 100644 --- a/www/angie-module-rtmp/Makefile +++ b/www/angie-module-rtmp/Makefile @@ -1,7 +1,10 @@ PORTNAME= angie-module-rtmp -GH_TUPLE= arut:nginx-rtmp-module:v1.2.2:module +MODULE_VERSION= 1.2.2 +MODULE_PORTREVISION= 0 +GH_TUPLE= arut:nginx-rtmp-module:v${MODULE_VERSION}:module COMMENT= Angie RTMP dynamic module +WWW= https://github.com/arut/nginx-rtmp-module/ DEPRECATED= Upstream development has slowed down and there are a lot of unresolved issues and PRs upstream, consider migrating to multimedia/mediamtx EXPIRATION_DATE=2025-12-31 @@ -9,8 +12,8 @@ EXPIRATION_DATE=2025-12-31 MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_rtmp_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-set-misc/Makefile b/www/angie-module-set-misc/Makefile index 64b5078e7f96..d31f7e1d5cb4 100644 --- a/www/angie-module-set-misc/Makefile +++ b/www/angie-module-set-misc/Makefile @@ -1,8 +1,11 @@ PORTNAME= angie-module-set-misc -GH_TUPLE= vision5:ngx_devel_kit:v0.3.4:ndk +MODULE_VERSION= 0.3.4 +MODULE_PORTREVISION= 0 +GH_TUPLE= vision5:ngx_devel_kit:v${MODULE_VERSION}:ndk GH_TUPLE+= openresty:set-misc-nginx-module:v0.33:module COMMENT= Angie set-misc dynamic module +WWW= https://github.com/openresty/set-misc-nginx-module/ LICENSE_FILE= ${WRKSRC_module}/README.markdown @@ -12,8 +15,8 @@ CONFIGURE_ADD= --add-dynamic-module=${WRKSRC_ndk} \ MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_set_misc_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-subs/Makefile b/www/angie-module-subs/Makefile index b444f72eab8a..2c78e61498af 100644 --- a/www/angie-module-subs/Makefile +++ b/www/angie-module-subs/Makefile @@ -2,14 +2,15 @@ PORTNAME= angie-module-subs GH_TUPLE= yaoweibin:ngx_http_substitutions_filter_module:e12e965ac1837ca709709f9a26f572a54d83430e:module COMMENT= Angie substitutions filter dynamic module +WWW= https://github.com/yaoweibin/ngx_http_substitutions_filter_module/ LICENSE_FILE= ${WRKSRC_module}/README MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_subs_filter_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-testcookie/Makefile b/www/angie-module-testcookie/Makefile index f4026c99bd06..ce926119a900 100644 --- a/www/angie-module-testcookie/Makefile +++ b/www/angie-module-testcookie/Makefile @@ -2,14 +2,16 @@ PORTNAME= angie-module-testcookie GH_TUPLE= kyprizel:testcookie-nginx-module:64137c2f7e66e8866f56fdecaaf09ac10a034da9:module COMMENT= Angie testcookie dynamic module +WWW= https://github.com/kyprizel/testcookie-nginx-module/ +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC_module}/README.markdown MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_testcookie_access_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-upload/Makefile b/www/angie-module-upload/Makefile index 11edfbe73956..dc9fc73d6d89 100644 --- a/www/angie-module-upload/Makefile +++ b/www/angie-module-upload/Makefile @@ -1,15 +1,19 @@ PORTNAME= angie-module-upload -GH_TUPLE= fdintino:nginx-upload-module:2.3.0:module +MODULE_VERSION= 2.3.0 +MODULE_PORTREVISION= 0 +GH_TUPLE= fdintino:nginx-upload-module:${MODULE_VERSION}:module COMMENT= Angie upload dynamic module +WWW= https://github.com/fdintino/nginx-upload-module/ +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC_module}/LICENCE MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_upload_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie-module-vod/Makefile b/www/angie-module-vod/Makefile index 794908d2d342..5a4141758c92 100644 --- a/www/angie-module-vod/Makefile +++ b/www/angie-module-vod/Makefile @@ -1,7 +1,12 @@ PORTNAME= angie-module-vod -GH_TUPLE= kaltura:nginx-vod-module:1.33:module +MODULE_VERSION= 1.33 +MODULE_PORTREVISION= 0 +GH_TUPLE= kaltura:nginx-vod-module:${MODULE_VERSION}:module COMMENT= VOD dynamic module for Angie +WWW= https://github.com/kaltura/nginx-vod-module/ + +LICENSE= AGPLv3 LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg @@ -9,8 +14,8 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ MASTERDIR= ${.CURDIR}/../../www/angie do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${MODDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_vod_module.so \ ${STAGEDIR}${MODDIR} diff --git a/www/angie/Makefile b/www/angie/Makefile index 7ac5e95fde80..728697fc8194 100644 --- a/www/angie/Makefile +++ b/www/angie/Makefile @@ -1,9 +1,9 @@ PORTNAME?= angie -DISTVERSION= 1.10.2 -PORTREVISION= 1 +ANGIE_VERSION= 1.10.2 +ANGIE_PORTREVISION= 2 CATEGORIES+= www MASTER_SITES+= https://download.angie.software/files/:angie -DISTNAME= angie-${DISTVERSIONFULL} +DISTNAME= angie-${ANGIE_VERSION} DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}:angie MAINTAINER?= sko@rostwald.de @@ -13,6 +13,8 @@ WWW?= https://angie.software/en/ LICENSE?= BSD2CLAUSE .if ${PORTNAME} == angie +DISTVERSION= ${ANGIE_VERSION} +PORTREVISION= ${ANGIE_PORTREVISION} LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpcre2-8.so:devel/pcre2 USE_RC_SUBR= angie @@ -22,9 +24,17 @@ SUB_FILES= angie.conf.sample \ example.conf.sample \ pkg-message .else +. if defined(MODULE_VERSION) +DISTVERSION= ${MODULE_VERSION} +PORTREVISION= ${MODULE_PORTREVISION} +PORTEPOCH= 1 +. else +DISTVERSION= ${ANGIE_VERSION} +PORTREVISION= ${ANGIE_PORTREVISION} +. endif LICENSE_FILE?= ${WRKSRC_module}/LICENSE BUILD_DEPENDS+= pcre2>=0:devel/pcre2 -RUN_DEPENDS+= angie==${PKGVERSION}:www/angie +RUN_DEPENDS+= angie>=${ANGIE_VERSION}:www/angie ALL_TARGET?= modules CONFIGURE_ADD?= --add-dynamic-module=${WRKSRC_module} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?693880ee.2e4ec.1ebd3d0f>