Re: update net/i2p

2024-06-11 Thread Stuart Henderson
On 2024/06/11 15:25, Solene Rapenne wrote:
> this updates i2p to the latest version
> 
> unfortunately, they did not publish a release/tag on GitHub and two
> weeks after I filled an issue about it
> https://github.com/i2p/i2p.i2p/issues/78
> I got no reply and there are still no tag done, so this patch switch
> to their official mirror instead of GitHub

No interest in i2p, but switching to a proper tarball from an
autogenerated git-archive tarball ia nearly always the right thing to
do.

> heavily tested on 7.5 and -current, works fine
> 
> diff --git a/net/i2p/Makefile b/net/i2p/Makefile
> index f8765fb1a4c..72530bb18a4 100644
> --- a/net/i2p/Makefile
> +++ b/net/i2p/Makefile
> @@ -1,9 +1,8 @@
>  COMMENT= i2p routing protocol
>  
> -GH_ACCOUNT=  i2p
> -GH_PROJECT=  i2p.i2p
> -GH_TAGNAME=  i2p-2.5.1
> -DISTNAME=${GH_TAGNAME}
> +V =  2.5.2
> +DISTNAME =   i2psource_${V}
> +PKGNAME =i2p-${V}
>  
>  CATEGORIES=  net
>  
> @@ -15,8 +14,12 @@ MAINTAINER=Pascal Stumpf 
>  # EPLv1.0 GPLv2 GPLv3 LGPLv2.1 LGPLv3 MIT public-domain WTFPLv2
>  PERMIT_PACKAGE=  Yes
>  
> +EXTRACT_SUFX =   .tar.bz2
> +
>  WANTLIB +=   gmp
>  
> +SITES =  https://files.i2p-projekt.de/${V}/
> +
>  MODULES= java
>  MODJAVA_VER= 1.8
>  MODJAVA_BUILD=   ant
> @@ -48,6 +51,8 @@ MAKE_ENV=   CC=${CC} BITS=${BITS} 
> MACHINE_ARCH=${MACHINE_ARCH}
>  # test requires addition dependencies (atleast: junit, hamcrest, jmockfit)
>  NO_TEST= Yes
>  
> +WRKDIST= ${WRKDIR}/i2p-${V}
> +
>  post-patch:
>   ${SUBST_CMD} ${WRKSRC}/installer/resources/wrapper.config
>   ${SUBST_CMD} ${WRKSRC}/installer/resources/i2prouter
> diff --git a/net/i2p/distinfo b/net/i2p/distinfo
> index 51c78797fb6..0141daa6cb3 100644
> --- a/net/i2p/distinfo
> +++ b/net/i2p/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (i2p-2.5.1.tar.gz) = 0gluxFWJoi4IDhibrAPQkuIDe0qg7615Xs0NFhoTaIw=
> -SIZE (i2p-2.5.1.tar.gz) = 38419885
> +SHA256 (i2psource_2.5.2.tar.bz2) = 
> 8j0HRtcqVczL0X9Adi5JGuG0LN9V1+c0BNITqEmFynM=
> +SIZE (i2psource_2.5.2.tar.bz2) = 33791390
> 



Re: security/py-mitmproxy: new port (version 10.3.0)

2024-06-10 Thread Stuart Henderson
- main port is a standalone tool that happens to be written in python so
would be better as mitmproxy rather than py-mitmproxy (and get rid of
FLAVOR/FLAVORS)
- no An / trailing . in COMMENT
- there's a proper distfile so please use that instead of github:
https://downloads.mitmproxy.org/10.3.0/mitmproxy-10.3.0.tar.gz

On 2024/06/11 00:03, Kirill A. Korinsky wrote:
> ports@,
> 
> Here a new port security/py-mitmproxy and security/py-mitmproxy_rs which I'd
> like to send as one part because this two ports are logically linked
> together and the last one is useless without the first one.

btw, I think generally it would have be helpful to include the set of
dependencies with the main port too; splitting across half a dozen or so
emails makes it harder to keep track of them all, and someone testing
this will need to look at the others.

I'll try to look at the others but din't have all that much time atm.

> mitmproxy is an interactive, SSL/TLS-capable intercepting proxy with a
> console interface for HTTP/1, HTTP/2, and WebSockets. It contains also
> mitmdump which is the command-line version of mitmproxy. Think tcpdump for
> HTTP. And mitmweb which is a web-based interface for mitmproxy.
> 
> Homepage: https://mitmproxy.org/
> 
> -- 
> wbr, Kirill




CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 15:27:14

Modified files:
misc/openhab-addons: Makefile distinfo 
misc/openhab-addons/pkg: PLIST 

Log message:
update to openhab-addons-4.1.3



CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 15:27:12

Modified files:
misc/openhab   : Makefile distinfo 
misc/openhab/pkg: README 

Log message:
update to openhab-4.1.3



CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 15:25:14

Modified files:
x11/windowmaker: Makefile 

Log message:
add missing deps



CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 15:17:41

Modified files:
devel/py-twisted: Makefile 

Log message:
add missing TDEP, from Kirill A. Korinsky



CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 04:38:58

Modified files:
devel/py-types-psutil: Makefile 
devel/py-types-setuptools: Makefile 

Log message:
fix license marker (Apache 2.0), from daniel



CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 04:36:17

Modified files:
devel/py-mypy  : Makefile distinfo 
devel/py-mypy/pkg: DESCR PLIST 

Log message:
update to py3-mypy-1.10.0



CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 04:36:06

Modified files:
devel  : Makefile 

Log message:
+py-types-psutil, py-types-setuptools



CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 04:35:03

Log message:
import py-types-psutil, ok landry daniel

This is a PEP 561 type stub package for the 'psutil' package.
It can be used by type-checking tools like mypy, pyright, pytype,
PyCharm, etc. to check code that uses psutil.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20240610

N ports/devel/py-types-psutil/Makefile
N ports/devel/py-types-psutil/distinfo
N ports/devel/py-types-psutil/pkg/DESCR
N ports/devel/py-types-psutil/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 04:34:28

Modified files:
devel/py-setuptools: Makefile 

Log message:
add comment about keeping py-types-setuptools in sync



CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 04:32:55

Log message:
import py-types-setuputils, ok landry daniel

This is a PEP 561 type stub package for the 'setuptools' package.
It can be used by type-checking tools like mypy, pyright, pytype,
PyCharm, etc. to check code that uses setuptools.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20240610

N ports/devel/py-types-setuptools/Makefile
N ports/devel/py-types-setuptools/distinfo
N ports/devel/py-types-setuptools/pkg/DESCR
N ports/devel/py-types-setuptools/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2024-06-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/10 04:31:37

Modified files:
devel/llvm/13  : Makefile 

Log message:
tidy lldb remnants, from brad



Re: new port: mail/p5-Email-Outlook-Message

2024-06-10 Thread Stuart Henderson
OK (whoever imports, beware the CVS dirs in the tar)


On 2024/06/10 04:00, Abel Abraham Camarillo Ojeda wrote:
> 
> 
> On Fri, Jun 7, 2024 at 2:20 PM Stuart Henderson  wrote:
> 
> Added automatically if you set 
> 
> MAKE_ENV= TEST_POD=1
> 
> -- 
>   Sent from a phone, apologies for poor formatting.
> 
> 
> 
> Now with MAKE_ENV= TEST_POD=1 as Stuart mentioned:
> 
> ===>  Regression tests for p5-Email-Outlook-Message-0.921
> PERL_DL_NONLAZY=1 "/usr/bin/perl" "-MExtUtils::Command::MM" "-MTest::Harness" 
> "-e" "undef
> *Test::Harness::Switches; test_harness(0, 'blib/lib', 'blib/arch')" t/*.t
> t/basics.t ... ok
> t/charset.t .. ok
> t/full_structure.t ... ok
> t/gpg_signed.t ... ok
> t/internals.t  ok
> t/plain_jpeg_attached.t .. ok
> t/plain_uc_unsent.t .. ok
> t/plain_uc_wc_unsent.t ... ok
> t/plain_unsent.t . ok
> t/pod_coverage.t . ok
> All tests successful.
> Files=10, Tests=122,  2 wallclock secs ( 0.05 usr  0.05 sys +  1.52 cusr  
> 0.42 csys =  2.04
> CPU)
> Result: PASS
>  
> port tgz attached
> 




Re: [new] archivers/py-zstandard

2024-06-09 Thread Stuart Henderson
I'd expect cffi to use dlopen not static linking. We normally record those 
as LIB_DEPENDS and WANTLIB with a comment next to the WANTLIB saying "uses 
dlopen" (check-lib-depends will say 'Extra' in that case).


--
 Sent from a phone, apologies for poor formatting.

On 8 June 2024 00:04:57 Kirill A. Korinsky  wrote:


ports@,

Here the new port archivers/py-zstandard which is part of dependency tree of
security/wapiti which I'm working to update and fix

Unfortently I can't fix tests and make test fails as:

 ImportError while importing test module 
 '/usr/ports/pobj/py-zstandard-0.22.0-python3/zstandard-0.22.0/tests/test_open.py'.

 Hint: make sure your test modules/packages have valid Python names.
 Traceback:
 /usr/local/lib/python3.11/importlib/__init__.py:126: in import_module
 return _bootstrap._gcd_import(name[level:], package, level)
 tests/test_open.py:6: in 
 import zstandard as zstd
 zstandard/__init__.py:39: in 
 from .backend_c import *  # type: ignore
 E   ModuleNotFoundError: No module named 'zstandard.backend_c'
 ___ ERROR collecting tests/test_train_dictionary.py 
 


I have no idea how to fix it, but I've tested on -current/amd64 by hand and
it works.

Also, to avoid static linking against zstd I disabled CFFI part of that
library, but so-called C-backend works well.

--
wbr, Kirill




CVS: cvs.openbsd.org: ports

2024-06-08 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/08 06:14:07

Modified files:
lang/php/8.1   : Tag: OPENBSD_7_5 Makefile distinfo 

Log message:
update to php-8.1.29



CVS: cvs.openbsd.org: ports

2024-06-08 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/08 06:14:00

Modified files:
lang/php/8.2   : Tag: OPENBSD_7_5 Makefile distinfo 
lang/php/8.2/patches: Tag: OPENBSD_7_5 patch-configure_ac 

Log message:
update to php-8.2.20



CVS: cvs.openbsd.org: ports

2024-06-08 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/08 06:13:52

Modified files:
lang/php/8.3   : Tag: OPENBSD_7_5 Makefile distinfo 
lang/php/8.3/patches: Tag: OPENBSD_7_5 patch-configure_ac 

Log message:
update to php-8.3.8



CVS: cvs.openbsd.org: ports

2024-06-08 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/08 06:13:30

Modified files:
lang/php/8.1   : Makefile distinfo 

Log message:
update to php-8.1.29



CVS: cvs.openbsd.org: ports

2024-06-08 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/08 06:13:23

Modified files:
lang/php/8.3   : Makefile distinfo 
lang/php/8.3/patches: patch-configure_ac 

Log message:
update to php-8.3.8



CVS: cvs.openbsd.org: ports

2024-06-08 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/08 06:13:26

Modified files:
lang/php/8.2   : Makefile distinfo 
lang/php/8.2/patches: patch-configure_ac 

Log message:
update to php-8.2.20



CVS: cvs.openbsd.org: ports

2024-06-08 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/08 05:19:18

Modified files:
lang/lucee/v6  : Makefile distinfo 

Log message:
update to lucee-6.0.2.45



CVS: cvs.openbsd.org: ports

2024-06-08 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/08 05:19:14

Modified files:
lang/lucee/v5  : Makefile distinfo 

Log message:
update to lucee-5.4.6.9



CVS: cvs.openbsd.org: ports

2024-06-08 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/08 05:09:48

Modified files:
devel/llvm : Makefile.inc 
devel/llvm/13  : Makefile 
Removed files:
devel/llvm/13/pkg: DESCR-lldb PLIST-lldb 

Log message:
totally remove lldb for llvm 13 rather than using no_lldb (dpb's "build
once" mechanism gets in the way of what I tried to do).



CVS: cvs.openbsd.org: ports

2024-06-08 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/08 05:07:37

Modified files:
www/trac   : Makefile 

Log message:
add missing rdep (setuptools, for pkg_resources), pointed out by Sven F



Re: new port: mail/p5-Email-Outlook-Message

2024-06-07 Thread Stuart Henderson

Added automatically if you set

MAKE_ENV= TEST_POD=1

--
 Sent from a phone, apologies for poor formatting.

On 7 June 2024 16:54:49 giova...@paclan.it wrote:


On 6/6/24 9:35 AM, Abel Abraham Camarillo Ojeda wrote:

Hi porters

I need this port to use msgconvert utility to transform .msg (outlook) 
files to plaintext .eml files


`make test` pass in amd64, I was also able to read some output .eml files.


I would add devel/p5-Test-Pod-Coverage to TEST_DEPENDS.
ok giovanni@ anyway.

 Cheers
  Giovanni


===>  Regression tests for p5-Email-Outlook-Message-0.921
PERL_DL_NONLAZY=1 "/usr/bin/perl" "-MExtUtils::Command::MM" 
"-MTest::Harness" "-e" "undef *Test::Harness::Switches; test_harness(0, 
'blib/lib', 'blib/arch')" t/*.t

t/basics.t ... ok
t/charset.t .. ok
t/full_structure.t ... ok
t/gpg_signed.t ... ok
t/internals.t  ok
t/plain_jpeg_attached.t .. ok
t/plain_uc_unsent.t .. ok
t/plain_uc_wc_unsent.t ... ok
t/plain_unsent.t . ok
t/pod_coverage.t . skipped: Test::Pod::Coverage required for 
testing pod coverage

All tests successful.
Files=10, Tests=118,  2 wallclock secs ( 0.05 usr  0.02 sys +  1.42 cusr  
0.36 csys =  1.85 CPU)

Result: PASS

Please tell if I'm missing something

port attached

kind regards~




Re: [new] archivers/py-brotlicffi: version 1.1.0.0

2024-06-07 Thread Stuart Henderson
Missing LIB_DEPENDS.

On 2024/06/07 13:44, Kirill A. Korinsky wrote:
> ports@,
> 
> I'm working to update and fix security/wapiti and it requires to import some
> new pythong ports.
> 
> Here the first in the list: archivers/py-brotlicffi which I linked against
> ports brotli instead of shiped version.
> 
> Anyway make port-lib-depends-check complains on this port as:
> 
>   py3-brotlicffi-1.1.0.0(archivers/py-brotlicffi,python3):
>   Bogus WANTLIB: brotlidec.1 
> (/usr/local/lib/python3.11/site-packages/brotlicffi/_brotlicffi.abi3.so) (NOT 
> REACHABLE)
>   Bogus WANTLIB: brotlienc.1 
> (/usr/local/lib/python3.11/site-packages/brotlicffi/_brotlicffi.abi3.so) (NOT 
> REACHABLE)
>   *** Error 1 in target 'port-lib-depends-check' (ignored)
> 
> and I have no udea how to fix it.
> 
> Thanks.
> 
> --
> wbr, Kirill




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

2024-06-07 Thread Stuart Henderson
On 2024/06/07 13:26, Sergey A. Osokin wrote:
> Hello,
> 
> could you please provide an update.

Update is: There's been no reply from the maintainer yet. But it's
only been a few days.

> Thank you.
> 
> -- 
> Sergey A. Osokin
> 
> On Sat, Jun 01, 2024 at 06:30:04PM +, Sergey A. Osokin wrote:
> [...]
> > 
> > here's the patch to update www/nginx third-party modules to their
> > recent versions.
> 
> [...]
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/nginx/Makefile,v
> > diff -u -p -r1.179 Makefile
> > --- Makefile30 May 2024 12:41:00 -  1.179
> > +++ Makefile1 Jun 2024 18:27:07 -
> > @@ -22,8 +22,8 @@ VERSION=  1.26.1
> >  DISTNAME=  nginx-${VERSION}
> >  CATEGORIES=www
> >  
> > -VERSION-njs=   0.8.2
> > -VERSION-rtmp=  1.2.1
> > +VERSION-njs=   0.8.4
> > +VERSION-rtmp=  1.2.2
> >  
> >  PKGNAME-main=  ${DISTNAME}
> >  PKGNAME-image_filter=  nginx-image_filter-${VERSION}
> > @@ -41,6 +41,8 @@ PKGNAME-passenger=nginx-passenger-${VER
> >  PKGNAME-rtmp=  nginx-rtmp-${VERSION}
> >  PKGNAME-securelink=nginx-securelink-${VERSION}
> >  
> > +REVISION-main= 0
> > +
> >  ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
> >  
> >  SITES= https://nginx.org/download/
> > @@ -55,8 +57,8 @@ _GH_MODS= \
> > kvspb   nginx-auth-ldap 
> > 83c059b73566c2ee9cbda920d91b66657cf120b7 \
> > arutnginx-rtmp-module   v${VERSION-rtmp} \
> > nginx   njs ${VERSION-njs} \
> > -   simpl   ngx_devel_kit   v0.3.0 \
> > -   leevngx_http_geoip2_module  3.3 \
> > +   vision5 ngx_devel_kit   v0.3.3 \
> > +   leevngx_http_geoip2_module  3.4 \
> > nginx-modules   ngx_http_hmac_secure_link_module 
> > 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
> >  
> >  .for _a _p _c in ${_GH_MODS}
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/www/nginx/distinfo,v
> > diff -u -p -r1.85 distinfo
> > --- distinfo30 May 2024 12:41:00 -  1.85
> > +++ distinfo1 Jun 2024 18:27:07 -
> > @@ -4,19 +4,19 @@ SHA256 (naxsi-d714f1636ea49a9a9f4f06dba1
> >  SHA256 (nginx-1.20.1-chroot.patch) = 
> > SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
> >  SHA256 (nginx-1.26.1.tar.gz) = +Rh0aP8usVkmC/1Thnwl/44zRyYjes8ie56HDlPT42s=
> >  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 (ngx_http_geoip2_module-3.3.tar.gz) = 
> > QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
> > +SHA256 (nginx-rtmp-module-v1.2.2.tar.gz) = 
> > B/Gbe//sXjV7uIIMY+UoHevUX1oubUaxY22SAsPgnXg=
> > +SHA256 (ngx_devel_kit-v0.3.3.tar.gz) = 
> > +qL81RaLEHZNNQgTVlEdX4TbXFJqGqS2rdLblLaFOys=
> > +SHA256 (ngx_http_geoip2_module-3.4.tar.gz) = 
> > rXL8IzSNcVozCZSYRTH6ubNgbhYEgyNnN/mkppV9lFI=
> >  SHA256 
> > (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> >  = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
> > -SHA256 (njs-0.8.2.tar.gz) = bxc4fbjfkLbjOC0oBFWWL/hforGjLZHCzh/Rr1qFTXI=
> > +SHA256 (njs-0.8.4.tar.gz) = /hl+JUIEwV6fHfCs83Wt1XvjQWkB7I17hzGdzLSQ+Q0=
> >  SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
> >  SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> >  SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
> >  SIZE (nginx-1.20.1-chroot.patch) = 8783
> >  SIZE (nginx-1.26.1.tar.gz) = 1244738
> >  SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 
> > 18542
> > -SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
> > -SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
> > -SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
> > +SIZE (nginx-rtmp-module-v1.2.2.tar.gz) = 519934
> > +SIZE (ngx_devel_kit-v0.3.3.tar.gz) = 66561
> > +SIZE (ngx_http_geoip2_module-3.4.tar.gz) = 8877
> >  SIZE 
> > (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> >  = 6159
> > -SIZE (njs-0.8.2.tar.gz) = 733916
> > +SIZE (njs-0.8.4.tar.gz) = 743910
> 



Re: CVS: cvs.openbsd.org: ports

2024-06-07 Thread Stuart Henderson
On 2024/06/06 21:11, Antoine Jacoutot wrote:
> On Wed, Jun 05, 2024 at 05:47:39PM -0600, Stuart Henderson wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: st...@cvs.openbsd.org   2024/06/05 17:47:39
> > 
> > Modified files:
> > devel/llvm/13  : Makefile 
> > 
> > Log message:
> > disable lldb for llvm/13, afaik this pprt is only there until gcc
> > build can be fixed with newer clang on i386, and building lldb has
> > problems with forthcoming opaque stdio diffs.
> 
> Failed to package.
> Log attached.

I don't understand why dpb tries to build that - the only port depending
on ,-lldb is rust-gdb but that uses llvm/16, and without a dependency on
that, why would it try to build?

$ make show='BUILD_PACKAGES PKGNAMES'
===> devel/llvm/13
 -main -python
llvm-13.0.0p29 py3-llvm-13.0.0p6
===> devel/llvm/16
 -main -python -lldb
llvm-16.0.6p27 py3-llvm-16.0.6p3 lldb-16.0.6p6
===> devel/llvm/17
 -main -python -lldb
llvm-17.0.6p9 py3-llvm-17.0.6p1 lldb-17.0.6p2

Otherwise we can try the diff below, though I don't think it is quite
how no_XX should be used, or just get rid of the lldb subpackage
completely for 13.

Index: Makefile.inc
===
RCS file: /cvs/ports/devel/llvm/Makefile.inc,v
diff -u -p -r1.16 Makefile.inc
--- Makefile.inc5 Jun 2024 23:43:07 -   1.16
+++ Makefile.inc7 Jun 2024 12:22:50 -
@@ -35,8 +35,6 @@ WANTLIB +=${COMPILER_LIBCXX} c edit exe
 SITES =
https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/
 EXTRACT_SUFX = .tar.xz
 
-MULTI_PACKAGES =   -main -python -lldb
-
 PSEUDO_FLAVORS =   no_lldb
 FLAVOR ?=
 
@@ -63,8 +61,10 @@ RUN_DEPENDS +=   lang/gcc/${MODGCC4_VERSIO
 
 .if ${FLAVOR:Mno_lldb}
 PROJECTS = clang;lld
+MULTI_PACKAGES =   -main -python
 .else
 PROJECTS = clang;lld;lldb
+MULTI_PACKAGES =   -main -python -lldb
 .endif
 
 CONFIGURE_STYLE += cmake



Re: [update] lang/go to 1.22.4; add missed syscall.EBADMSG

2024-06-07 Thread Stuart Henderson
On 2024/06/07 01:04, Kirill A. Korinsky wrote:
> I also included trivial patches to add missed syscall.EBADMSG on 386, amd64
> and arm which allows to remove dozen of patches from port tree.

slight exaggeration... 7 patches in docker-compose and 7 in
docker-buildx, all because of github.com/tonistiigi/fsutil.

afaik they're meant to be getting these from golang.org/x/sys/unix
(where EBADMSG *is* present for all OpenBSD platforms) rather than
go itself anyway?


> 
> Tested on -current/amd64.
> 
> diff --git lang/go/Makefile lang/go/Makefile
> index 87e960b38a5..4213793cbf5 100644
> --- lang/go/Makefile
> +++ lang/go/Makefile
> @@ -7,7 +7,7 @@ COMMENT = Go programming language
>  
>  # increment _MODGO_SYSTEM_VERSION in go.port.mk after updating to a new
>  # version, to trigger updates of go-compiled ports
> -VERSION =1.22.3
> +VERSION =1.22.4
>  DISTNAME =   go${VERSION}.src
>  PKGNAME =go-${VERSION}
>  PKGSPEC =${FULLPKGNAME:S/go-/go-=/}
> diff --git lang/go/distinfo lang/go/distinfo
> index a70f909087a..28eabcd6e3d 100644
> --- lang/go/distinfo
> +++ lang/go/distinfo
> @@ -4,11 +4,11 @@ SHA256 (go-openbsd-arm-bootstrap-1.20.4.tar.gz) = 
> MFK9DdbKJSqyYFLANhKbD6KWT1x+wX
>  SHA256 (go-openbsd-arm64-bootstrap-1.20.4.tar.gz) = 
> G3sZhx63D+QLEgbwU1+d3ECiVJjVrFD5RqD2/qutXmI=
>  SHA256 (go-openbsd-mips64-bootstrap-1.20.4.tar.gz) = 
> CaZYJ+pIQp+lp721Ox45Y8uqkbsygcfyDFxQsqabPIs=
>  SHA256 (go-openbsd-riscv64-bootstrap-1.20.4.tar.gz) = 
> lQv/8KPWi8U3yLG+k3xVDNRVzxa5rmPIIpJUDrwVo0o=
> -SHA256 (go1.22.3.src.tar.gz) = gGSO80+QMZPXKlnA3/AZ9fmK4MmqE63gsOy/+ZGnb2g=
> +SHA256 (go1.22.4.src.tar.gz) = /tcgZ45yinyjC6jR3tHKr+J9FgKPqwIyuLqOIgCPt4Q=
>  SIZE (go-openbsd-386-bootstrap-1.20.4.tar.gz) = 100681343
>  SIZE (go-openbsd-amd64-bootstrap-1.20.4.tar.gz) = 107075675
>  SIZE (go-openbsd-arm-bootstrap-1.20.4.tar.gz) = 104680775
>  SIZE (go-openbsd-arm64-bootstrap-1.20.4.tar.gz) = 102706601
>  SIZE (go-openbsd-mips64-bootstrap-1.20.4.tar.gz) = 105352848
>  SIZE (go-openbsd-riscv64-bootstrap-1.20.4.tar.gz) = 106167229
> -SIZE (go1.22.3.src.tar.gz) = 27552410
> +SIZE (go1.22.4.src.tar.gz) = 2703
> diff --git lang/go/patches/patch-src_syscall_zerrors_openbsd_386_go 
> lang/go/patches/patch-src_syscall_zerrors_openbsd_386_go
> new file mode 100644
> index 000..58d7b282dc6
> --- /dev/null
> +++ lang/go/patches/patch-src_syscall_zerrors_openbsd_386_go
> @@ -0,0 +1,11 @@
> +Index: src/syscall/zerrors_openbsd_386.go
> +--- src/syscall/zerrors_openbsd_386.go.orig
>  src/syscall/zerrors_openbsd_386.go
> +@@ -1330,6 +1330,7 @@ const (
> + EALREADY= Errno(0x25)
> + EAUTH   = Errno(0x50)
> + EBADF   = Errno(0x9)
> ++EBADMSG = Errno(0x5c)
> + EBADRPC = Errno(0x48)
> + EBUSY   = Errno(0x10)
> + ECANCELED   = Errno(0x58)
> diff --git lang/go/patches/patch-src_syscall_zerrors_openbsd_amd64_go 
> lang/go/patches/patch-src_syscall_zerrors_openbsd_amd64_go
> new file mode 100644
> index 000..3027cd91787
> --- /dev/null
> +++ lang/go/patches/patch-src_syscall_zerrors_openbsd_amd64_go
> @@ -0,0 +1,11 @@
> +Index: src/syscall/zerrors_openbsd_amd64.go
> +--- src/syscall/zerrors_openbsd_amd64.go.orig
>  src/syscall/zerrors_openbsd_amd64.go
> +@@ -1329,6 +1329,7 @@ const (
> + EALREADY= Errno(0x25)
> + EAUTH   = Errno(0x50)
> + EBADF   = Errno(0x9)
> ++EBADMSG = Errno(0x5c)
> + EBADRPC = Errno(0x48)
> + EBUSY   = Errno(0x10)
> + ECANCELED   = Errno(0x58)
> diff --git lang/go/patches/patch-src_syscall_zerrors_openbsd_arm_go 
> lang/go/patches/patch-src_syscall_zerrors_openbsd_arm_go
> new file mode 100644
> index 000..f0ffcb34cbc
> --- /dev/null
> +++ lang/go/patches/patch-src_syscall_zerrors_openbsd_arm_go
> @@ -0,0 +1,11 @@
> +Index: src/syscall/zerrors_openbsd_arm.go
> +--- src/syscall/zerrors_openbsd_arm.go.orig
>  src/syscall/zerrors_openbsd_arm.go
> +@@ -1329,6 +1329,7 @@ const (
> + EALREADY= Errno(0x25)
> + EAUTH   = Errno(0x50)
> + EBADF   = Errno(0x9)
> ++EBADMSG = Errno(0x5c)
> + EBADRPC = Errno(0x48)
> + EBUSY   = Errno(0x10)
> + ECANCELED   = Errno(0x58)
> diff --git lang/go/pkg/PLIST lang/go/pkg/PLIST
> index 10203640095..6ab40404a65 100644
> --- lang/go/pkg/PLIST
> +++ lang/go/pkg/PLIST
> @@ -188,6 +188,7 @@ go/src/archive/zip/reader_test.go
>  go/src/archive/zip/register.go
>  go/src/archive/zip/struct.go
>  go/src/archive/zip/testdata/
> +go/src/archive/zip/testdata/comment-truncated.zip
>  go/src/archive/zip/testdata/crc32-not-streamed.zip
>  go/src/archive/zip/testdata/dd.zip
>  go/src/archive/zip/testdata/dupdir.zip
> @@ -2576,6 +2577,7 @@ go/src/cmd/go/testdata/script/gopath_std_vendor.txt
>  go/src/cmd/go/testdata/script/gopath_vendor_dup_err.txt
>  

[s...@spacehopper.org: warzone2100: picks up glslc from shaderc]

2024-06-06 Thread Stuart Henderson
this is still a problem:

- Forwarded message from Stuart Henderson  -

From: Stuart Henderson 
Date: Thu, 9 May 2024 09:31:40 +0100
To: ports 
Subject: warzone2100: picks up glslc from shaderc
Mail-Followup-To: ports 

Can someone take a look at this please?

[53/1508] cd /pobj/warzone2100-4.3.2/warzone2100/data/base/shaders/vk && 
/usr/local/bin/glslc -c 
/pobj/warzone2100-4.3.2/warzone2100/data/base/shaders/vk/button.frag -o 
/pobj/warzone2100-4.3.2/build-i386/data/base/shaders/vk/button.frag.spv
FAILED: data/base/shaders/vk/button.frag.spv 
/pobj/warzone2100-4.3.2/build-i386/data/base/shaders/vk/button.frag.spv 
cd /pobj/warzone2100-4.3.2/warzone2100/data/base/shaders/vk && 
/usr/local/bin/glslc -c 
/pobj/warzone2100-4.3.2/warzone2100/data/base/shaders/vk/button.frag -o 
/pobj/warzone2100-4.3.2/build-i386/data/base/shaders/vk/button.frag.spv
/bin/sh: /usr/local/bin/glslc: not found
ninja: build stopped: subcommand failed.

glslc is mentioned in the Makefile, where vulkan is disabled,
so maybe it makes sense to enable that too.


- End forwarded message -



Re: [update] devel/cryptopp to 8.9.0

2024-06-06 Thread Stuart Henderson
On 2024/06/05 23:55, Kirill A. Korinsky wrote:
> -SHARED_LIBS =cryptopp7.0
> +SHARED_LIBS =cryptopp9.0

committed, I changed SHARED_LIBS to 8.0 not 9.0



CVS: cvs.openbsd.org: ports

2024-06-06 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/06 09:36:24

Modified files:
devel/cryptopp : Makefile distinfo 

Log message:
update to cryptopp-8.9.0, from Kirill A. Korinsky



Re: Windowmaker

2024-06-06 Thread Stuart Henderson
On 2024/06/06 17:19, Aleksandr Mikhaylov wrote:
> Hi.
> 
> There was a windowmaker port update brought here last september, 
> https://www.mail-archive.com/ports@openbsd.org/msg120442.html
> but for some reason this still hasn't made it into the ports tree.
> 
> Why? Is there any way to bring it in, 
> because I have to mess around with patches.
> 
> Thanks!
> 

done.



CVS: cvs.openbsd.org: ports

2024-06-06 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/06 08:28:44

Modified files:
x11/windowmaker: Makefile distinfo 
x11/windowmaker/patches: patch-WINGs_Makefile_in 
 patch-WINGs_wapplication_c 
 patch-WPrefs_app_Appearance_c 
 patch-WPrefs_app_Makefile_in 
 patch-WPrefs_app_Menu_c 
 patch-WPrefs_app_Paths_c 
 patch-WindowMaker_Defaults_Makefile_in 
 patch-WindowMaker_Makefile_in 
 patch-configure patch-m4_windowmaker_m4 
 patch-m4_wm_i18n_m4 patch-src_startup_c 
x11/windowmaker/pkg: PLIST-lang PLIST-main 

Log message:
update to windowmaker-0.96.0, from Joel Carnat, "builds and works
fine" for maintainer



Re: ancient multimedia/imagination

2024-06-06 Thread Stuart Henderson

sqlite3 /use/local/share/sqlports

select * from wantlib where value like 'sox%'

(Don't just search with "= 'sox'" in case a port has a library version spec 
using >).


--
 Sent from a phone, apologies for poor formatting.

On 6 June 2024 14:51:13 Jan Stary  wrote:


On Jun 06 15:45:24, h...@stare.cz wrote:

multimedia/imagination is at version 3.0
which means it hasn;t been updated in 13 years.
Does that mean it is safe to remove it?

The real reason I ask is because this seems to be
the only user of libsox (audio/sox), to do a five second fade out.


Hm, multimedia/mlt7 too.

Besides a naive grep and my weary eyes,
What is the canocnical way to find out
which ports require a given library (WANTLIB = sox)?

Thank you

 Jan




CVS: cvs.openbsd.org: ports

2024-06-06 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/06 08:04:36

Modified files:
net/tcpflow: Makefile distinfo 
net/tcpflow/patches: patch-doc_tcpflow_1_in 
Added files:
net/tcpflow/patches: patch-configure_ac 
 patch-src_be13_api_bulk_extractor_i_h 
 patch-src_datalink_cpp patch-src_tcpflow_h 
 patch-src_wifipcap_wifipcap_cpp 
 patch-src_wifipcap_wifipcap_h 
Removed files:
net/tcpflow/patches: patch-src_datalink_c patch-src_main_c 
 patch-src_util_c 

Log message:
update to tcpflow-1.6.1, from Kirill A. Korinsky (taking maintainer)



Re: [update] net/tcpslice to 1.7

2024-06-06 Thread Stuart Henderson
On 2024/06/06 00:26, Kirill A. Korinsky wrote:
> Greetings,
> 
> Here an update of net/tcpslice from 10 years old snapshot to the last
> release from January which requires to increase epoch.
> 
> All pathces do not required anymore.

Are you sure about that? OpenBSD's pcap is non-standard and uses
bpf_timeval which is _not_ the same as timeval. (Other OS use timeval
when dealing with packet headers, but use a different struct when
writing timevals to disk).

> Tested on -current/amd64.
> 
> diff --git net/tcpslice/Makefile net/tcpslice/Makefile
> index 1ada4b809be..bddf9a126e0 100644
> --- net/tcpslice/Makefile
> +++ net/tcpslice/Makefile
> @@ -1,11 +1,12 @@
>  COMMENT= tool for extracting and gluing pcap (tcpdump) files
>  
> +V=   1.7
>  GH_ACCOUNT=  the-tcpdump-group
>  GH_PROJECT=  tcpslice
> -GH_COMMIT=   2837b722f0a6150971b327a252a59c64b24b9640
> +GH_COMMIT=   tcpslice-${V}
>  
> -DISTNAME=tcpslice-20140501
> -REVISION=1
> +DISTNAME=tcpslice-${V}
> +EPOCH=   0
>  CATEGORIES=  net
>  
>  HOME_PAGE=   https://github.com/the-tcpdump-group/tcpslice
> @@ -17,7 +18,11 @@ PERMIT_PACKAGE=Yes
>  WANTLIB= c pcap
>  
>  SEPARATE_BUILD=  Yes
> -CONFIGURE_STYLE=gnu
> +
> +AUTOCONF_VERSION=2.71
> +AUTOMAKE_VERSION=1.16
> +
> +CONFIGURE_STYLE=autoreconf
>  
>  NO_TEST= Yes
>  
> @@ -25,6 +30,6 @@ post-install:
>   ${INSTALL_MAN} ${WRKSRC}/tcpslice.1 ${PREFIX}/man/man1/tcpslice.1
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcpslice
>   ${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/tcpslice
> - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tcpslice
> + ${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/tcpslice
>  
>  .include 
> diff --git net/tcpslice/distinfo net/tcpslice/distinfo
> index e9800ad5628..8569162b9b6 100644
> --- net/tcpslice/distinfo
> +++ net/tcpslice/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (tcpslice-20140501-2837b722.tar.gz) = 
> 0hHzerRN18LrsVNN/MzXx+bFLykx9AfajfN5xNMZ5tc=
> -SIZE (tcpslice-20140501-2837b722.tar.gz) = 112218
> +SHA256 (tcpslice-1.7-tcpslice.tar.gz) = 
> m/ai/QBXLy2THJvC6gmdVb2I+iRodvoyk9V+lBDhwAc=
> +SIZE (tcpslice-1.7-tcpslice.tar.gz) = 97296
> diff --git net/tcpslice/patches/patch-Makefile_in 
> net/tcpslice/patches/patch-Makefile_in
> deleted file mode 100644
> index 63fdf8735a9..000
> --- net/tcpslice/patches/patch-Makefile_in
> +++ /dev/null
> @@ -1,26 +0,0 @@
>  Makefile.in.orig Mon Apr  7 14:09:35 2014
> -+++ Makefile.in  Fri Oct 10 13:15:24 2014
> -@@ -39,8 +39,8 @@ VPATH = @srcdir@
> - 
> - CC = @CC@
> - PROG = tcpslice
> --CCOPT = @V_CCOPT@
> --INCLS = -I. @V_INCLS@
> -+CCOPT = @CFLAGS@
> -+INCLS = -I. -I$(srcdir) -I$(srcdir)/lbl
> - DEFS = @DEFS@ @CPPFLAGS@ @V_DEFS@
> - 
> - # Standard CFLAGS
> -@@ -59,9 +59,9 @@ INSTALL_DATA = @INSTALL_DATA@
> - # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
> - # Also, gcc does not remove the .o before forking 'as', which can be a
> - # problem if you don't own the file but can write to the directory.
> --.c.o:
> --@rm -f $@
> --$(CC) $(CFLAGS) -c $(srcdir)/$*.c
> -+#.c.o:
> -+#   @rm -f $@
> -+#   $(CC) $(CFLAGS) -c $(srcdir)/$*.c
> - 
> - CSRC =  tcpslice.c gmt2local.c gwtm2secs.c machdep.c search.c 
> sessions.c util.c
> - GENSRC = version.c
> diff --git net/tcpslice/patches/patch-search_c 
> net/tcpslice/patches/patch-search_c
> deleted file mode 100644
> index 34a3ef1f2be..000
> --- net/tcpslice/patches/patch-search_c
> +++ /dev/null
> @@ -1,79 +0,0 @@
>  search.c.origMon Apr  7 14:09:35 2014
> -+++ search.c Fri Oct 10 13:15:24 2014
> -@@ -302,8 +302,8 @@ find_header( pcap_t *p, u_char *buf, int buf_len,
> -  * present in the dump file.
> -  */
> - int
> --sf_find_end( pcap_t *p, struct timeval *first_timestamp,
> --struct timeval *last_timestamp )
> -+sf_find_end( pcap_t *p, struct bpf_timeval *first_timestamp,
> -+struct bpf_timeval *last_timestamp )
> - {
> - time_t first_time = first_timestamp->tv_sec;
> - off_t len_file;
> -@@ -406,7 +406,7 @@ sf_find_end( pcap_t *p, struct timeval *first_timestam
> - /* Takes two timeval's and returns the difference, tv2 - tv1, as a double. 
> */
> - 
> - static double
> --timeval_diff( struct timeval *tv1, struct timeval *tv2 )
> -+timeval_diff( struct bpf_timeval *tv1, struct bpf_timeval *tv2 )
> - {
> - double result = (tv2->tv_sec - tv1->tv_sec);
> - result += (tv2->tv_usec - tv1->tv_usec) / 100.0;
> -@@ -418,7 +418,7 @@ timeval_diff( struct timeval *tv1, struct timeval *tv2
> - /* Returns true if timestamp t1 is chronologically less than timestamp t2. 
> */
> - 
> - int
> --sf_timestamp_less_than( struct timeval *t1, struct timeval *t2 )
> -+sf_timestamp_less_than( struct bpf_timeval *t1, struct bpf_timeval *t2 )
> - {
> - return t1->tv_sec < t2->tv_sec ||
> -(t1->tv_sec == t2->tv_sec &&
> -@@ -432,9 +432,9 @@ sf_timestamp_less_than( struct 

Re: [new] audio/pylast: new port (version 5.3.0)

2024-06-06 Thread Stuart Henderson
On 2024/06/06 13:00, Kirill A. Korinsky wrote:
> Anyway, ports has pithos-1.1.2 whcih was released in end of 2015 [1], I
> have't find any requried version of pylast and on that time the last
> released varions of pylast was 1.4.2 [2]

Also pithos 1.6.1 has "Fix Python 3.11 support".

> With an assumtion that both version of compatible I've analyzed which API is
> used by that plugin [3] which is quite limited but used method
> get_lastfm_network which was removed since release 2.0.0 [4] in 2017.
> 
> So, it seems that this update is really broke audio/pithos which is quite
> outdated (almost 10 years old!) and the right move is update it.

That, or remove it if nobody uses it.



CVS: cvs.openbsd.org: ports

2024-06-05 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/05 17:47:39

Modified files:
devel/llvm/13  : Makefile 

Log message:
disable lldb for llvm/13, afaik this pprt is only there until gcc
build can be fixed with newer clang on i386, and building lldb has
problems with forthcoming opaque stdio diffs.



CVS: cvs.openbsd.org: ports

2024-06-05 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/05 17:43:07

Modified files:
devel/llvm : Makefile.inc 

Log message:
allow disabling lldb with FLAVKR=no_lldb, ok tb@



Re: [update] gimp/stable 2.10.38

2024-06-05 Thread Stuart Henderson

It's not the sort of thing that would usually go to -stable.

--
 Sent from a phone, apologies for poor formatting.

On 5 June 2024 21:52:31 "J. Scott Heppler"  wrote:


Are there plans to backport this to 7.5 packages-stable?

Thanks,

--
J. Scott Heppler




Re: [update] net/tcpflow to 1.6.1; taking maintainer

2024-06-05 Thread Stuart Henderson
just skimmed through it quickly;

- is AUTORECONF needed or is the default ok?

- if ${COMPILER_LIBCXX} is used you should set COMPILER, usually with
base-clang ports-gcc, or maybe base-clang ports-gcc base-gcc (base-gcc
is only used for m88k). key thing being that archs which have gcc 4 in
base generally need ports-gcc for building C++ software in ports so
that we only use a single libstdc++ across the tree (otherwise there
are conflicts)

- probably worth doing a test build with "COMPILER=ports-gcc" to
make that it doesn't need any changes to build with ports g++ (sometimes
we need to set -std)

- license is now GPLv3

On 2024/06/05 16:53, Kirill A. Korinsky wrote:
> ports@,
> 
> Here an update for net/tcpflow to the last version. It was quite outdated,
> version 0.21 was released in 2003!
> 
> So, it required some work to migrate existed patches, and fix build.
> 
> Some patches I was made a while ago and it was already merged by upstream,
> but some of them is new and I'll send it soon.
> 
> Anyway, it works and was tested on -current/amd64.
> 
> Thus, I also would like to take care of this port.
> 
> diff --git net/tcpflow/Makefile net/tcpflow/Makefile
> index 9601500d65f..56c427c3062 100644
> --- net/tcpflow/Makefile
> +++ net/tcpflow/Makefile
> @@ -1,17 +1,30 @@
> -COMMENT= tool for capturing data from TCP connections
> +COMMENT= tool for capturing data from TCP connections
>  
> -DISTNAME=tcpflow-0.21
> -REVISION=2
> -CATEGORIES=  net
> -SITES=   http://www.circlemud.org/pub/jelson/tcpflow/
> +V=   1.6.1
> +DISTNAME=tcpflow-${V}
> +CATEGORIES=  net
>  
> -HOMEPAGE=   http://www.circlemud.org/~jelson/software/tcpflow/
> +SITES=   
> https://github.com/simsong/tcpflow/releases/download/tcpflow-${V}/
> +
> +HOMEPAGE=https://github.com/simsong/tcpflow
> +
> +MAINTAINER=  Kirill A. Korinsky 
>  
>  # GPLv2
> -PERMIT_PACKAGE=  Yes
> +PERMIT_PACKAGE=  Yes
> +
> +WANTLIB += ${COMPILER_LIBCXX} c crypto m pcap sqlite3 ssl z
> +
> +LIB_DEPENDS= databases/sqlite3
> +
> +# a test for cairo has a side effect which brokes pcap test
> +# when it can't find cairo, so, disable it.
> +CONFIGURE_ARGS=  --enable-cairo=false
>  
> -WANTLIB= c pcap 
> +AUTOCONF_VERSION=2.71
> +AUTOMAKE_VERSION=1.16
> +AUTORECONF=  autoreconf -i
>  
> -CONFIGURE_STYLE=gnu
> +CONFIGURE_STYLE= autoreconf
>  
>  .include 
> diff --git net/tcpflow/distinfo net/tcpflow/distinfo
> index 50bb3b39178..9a4e2edfe75 100644
> --- net/tcpflow/distinfo
> +++ net/tcpflow/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (tcpflow-0.21.tar.gz) = FpKL2XIcDeaFtmNl0yC81SqXpO3w4Qh2VK2Ns3nRlGk=
> -SIZE (tcpflow-0.21.tar.gz) = 79369
> +SHA256 (tcpflow-1.6.1.tar.gz) = Q2+TsRQb4Kvlk3EJRzB9j5ESmlNTw6jDwp4roDVeFx4=
> +SIZE (tcpflow-1.6.1.tar.gz) = 450511
> diff --git net/tcpflow/patches/patch-configure_ac 
> net/tcpflow/patches/patch-configure_ac
> new file mode 100644
> index 000..a9e99810a6d
> --- /dev/null
> +++ net/tcpflow/patches/patch-configure_ac
> @@ -0,0 +1,40 @@
> +Index: configure.ac
> +--- configure.ac.orig
>  configure.ac
> +@@ -490,36 +490,6 @@ AC_CHECK_TYPES([sa_family_t], [], [],
> + ]]
> + )
> + 
> +-
> +-# Plugin scan_python.cpp requires header "Python.h"
> +-# If the header is not present => Disable the source code of the plugin
> +-#
> +-AC_CHECK_HEADERS(python2.7/Python.h)  # ==> #define HAVE_PYTHON2_7_PYTHON_H
> +-AC_CHECK_LIB(python2.7,Py_Initialize,,[
> +-  AC_MSG_WARN([
> +-*** Cannot find python library.
> +-*** Please install python-devel to enable scanner python.
> +-  ])
> +-  Fmissing_library="$Fmissing_library python-devel "  # Validated on 
> Fedora 25
> +-  Umissing_library="$Umissing_library libpython2.7-dev"   # Should be OK: 
> https://packages.ubuntu.com/yakkety/libpython2.7-dev
> +-  Mmissing_library="$Mmissing_library python27"   # Not sure: 
> https://github.com/macports/macports-ports/blob/master/lang/python27/Portfile
> +-])
> +-
> +-
> +-# Plugin scanner_python.cpp requires header "Python.h"
> +-# If the header is not present => Disable the source code of the plugin
> +-#
> +-AC_CHECK_HEADERS(python2.7/Python.h)  # ==> #define HAVE_PYTHON2_7_PYTHON_H
> +-AC_CHECK_LIB(python2.7,Py_Initialize,,[
> +-  AC_MSG_WARN([
> +-*** Cannot find python library.
> +-*** Please install python-devel to enable scanner python.
> +-  ])
> +-  Fmissing_library="$Fmissing_library python-devel "  # Validated on 
> Fedora 25
> +-  Umissing_library="$Umissing_library libpython2.7-dev"   # Should be OK: 
> https://packages.ubuntu.com/yakkety/libpython2.7-dev
> +-  Mmissing_library="$Mmissing_library python27"   # Not sure: 
> https://github.com/macports/macports-ports/blob/master/lang/python27/Portfile
> +-])

Re: [update] textproc/tinyxml2: update to 10.0.0

2024-06-05 Thread Stuart Henderson
thanks, committed.

On 2024/06/05 11:34, Kirill A. Korinsky wrote:
> On Wed, 05 Jun 2024 00:33:27 +0100,
> Stuart Henderson  wrote:
> > 
> > On 2024/06/05 00:20, Kirill A. Korinsky wrote:
> > > ports@
> > > 
> > > Here an update of textproc/tinyxml2 which drops one of patches,
> > > and the home page were moved to github.
> > > 
> > > Brifley tested on -current/amd64, make test passes.
> > 
> > Did you test building any of the dependent ports?
> > 
> > games/blobby
> > games/choria
> > mail/grommunio/gromox
> > security/encfs
> >
> 
> Just did it, and all of them had built suceffuly.
> 
> -- 
> wbr, Kirill
> 



CVS: cvs.openbsd.org: ports

2024-06-05 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/05 05:12:53

Modified files:
textproc/tinyxml2: Makefile distinfo 
Removed files:
textproc/tinyxml2/patches: patch-tinyxml2_cpp 

Log message:
update to tinyxml2-10.0.0, from Kirill A. Korinsky



Re: 回复: 回复: [Update] www/p5-Mojo : Update to 9.37

2024-06-05 Thread Stuart Henderson
On 2024/06/05 07:41, Olivier Cherrier wrote:
>     Hello,
> 
> It works well on my side.
> Any comment or plan for committing it ?

/me dusts off the time machine and goes back to May 14th



CVS: cvs.openbsd.org: ports

2024-06-05 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/05 00:53:19

Modified files:
databases/py-mongo: Makefile distinfo 
databases/py-mongo/pkg: PLIST 

Log message:
update to py3-mongo-4.7.3



CVS: cvs.openbsd.org: ports

2024-06-05 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/05 00:53:17

Modified files:
devel/py-path  : Makefile distinfo 
devel/py-path/pkg: PLIST 

Log message:
update to py3-path-16.14.0



CVS: cvs.openbsd.org: ports

2024-06-05 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/05 00:53:14

Modified files:
devel/py-tempora: Makefile distinfo 
devel/py-tempora/pkg: PLIST 

Log message:
update to py3-tempora-5.5.1



CVS: cvs.openbsd.org: ports

2024-06-05 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/05 00:47:48

Modified files:
devel/py-munch : Makefile distinfo 
devel/py-munch/pkg: PLIST 

Log message:
update to py3-munch-4.0.0



CVS: cvs.openbsd.org: ports

2024-06-05 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/05 00:40:10

Modified files:
textproc/py-black: Makefile 

Log message:
py-black: drop RDEPs not needed with Python 3.11, add missing TDEP
without which test collection fails. ok daniel@



CVS: cvs.openbsd.org: ports

2024-06-04 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/04 17:41:23

Modified files:
textproc/xpdf  : Tag: OPENBSD_7_5 Makefile distinfo 
textproc/xpdf/patches: Tag: OPENBSD_7_5 
   patch-xpdf_GlobalParams_cc 
   patch-xpdf_XRef_cc 

Log message:
update to xpdf-4.05, from Kirill A. Korinsky
https://www.xpdfreader.com/security-fixes.html



CVS: cvs.openbsd.org: ports

2024-06-04 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/04 17:40:42

Modified files:
textproc/xpdf  : Makefile distinfo 
textproc/xpdf/patches: patch-xpdf_GlobalParams_cc 
   patch-xpdf_XRef_cc 

Log message:
update to xpdf-4.05, from Kirill A. Korinsky
https://www.xpdfreader.com/security-fixes.html



Re: [update] textproc/tinyxml2: update to 10.0.0

2024-06-04 Thread Stuart Henderson
On 2024/06/05 00:20, Kirill A. Korinsky wrote:
> ports@
> 
> Here an update of textproc/tinyxml2 which drops one of patches,
> and the home page were moved to github.
> 
> Brifley tested on -current/amd64, make test passes.

Did you test building any of the dependent ports?

games/blobby
games/choria
mail/grommunio/gromox
security/encfs


> diff --git textproc/tinyxml2/Makefile textproc/tinyxml2/Makefile
> index 3656dd94111..734640e2692 100644
> --- textproc/tinyxml2/Makefile
> +++ textproc/tinyxml2/Makefile
> @@ -2,13 +2,13 @@ COMMENT =   simple, small and efficient C++ XML 
> parser
>  
>  GH_ACCOUNT = leethomason
>  GH_PROJECT = tinyxml2
> -GH_TAGNAME = 9.0.0
> +GH_TAGNAME = 10.0.0
>  
> -SHARED_LIBS +=   tinyxml29.0 # 9.0
> +SHARED_LIBS +=   tinyxml210.0 # 10.0
>  
>  CATEGORIES = textproc
>  
> -HOMEPAGE =   http://www.grinninglizard.com/tinyxml2/index.html
> +HOMEPAGE =   https://github.com/leethomason/tinyxml2/
>  
>  # zlib
>  PERMIT_PACKAGE = Yes
> diff --git textproc/tinyxml2/distinfo textproc/tinyxml2/distinfo
> index 7d2c370ae32..572312d2177 100644
> --- textproc/tinyxml2/distinfo
> +++ textproc/tinyxml2/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (tinyxml2-9.0.0.tar.gz) = zC8UF8MIsfasxU+I63B3Ggv2X3YoLOXEDlTP5SlScCw=
> -SIZE (tinyxml2-9.0.0.tar.gz) = 619734
> +SHA256 (tinyxml2-10.0.0.tar.gz) = 
> O98VEouhZobmm84lbMRo52x7lP8sfzkcxewJ5Av/ODk=
> +SIZE (tinyxml2-10.0.0.tar.gz) = 642421
> diff --git textproc/tinyxml2/patches/patch-tinyxml2_cpp 
> textproc/tinyxml2/patches/patch-tinyxml2_cpp
> deleted file mode 100644
> index 682ee129ccf..000
> --- textproc/tinyxml2/patches/patch-tinyxml2_cpp
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -Index: tinyxml2.cpp
>  tinyxml2.cpp.orig
> -+++ tinyxml2.cpp
> -@@ -103,7 +103,7 @@ distribution.
> - #if defined(_WIN64)
> - #define TIXML_FSEEK _fseeki64
> - #define TIXML_FTELL _ftelli64
> --#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__)
> -+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__) || 
> defined(__OpenBSD__)
> - #define TIXML_FSEEK fseeko
> - #define TIXML_FTELL ftello
> - #elif defined(__unix__) && defined(__x86_64__)
> 
> 
> -- 
> wbr, Kirill
> 



NEW: devel/py-types-{psutil,setuptools} to update mypy

2024-06-04 Thread Stuart Henderson
Attached tgz includes py-types-psutil and py-types-setuptools to extract
in devel/ - nothing particularly interesting, and they're not directly
useful in themselves, py-types-* just provide type information for
variables/functions for the relevant packages.

devel/py-mypy has skipped updates for a while because these additional
deps are required at build time. (types-typed-ast mentioned in the
comment in py-mypy used to be needed but isn't any more).

OK to add them?

mypy diff if anyone wants to try them with that.
https://github.com/python/mypy/blob/master/CHANGELOG.md

Index: Makefile
===
RCS file: /cvs/ports/devel/py-mypy/Makefile,v
diff -u -p -r1.4 Makefile
--- Makefile7 May 2024 00:37:10 -   1.4
+++ Makefile4 Jun 2024 22:03:58 -
@@ -1,10 +1,6 @@
 COMMENT=   optional static type checker for Python
 
-# additional deps needed for 0.980+:
-# "types-psutil", "types-setuptools", "types-typed-ast"
-MODPY_EGG_VERSION= 0.971
-REVISION=  2
-
+MODPY_EGG_VERSION= 1.10.0
 DISTNAME=  mypy-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 
@@ -20,12 +16,13 @@ MODULES=lang/python
 
 MODPY_PI=  Yes
 MODPY_PYBUILD= setuptools
-TEST_DEPENDS=  devel/py-test-xdist${MODPY_FLAVOR}
-# additional deps
-#MODPY_PYTEST_ARGS= --ignore tests/providers/test_internet.py \
-#  --ignore tests/providers/test_ssn.py
+BUILD_DEPENDS= devel/py-types-psutil${MODPY_FLAVOR} \
+   devel/py-types-setuptools${MODPY_FLAVOR}
 RUN_DEPENDS=   devel/py-typing-extensions${MODPY_FLAVOR} \
devel/py-mypy-extensions${MODPY_FLAVOR}
+TEST_DEPENDS=  devel/py-test-cov${MODPY_FLAVOR} \
+   devel/py-test-xdist${MODPY_FLAVOR} \
+   sysutils/py-filelock${MODPY_FLAVOR}
 
 FLAVORS=   python3
 FLAVOR=python3
Index: distinfo
===
RCS file: /cvs/ports/devel/py-mypy/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- distinfo24 Nov 2022 16:39:36 -  1.1.1.1
+++ distinfo4 Jun 2024 22:03:58 -
@@ -1,2 +1,2 @@
-SHA256 (mypy-0.971.tar.gz) = QLDyFIQjgmmualcgDIB9gN68ZFnURMBImhAtfGp1+lY=
-SIZE (mypy-0.971.tar.gz) = 2757982
+SHA256 (mypy-1.10.0.tar.gz) = PQh/y+wFbE7jSXTaSTqCbOMWlHSFzvOQH1EYSOaHwTE=
+SIZE (mypy-1.10.0.tar.gz) = 3022145
Index: pkg/DESCR
===
RCS file: /cvs/ports/devel/py-mypy/pkg/DESCR,v
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR   24 Nov 2022 16:39:36 -  1.1.1.1
+++ pkg/DESCR   4 Jun 2024 22:03:58 -
@@ -1,8 +1,8 @@
 Mypy is an optional static type checker for Python that aims to combine
 the benefits of dynamic (or "duck") typing and static typing.
 
-Mypy combines the expressive power and convenience of Python with a
-powerful type system and compile-time type checking.
-
-Mypy type-checks standard Python programs; run them using any Python VM
-with basically no runtime overhead.
+Add type annotations to your Python programs, and use mypy to type check
+them. Mypy is essentially a Python linter on steroids, and it can catch
+many programming errors by analyzing your program, without actually
+having to run it. Mypy has a powerful type system with features such as
+type inference, gradual typing, generics and union types.
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-mypy/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   24 Nov 2022 16:39:36 -  1.1.1.1
+++ pkg/PLIST   4 Jun 2024 22:03:58 -
@@ -24,8 +24,6 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}applytype.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}argmap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}argmap.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}backports.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}backports.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}binder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}binder.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}bogus_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -44,6 +42,8 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}checkstrformat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}config_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/mypy/${MODPY_PYCACHE}config_parser.${MODPY_PYC_MAGIC_TAG}pyc

Re: Update sysutils/opam to 2.1.6

2024-06-04 Thread Stuart Henderson
On 2024/06/04 21:05, Christopher Zimmermann wrote:
> It's been some time... Opam really needs an update.
> 
> On Fri, Dec 31, 2021 at 01:41:44PM -0500, Daniel Dickman wrote:
> > On Fri, Dec 31, 2021 at 2:36 AM Christopher Zimmermann
> >  wrote:
> > > 
> > > Hi,
> > > 
> > > this update of opam changes to the build-utils shipped with opam and
> > > drops dependencies on our ports utils. This makes ports dune version
> > > independent of opam. OK?
> > > 
> > > Christopher
> > 
> > 1) I get a bunch of failures like this when running "make test". we
> > probably have to neuter "-- strip-trailing-cr" usage?
> > 
> > var-optiondiff: unknown option -- strip-trailing-cr
> > usage: diff [-abdipTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L 
> > label]
> >file1 file2
> >   diff [-abdipTtw] [-I pattern] [-L label] -C number file1 file2
> >   diff [-abditw] [-I pattern] -D string file1 file2
> >   diff [-abdipTtw] [-I pattern] [-L label] -U number file1 file2
> >   diff [-abdiNPprsTtw] [-c | -e | -f | -n | -q | -u] [-I pattern]
> >[-L label] [-S name] [-X file] [-x pattern] dir1 dir2
> > [FAIL]
> 
> This is now dealt with by using gdiff for tests.
> 
> > 2) Running portcheck resulted in:
> > 
> > C++ libraries in WANTLIB with default COMPILER (most ports need
> > 'COMPILER=base-clang ports-gcc' or 'COMPILER=base-clang ports-gcc
> > base-gcc')
> 
> I also made some tests more posix compliant, which helps them to succeed on
> OpenBSD. I will try to get those fixes upstream.
> 
> OK?
> 
> Christopher
> 
> 
> ... and here is the diff:
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/opam/Makefile,v
> retrieving revision 1.28
> diff -u -p -r1.28 Makefile
> --- Makefile  24 Apr 2024 17:10:39 -  1.28
> +++ Makefile  4 Jun 2024 19:01:12 -
> @@ -2,10 +2,9 @@ COMMENT =OCaml source-based package ma
>  CATEGORIES = sysutils devel
> -V =  2.0.10
> +V =  2.1.6
>  PKGNAME =opam-${V}
>  DISTNAME =   opam-full-${V}
> -REVISION =   1
>  SITES =  
> https://github.com/ocaml/opam/releases/download/${V}/
> @@ -16,14 +15,12 @@ MAINTAINER =  Christopher Zimmermann   # LGPLv3
>  PERMIT_PACKAGE = Yes
> -WANTLIB =${COMPILER_LIBCXX} c m
> +WANTLIB =${LIBCXX} c m

${COMPILER_LIBCXX} was already correct.

> +
> +COMPILER =   base-clang base-gcc

C++ programs in ports should all prefer ports-gcc over base-gcc except
in special cases. Basically you can't have a mix of C++ programs and
libraries using base-gcc and ports-gcc otherwise there are library
conflicts, and on those archs which still use gcc in base the majority
of C++ things in ports require more recent GCC. So: this should use
"base-clang ports-gcc", or possibly "base-clang ports-gcc base-gcc".


>  BUILD_DEPENDS =  lang/ocaml \
> - sysutils/findlib \
> - devel/dune \
> - devel/ocaml-cppo \
> - archivers/bzip2 \
> - net/curl
> + archivers/bzip2
>  RUN_DEPENDS =archivers/unzip \
>   archivers/bzip2 \
> @@ -32,11 +29,16 @@ RUN_DEPENDS = archivers/unzip \
>   devel/gmake \
>   net/curl
> +TEST_DEPENDS =   textproc/gdiff \
> + net/wget
> +
>  USE_GMAKE =  Yes
>  CONFIGURE_ENV += CFLAGS="${CFLAGS}" \
>   LDFLAGS="${LDFLAGS}"
> -CONFIGURE_STYLE =gnu
> +CONFIGURE_STYLE =gnu autoreconf no-autoheader
> +AUTOCONF_VERSION =   2.69
> +AUTOMAKE_VERSION =   1.16
>  ALL_TARGET = lib-ext all
>  INSTALL_TARGET = install
> @@ -52,5 +54,8 @@ post-install:
>   ${docdir}/
>   ${INSTALL_DATA_DIR} ${docdir}/pages
>   ${INSTALL_DATA} ${WRKSRC}/doc/pages/*.md ${docdir}/pages
> +
> +pre-test:
> + ln -fs ${LOCALBASE}/bin/gdiff ${WRKDIR}/bin/diff
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/opam/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  16 Jan 2023 19:03:18 -  1.9
> +++ distinfo  4 Jun 2024 19:01:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (opam-full-2.0.10.tar.gz) = 
> O1dAuOHBvGXc+KohxOjNgc1qv+G/UuosxDZ8P4nVvkA=
> -SIZE (opam-full-2.0.10.tar.gz) = 8173617
> +SHA256 (opam-full-2.1.6.tar.gz) = 
> 0q9e3IX1UuDPXsDdzJSdlPLcVQ3F31lRdKBqTq+K9ig=
> +SIZE (opam-full-2.1.6.tar.gz) = 11704198
> Index: patches/patch-Makefile_config_in
> ===
> RCS file: patches/patch-Makefile_config_in
> diff -N patches/patch-Makefile_config_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Makefile_config_in  4 Jun 2024 

CVS: cvs.openbsd.org: ports

2024-06-04 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/04 07:31:15

Modified files:
www/qutebrowser: Makefile distinfo 
www/qutebrowser/patches: patch-qutebrowser_qt_machinery_py 
www/qutebrowser/pkg: PLIST 

Log message:
update to qutebrowser-3.2.0



CVS: cvs.openbsd.org: ports

2024-06-04 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/04 06:46:39

Modified files:
www/phppgadmin : Makefile distinfo 
www/phppgadmin/patches: patch-conf_config_inc_php-dist 
www/phppgadmin/pkg: DESCR PLIST README 

Log message:
update to phpPgAdmin-7.14.7, moving to a still-maintained fork which works
with PHP 8.2. maintainer timeout, ok landry@

I also amended README taking landry's suggestions re Apache into account.



Re: [NEW] vo-amrwbenc

2024-06-04 Thread Stuart Henderson
On 2024/06/04 12:38, Jan Stary wrote:
> The audio/opencore-amr port provides amrnb (narrowband encoder + decoder)
> and amrwb (wideband decoder). This is the missing part, the wideband encoder.
> 
> Tested on current/amd64, please test everywhere.
> (Also tested with aduio/sox.)
> 
>   Jan
> 

whitespace is rather inconsistent. ok sthen with this on top.

diff --git a/audio/vo-amrwbenc/Makefile b/audio/vo-amrwbenc/Makefile
index ebbdc01..0bb4bdf 100644
--- a/audio/vo-amrwbenc/Makefile
+++ b/audio/vo-amrwbenc/Makefile
@@ -1,8 +1,8 @@
-COMMENT= VisualOn AMR-WB encoder library
-CATEGORIES = audio
+COMMENT=   VisualOn AMR-WB encoder library
+CATEGORIES=audio
 
-DISTNAME   = vo-amrwbenc-0.1.3
-SHARED_LIBS= vo-amrwbenc 0.0
+DISTNAME=  vo-amrwbenc-0.1.3
+SHARED_LIBS=   vo-amrwbenc 0.0
 
 HOMEPAGE=  https://opencore-amr.sourceforge.net/
 SITES= ${SITE_SOURCEFORGE:=opencore-amr/}



CVS: cvs.openbsd.org: ports

2024-06-04 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/04 06:24:45

Modified files:
audio/beets: Makefile distinfo 
audio/beets/pkg: PLIST README 
Added files:
audio/beets/patches: patch-test_test_files_py 
Removed files:
audio/beets/patches: patch-test__common_py 

Log message:
update to beets-2.0.0, from Kirill A. Korinsky (taking maintainer)

tweak from me to drop py3-gobject3 from optional deps for gstreamer
replaygain in README (as it's already pulled in via py3-gstreamer1
which is listed).



CVS: cvs.openbsd.org: ports

2024-06-04 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/04 05:58:45

Modified files:
audio/py-last  : Makefile distinfo 
audio/py-last/pkg: PLIST 

Log message:
update to py3-last-5.3.0, from Kirill A. Korinsky with tweaks.
feedback from edd@ who wanted to drop maintainer.



CVS: cvs.openbsd.org: ports

2024-06-04 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/04 04:04:27

Modified files:
benchmarks/iozone: Makefile distinfo 
Added files:
benchmarks/iozone/patches: patch-src_current_iozone_c 

Log message:
update to iozone-3.494

clean up prototypes a bit

allow packaging, there's a license buried in iozone.c which looks alright



CVS: cvs.openbsd.org: ports

2024-06-04 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/04 03:03:22

Modified files:
databases/freetds: Makefile distinfo 

Log message:
update to freetds-1.4.17



Re: fvwm3 perl modules missing man pages and errors in man pages for version 3

2024-06-03 Thread Stuart Henderson
On 2024/06/03 10:05, Chris Bennett wrote:
> I noticed that the Perl modules don't have any man pages. They can be
> read by perldoc, but man pages would be nice.
> I don't know if that is desired.
> Also, I searched code, but I couldn't find how Perl pods are made into
> man pages during porting.

Normally they're processed in the upstream Makefiles, but fvwm3 didn't
do that. Still, you could add a post-install target to do this.

> Another problem I noticed is that the man pages contain examples that
> don't match the names of the commands that have been altered with the 3
> at the end of the filenames.
> For example, FvwmCommand is in a man page, but it really needs to be
> FvwmCommand3 to use it.
> So cut and paste won't work. That might be a real head scratcher.
> 
> Is fixing that worth the effort? Or adding a README mentioning the need
> to watch out for that a better option?

Patching that in the manpages would be better I think.



Re: doveadm index segfaults after upgrade to 7.5

2024-06-03 Thread Stuart Henderson
On 2024/06/03 08:08, Maksim Rodin wrote:
> I applied a patch and installed from ports:
> # pkg_info | grep xapian
> dovecot-fts-xapian-1.7.13 full text search plugin for Dovecot\
>   using Xapian
> xapian-core-1.4.24  search engine library
> 
> It seems to have no effect.
> Jun 03 08:01:39 doveadm(mail...@somedomain.org): Debug:\
>   Mailbox INBOX: UID 1048: Opened mail because: fts indexing
> Segmentation fault

You could try getting a backtrace from a core dump. Something like this
should work:

pkg_add gdb debug-dovecot
(if you were on snapshots rather than 7.5 I would say pkg_delete dovecot
then pkg_add dovecot debug-dovecot to make sure that you have matching
versions)

add DEBUG_PACKAGES=${BUILD_PACKAGES} to the port and rebuild
make install INSTALL_DEBUG_PACKAGES=Yes

egdb doveadm
set args -Dvv index -u somemail...@somedom.com '*'
run

bt

To catch crashes in non-interactive indexer-worker runs, you should
be able to:

mkdir /var/crash/indexer-worker
sysctl kern.nosuidcoredump=3

then when you get some .core files,

egdb /usr/local/libexec/dovecot/indexer-worker 
/var/crash/indexer-worker/$pid.core
bt

Show the backtrace here and we might be able to figure something out,
but if not then it'll probably need to go upstream

> 
> On Fri May 31 15:28:41 2024, Stuart Henderson wrote:
> > On 2024/05/31 15:44, Maksim Rodin wrote:
> > > Hello
> > > After upgrading the machine to 7.5 amd64 doveadm command used for
> > > indexing mailboxes does not work anymore:
> > 
> > Does 1.7.13 work any better? Here's a ports diff.
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/mail/dovecot-fts-xapian/Makefile,v
> > diff -u -p -r1.19 Makefile
> > --- Makefile25 Feb 2024 11:36:11 -  1.19
> > +++ Makefile31 May 2024 14:28:15 -
> > @@ -1,8 +1,9 @@
> >  COMMENT=   full text search plugin for Dovecot using Xapian
> >  
> > -DIST_TUPLE=github grosjo fts-xapian 1.7.0 .
> > -
> > -PKGNAME=   dovecot-${DISTNAME}
> > +V= 1.7.13
> > +DISTNAME=  dovecot-fts-xapian-$V
> > +SITES= 
> > https://github.com/grosjo/fts-xapian/releases/download/$V/
> > +WRKDIST=   ${WRKDIR}/fts-xapian-$V
> >  
> >  CATEGORIES=mail
> >  
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/mail/dovecot-fts-xapian/distinfo,v
> > diff -u -p -r1.10 distinfo
> > --- distinfo25 Feb 2024 11:36:11 -  1.10
> > +++ distinfo31 May 2024 14:28:15 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (grosjo-fts-xapian-1.7.0.tar.gz) = 
> > ygkBoEvgrNRIxGfCa/MWaFMbrzwlkJXjD99dc/NeS/o=
> > -SIZE (grosjo-fts-xapian-1.7.0.tar.gz) = 35121
> > +SHA256 (dovecot-fts-xapian-1.7.13.tar.gz) = 
> > MF60UgNoctNs3MQN0aI5qKBvE7zRh9RkWeMOm5aL6S4=
> > +SIZE (dovecot-fts-xapian-1.7.13.tar.gz) = 37569
> 
> -- 
> Best regards
> Maksim Rodin
> 
> С уважением,
> Родин Максим
> 



CVS: cvs.openbsd.org: ports

2024-06-03 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/03 07:11:09

Modified files:
sysutils/py-pipx: Makefile distinfo 
sysutils/py-pipx/pkg: PLIST 

Log message:
update to py3-pipx-1.6.0



CVS: cvs.openbsd.org: ports

2024-06-03 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/03 07:11:11

Modified files:
sysutils/py-platformdirs: Makefile distinfo 

Log message:
update to py3-platformdirs-4.2.2



CVS: cvs.openbsd.org: ports

2024-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/01 10:16:09

Modified files:
www/unit   : Makefile.inc 
www/unit/unit  : Makefile distinfo 
www/unit/unit-perl: distinfo 
www/unit/unit-php: distinfo 
www/unit/unit-python: Makefile distinfo 
www/unit/unit-ruby: distinfo 
Added files:
www/unit/unit/patches: patch-src_nxt_js_c patch-src_nxt_script_c 

Log message:
update to unit-1.32.1, from Sergey A. Osokin (maintainer)



CVS: cvs.openbsd.org: ports

2024-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/01 10:15:35

Modified files:
lang/njs   : Makefile distinfo 
lang/njs/pkg   : PLIST 
Removed files:
lang/njs/patches: patch-auto_make 
  patch-external_njs_xml_module_c 

Log message:
update to njs-0.8.4, from Sergey A. Osokin (maintainer)



Re: [patch] lang/njs update

2024-06-01 Thread Stuart Henderson
On 2024/06/01 16:02, Sergey A. Osokin wrote:
> here's the patch to update lang/njs to the latest version, 0.8.4.

will check and commit.

> Please note that the following patches can be safely removed
> from the port:
> - patch-auto_make
> - patch-external_njs_xml_module_c

you can use "cvs rm" and "cvs diff -uNp" to include the removals in your
diff.

> +++ unit/patches/patch-src_nxt__js.c  Sat Jun  1 11:47:20 2024
> +++ unit/patches/patch-src_nxt__script.c  Sat Jun  1 11:47:46 2024

these should be generated with "make update-patches" which generates
diffs for files in the work directory where the original has been copied
with an ".orig.port" extension, and uses a standardized patch format and
filename.

there was also REVISION=0 to remove in unit-python.



Re: NEW: security/xhash v3.4.0

2024-06-01 Thread Stuart Henderson
On 2024/06/01 11:41, Ricardo Branco wrote:
>  security/xhash/Makefile| 23 +
>  security/xhash/distinfo| 42 ++
>  security/xhash/modules.inc | 12 +++
>  security/xhash/pkg/DESCR   |  1 +
>  security/xhash/pkg/PLIST   |  1 +
>  5 files changed, 79 insertions(+)
>  create mode 100644 security/xhash/Makefile
>  create mode 100644 security/xhash/distinfo
>  create mode 100644 security/xhash/modules.inc
>  create mode 100644 security/xhash/pkg/DESCR
>  create mode 100644 security/xhash/pkg/PLIST

Please send tars rather than diffs for new ports.

> +V =  3.4.0
> +MODGO_MODNAME =  github.com/ricardobranco777/xhash
> +MODGO_VERSION =  v0.0.0-20240601062954-9bdefd997316
> +DISTNAME =   xhash-${V}

I don't understand what's needed to make the go proxy stuff pick things
up, but it would be nice if this could use the tags rather than a
date+hash version.

> +++ b/security/xhash/pkg/DESCR
> @@ -0,0 +1 @@
> +This Go program uses goroutines to calculate multiple hashes on strings, 
> files and directories.  By default it reads from standard input.  It can be 
> used as a drop-in replacement for the GNU **coreutils** when hard-linked as 
> **md5sum**, etc. and it actually supports the `--zero` option with `--check`. 
>  The output format is fully configurable.

DESCR should be wrapped at <80 columns and plaintext not markdown.

Might be nice to outline which actual hashes are supported - doesn't
need to be in full detail, but something like "Supports a range of SHA
and BLAKE algorithms and can use HMACs" would give a better idea of what
it can do.



Re: import databases/duckdb

2024-06-01 Thread Stuart Henderson
On 2024/06/01 17:02, Sebastien Marie wrote:
> Hi,
> 
> I would like to import duckdb (https://duckdb.org/) port.
> 
> DuckDB is a high-performance analytical database system. It is designed to be 
> fast, reliable, portable, and easy to use. DuckDB provides a rich SQL 
> dialect, 
> with support far beyond basic SQL. DuckDB supports arbitrary and nested 
> correlated subqueries, window functions, collations, complex types (arrays, 
> structs), and more.
> 
> The port installs the CLI with several extensions and the shared lib,
> but no bindings for external language.
> 
> Comments or OK ?
> -- 
> Sebastien Marie
> 

It would be nice to have duckdb in the tree. I think it's not quite as
fast as clickhouse-local but seems more straightforward. A few comments:

- No need to set DISTNAME, that is the default.

- Personally I would use GH_* rather than DIST_TUPLE, there's not really
an advantage to DIST_TUPLE here, and it has the downside that it doesn't
work with portroach.

- I'm a bit unsure about packaging the extensions as .a files, do they
do anything useful? I would have expected to see the shared objects
(see WRKBUILD/extension/*/*.duckdb_extension after build) instead.



CVS: cvs.openbsd.org: ports

2024-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/01 04:03:48

Modified files:
editors/vim: Makefile distinfo 
editors/vim/patches: patch-runtime_filetype_vim 
editors/vim/pkg: PLIST-main 

Log message:
update to vim-9.1.455



CVS: cvs.openbsd.org: ports

2024-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/01 01:47:25

Modified files:
www/lynx   : Makefile distinfo 

Log message:
update to lynx-2.9.2



CVS: cvs.openbsd.org: ports

2024-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/01 01:47:14

Modified files:
devel/py-validators: Makefile distinfo 

Log message:
update to py3-validators-0.28.3



CVS: cvs.openbsd.org: ports

2024-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/01 01:47:10

Modified files:
devel/py-country: Makefile distinfo 
devel/py-country/pkg: PLIST 

Log message:
update to py3-country-24.6.1



CVS: cvs.openbsd.org: ports

2024-06-01 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/06/01 01:47:03

Modified files:
databases/py-peewee: Makefile distinfo 
databases/py-peewee/pkg: PLIST 

Log message:
update to py3-peewee-3.17.5



security/pinentry picks up KF6WindowSystem if present

2024-05-31 Thread Stuart Henderson
security/pinentry qt6 build picks up KF6WindowSystem if present. There's
no autoconf cache so if we want to prevent it being picked up we'll need
to patch configure. Any opinions whether we'd be better off to prevent
it from being found or whether we should add the dep?

checking for KF6WindowSystem >= 5.240... yes

As you'd expect, found by dpb junking:

main.cpp:76:10: fatal error: 'KWindowSystem' file not found
#include 




CVS: cvs.openbsd.org: ports

2024-05-31 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/05/31 12:05:40

Modified files:
devel/py-python-lsp-server: Makefile 

Log message:
remove version spec for autopep8 to unbreak packaging. it's an optional
dep in the first place, doc says that YAPF is preferred if available anyway
(YAPF is also listed as a dep), and test/plugins/test_autopep8_format.py
is successful with the updated version



Re: [maintainer update] 6.18.14 -> 6.19.0

2024-05-31 Thread Stuart Henderson
committed with a tweak:

> +MODPY_EGG_VERSION=   6.19.00
> -lib/python${MODPY_VERSION}/site-packages/getmail6-${MODPY_EGG_VERSION}.dist-info/
> +lib/python${MODPY_VERSION}/site-packages/getmail6-6.19.0.dist-info/

MODPY_EGG_VERSION should be set to the string here   ^^

(+ drop REVISION=0)



CVS: cvs.openbsd.org: ports

2024-05-31 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/05/31 08:34:09

Modified files:
mail/getmail   : Makefile distinfo 

Log message:
update to getmail-6.19.0, from Martin Ziemer (maintainer), tweak to
fix MODPY_EGG_VERSION and drop REVISION=0 from me



CVS: cvs.openbsd.org: ports

2024-05-31 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/05/31 08:29:14

Modified files:
www/hugo   : Makefile distinfo modules.inc 
www/hugo/pkg   : PLIST 

Log message:
update to hugo-0.126.2, from Kirill A. Korinsky (taking maintainer)



Re: doveadm index segfaults after upgrade to 7.5

2024-05-31 Thread Stuart Henderson
On 2024/05/31 15:44, Maksim Rodin wrote:
> Hello
> After upgrading the machine to 7.5 amd64 doveadm command used for
> indexing mailboxes does not work anymore:

Does 1.7.13 work any better? Here's a ports diff.

Index: Makefile
===
RCS file: /cvs/ports/mail/dovecot-fts-xapian/Makefile,v
diff -u -p -r1.19 Makefile
--- Makefile25 Feb 2024 11:36:11 -  1.19
+++ Makefile31 May 2024 14:28:15 -
@@ -1,8 +1,9 @@
 COMMENT=   full text search plugin for Dovecot using Xapian
 
-DIST_TUPLE=github grosjo fts-xapian 1.7.0 .
-
-PKGNAME=   dovecot-${DISTNAME}
+V= 1.7.13
+DISTNAME=  dovecot-fts-xapian-$V
+SITES= https://github.com/grosjo/fts-xapian/releases/download/$V/
+WRKDIST=   ${WRKDIR}/fts-xapian-$V
 
 CATEGORIES=mail
 
Index: distinfo
===
RCS file: /cvs/ports/mail/dovecot-fts-xapian/distinfo,v
diff -u -p -r1.10 distinfo
--- distinfo25 Feb 2024 11:36:11 -  1.10
+++ distinfo31 May 2024 14:28:15 -
@@ -1,2 +1,2 @@
-SHA256 (grosjo-fts-xapian-1.7.0.tar.gz) = 
ygkBoEvgrNRIxGfCa/MWaFMbrzwlkJXjD99dc/NeS/o=
-SIZE (grosjo-fts-xapian-1.7.0.tar.gz) = 35121
+SHA256 (dovecot-fts-xapian-1.7.13.tar.gz) = 
MF60UgNoctNs3MQN0aI5qKBvE7zRh9RkWeMOm5aL6S4=
+SIZE (dovecot-fts-xapian-1.7.13.tar.gz) = 37569



CVS: cvs.openbsd.org: ports

2024-05-31 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/05/31 06:59:13

Removed files:
databases/pgbackrest/patches: patch-src_meson_build 

Log message:
missed cvs rm



Re: [update] devel/py-yamllint version 1.35.1

2024-05-31 Thread Stuart Henderson
ok

On 2024/05/31 11:16, Laurent Cheylus wrote:
> Hi,
> 
> [cc rpointel@ as maintainer]
> 
> a simple update for devel/py-yamllint to the latest version 1.35.1 (linter 
> for YAML files, in Python).
> 
> - update Makefile and distinfo
> 
> Build and tests OK on current/amd64 with Python 3.11.9
> 
> Tests welcome and please commit if OK.
> 
> Laurent
> 
> 

> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/py-yamllint/Makefile,v
> diff -u -p -r1.25 Makefile
> --- Makefile  6 May 2024 12:23:32 -   1.25
> +++ Makefile  31 May 2024 09:09:12 -
> @@ -1,9 +1,8 @@
>  COMMENT =linter for YAML files
>  
> -MODPY_EGG_VERSION = 1.33.0
> +MODPY_EGG_VERSION = 1.35.1
>  DISTNAME =   yamllint-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
> -REVISION =   0
>  
>  CATEGORIES = devel
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/py-yamllint/distinfo,v
> diff -u -p -r1.13 distinfo
> --- distinfo  24 Nov 2023 15:13:53 -  1.13
> +++ distinfo  31 May 2024 09:09:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (yamllint-1.33.0.tar.gz) = 
> Lc6rnvLZlRii/PT/yWTUQlCsRFm+G6PKMVEY5KGoH30=
> -SIZE (yamllint-1.33.0.tar.gz) = 130357
> +SHA256 (yamllint-1.35.1.tar.gz) = 
> egA4CfiDJP0sh3c08tV17niB3ZBDNgZXzIBJyAnrps0=
> +SIZE (yamllint-1.35.1.tar.gz) = 134583



Re: Fwd: [Update] devel/py-tqdm (from lau...@tratt.net)

2024-05-31 Thread Stuart Henderson
On 2024/05/31 09:19, Laurence Tratt wrote:
> A quick ping on this one: I've tested it with the latest ports tree
> (including ffmpeg-normalize) and it works as expected (including `make
> test`).

oops, sorry for the delay - committed.



CVS: cvs.openbsd.org: ports

2024-05-31 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/05/31 02:24:26

Modified files:
devel/py-tqdm  : Makefile distinfo 

Log message:
update to py3-tqdm-4.66.2, from Laurence Tratt (maintainer)



CVS: cvs.openbsd.org: ports

2024-05-31 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/05/31 02:19:15

Modified files:
devel/autopep8 : Makefile distinfo 

Log message:
update to autopep8-2.2.0



Re: remove telephony/sofia-sip

2024-05-31 Thread Stuart Henderson
On 2024/05/31 04:11, Theo Buehler wrote:
> The sofia-sip port is very outdated. Upstream is dormant and points at
> 
> https://github.com/freeswitch/sofia-sip
> 
> which has seen many releases in the last dozen years.
> 
> There never has been a consumer of the library that I can find, so I
> guess the bundled utilities may have been of some use at some point.

Most likely it was done as a precursor to writing a port for freeswitch,
which didn't happen (it always was a pain to build, and wanted to use
its own versions of a dozen or so libraries and made it hard to use
system versions of them).

I don't think the utilities are particularly helpful.

> I suggest we remove the port, or else someone who cares about it should
> update it to a more recent version.

+1



Re: Remove x11/kde-applications/kaccounts-integration

2024-05-30 Thread Stuart Henderson
After the diff, kf6-kaccounts-integration will have the PKGNAME
kf6-kaccounts-integration-24.02.1p1 so the version number is
considered a valid update from kaccounts-integration-24.02.1p0,
so that part is alright.

In x11/kde-applications/kf6-kaccounts-integration/pkg/PLIST
you'll need this so that it is treated as an update candidate:

@pkgpath x11/kde-applications/kaccounts-integration

With that it's OK sthen




On 2024/05/30 08:55, Rafael Sadowski wrote:
> Stuart has asked if we can get rid of kaccounts-integration (kf5).
> 
> I had left it in so as not to lose support in kf5/purpose. However,
> purpose is only used by kdevleop. I think that's fine.
> 
> Here is a diff that tries to clear up the nonsense with kf5 and kf6
> kaccounts-integration.
> 
> - Remove kaccounts-integration (kf5) support in purpose.
> - Remove kaccounts-integration (kf5) from meta/kde
> - Unhook kaccounts-integration (kf5)
> - Add update path in quirks
> - +@conflict kaccounts-integration-* in kf6
> 
> Thanks Stuart for the idea and taking care of it.
> 
> Input, ok?
> 
> Rafael
> 
> Index: devel/kf5/purpose/Makefile
> ===
> RCS file: /cvs/ports/devel/kf5/purpose/Makefile,v
> diff -u -p -r1.26 Makefile
> --- devel/kf5/purpose/Makefile21 May 2024 13:35:51 -  1.26
> +++ devel/kf5/purpose/Makefile30 May 2024 06:48:07 -
> @@ -1,5 +1,6 @@
>  COMMENT =framework to create integrate services and actions
>  DISTNAME =   purpose-${VERSION}
> +REVISION =   0
>  
>  SHARED_LIBS +=  KF5Purpose3.0
>  SHARED_LIBS +=  KF5PurposeWidgets 2.0
> @@ -10,8 +11,7 @@ WANTLIB += ${COMPILER_LIBCXX} KF5Complet
>  WANTLIB += KF5I18n KF5JobWidgets KF5KIOCore KF5KIOGui KF5KIOWidgets
>  WANTLIB += KF5Notifications KF5Service KF5Solid KF5WidgetsAddons
>  WANTLIB += KF5WindowSystem Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
> -WANTLIB += Qt5Network Qt5Qml Qt5Widgets Qt5Xml X11 accounts-qt5
> -WANTLIB += c kaccounts m
> +WANTLIB += Qt5Network Qt5Qml Qt5Widgets X11 c m
>  
>  # Special case, KAccounts depends on intltool-merge
>  MODULES +=   textproc/intltool
> @@ -38,8 +38,7 @@ LIB_DEPENDS =   devel/kf5/kcompletion>=${M
>   devel/kf5/solid>=${MODKF5_VERSION} \
>   x11/qt5/qtdeclarative
>  
> -LIB_DEPENDS +=   net/libaccounts-qt \
> - x11/kde-applications/kaccounts-integration
> +CONFIGURE_ARGS +=-DCMAKE_DISABLE_FIND_PACKAGE_KAccounts=ON
>  
>  # sucks
>  TEST_IS_INTERACTIVE =X11
> Index: devel/kf5/purpose/pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/kf5/purpose/pkg/PLIST,v
> diff -u -p -r1.28 PLIST
> --- devel/kf5/purpose/pkg/PLIST   21 May 2024 13:35:51 -  1.28
> +++ devel/kf5/purpose/pkg/PLIST   30 May 2024 06:48:07 -
> @@ -41,14 +41,12 @@ lib/qt5/plugins/kf5/purpose/
>  @so lib/qt5/plugins/kf5/purpose/kdeconnectplugin.so
>  @so lib/qt5/plugins/kf5/purpose/kdeconnectsmsplugin.so
>  @so lib/qt5/plugins/kf5/purpose/ktpsendfileplugin.so
> -@so lib/qt5/plugins/kf5/purpose/nextcloudplugin.so
>  @so lib/qt5/plugins/kf5/purpose/pastebinplugin.so
>  @so lib/qt5/plugins/kf5/purpose/phabricatorplugin.so
>  @so lib/qt5/plugins/kf5/purpose/reviewboardplugin.so
>  @so lib/qt5/plugins/kf5/purpose/saveasplugin.so
>  @so lib/qt5/plugins/kf5/purpose/telegramplugin.so
>  @so lib/qt5/plugins/kf5/purpose/twitterplugin.so
> -@so lib/qt5/plugins/kf5/purpose/youtubeplugin.so
>  lib/qt5/qml/org/kde/purpose/
>  lib/qt5/qml/org/kde/purpose/AlternativesView.qml
>  lib/qt5/qml/org/kde/purpose/JobView.qml
> @@ -61,20 +59,12 @@ lib/qt5/qml/org/kde/purpose/reviewboard/
>  @so lib/qt5/qml/org/kde/purpose/reviewboard/librbpurposequickplugin.so
>  lib/qt5/qml/org/kde/purpose/reviewboard/qmldir
>  @bin libexec/kf5/purposeprocess
> -share/accounts/
> -share/accounts/services/
> -share/accounts/services/kde/
>  @comment share/accounts/services/kde/google-youtube.service
>  @comment share/accounts/services/kde/nextcloud-upload.service
>  share/icons/hicolor/128x128/apps/phabricator-purpose.png
>  share/icons/hicolor/128x128/apps/reviewboard-purpose.png
> -share/icons/hicolor/16x16/actions/kipiplugin_youtube.png
>  share/icons/hicolor/16x16/apps/phabricator-purpose.png
>  share/icons/hicolor/16x16/apps/reviewboard-purpose.png
> -share/icons/hicolor/22x22/actions/kipiplugin_youtube.png
> -share/icons/hicolor/32x32/actions/kipiplugin_youtube.png
> -share/icons/hicolor/48x48/actions/kipiplugin_youtube.png
> -share/icons/hicolor/64x64/actions/kipiplugin_youtube.png
>  share/locale/ar/LC_MESSAGES/libpurpose_quick.mo
>  share/locale/ar/LC_MESSAGES/libpurpose_widgets.mo
>  share/locale/ar/LC_MESSAGES/purpose-fileitemaction.mo
> @@ -696,11 +686,9 @@ share/locale/zh_TW/LC_MESSAGES/purpose_y
>  share/purpose/
>  share/purpose/barcodeplugin_config.qml
>  share/purpose/kdeconnectplugin_config.qml
> -share/purpose/nextcloudplugin_config.qml
>  

Re: [update] textproc/lowdown to 1.1.0

2024-05-30 Thread Stuart Henderson
On 2024/05/30 10:34, Justin Berthault wrote:
> Hi ports@
> 
> Trivial update for lowdown to latest version (1.1.0)
> 
> No errors where I tried to rebuild my website and convert some files.
> 
> cc maintainer@
> 
> 
> diff /usr/ports
> commit - 1d153f0cab58ff8ac9ca5e49028143439a8daadd
> path + /usr/ports
> blob - b8563e3bfd373abc147a9a6ba2a2c1a23a475bb5
> file + textproc/lowdown/Makefile
> --- textproc/lowdown/Makefile
> +++ textproc/lowdown/Makefile
> @@ -1,8 +1,8 @@
>  COMMENT =simple markdown translator
> -DISTNAME =   lowdown-1.0.0
> +DISTNAME =   lowdown-1.1.0
>  CATEGORIES = textproc
>  
> -SHARED_LIBS =lowdown 0.0 # 1
> +SHARED_LIBS =lowdown 0.1 # 2

Many functions were removed, that should be a major bump not minor.

>  HOMEPAGE =   https://kristaps.bsd.lv/lowdown/
>  MAINTAINER = Bryan Vyhmeister 
> blob - 19db86108d89fbff77a606f1ab4542fed6d1452a
> file + textproc/lowdown/distinfo
> --- textproc/lowdown/distinfo
> +++ textproc/lowdown/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (lowdown-1.0.0.tar.gz) = p8nbvUDj6dkpb/bvasVP7IOxq+VNt7YRPNnA9pKiDBM=
> -SIZE (lowdown-1.0.0.tar.gz) = 247307
> +SHA256 (lowdown-1.1.0.tar.gz) = 8x45UMRzKx5AkXT6CS7KQMVb53pEjuKBjfmHl517CHk=
> +SIZE (lowdown-1.1.0.tar.gz) = 269632
> blob - 5cf757344dfc6c1e29cd33a2ab2db78470d4e8b5
> file + textproc/lowdown/pkg/PLIST
> --- textproc/lowdown/pkg/PLIST
> +++ textproc/lowdown/pkg/PLIST
> @@ -2,6 +2,7 @@
>  @bin bin/lowdown-diff
>  include/lowdown.h
>  @static-lib lib/liblowdown.a
> +@so lib/liblowdown.so

We don't want that, it should be rm'd or @commented.

>  @lib lib/liblowdown.so.${LIBlowdown_VERSION}
>  lib/pkgconfig/lowdown.pc
>  @man man/man1/lowdown-diff.1
> 
> -- 
> ~Justin
> 



Re: [new] textproc/py-langdetect

2024-05-30 Thread Stuart Henderson
On 2024/05/30 12:32, Kirill A. Korinsky wrote:
> ports@,
> 
> Here the second new optional port for beets update which is requires for
> lyrics plugin for exmple.
> 
> Tested on -current/amd64.
> 
> P.S. I had my morning coffe, and double checked that this port doesn't
> exits already.
> 
> -- 
> wbr, Kirill

that one's OK sthen to import



Re: [update] audio/beets update to 2.0.0; taking maintainer

2024-05-30 Thread Stuart Henderson
On 2024/05/30 13:20, Kirill A. Korinsky wrote:
> -RUN_DEPENDS+=audio/py-discogs-client${MODPY_FLAVOR}>=2.0.2 \
> +RUN_DEPENDS+=audio/py-discogs-client${MODPY_FLAVOR}>=2.3.15 \
>   audio/py-last${MODPY_FLAVOR} \
> - audio/py-mediafile${MODPY_FLAVOR} \
> - audio/py-musicbrainzngs${MODPY_FLAVOR} \
> + audio/py-mediafile${MODPY_FLAVOR}>=0.12.0 \
> + audio/py-musicbrainzngs${MODPY_FLAVOR}>=0.4 \

I recommend not listing the minimum versions, there's no support for
using mixed versions of the ports tree, or current versions of the ports
tree with out of date packages, and if they're present then it's one
more thing that needs dealing with if we ever have to revert an update
to one of those ports (which would require using EPOCH and then changing
version specs to add the 'v0').



Re: [new] audio/pylast: new port (version 5.3.0)

2024-05-30 Thread Stuart Henderson
On 2024/05/30 12:35, Stuart Henderson wrote:
> On 2024/05/30 12:34, Kirill A. Korinsky wrote:
> > On Thu, 30 May 2024 12:23:48 +0100,
> > Stuart Henderson  wrote:
> > > 
> > > On 2024/05/30 12:13, Kirill A. Korinsky wrote:
> > > > ports@,
> > > > 
> > > > I'm working on update of audio/beets which was released few hours ago 
> > > > and it
> > > > requires a few new ports as dependencies.
> > > 
> > > pylast is an optional rather than a required dep.
> > >
> > 
> > And which is already in dependency tree. I defently need more coffee.
> > 
> > > > This is the first one: python interface to Last.fm and Libre.fm.
> > > > 
> > > > Tested on -current/amd64 with one note: majority of tests are skipt 
> > > > without
> > > > real credetionals to Last.fm
> > > 
> > > It's missing something for tests,
> > > 
> > > importlib.metadata.PackageNotFoundError: No package metadata was found 
> > > for pylast
> > > 
> > > could be fixed with "TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH}" or
> > > maybe something smarter.
> > > 
> > 
> > Thanks to pointing this.
> > 
> > BTW how did you find this output?
> 
> "make test" without having pylast installed.
> 

...presumably because it does this:

src/pylast/__init__.py
26:import importlib.metadata
44:__version__ = importlib.metadata.version(__name__)




Re: [new] audio/pylast: new port (version 5.3.0)

2024-05-30 Thread Stuart Henderson
On 2024/05/30 12:34, Kirill A. Korinsky wrote:
> On Thu, 30 May 2024 12:23:48 +0100,
> Stuart Henderson  wrote:
> > 
> > On 2024/05/30 12:13, Kirill A. Korinsky wrote:
> > > ports@,
> > > 
> > > I'm working on update of audio/beets which was released few hours ago and 
> > > it
> > > requires a few new ports as dependencies.
> > 
> > pylast is an optional rather than a required dep.
> >
> 
> And which is already in dependency tree. I defently need more coffee.
> 
> > > This is the first one: python interface to Last.fm and Libre.fm.
> > > 
> > > Tested on -current/amd64 with one note: majority of tests are skipt 
> > > without
> > > real credetionals to Last.fm
> > 
> > It's missing something for tests,
> > 
> > importlib.metadata.PackageNotFoundError: No package metadata was found for 
> > pylast
> > 
> > could be fixed with "TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH}" or
> > maybe something smarter.
> > 
> 
> Thanks to pointing this.
> 
> BTW how did you find this output?

"make test" without having pylast installed.



Re: [new] audio/pylast: new port (version 5.3.0)

2024-05-30 Thread Stuart Henderson
On 2024/05/30 12:13, Kirill A. Korinsky wrote:
> ports@,
> 
> I'm working on update of audio/beets which was released few hours ago and it
> requires a few new ports as dependencies.

pylast is an optional rather than a required dep.

> This is the first one: python interface to Last.fm and Libre.fm.
> 
> Tested on -current/amd64 with one note: majority of tests are skipt without
> real credetionals to Last.fm

It's missing something for tests,

importlib.metadata.PackageNotFoundError: No package metadata was found for 
pylast

could be fixed with "TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH}" or
maybe something smarter.



Re: UPDATE: games/minetest to 5.8.0

2024-05-30 Thread Stuart Henderson
On 2024/05/30 07:35, Fabien ROMANO wrote:
> Haaa ok, thx for explanation, thus the port needs either.
> 
> ONLY_FOR_ARCHS = aarch64 arm amd64 i386 powerpc

No need for that: if luajit is not available, the dependency cannot
be satisfied, so it won't be built anyway.

> I have issues with googlesource, I understand your point. Github use a big 
> cache
> to avoid generating new tarballs or they just care about timestamp ? Crazy but
> handy CI/testing (not for releases, I agree !).

They have caches, and they mostly try to avoid changes in the software
stack that would result in differing tarballs, but don't guarantee it.
We've certainly had times when people fetching from github in different
parts of the world got different files.

The archives can vary depending on commit activity too. Either later
commits on a tag, or from embedded 'short' commit hashes (there are
options to allow including them in git-archive files) which can get
longer if a later commit means that an old short tag is now ambiguous.

> This port is using a release, not a commit id, which is a fixed tarballs from
> github, this is perfectly fine ?

Releases by default just have links to on-the-fly/cached git-archive
files (the "source code .tar.gz" links) but project owners can also
upload "release artefacts" - the named files you'll see in some projects
- the latter are stable.


On 2024/05/30 00:42, Anthony J. Bentley wrote:
> Switching away from Lua is necessary because newer minetest decided to
> stop supporting system installations of Lua. So the choice is to either
> build the Lua embedded in minetest, or switch to system luajit.

ah, gotcha. Probably not worth the complexity in this case - now that
luajit's updated to the 2.1 branch it covers archs where minetest might
be useful.



Re: UPDATE: games/minetest to 5.8.0

2024-05-29 Thread Stuart Henderson
On 2024/05/29 20:11, Fabien ROMANO wrote:
> By curiosity, lang/lua (5.1.5) doesn't USE_NOBTCFI, there is no JIT ?
> Why its required for minetest (lua 5.1.4), some patches they bring ?

This diff changes minetest from using lua (no jit, works on most
archs) to luajit (restricted archs and doesn't do BTCFI landing pads
yet). (It could alternatively pull in bsd.port.arch.mk and test
${PROPERTIES:Mluajit} to decide which to use).

> DIST_TUPLE are pretty cool.

Would be even cooler if people didn't rely on inconsistent automated
git-archive production on websites and distributed fixed tarballs
instead.



CVS: cvs.openbsd.org: ports

2024-05-29 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/05/29 15:32:07

Modified files:
devel/llvm/17  : Makefile 
devel/llvm/17/pkg: PLIST-lldb PLIST-main PLIST-python 

Log message:
use MODPY_COMPILEALL and move some includes to PLIST-lldb



CVS: cvs.openbsd.org: ports

2024-05-29 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2024/05/29 15:31:42

Modified files:
devel/llvm : Makefile.inc 
devel/llvm/13  : Makefile 
devel/llvm/13/pkg: PLIST-lldb PLIST-main PLIST-python 
devel/llvm/16  : Makefile 
devel/llvm/16/pkg: PLIST-lldb PLIST-main PLIST-python 
devel/llvm/18  : Makefile 
devel/llvm/18/pkg: PLIST-lldb PLIST-main PLIST-python 

Log message:
use MODPY_COMPILEALL



  1   2   3   4   5   6   7   8   9   10   >