Re: [UPDATE] fonts/alkalami-1.300

2022-06-03 Thread Omar Polo
George Rosamond  wrote:
> MAINTAINER update from 1.200 to 1.300. Diff attached.
> 
> Changelog with 1.300 includes:
> 
> Added characters to support other languages: U+0600, U+0657..U+0658, 
> U+065D, U+067D, U+0684, U+06A5, U+06E5, U+0761, U+0870, U+0872, U+0874, 
> U+08A2..U+08A3, U+08F4..U+08FD, U+FDFD, U+2212
> Changed design of U+0643 (KAF) and U+06AD (NG)
> Added ss09 to support “Wagaf small”
> Added more contextual substitutions of swash tails for collision avoidance
> Fixed bug in outline of U+0624 (Regular)
> Added positional digit variants for Latin digits
> 
> thanks
> 
> g

committed, thanks :)



sparc64 bulk build report

2022-06-03 Thread kmos
Bulk build on sparc64-0a.ports.openbsd.org

Started : Tue May 31 13:41:31 MDT 2022
Finished: Fri Jun  3 02:11:00 MDT 2022
Duration: 2 Days 12 hours 29 minutes

Built using OpenBSD 7.1-current (GENERIC.MP) #1333: Mon May 30 23:15:38 MDT 2022

Built 9321 packages

Number of packages built each day:
May 31: 6497
Jun 1: 2023
Jun 2: 799
Jun 3: 2



Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2022-05-31/summary.log

Build failures: 32
http://build-failures.rhaalovely.net/sparc64/2022-05-31/cad/dxf2gcode.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/cad/oce.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/comms/gammu.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/databases/recoll.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/devel/avr/gcc.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/devel/kf5/kio.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/devel/xtensa-esp32-elf/binutils.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/devel/xtensa-lx106-elf/binutils.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/emulators/qemu,-ga.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/games/arx-libertatis.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/games/gargoyle.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/geo/pdal.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/graphics/birdfont.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/graphics/makehuman.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/graphics/opencolorio.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/inputmethods/libime.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/lang/clazy.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/math/arpack.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/math/maxima.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/multimedia/mkvtoolnix.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/productivity/gnucash.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/security/clamav.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/security/keepassxc.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/security/veracrypt.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/textproc/lgrind.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/textproc/libmarisa.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/www/ruby-capybara,ruby30.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/www/unit/unit-ruby.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/x11/gnome/gjs.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/x11/gnome/secrets.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/x11/qt6/qtdeclarative.log
http://build-failures.rhaalovely.net/sparc64/2022-05-31/x11/xscreensaver.log

Recurrent failures:
 failures/cad/oce.log
 failures/comms/gammu.log
 failures/devel/avr/gcc.log
 failures/devel/xtensa-esp32-elf/binutils.log
 failures/devel/xtensa-lx106-elf/binutils.log
 failures/graphics/opencolorio.log
 failures/lang/clazy.log
 failures/security/clamav.log
 failures/textproc/libmarisa.log
 failures/www/unit/unit-ruby.log
 failures/x11/gnome/gjs.log

New failures:
+failures/cad/dxf2gcode.log
+failures/databases/recoll.log
+failures/devel/kf5/kio.log
+failures/emulators/qemu,-ga.log
+failures/games/arx-libertatis.log
+failures/games/gargoyle.log
+failures/geo/pdal.log
+failures/graphics/birdfont.log
+failures/graphics/makehuman.log
+failures/inputmethods/libime.log
+failures/math/arpack.log
+failures/math/maxima.log
+failures/multimedia/mkvtoolnix.log
+failures/productivity/gnucash.log
+failures/security/keepassxc.log
+failures/security/veracrypt.log
+failures/textproc/lgrind.log
+failures/www/ruby-capybara,ruby30.log
+failures/x11/gnome/secrets.log
+failures/x11/qt6/qtdeclarative.log
+failures/x11/xscreensaver.log

Resolved failures:
-failures/devel/openmpi.log
-failures/print/cups.log

Packages newly built:
+archivers/pecl-lzf,php74
+archivers/pecl-lzf,php80
+archivers/pecl-rar,php74
+archivers/pecl-rar,php80
+archivers/quazip
+astro/celestia
+astro/gnuastro
+audio/ario
+audio/audacious/player
+audio/audacious/plugins
+audio/audacity
+audio/calf
+audio/cantata
+audio/clementine
+audio/cozy
+audio/cplay
+audio/curseradio
+audio/deadbeef
+audio/disc-cover
+audio/easytag
+audio/faudio
+audio/gmpc
+audio/gmpc-plugins
+audio/gogglesmm
+audio/gqmpeg
+audio/gradio
+audio/grip
+audio/gsound
+audio/hydrogen
+audio/libcanberra
+audio/libcanberra,-gtk
+audio/libcanberra,-gtk3
+audio/libcanberra,-main
+audio/liblastfm
+audio/lilv
+audio/lmms
+audio/lv2
+audio/milkytracker
+audio/mp3cddb
+audio/mp3info
+audio/mp3splt-gtk
+audio/mscore
+audio/mumble
+audio/mumble,-main
+audio/mumble,-server
+audio/musique
+audio/ocp
+audio/p5-gnupod
+audio/parlatype
+audio/pavucontrol
+audio/picard
+audio/pithos
+audio/pota

new security/libdigidocpp 3.14.8

2022-06-03 Thread Klemens Nanni
Here is the first piece of software from https://github.com/open-eid
that is required to use Smart-ID cards on OpenBSD.

Their Qt GUI packs all the features, but th library ships a small tool.

I can successfully sign/validate and en/decrypt files between OpenBSD
and Linux (both officially built and unofficial distribution packages).

Version 3.14.8 currently requires ports OpenSSL 1.1.1, base LibreSSL
fails to build, upstream has support for OpenSSL 3.0 and I plan to
support LibreSSL eventually, but that'll come afterwards.

All patches except the mechanic OpenSSL neutering in CMake files have
been submitted and approved upstream already.

This port depends on the following ports I've sent to ports@ already:
new: texproc/xml-security-c 2.0.4
new: devel/xsd
new: textproc/xalan-c 1.12

Feedback? OK?

---
Information for inst:libdigidocpp-3.14.8

Comment:
library for creating DigiDoc signature files

Required by:
debug-libdigidocpp-3.14.8

Description:
libdigidocpp offers creating, signing and verification of digitally signed
documents, according to XAdES and XML-DSIG standards.

digidoc-tool(1) provides a simple CLI.

Maintainer: Klemens Nanni 

WWW: https://www.id.ee/


libdigidocpp.tgz
Description: Binary data


Re: [PATCH] www/nginx: update third-party modules

2022-06-03 Thread Omar Polo
Hello,

"Sergey A. Osokin"  wrote:
> And here's the patch.
> 
> Thank you.

(+cc robert@; please put the maintainer in Cc so it's easier for them to
see the mail)

the diff it doesn't build here:
patch-lua-nginx-module_src_ngx_http_lua_ssl_certby_c was upstreamed and
needs to be removed, and then other two patches fails to apply:

===>   Failed patches:
patch-lua-nginx-module_src_ngx_http_lua_ssl_ocsp_c
patch-lua-nginx-module_src_ngx_http_lua_ssl_session_storeby_c

(forgot to 'cvs add' the patches/ before generating the diff?)

Then, some comments on the diff:

 - it's REVISION and not PORTREVISION here :P
   (also, it's generally closer to the DISTNAME/PKGNAME line, but YMMV)

 - even if it probably makes more sense to sort the PKGNAMESs, WANTLIBs
   and whatnot, it makes more difficoult to understand the changes when
   looking at the diff, so i'd postpone the matter for later.

i'm attaching an updated diff without the sorting and with the
upstreamed patch removed, but it still needs some work on the two
failing patches.

Cheers,

Omar Polo

Index: Makefile
===
RCS file: /home/cvs/ports/www/nginx/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile30 May 2022 08:17:34 -  1.163
+++ Makefile3 Jun 2022 10:11:45 -
@@ -7,6 +7,7 @@ COMMENT-xslt=   nginx XSLT filter module
 COMMENT-mailproxy= nginx mail proxy module
 COMMENT-stream=nginx TCP/UDP proxy module
 COMMENT-naxsi= nginx web application firewall module
+COMMENT-njs=   nginx JavaScript module
 COMMENT-ldap_auth= nginx LDAP authentication module
 COMMENT-lua=   nginx lua scripting module
 COMMENT-headers_more=  nginx module for setting/adding/clearing headers
@@ -17,9 +18,10 @@ COMMENT-securelink=  nginx HMAC secure li
 
 VERSION=   1.22.0
 DISTNAME=  nginx-${VERSION}
+REVISION=  0
 CATEGORIES=www
 
-VERSION-rtmp=  1.2.1
+VERSION-rtmp=  1.2.2
 
 PKGNAME-main=  ${DISTNAME}
 PKGNAME-image_filter=  nginx-image_filter-${VERSION}
@@ -47,13 +49,14 @@ DISTFILES=  ${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=  \
openresty   headers-more-nginx-module   v0.33 \
-   openresty   lua-nginx-modulev0.10.11 \
+   openresty   lua-nginx-modulev0.10.21 \
nbs-system  naxsi   1.3 \
kvspb   nginx-auth-ldap 
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arutnginx-rtmp-module   v${VERSION-rtmp} \
-   simpl   ngx_devel_kit   v0.3.0 \
leevngx_http_geoip2_module  3.3 \
-   nginx-modules   ngx_http_hmac_secure_link_module 
48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+   nginx-modules   ngx_http_hmac_secure_link_module 
8c5449202cd5afd8970f316bd6828d28281dc9bc \
+   nginx   njs 0.7.4 \
+   vision5 ngx_devel_kit   v0.3.1
 
 .for _a _p _c in ${_GH_MODS}
 DISTFILES+=${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -68,9 +71,9 @@ PERMIT_PACKAGE=   Yes
 
 MULTI_PACKAGES =   -main -naxsi -perl ${MODULE_PACKAGES}
 
-MODULE_PACKAGES =  -image_filter -geoip2 -xslt -mailproxy -stream \
-   -passenger -headers_more -ldap_auth -lua -rtmp \
-   -securelink
+MODULE_PACKAGES =  -headers_more -geoip2 -image_filter \
+   -ldap_auth -lua -mailproxy -passenger \
+   -rtmp -securelink -stream -xslt
 
 FLAVOR ?=
 PSEUDO_FLAVORS =   no_lua no_passenger
@@ -93,6 +96,7 @@ WANTLIB-headers_more=
 WANTLIB-perl=  c m perl
 WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
 WANTLIB-securelink=crypto
+WANTLIB-njs=
 
 LIB_DEPENDS-main=  devel/pcre
 LIB_DEPENDS-xslt=  textproc/libxml \
@@ -194,7 +198,7 @@ NO_TEST=Yes
 ALL_TARGET=
 
 pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi \
+.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
ngx_http_hmac_secure_link_module
cd ${WRKSRC} && mv ../$i-* $i
Index: distinfo
===
RCS file: /home/cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo30 May 2022 08:17:34 -  1.79
+++ distinfo3 Jun 2022 10:04:28 -
@@ -1,20 +1,22 @@
 SHA256 (headers-more-nginx-module-v0.33.tar.gz) = 
o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
-SHA256 (lua-nginx-module-v0.10.11.tar.gz) = 
wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
+SHA256 (lua-nginx-module-v0.10.21.tar.gz) = 
nbdWAAV4767LQ76k/Gz2MaqoCYjYb/5dOv65kniV/60=
 SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
 SHA256 (nginx-1.20.1-chroot.patch) = 
SS1TB0j8N4/dn5pUTGT6Wv

Re: [PATCH] www/nginx: update third-party modules

2022-06-03 Thread Omar Polo
Omar Polo  wrote:
> Hello,
> 
> "Sergey A. Osokin"  wrote:
> > And here's the patch.
> > 
> > Thank you.
> 
> (+cc robert@; please put the maintainer in Cc so it's easier for them to
> see the mail)
> 
> the diff it doesn't build here:
> patch-lua-nginx-module_src_ngx_http_lua_ssl_certby_c was upstreamed and
> needs to be removed, and then other two patches fails to apply:
> 
> ===>   Failed patches:
> patch-lua-nginx-module_src_ngx_http_lua_ssl_ocsp_c
> patch-lua-nginx-module_src_ngx_http_lua_ssl_session_storeby_c
> 
> (forgot to 'cvs add' the patches/ before generating the diff?)

(i meant 'cvs rm'...)

> Then, some comments on the diff:
> 
>  - it's REVISION and not PORTREVISION here :P
>(also, it's generally closer to the DISTNAME/PKGNAME line, but YMMV)
> 
>  - even if it probably makes more sense to sort the PKGNAMESs, WANTLIBs
>and whatnot, it makes more difficoult to understand the changes when
>looking at the diff, so i'd postpone the matter for later.

and i forgot probably the most obvious thing: the diff is lacking the
DESCR and PLIST for the new njs subpackage (forgot a 'cvs add'?).  you
also need to add njs to MODULE_PACKAGES.

> i'm attaching an updated diff without the sorting and with the
> upstreamed patch removed, but it still needs some work on the two
> failing patches.
> 
> Cheers,
> 
> Omar Polo
> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.163
> diff -u -p -r1.163 Makefile
> --- Makefile  30 May 2022 08:17:34 -  1.163
> +++ Makefile  3 Jun 2022 10:11:45 -
> @@ -7,6 +7,7 @@ COMMENT-xslt= nginx XSLT filter module
>  COMMENT-mailproxy=   nginx mail proxy module
>  COMMENT-stream=  nginx TCP/UDP proxy module
>  COMMENT-naxsi=   nginx web application firewall module
> +COMMENT-njs= nginx JavaScript module
>  COMMENT-ldap_auth=   nginx LDAP authentication module
>  COMMENT-lua= nginx lua scripting module
>  COMMENT-headers_more=nginx module for setting/adding/clearing headers
> @@ -17,9 +18,10 @@ COMMENT-securelink=nginx HMAC secure li
>  
>  VERSION= 1.22.0
>  DISTNAME=nginx-${VERSION}
> +REVISION=0
>  CATEGORIES=  www
>  
> -VERSION-rtmp=1.2.1
> +VERSION-rtmp=1.2.2
>  
>  PKGNAME-main=${DISTNAME}
>  PKGNAME-image_filter=nginx-image_filter-${VERSION}
> @@ -47,13 +49,14 @@ DISTFILES=${DISTNAME}${EXTRACT_SUFX}
>  
>  _GH_MODS=\
>   openresty   headers-more-nginx-module   v0.33 \
> - openresty   lua-nginx-modulev0.10.11 \
> + openresty   lua-nginx-modulev0.10.21 \
>   nbs-system  naxsi   1.3 \
>   kvspb   nginx-auth-ldap 
> 83c059b73566c2ee9cbda920d91b66657cf120b7 \
>   arutnginx-rtmp-module   v${VERSION-rtmp} \
> - simpl   ngx_devel_kit   v0.3.0 \
>   leevngx_http_geoip2_module  3.3 \
> - nginx-modules   ngx_http_hmac_secure_link_module 
> 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
> + nginx-modules   ngx_http_hmac_secure_link_module 
> 8c5449202cd5afd8970f316bd6828d28281dc9bc \
> + nginx   njs 0.7.4 \
> + vision5 ngx_devel_kit   v0.3.1
>  
>  .for _a _p _c in ${_GH_MODS}
>  DISTFILES+=  ${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
> @@ -68,9 +71,9 @@ PERMIT_PACKAGE= Yes
>  
>  MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES}
>  
> -MODULE_PACKAGES =-image_filter -geoip2 -xslt -mailproxy -stream \
> - -passenger -headers_more -ldap_auth -lua -rtmp \
> - -securelink
> +MODULE_PACKAGES =-headers_more -geoip2 -image_filter \
> + -ldap_auth -lua -mailproxy -passenger \
> + -rtmp -securelink -stream -xslt
>  
>  FLAVOR ?=
>  PSEUDO_FLAVORS = no_lua no_passenger
> @@ -93,6 +96,7 @@ WANTLIB-headers_more=
>  WANTLIB-perl=c m perl
>  WANTLIB-passenger=   m pthread ${COMPILER_LIBCXX}
>  WANTLIB-securelink=  crypto
> +WANTLIB-njs=
>  
>  LIB_DEPENDS-main=devel/pcre
>  LIB_DEPENDS-xslt=textproc/libxml \
> @@ -194,7 +198,7 @@ NO_TEST=  Yes
>  ALL_TARGET=
>  
>  pre-patch:
> -.for i in headers-more-nginx-module lua-nginx-module naxsi \
> +.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
>   nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
>   ngx_http_hmac_secure_link_module
>   cd ${WRKSRC} && mv ../$i-* $i
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/www/nginx/distinfo,v
> retrieving revision 1.79
> diff -u -p -r1.79 distinfo
> --- distinfo  30 May 2022 08:17:34 -  1.79
> +++ distinfo  3 Jun 2022 10:04:28 -
> @@

Re: [PATCH] www/nginx: update third-party modules

2022-06-03 Thread Sergey A. Osokin
On Fri, Jun 03, 2022 at 12:52:48PM +0200, Omar Polo wrote:
> Omar Polo  wrote:
> > Hello,
> > 
> > "Sergey A. Osokin"  wrote:
> > > And here's the patch.
> > 
> > (+cc robert@; please put the maintainer in Cc so it's easier for them to
> > see the mail)

Thanks for the review, Omar.

I've just updated the patch:
o) remove upstreamed patches
o) add DESCR-njs and PLIST-njs files
o) removed sorting staff, will do that later

While I'm here I've found a compiling issue with the third-party lua
module, so I've just made some additional changes in that place as well.

-- 
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile	30 May 2022 08:17:34 -	1.163
+++ Makefile	3 Jun 2022 14:49:08 -
@@ -7,6 +7,7 @@ COMMENT-xslt=		nginx XSLT filter module
 COMMENT-mailproxy=	nginx mail proxy module
 COMMENT-stream=		nginx TCP/UDP proxy module
 COMMENT-naxsi=		nginx web application firewall module
+COMMENT-njs=		nginx JavaScript module
 COMMENT-ldap_auth=	nginx LDAP authentication module
 COMMENT-lua=		nginx lua scripting module
 COMMENT-headers_more=	nginx module for setting/adding/clearing headers
@@ -18,8 +19,9 @@ COMMENT-securelink=	nginx HMAC secure li
 VERSION=	1.22.0
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
+REVISION=	0
 
-VERSION-rtmp=	1.2.1
+VERSION-rtmp=	1.2.2
 
 PKGNAME-main=		${DISTNAME}
 PKGNAME-image_filter=	nginx-image_filter-${VERSION}
@@ -35,6 +37,7 @@ PKGNAME-perl=		nginx-perl-${VERSION}
 PKGNAME-passenger=	nginx-passenger-${VERSION}
 PKGNAME-rtmp=		nginx-rtmp-${VERSION}
 PKGNAME-securelink=	nginx-securelink-${VERSION}
+PKGNAME-njs=		nginx-njs-${VERSION}
 
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
@@ -47,13 +50,14 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=	\
 	openresty	headers-more-nginx-module	v0.33 \
-	openresty	lua-nginx-module		v0.10.11 \
+	openresty	lua-nginx-module		v0.10.21 \
 	nbs-system	naxsi1.3 \
 	kvspb		nginx-auth-ldap			83c059b73566c2ee9cbda920d91b66657cf120b7 \
 	arut		nginx-rtmp-module		v${VERSION-rtmp} \
-	simpl		ngx_devel_kit			v0.3.0 \
+	vision5		ngx_devel_kit			v0.3.1 \
 	leev		ngx_http_geoip2_module		3.3 \
-	nginx-modules	ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+	nginx-modules	ngx_http_hmac_secure_link_module 8c5449202cd5afd8970f316bd6828d28281dc9bc \
+	nginx		njs0.7.4
 
 .for _a _p _c in ${_GH_MODS}
 DISTFILES+=	${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -70,7 +74,7 @@ MULTI_PACKAGES =	-main -naxsi -perl ${MO
 
 MODULE_PACKAGES =	-image_filter -geoip2 -xslt -mailproxy -stream \
 			-passenger -headers_more -ldap_auth -lua -rtmp \
-			-securelink
+			-securelink -njs
 
 FLAVOR ?=
 PSEUDO_FLAVORS =	no_lua no_passenger
@@ -93,6 +97,7 @@ WANTLIB-headers_more=
 WANTLIB-perl=		c m perl
 WANTLIB-passenger=	m pthread ${COMPILER_LIBCXX}
 WANTLIB-securelink=	crypto
+WANTLIB-njs=
 
 LIB_DEPENDS-main=	devel/pcre
 LIB_DEPENDS-xslt=	textproc/libxml \
@@ -132,9 +137,8 @@ CONFIGURE_STYLE=	simple
 MODULES+=		perl
 
 .if ${BUILD_PACKAGES:M-lua}
-MODULES+=		lang/lua
-CONFIGURE_ENV+=		MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \
-			MODLUA_LIB=${MODLUA_LIB}
+CONFIGURE_ENV+=		LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \
+			LUAJIT_LIB=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--add-dynamic-module=${WRKSRC}/lua-nginx-module
 .endif
 
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo	30 May 2022 08:17:34 -	1.79
+++ distinfo	3 Jun 2022 14:49:08 -
@@ -1,20 +1,22 @@
 SHA256 (headers-more-nginx-module-v0.33.tar.gz) = o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
-SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
+SHA256 (lua-nginx-module-v0.10.21.tar.gz) = nbdWAAV4767LQ76k/Gz2MaqoCYjYb/5dOv65kniV/60=
 SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
 SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
 SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
 SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
-SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
-SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
+SHA256 (nginx-rtmp-module-v1.2.2.tar.gz) = B/Gbe//sXjV7uIIMY+UoHevUX1oubUaxY22SAsPgnXg=
+SHA256 (ngx_devel_kit-v0.3.1.tar.gz) = DpcRBeIQ0nKkl1Z/ouLCVvTjm4RaW6gNNz4muhq/vYU=
 SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
-SHA256 (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
+SHA256 (ngx_http_hmac_secure_link_module-8c5449202cd5afd8970f316bd6828d28281dc9bc.tar.gz) = 4flk02zJ1

Re: [PATCH] www/nginx: update third-party modules

2022-06-03 Thread Sergey A. Osokin
Please disregard this patch, I've just found another issue.

On Fri, Jun 03, 2022 at 02:54:54PM +, Sergey A. Osokin wrote:
> On Fri, Jun 03, 2022 at 12:52:48PM +0200, Omar Polo wrote:
> > Omar Polo  wrote:
> > > "Sergey A. Osokin"  wrote:
> > > > And here's the patch.
> > > 
> > > (+cc robert@; please put the maintainer in Cc so it's easier for them to
> > > see the mail)
> 
> Thanks for the review, Omar.
> 
> I've just updated the patch:
> o) remove upstreamed patches
> o) add DESCR-njs and PLIST-njs files
> o) removed sorting staff, will do that later
> 
> While I'm here I've found a compiling issue with the third-party lua
> module, so I've just made some additional changes in that place as well.
-- 
Sergey A. Osokin


signature.asc
Description: PGP signature


Compiling trojita outside the ports tree fails

2022-06-03 Thread Caspar Schutijser
Hi,

On a snapshot of two weeks old, the below command sequence (to compile
trojita outside the ports tree) succeeds successfully. However, on a
machine updated to today's snapshot, this fails with the error message
shown below. I assume it has something to do with the update to
CMake 3.23 (and perhaps specifically with the
"Fix build with CMake 3.23" commit on 2022-05-28) but I don't know for
sure. Do you know what's going on?

Thanks,
Caspar


$ cd /tmp
$ git clone https://invent.kde.org/pim/trojita
$ cd trojita
$ echo "set(CMAKE_PREFIX_PATH /usr/local/lib/qt5/cmake)" >new
$ cat CMakeLists.txt >>new
$ mv new CMakeLists.txt
$ mkdir _build
$ cd _build
$ cmake ..
[snip]
-- Configuring done
CMake Error at /usr/local/lib/qt5/cmake/Qt5WebKit/WebKitTargets.cmake:67 
(set_target_properties):
  The link interface of target "Qt5::WebCore" contains:

Qt5::Sensors

  but the target was not found.  Possible reasons include:

* There is a typo in the target name.
* A find_package call is missing for an IMPORTED target.
* An ALIAS target is missing.

Call Stack (most recent call first):
  /usr/local/lib/qt5/cmake/Qt5WebKit/Qt5WebKitConfig.cmake:87 (include)
  /usr/local/share/cmake/Modules/CMakeFindDependencyMacro.cmake:47 
(find_package)
  /usr/local/lib/qt5/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake:83 
(find_dependency)
  CMakeLists.txt:52 (find_package)


CMake Error at /usr/local/lib/qt5/cmake/Qt5WebKit/WebKitTargets.cmake:83 
(set_target_properties):
  The link interface of target "Qt5::WebKit2" contains:

Qt5::Positioning

  but the target was not found.  Possible reasons include:

* There is a typo in the target name.
* A find_package call is missing for an IMPORTED target.
* An ALIAS target is missing.

Call Stack (most recent call first):
  /usr/local/lib/qt5/cmake/Qt5WebKit/Qt5WebKitConfig.cmake:87 (include)
  /usr/local/share/cmake/Modules/CMakeFindDependencyMacro.cmake:47 
(find_package)
  /usr/local/lib/qt5/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake:83 
(find_dependency)
  CMakeLists.txt:52 (find_package)


-- Generating done
CMake Generate step failed.  Build files cannot be regenerated correctly.



Re: [PATCH] www/nginx: update third-party modules

2022-06-03 Thread Sergey A. Osokin
Hi,

thanks for your patience.

On Fri, Jun 03, 2022 at 03:14:38PM +, Sergey A. Osokin wrote:
> Please disregard this patch, I've just found another issue.
 
And here's another version of the patch with the following changes:
o) remove upstreamed patches
o) add DESCR-njs and PLIST-njs files
o) removed sorting staff, will do that later
o) add patch for njs module

While I'm here I've found a compiling issue with the third-party lua
module, so I've just made some additional changes in that place as well.

Now the port builds and installs just fine.

-- 
Sergey A. Osokin


Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile	30 May 2022 08:17:34 -	1.163
+++ Makefile	3 Jun 2022 15:43:56 -
@@ -7,6 +7,7 @@ COMMENT-xslt=		nginx XSLT filter module
 COMMENT-mailproxy=	nginx mail proxy module
 COMMENT-stream=		nginx TCP/UDP proxy module
 COMMENT-naxsi=		nginx web application firewall module
+COMMENT-njs=		nginx JavaScript module
 COMMENT-ldap_auth=	nginx LDAP authentication module
 COMMENT-lua=		nginx lua scripting module
 COMMENT-headers_more=	nginx module for setting/adding/clearing headers
@@ -18,8 +19,9 @@ COMMENT-securelink=	nginx HMAC secure li
 VERSION=	1.22.0
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
+REVISION=	0
 
-VERSION-rtmp=	1.2.1
+VERSION-rtmp=	1.2.2
 
 PKGNAME-main=		${DISTNAME}
 PKGNAME-image_filter=	nginx-image_filter-${VERSION}
@@ -35,6 +37,7 @@ PKGNAME-perl=		nginx-perl-${VERSION}
 PKGNAME-passenger=	nginx-passenger-${VERSION}
 PKGNAME-rtmp=		nginx-rtmp-${VERSION}
 PKGNAME-securelink=	nginx-securelink-${VERSION}
+PKGNAME-njs=		nginx-njs-${VERSION}
 
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
@@ -47,13 +50,14 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=	\
 	openresty	headers-more-nginx-module	v0.33 \
-	openresty	lua-nginx-module		v0.10.11 \
+	openresty	lua-nginx-module		v0.10.21 \
 	nbs-system	naxsi1.3 \
 	kvspb		nginx-auth-ldap			83c059b73566c2ee9cbda920d91b66657cf120b7 \
 	arut		nginx-rtmp-module		v${VERSION-rtmp} \
-	simpl		ngx_devel_kit			v0.3.0 \
+	vision5		ngx_devel_kit			v0.3.1 \
 	leev		ngx_http_geoip2_module		3.3 \
-	nginx-modules	ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+	nginx-modules	ngx_http_hmac_secure_link_module 8c5449202cd5afd8970f316bd6828d28281dc9bc \
+	nginx		njs0.7.4
 
 .for _a _p _c in ${_GH_MODS}
 DISTFILES+=	${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -70,7 +74,7 @@ MULTI_PACKAGES =	-main -naxsi -perl ${MO
 
 MODULE_PACKAGES =	-image_filter -geoip2 -xslt -mailproxy -stream \
 			-passenger -headers_more -ldap_auth -lua -rtmp \
-			-securelink
+			-securelink -njs
 
 FLAVOR ?=
 PSEUDO_FLAVORS =	no_lua no_passenger
@@ -93,6 +97,7 @@ WANTLIB-headers_more=
 WANTLIB-perl=		c m perl
 WANTLIB-passenger=	m pthread ${COMPILER_LIBCXX}
 WANTLIB-securelink=	crypto
+WANTLIB-njs=
 
 LIB_DEPENDS-main=	devel/pcre
 LIB_DEPENDS-xslt=	textproc/libxml \
@@ -100,15 +105,14 @@ LIB_DEPENDS-xslt=	textproc/libxml \
 LIB_DEPENDS-image_filter=graphics/gd
 LIB_DEPENDS-geoip2=	net/libmaxminddb
 LIB_DEPENDS-ldap_auth=	databases/openldap
-LIB_DEPENDS-lua=	${MODLUA_LIB_DEPENDS}
+LIB_DEPENDS-lua=	lang/luajit
 LIB_DEPENDS-rtmp=
 LIB_DEPENDS-securelink=
 
 MODLUA_RUNDEP=		No
 RUN_DEPENDS=		www/nginx,-main=${VERSION}
 RUN_DEPENDS-main=	# blank (override default)
-RUN_DEPENDS-lua=	${RUN_DEPENDS} \
-			${_MODLUA_RUN_DEPENDS}
+RUN_DEPENDS-lua=	lang/luajit
 RUN_DEPENDS-passenger=	${RUN_DEPENDS} \
 			ruby*-passenger-*:www/ruby-passenger
 
@@ -132,12 +136,15 @@ CONFIGURE_STYLE=	simple
 MODULES+=		perl
 
 .if ${BUILD_PACKAGES:M-lua}
-MODULES+=		lang/lua
-CONFIGURE_ENV+=		MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \
-			MODLUA_LIB=${MODLUA_LIB}
+CONFIGURE_ENV+=		LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \
+			LUAJIT_LIB=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--add-dynamic-module=${WRKSRC}/lua-nginx-module
 .endif
 
+.if ${BUILD_PACKAGES:M-njs}
+CONFIGURE_ARGS+=	--add-dynamic-module=${WRKSRC}/njs/nginx
+.endif
+
 .if ${BUILD_PACKAGES:M-passenger}
 MODULES+=		lang/ruby
 MODRUBY_BUILDDEP=	No
@@ -194,7 +201,7 @@ NO_TEST=		Yes
 ALL_TARGET=
 
 pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi \
+.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
 	nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
 	ngx_http_hmac_secure_link_module
 	cd ${WRKSRC} && mv ../$i-* $i
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo	30 May 2022 08:17:34 -	1.79
+++ distinfo	3 Jun 2022 15:43:56 -
@@ -1,20 +1,22 @@
 SHA256 (headers-more-nginx-module-v0.33.tar.gz) = o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
-SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
+SHA256 (lua-nginx-module-v0.10.21.tar.gz) = nbdWAAV4767LQ76k/Gz

UPDATE: sysutils/vultr-cli-2.14.1

2022-06-03 Thread Adriano Barbosa
Hi.
Update for sysutils/vultr-cli-2.14.0
Changelog: https://github.com/vultr/vultr-cli/blob/master/CHANGELOG.md

Plans: Add GPU fields PR 269
Instances: Update tag to string pointer PR 268
Kuberneted: Update tag to string pointer PR 268
Bump github.com/spf13/viper from 1.11.0 to 1.12.0 PR 266
Bump govultr version from 2.16.0 to 2.17.1 PR 267

Obrigado!
-- 
Adriano Barbosa
Index: Makefile
===
RCS file: /cvs/ports/sysutils/vultr-cli/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile	11 May 2022 07:30:30 -	1.8
+++ Makefile	3 Jun 2022 19:34:10 -
@@ -1,7 +1,7 @@
 COMMENT =	Vultr Command Line Interface
 
 MODGO_MODNAME =	github.com/vultr/vultr-cli/v2
-MODGO_VERSION =	v2.14.0
+MODGO_VERSION =	v2.14.1
 
 DISTNAME =	vultr-cli-${MODGO_VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/vultr-cli/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo	11 May 2022 07:30:30 -	1.6
+++ distinfo	3 Jun 2022 19:34:11 -
@@ -26,8 +26,8 @@ SHA256 (go_modules/cloud.google.com/go/b
 SHA256 (go_modules/cloud.google.com/go/bigquery/@v/v1.7.0.mod) = HKRVvqUX0v5Jvzwvf+5NDNFa+penbMBDl5RGC4Hk8M0=
 SHA256 (go_modules/cloud.google.com/go/bigquery/@v/v1.8.0.mod) = toghopjskKDZvXw9jhgakkEk652JmdL6BXOk8VL6flU=
 SHA256 (go_modules/cloud.google.com/go/bigquery/@v/v1.8.0.zip) = iSsQkp1M+JsMjJiVwXze/2wNKPZeT/quZyWZdXLiEkk=
-SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.5.0.mod) = 4UJihoUhWISEjUvdFZK84kbCJfQDJ1RyePu2YFpkJ+8=
-SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.5.0.zip) = eToVHUHERu3EJWGjgVXmRFFODcwKV8p9jSYwkSBhKek=
+SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.6.1.mod) = AptruYw6E6qlwYlxymDZGBZujZwzDW0qJO8lwpfXOFM=
+SHA256 (go_modules/cloud.google.com/go/compute/@v/v1.6.1.zip) = /Zwp6ZrXY6utVRuDpBzqqw2lISsvaEtqwC+homoBSRQ=
 SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.0.0.mod) = A0xS+1OSg3+NsnVIX7DpXRDmzSUw3Ty2c9fTUJ4WsuY=
 SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.1.0.mod) = Yj/KeFSbpDuc5dHtTrHijciTKPpxM5eUBe4wnb0tt8A=
 SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.1.0.zip) = fa5WPcfC5USyKfMDIQOsBWhxIOjSVSGu8EtF80bsX/s=
@@ -69,6 +69,8 @@ SHA256 (go_modules/github.com/cncf/udpa/
 SHA256 (go_modules/github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.zip) = DiambexdlT0EROjnSTdPsIHdFHpsbinwrScVyR2bjMk=
 SHA256 (go_modules/github.com/coreos/go-semver/@v/v0.3.0.mod) = 7lARLbikHJ18hSy4jqSgh/IdaONnqPdq1u4Pt5rGvRw=
 SHA256 (go_modules/github.com/coreos/go-semver/@v/v0.3.0.zip) = svwHU5X/w0z/S5ZGgdCuPNIgls/K3Slw7qqHdZbOshA=
+SHA256 (go_modules/github.com/coreos/go-systemd/v22/@v/v22.3.2.mod) = 3pM5X+kwhvgFU4INFASJ4x6Tv+BFfhtN48dyVW1TSEA=
+SHA256 (go_modules/github.com/coreos/go-systemd/v22/@v/v22.3.2.zip) = ARNK6Jv0qRwX7rH4Ql4QZPm95kzzzgyc9Uap+h7iXmQ=
 SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.1.mod) = FMOvou9iNVXBtINNH4ixTfd1Sa/uheV1DBkQJGW3iro=
 SHA256 (go_modules/github.com/cpuguy83/go-md2man/v2/@v/v2.0.1.zip) = 9d7REwAx6Y3EvfF+RayJrS7q4wg9YVC21fP8dbnpzWs=
 SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.0.mod) = vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw=
@@ -84,13 +86,17 @@ SHA256 (go_modules/github.com/envoyproxy
 SHA256 (go_modules/github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip) = 7FJh87vEJtceK+THYGO6EkYMXSeEXWMHY+npEexHaK8=
 SHA256 (go_modules/github.com/fatih/color/@v/v1.13.0.mod) = 8KxJ/fh41LNolwJb+xhjni/mfYhM6o4yTlwZFWl/ixw=
 SHA256 (go_modules/github.com/fatih/color/@v/v1.13.0.zip) = jyKpKBbZRhsv+Wd1TTDpvIJ50EWvG3VYVOvnZehMqyA=
-SHA256 (go_modules/github.com/fsnotify/fsnotify/@v/v1.5.1.mod) = mn/ICQrE+gTWPC7XyOTQiji2gaG2HILX5dhGdqfSc4U=
-SHA256 (go_modules/github.com/fsnotify/fsnotify/@v/v1.5.1.zip) = 841+OVvEXwijTpWRycSQADH4HB3cfXYaeFy7uaruDbA=
+SHA256 (go_modules/github.com/frankban/quicktest/@v/v1.14.3.mod) = +e59KMX1SXjrR2GdVklcjNPLjI5u8UZ2iGDlLO7pMro=
+SHA256 (go_modules/github.com/frankban/quicktest/@v/v1.14.3.zip) = NQFL56zHneM8WHhdk3L0hwJVa/Nf2JBnw+y+30nC6Yc=
+SHA256 (go_modules/github.com/fsnotify/fsnotify/@v/v1.5.4.mod) = ot9L00+2Dm7S9LU/jl/jHkX7u87S5QLJ3LqLNPx2+ec=
+SHA256 (go_modules/github.com/fsnotify/fsnotify/@v/v1.5.4.zip) = sWWsMRbTaLrTPk9DPt6L281Z+sj+IuEXMA5Z0M/XR8E=
 SHA256 (go_modules/github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod) = UQstVL8si0jvh8XQVXb4dxIkx+fuKoWlqX6gGSVgPrc=
 SHA256 (go_modules/github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.zip) = lsaUxC57hm6o4m3Ei2EsTaqFgs5h/e776SwaTEYWMWk=
 SHA256 (go_modules/github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod) = 1WNuRK+jDUmMutczAQLwzsjeXbXGpwN25pxs/j4UNco=
 SHA256 (go_modules/github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod) = 1WNuRK+jDUmMutczAQLwzsjeXbXGpwN25pxs/j4UNco=
 SHA256 (go_modules/github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.zip) = L2oZYzl8t8PfZiV6RddfroYKqb

Re: [patch] Add font module in fonts/a* and fonts/b*

2022-06-03 Thread Juan Picca
On Mon, May 30, 2022 at 05:48:33AM -0600, Anthony J. Bentley wrote:
> Juan Picca writes:
> > 1. Define the variable `FONT_DOCDIR ?=  ${PREFIX}/share/doc/${TYPEFACE}`
> >   (suggested name; DOCDIR is better?) in the font module.
> > 2. If the variable `FONT_DOCFILES` (also a suggested name; or maybe
> >   DOCFILES?) is defined, add to the `do-install` the installation of the
> >   files under the `doc` directory:
>
> I've had the exact same idea. In fact, I would also like to introduce a
> FONT_FILES variable that can be set to a list of font files to install
> (including wildcards). The do-install would be closer to the typical
> do-install targets in font ports, and would obviate FONTTYPES completely.
What about the attached patch?

A second patch as an example of use in some fonts was added.
>From f0cb6badd9795383b3532c2253b36f5bba8bbf40 Mon Sep 17 00:00:00 2001
From: Juan Picca 
Date: Wed, 1 Jun 2022 22:47:47 -0300
Subject: [PATCH 1/2] Update font.port.mk

* Define FONT_DOCDIR directory for the typeface.
* Accepts DOC_FILES, a list of files to copy to the FONT_DOCDIR directory.
* Accepts FONT_FILES, a list of files to copy to the fonts directory used
  as an alternative to FONTTYPES.
---
 infrastructure/mk/font.port.mk | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/infrastructure/mk/font.port.mk b/infrastructure/mk/font.port.mk
index 95d4be75f33..e597460c8b0 100644
--- a/infrastructure/mk/font.port.mk
+++ b/infrastructure/mk/font.port.mk
@@ -14,16 +14,28 @@ PKGNAME ?=  ${TYPEFACE}-${VERSION}
 .  endif
 
 FONTDIR ?= ${PREFIX}/share/fonts/${TYPEFACE}
+FONT_DOCDIR ?= ${PREFIX}/share/doc/${TYPEFACE}
 
 FONTTYPES ?=   ttf
 
 FONT_DISTDIR ?=${WRKSRC}
 
-MODFONT_do-install = ${INSTALL_DATA_DIR} ${FONTDIR}; \
+MODFONT_do-install_FONTTYPES = ${INSTALL_DATA_DIR} ${FONTDIR}; \
for t in ${FONTTYPES}; do ${INSTALL_DATA} 
${FONT_DISTDIR}/${FONT_DISTSUBDIR}/*.$$t ${FONTDIR}; done
+MODFONT_do-install_FONTFILES = ${INSTALL_DATA_DIR} ${FONTDIR}; \
+   for f in ${FONT_FILES}; do ${INSTALL_DATA} ${FONT_DISTDIR}/$$f 
${FONTDIR}; done
+MODFONT_do-install_DOCFILES = ${INSTALL_DATA_DIR} ${FONT_DOCDIR}; \
+   for d in ${DOC_FILES}; do ${INSTALL_DATA} ${FONT_DISTDIR}/$$d 
${FONT_DOCDIR}; done
 
 .  if !target(do-install)
 do-install:
-   ${MODFONT_do-install}
+.if defined(FONT_FILES)
+   ${MODFONT_do-install_FONTFILES}
+.else
+   ${MODFONT_do-install_FONTTYPES}
+.endif
+.if defined(DOC_FILES)
+   ${MODFONT_do-install_DOCFILES}
+.endif
 .  endif
 .endif
-- 
2.36.1

>From 5fb58b87aabba903e9058ea4d7608613defeeb8b Mon Sep 17 00:00:00 2001
From: Juan Picca 
Date: Sat, 4 Jun 2022 00:43:55 -0300
Subject: [PATCH 2/2] Examples of use in some fonts

---
 fonts/alkalami/Makefile | 12 +++-
 fonts/amigafonts/Makefile   | 18 --
 fonts/anonymous-pro/Makefile| 18 +-
 fonts/apl-fonts/Makefile| 15 +++
 fonts/artwiz-aleczapka/Makefile | 23 ---
 fonts/cascadia-code/Makefile| 11 ---
 fonts/crimson/Makefile  | 14 +++---
 fonts/dina-fonts/Makefile   | 16 
 fonts/dina-fonts/pkg/PLIST  |  4 ++--
 fonts/gohufont/Makefile | 15 +--
 fonts/ibm-plex/Makefile | 23 +++
 fonts/juliamono/Makefile| 15 ---
 12 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/fonts/alkalami/Makefile b/fonts/alkalami/Makefile
index 5cf8f5ff5b9..ef66c04657f 100644
--- a/fonts/alkalami/Makefile
+++ b/fonts/alkalami/Makefile
@@ -1,8 +1,7 @@
 COMMENT =  Unicode font for African Arabic script
+TYPEFACE = alkalami
 V =1.300
 DISTNAME = Alkalami-${V}
-PKGNAME =  alkalami-${V}
-CATEGORIES =   fonts

 HOMEPAGE = https://software.sil.org/alkalami/
 MAINTAINER =   George Rosamond 
@@ -18,12 +17,7 @@ MODULES =font
 NO_BUILD = Yes
 NO_TEST =  Yes

-FONTDIR =  ${PREFIX}/share/fonts/alkalami
-DOCDIR =   ${PREFIX}/share/doc/alkalami
-
-do-install:
-   ${INSTALL_DATA_DIR} ${FONTDIR} ${DOCDIR}
-   ${INSTALL_DATA} ${WRKDIST}/*.ttf ${FONTDIR}
-   ${INSTALL_DATA} ${WRKDIST}/{FONTLOG.txt,README.txt} ${DOCDIR}
+FONT_FILES =   *.ttf
+DOC_FILES =FONTLOG.txt README.txt

 .include 
diff --git a/fonts/amigafonts/Makefile b/fonts/amigafonts/Makefile
index 441a99be09c..31e0d0fa62e 100644
--- a/fonts/amigafonts/Makefile
+++ b/fonts/amigafonts/Makefile
@@ -1,32 +1,30 @@
 COMMENT =  faithfully remade Amiga fonts
+TYPEFACE = amigafonts
+V =1.02

 GH_ACCOUNT =   rewtnull
 GH_PROJECT =   amigafonts
-GH_TAGNAME =   1.02
+GH_TAGNAME =   ${V}
 REVISION = 1
-
-CATEGORIES =   fonts
+EXTRACT_SUFX = .tar.gz

 HOMEPAGE = https://www.trueschool.se/html/fonts.html

 # GPL-FE
 PERMIT_PACKAG

Re: UPDATE: sysutils/coreutils 9.0 => 9.1

2022-06-03 Thread Brian Callahan
On 4/27/2022 7:20 PM, Brian Callahan wrote:
> Hi ports --
> 
> Attached is an update to the GNU coreutils.
> The NEWS file with the major changes is here:
> https://git.savannah.gnu.org/cgit/coreutils.git/tree/NEWS
> 
> All tests pass on amd64. Please test on other archs.
> 
> OK?
> 
> ~Brian

Ping. Diff reattached for convenience.

OK?

~Brian
Index: Makefile
===
RCS file: /cvs/ports/sysutils/coreutils/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile11 Mar 2022 19:57:18 -  1.24
+++ Makefile27 Apr 2022 23:17:23 -
@@ -1,6 +1,6 @@
 COMMENT =  file, shell and text manipulation utilities
 
-DISTNAME = coreutils-9.0
+DISTNAME = coreutils-9.1
 CATEGORIES =   sysutils
 
 MAINTAINER =   Brian Callahan 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/coreutils/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo5 Oct 2021 23:26:51 -   1.12
+++ distinfo27 Apr 2022 23:17:23 -
@@ -1,2 +1,2 @@
-SHA256 (coreutils-9.0.tar.xz) = zjCs30pBvFuzDdlV6eqnX6IWtOPesIiJ7TJDPHs7l84=
-SIZE (coreutils-9.0.tar.xz) = 5612752
+SHA256 (coreutils-9.1.tar.xz) = YaH0ENeLp+fzelpPUObRMgrKMzdUhKMlXt3xejhYBCM=
+SIZE (coreutils-9.1.tar.xz) = 5712104
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/coreutils/patches/patch-Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-Makefile_in
--- patches/patch-Makefile_in   11 Mar 2022 19:57:18 -  1.12
+++ patches/patch-Makefile_in   27 Apr 2022 23:17:23 -
@@ -3,7 +3,7 @@ XXX: Avoid rebuilding coreutils.info; ou
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -13254,6 +13254,7 @@ doc/$(am__dirstamp):
+@@ -20801,6 +20801,7 @@ doc/$(am__dirstamp):
@: > doc/$(am__dirstamp)
  
  $(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi 
$(doc_coreutils_TEXINFOS)
Index: patches/patch-src_ls_c
===
RCS file: patches/patch-src_ls_c
diff -N patches/patch-src_ls_c
--- patches/patch-src_ls_c  11 Mar 2022 19:57:18 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-https://github.com/coreutils/coreutils/commit/4cfd48481da0486e2bad193495bc38e7d5ead7e4
-
-Index: src/ls.c
 src/ls.c.orig
-+++ src/ls.c
-@@ -2273,7 +2273,7 @@ decode_switches (int argc, char **argv)
-   if (linelen < 0)
- {
-   /* Suppress bogus warning re comparing ws.ws_col to big integer.  */
--# if __GNUC_PREREQ (4, 6)
-+# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
- #  pragma GCC diagnostic push
- #  pragma GCC diagnostic ignored "-Wtype-limits"
- # endif
-@@ -2282,7 +2282,7 @@ decode_switches (int argc, char **argv)
-   && 0 <= ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws)
-   && 0 < ws.ws_col)
- linelen = ws.ws_col <= MIN (PTRDIFF_MAX, SIZE_MAX) ? ws.ws_col : 
0;
--# if __GNUC_PREREQ (4, 6)
-+# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
- #  pragma GCC diagnostic pop
- # endif
- }


[maintainer update] remind 4.0.0 -> 4.0.1

2022-06-03 Thread Martin Ziemer
This patch updates remind from 4.0.0 to 4.0.1.

Tested on amd64

Index: Makefile
===
RCS file: /cvs/ports/misc/remind/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile17 Apr 2022 02:02:28 -  1.57
+++ Makefile4 Jun 2022 05:24:39 -
@@ -1,7 +1,7 @@
 COMMENT=   scripting language for reminders, with a Tk front end
 
-DISTNAME=  remind-04.00.00
-PKGNAME=   remind-4.0.0
+DISTNAME=  remind-04.00.01
+PKGNAME=   remind-4.0.1
 
 CATEGORIES=misc
 
Index: distinfo
===
RCS file: /cvs/ports/misc/remind/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- distinfo13 Apr 2022 08:39:30 -  1.27
+++ distinfo4 Jun 2022 05:24:39 -
@@ -1,2 +1,2 @@
-SHA256 (remind-04.00.00.tar.gz) = I7bmsO3EAUnmo2KoIy5myxXuZB8tzs5kCEXpG550x8Y=
-SIZE (remind-04.00.00.tar.gz) = 462571
+SHA256 (remind-04.00.01.tar.gz) = NhXS7WpFbKuRFiAWDSy+g9PoYVQcpugLppQEF/S5WeI=
+SIZE (remind-04.00.01.tar.gz) = 464372



Re: new: devel/xsd

2022-06-03 Thread Rafael Sadowski
On Sun May 22, 2022 at 01:26:33AM +, Klemens Nanni wrote:
> Here's a new build dependency for my new libdigidocpp port, see ports@.
> 
> Works fine on amd64, although tests currently fail with 'Abort trap' in
> gmake(1)... this port is using a bundled "build-0.3" program, which is a
> "massively-parallel build system implemented on top of GNU make".
> 
> Feedback? OK?
> 
> 
>   Information for inst:xsd-4.1.0.a11
> 
>   Comment:
>   W3C XML Schema to C++ data binding compiler
> 
>   Description:
>   CodeSynthesis XSD is a W3C XML Schema to C++ translator.  It generates
>   vocabulary-specific, statically-typed C++ mappings (also called 
> bindings) from
>   XML Schema definitions.  XSD supports two C++ mappings: in-memory 
> C++/Tree and
>   event-driven C++/Parser.
> 
>   The C++/Tree mapping consists of C++ classes that represent data types 
> defined
>   in XML Schema, a set of parsing functions that convert XML documents to 
> a
>   tree-like in-memory object model, and a set of serialization functions 
> that
>   convert the object model back to XML.
> 
>   The C++/Parser mapping provides parser skeletons for data types defined 
> in XML
>   Schema. Using these parser skeletons you can build your own in-memory
>   representations or perform immediate processing of XML documents.
> 
>   Maintainer: Klemens Nanni 
> 
>   WWW: https://www.codesynthesis.com/products/xsd
> 
>   Install notice:
>   xsd is installed as xsdcxx(1) to avoid conflicts with lang/mono's 
> xsd(1).

Looks good but is .a11 a valid suffix? Will 4.2.0.a11 or xsd-4.1.0.a12
trigger an update?



Re: new: devel/xsd

2022-06-03 Thread Rafael Sadowski
On Sun May 22, 2022 at 01:26:33AM +, Klemens Nanni wrote:
> Here's a new build dependency for my new libdigidocpp port, see ports@.
> 
> Works fine on amd64, although tests currently fail with 'Abort trap' in
> gmake(1)... this port is using a bundled "build-0.3" program, which is a
> "massively-parallel build system implemented on top of GNU make".
> 
> Feedback? OK?
> 
> 
>   Information for inst:xsd-4.1.0.a11
> 
>   Comment:
>   W3C XML Schema to C++ data binding compiler
> 
>   Description:
>   CodeSynthesis XSD is a W3C XML Schema to C++ translator.  It generates
>   vocabulary-specific, statically-typed C++ mappings (also called 
> bindings) from
>   XML Schema definitions.  XSD supports two C++ mappings: in-memory 
> C++/Tree and
>   event-driven C++/Parser.
> 
>   The C++/Tree mapping consists of C++ classes that represent data types 
> defined
>   in XML Schema, a set of parsing functions that convert XML documents to 
> a
>   tree-like in-memory object model, and a set of serialization functions 
> that
>   convert the object model back to XML.
> 
>   The C++/Parser mapping provides parser skeletons for data types defined 
> in XML
>   Schema. Using these parser skeletons you can build your own in-memory
>   representations or perform immediate processing of XML documents.
> 
>   Maintainer: Klemens Nanni 
> 
>   WWW: https://www.codesynthesis.com/products/xsd
> 
>   Install notice:
>   xsd is installed as xsdcxx(1) to avoid conflicts with lang/mono's 
> xsd(1).

test core dumped

make test   


  (git)-[wayland-update] 
===>  Regression tests for xsd-4.1.0.a11
find: -printf: unknown option
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/built-in/driver
 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/built-in/test.xml
 | diff -u 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/built-in/output
 -
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/enumeration/driver
 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/enumeration/test.xml
 | diff -u 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/enumeration/output
 -
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/generated-impl/test-driver
 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/generated-impl/test.xml
 | diff -u 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/generated-impl/output
 -
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/list/driver
 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/list/test.xml
 | diff -u 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/list/output
 -
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/recursive/driver
 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/recursive/test.xml
 | diff -u 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/recursive/output
 -
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/name-clash/inheritance/driver
 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/name-clash/inheritance/test.xml
 | diff -u 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/name-clash/inheritance/output
 -
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/polymorphism/same-type/driver
 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/polymorphism/same-type/test.xml
 | diff -u 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/polymorphism/same-type/output
 -
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/polymorphism/recursive/driver
 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/polymorphism/recursive/test.xml
 | diff -u 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/polymorphism/recursive/output
 -
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/test-template/driver
 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/test-template/test.xml
 | diff -u 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/test-template/output
 -
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/validation/all/driver
 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/validation/all/test-000.xml
 | diff -u 
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/validation/all/test-000.std
 -
/usr/ports/pobj/xsd-4.1.0.a11/xsd-4.1.0.a11+dep/xsd/tests/cxx/parser/validation/all/dri