Re: [fix] productivity/radicale2 is missing setuptools RDEP

2023-04-15 Thread Paco Esteban
On Sat, 15 Apr 2023, Stefan Hagen wrote:

> Hi,
> 
> Radicale2 doesn't start anymore because:
> 
> # doas -u _radicale /usr/local/bin/radicale -d
> Traceback (most recent call last):
>   File "/usr/local/bin/radicale", line 5, in 
> from radicale.__main__ import run
>   File "/usr/local/lib/python3.10/site-packages/radicale/__init__.py", line 
> 36, in 
> import pkg_resources
> ModuleNotFoundError: No module named 'pkg_resources'
> 
> It works fine after installing py3-setuptools.
> This is also relevant for 7.3 release.
> 
> OK?

This is most likely the same problem we had with www/epehmetoot a couple
of months go:
https://marc.info/?l=openbsd-ports&m=167325446116128&w=2

I'll try to send a patch upstream later, as pkg_resources is now
deprecated.
In any case, ok paco@ so we can fix it for now.

> 
> Best regards,
> Stefan
> 
> 
> Index: productivity/radicale2/Makefile
> ===
> RCS file: /cvs/ports/productivity/radicale2/Makefile,v
> retrieving revision 1.13
> diff -u -p -u -p -r1.13 Makefile
> --- productivity/radicale2/Makefile   13 Nov 2022 20:31:00 -  1.13
> +++ productivity/radicale2/Makefile   15 Apr 2023 06:20:43 -
> @@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 2.1.12
>  DISTNAME =   Radicale-${MODPY_EGG_VERSION}
>  PKGNAME =${DISTNAME:L}
>  CATEGORIES = productivity net
> -REVISION =   4
> +REVISION =   5
>  
>  HOMEPAGE =   https://radicale.org/
>  
> @@ -16,6 +16,7 @@ MODPY_PI =  Yes
>  MODPY_PYBUILD =  setuptools
>  
>  RUN_DEPENDS =devel/py-dateutil${MODPY_FLAVOR}>=2.7.3 \
> + devel/py-setuptools${MODPY_FLAVOR} \
>   security/py-passlib${MODPY_FLAVOR} \
>   textproc/py-vobject${MODPY_FLAVOR}
>  
> 

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: [fix] productivity/radicale2 is missing setuptools RDEP

2023-04-15 Thread Stuart Henderson
I've confirmed that it is actually radicale and not some other package 
which needs the RDEP, so ok sthen@


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

On 15 April 2023 08:27:36 Paco Esteban  wrote:


On Sat, 15 Apr 2023, Stefan Hagen wrote:


Hi,

Radicale2 doesn't start anymore because:

# doas -u _radicale /usr/local/bin/radicale -d
Traceback (most recent call last):
  File "/usr/local/bin/radicale", line 5, in 
from radicale.__main__ import run
  File "/usr/local/lib/python3.10/site-packages/radicale/__init__.py", line 
  36, in 

import pkg_resources
ModuleNotFoundError: No module named 'pkg_resources'

It works fine after installing py3-setuptools.
This is also relevant for 7.3 release.

OK?


This is most likely the same problem we had with www/epehmetoot a couple
of months go:
https://marc.info/?l=openbsd-ports&m=167325446116128&w=2

I'll try to send a patch upstream later, as pkg_resources is now
deprecated.
In any case, ok paco@ so we can fix it for now.



Best regards,
Stefan


Index: productivity/radicale2/Makefile
===
RCS file: /cvs/ports/productivity/radicale2/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- productivity/radicale2/Makefile 13 Nov 2022 20:31:00 -  1.13
+++ productivity/radicale2/Makefile 15 Apr 2023 06:20:43 -
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 2.1.12
 DISTNAME = Radicale-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   productivity net
-REVISION = 4
+REVISION = 5

 HOMEPAGE = https://radicale.org/

@@ -16,6 +16,7 @@ MODPY_PI =Yes
 MODPY_PYBUILD =setuptools

 RUN_DEPENDS =  devel/py-dateutil${MODPY_FLAVOR}>=2.7.3 \
+   devel/py-setuptools${MODPY_FLAVOR} \
security/py-passlib${MODPY_FLAVOR} \
textproc/py-vobject${MODPY_FLAVOR}




--
Paco Esteban.
0x5818130B8A6DBC03




Re: [Update] comms/hidapi 0.13.1

2023-04-15 Thread Stuart Henderson
On 2023/04/06 17:01, Volker Schlecht wrote:
> 
> 
> On 4/4/23 13:01, Stuart Henderson wrote:
> > - I don't think it's a problem to lose static libraries.
> > The way to change this would be in the cmakefiles
> [...]
> > - please use ${INSTALL_xx} vars instead of cp/mkdir
> [...]
> > and some of the patches lost their comments, so I'd go with this:
> 
> Points taken, thanks!
> 
> Given that you already sent a fixed port, I can't test dependent
> ports beyond building them, and dabbling with solo2-cli, I won't follow
> up on that one.

Since there were no further reports I've committed the update.

> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/comms/libhidapi/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 Makefile
> > --- Makefile30 Mar 2023 03:04:05 -  1.8
> > +++ Makefile4 Apr 2023 10:56:56 -
> > @@ -3,17 +3,16 @@ COMMENT = library for communicating with
> >   # XXX Any consumer should be patched to use hidapi_hid_init() instead of
> >   # hid_init(3) to avoid conflict with base usbhid(3).
> > 
> > -V =0.8.0pre20160128
> > +V =0.13.1
> >   DISTNAME =libhidapi-${V}
> > -REVISION = 1
> > 
> > -GH_ACCOUNT =   signal11
> > +GH_ACCOUNT =   libusb
> >   GH_PROJECT =  hidapi
> > -GH_COMMIT =a6a622ffb680c55da0de787ff93b80280498330f
> > +GH_TAGNAME =   hidapi-${V}
> > 
> >   #libhidapi is symlink to hidapi-libusb. Same version numbers should be 
> > kept.
> > -SHARED_LIBS +=  hidapi-libusb  0.0 # 0.0
> > -SHARED_LIBS +=  hidapi 0.0 # 0.0
> > +SHARED_LIBS += hidapi-libusb   1.0 # 0.0
> > +SHARED_LIBS += hidapi  1.0 # 0.0
> > 
> >   CATEGORIES =  comms
> > 
> > @@ -26,20 +25,16 @@ WANTLIB += iconv pthread usb-1.0
> >   LIB_DEPENDS = converters/libiconv \
> > devel/libusb1
> > 
> > -SEPARATE_BUILD =   Yes
> > -CONFIGURE_STYLE =  autoreconf
> > -CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include/libusb-1.0 \
> > -   -I${LOCALBASE}/include" \
> > -   LDFLAGS="-L${LOCALBASE}/lib -lusb-1.0 -liconv"
> > +MODULES =  devel/cmake
> > 
> > -AUTOCONF_VERSION = 2.69
> > -AUTOMAKE_VERSION = 1.15
> > +DOCDIR =   ${PREFIX}/share/doc/hidapi
> > 
> > -NO_TEST =  Yes
> > +NO_TEST =  Yes
> > 
> >   post-install:
> > -   cd ${PREFIX}/lib && \
> > -   ln -sf libhidapi-libusb.so.${LIBhidapi-libusb_VERSION} \
> > -   libhidapi.so.${LIBhidapi-libusb_VERSION}
> > +   ${INSTALL_DATA_DIR} ${DOCDIR}
> > +   cd ${WRKSRC}; ${INSTALL_DATA} LICENSE* README.md AUTHORS.txt ${DOCDIR}/
> > +   ln -sf libhidapi-libusb.so.${LIBhidapi-libusb_VERSION} \
> > +   ${PREFIX}/lib/libhidapi.so.${LIBhidapi-libusb_VERSION}
> > 
> >   .include 
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/comms/libhidapi/distinfo,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 distinfo
> > --- distinfo18 Jun 2018 23:37:01 -  1.1.1.1
> > +++ distinfo4 Apr 2023 10:56:56 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (libhidapi-0.8.0pre20160128-a6a622ff.tar.gz) = 
> > ZvagI/auGUBb5QEGFmRuEiRsA7IAqucuLAU6IkUD5IE=
> > -SIZE (libhidapi-0.8.0pre20160128-a6a622ff.tar.gz) = 103980
> > +SHA256 (libhidapi-0.13.1.tar.gz) = 
> > R2osmk3H0fyX3SI7hDONvqOAmoTK6i3NiH2XeHJUkOM=
> > +SIZE (libhidapi-0.13.1.tar.gz) = 244666
> > Index: patches/patch-README_md
> > ===
> > RCS file: patches/patch-README_md
> > diff -N patches/patch-README_md
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-README_md 4 Apr 2023 10:56:56 -
> > @@ -0,0 +1,14 @@
> > +rename hid_init() to hidapi_hid_init() to avoid collision with usbhid
> > +
> > +Index: README.md
> > +--- README.md.orig
> >  README.md
> > +@@ -112,7 +112,7 @@ int main(int argc, char* argv[])
> > +   int i;
> > +
> > +   // Initialize the hidapi library
> > +-  res = hid_init();
> > ++  res = hidapi_hid_init();
> > +
> > +   // Open the device using the VID, PID,
> > +   // and optionally the Serial number.
> > Index: patches/patch-README_txt
> > ===
> > RCS file: patches/patch-README_txt
> > diff -N patches/patch-README_txt
> > --- patches/patch-README_txt11 Mar 2022 18:26:28 -  1.2
> > +++ /dev/null   1 Jan 1970 00:00:00 -
> > @@ -1,14 +0,0 @@
> > -rename hid_init() to hidapi_hid_init() to avoid collision with usbhid
> > -
> > -Index: README.txt
> >  README.txt.orig
> > -+++ README.txt
> > -@@ -64,7 +64,7 @@ int main(int argc, char* argv[])
> > -   int i;
> > -
> > -   // Initialize the hidapi library
> > --  res = hid_init();
> > -+  res = hidapi_hid_init();
> > -
> > -   // Open the device using the VID, PID,
> > -   // and optionall

Re: [update] productivity/monica to 4.0.0

2023-04-15 Thread Omar Polo
On 2023/04/09 18:14:52 -0400, A Tammy  wrote:
> Hi,
>   Attached update for monica to 4.0.0 - breaking change of php 8.1+
> dependency, so won't be there on sparc64.
> Full changelog at https://github.com/monicahq/monica/releases/tag/v4.0.0
> 
> OK?

have only built the package but looks good to me.  nit below:

> [...]
> --- Makefile  7 Jun 2022 18:59:10 -   1.2
> +++ Makefile  8 Apr 2023 02:07:53 -
> [...]
>   # AGPL-3.0
>  PERMIT_PACKAGE = Yes
> +
> +MODPHP_VERSION=  8.1
>   MODULES =   lang/php

I'd set MODPHP_VERSION *after* MODULES.

also

>  Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/monica/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo  21 May 2022 00:57:36 -  1.1.1.1
> +++ distinfo  8 Apr 2023 02:07:53 -
> @@ -1,2 +1,2 @@
> -SHA256 (monica-v3.7.0.tar.bz2) =
> YqGGMXRRqPnji9NoQTqX80lYaFxnANQ+WgIaYBedU+4=
> -SIZE (monica-v3.7.0.tar.bz2) = 27282164
> +SHA256 (monica-v4.0.0.tar.bz2) =
> uHsRCO7P5w1JmKDwyLUVjK6NwnTF2mjsz0hOnPrms+w=

the patch is mangled :/

Managed to get back the diff by manually editing the makefile, running
`make makesum' and update-plist.

> +SIZE (monica-v4.0.0.tar.bz2) = 21978004



mips64 bulk build report

2023-04-15 Thread visa
bulk build on octeon.ports.openbsd.org
started on  Sat Apr 8 13:07:07 UTC 2023
finished at Fri Apr 14 19:31:47 UTC 2023
lasted 07D06h24m
done with kern.version=OpenBSD 7.3-current (GENERIC.MP) #1244: Sat Apr  8 
00:23:36 MDT 2023

built packages:8436
Apr 8:1858
Apr 9:980
Apr 10:561
Apr 11:660
Apr 12:803
Apr 13:1301
Apr 14:2272


build failures: 70
http://build-failures.rhaalovely.net/mips64/2023-04-08/chinese/libpinyin.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/databases/postgresql-pllua.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/devel/clang-tools-extra.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/devel/ocaml-menhir.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/devel/py-thrift,python3.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/devel/py-unicorn,python3.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/devel/sdcc.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/emulators/openmsx.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/emulators/spike.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/games/astromenace.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/games/cataclysm-dda.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/games/goldberg_emulator.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/games/hyperrogue.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/games/wesnoth.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/games/witchblast.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/geo/gpstk.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/graphics/enblend-enfuse.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/graphics/openvdb.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/lang/STk.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/lang/gambit.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/lang/gforth.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/lang/librep.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/lang/pfe.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/lang/php/8.1.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/lang/php/8.2.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/mail/opensmtpd-filters/rspamd.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/math/gbc.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/math/lean.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/math/lrs.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/math/mlpack,-main.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/math/ntl.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/misc/remind.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/multimedia/assimp.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/net/eduvpn/vpn-daemon.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/net/icinga/core2.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/net/minio/client.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/net/minio/server.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/net/powerdns_recursor.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/net/syncthing.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/net/utox.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/plan9/drawterm.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/security/botan2.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/security/step-cli.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/security/vault.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/shells/elvish.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/amazon-ecs-cli.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/beats/filebeat.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/beats/heartbeat.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/beats/metricbeat.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/beats/packetbeat.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/dep.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/direnv.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/firmware/apple-boot.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/gitlab-runner.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/kubectl.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/libvirt.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/nix.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/nomad.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/rclone.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/telegraf.log
http://build-failures.rhaalovely.net/mips64/2023-04-08/sysutils/terragrun

Re: [new] sysutils/awscliv2, devel/py-awscrt

2023-04-15 Thread Antoine Jacoutot
On Fri, Apr 07, 2023 at 07:44:40AM -0600, Joel Knight wrote:
> Hi ports@,
> 
> On Tue, Mar 28, 2023 at 10:03 PM Joel Knight  wrote:
> >
> > Hi.
> >
> > Linked below are two new (and tightly coupled) ports: the AWS CLIv2
> > and the Python bindings for the AWS Common Runtime.
> >
> > Given that AWS releases v1 and v2 of their CLI as independent
> > products, I've elected to create  CLIv2 as a new port; the CLIv2 port
> > does not replace sysutils/awscli, the v1 port.
> >
> > Unlike the CLIv1, CLIv2 depends on the AWS CRT. I don't know if the
> > CRT will build on non-amd64 arches. I already know it doesn't build on
> > arm64. For now, I've set ONLY_FOR_ARCHS to amd64 in both ports.
> >
> > I've (presumptively) set myself as MAINTAINER as I'm volunteering to
> > maintain these ports.
> 
> Still looking for feedback on these two ports. Even if you aren't able
> to test the port, it would be helpful to have feedback on the contents
> of the tarball.
> 
> Attaching the tarball in case that's preferable to downloading it from a link.

Hi.

A few things:

- I think we also need a @conflict marker in sysutils/awscli
- add a comment to explain the reason for setting USE_NOEXECONLY
- if llvm is installed, the wrong ar is used by py-awscrt
  -- CMAKE_AR found: /usr/local/bin/llvm-ar

I also think these diffs are needed:


diff -ruN /tmp/devel/py-awscrt/Makefile devel/py-awscrt/Makefile
--- /tmp/devel/py-awscrt/Makefile   Tue Mar 28 21:36:29 2023
+++ devel/py-awscrt/MakefileSat Apr 15 13:21:28 2023
@@ -19,7 +19,10 @@
 MODULES =  lang/python
 
 MODPY_PI = Yes
-MODPY_SETUPTOOLS = Yes
+MODPY_PYBUILD =setuptools
+
+FLAVORS =  python3
+FLAVOR =   python3
 
 BUILD_DEPENDS +=   devel/cmake
 
diff -ruN /tmp/devel/py-awscrt/pkg/PLIST devel/py-awscrt/pkg/PLIST
--- /tmp/devel/py-awscrt/pkg/PLIST  Mon Mar  6 15:35:17 2023
+++ devel/py-awscrt/pkg/PLIST   Sat Apr 15 13:25:26 2023
@@ -1,24 +1,39 @@
 @so lib/python${MODPY_VERSION}/site-packages/_awscrt.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/awscrt/
-lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/NOTICE
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/awscrt/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}checksums.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}checksums.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYC

Re: [update] productivity/monica to 4.0.0

2023-04-15 Thread A Tammy


On 4/15/23 06:55, Omar Polo wrote:
> On 2023/04/09 18:14:52 -0400, A Tammy  wrote:
>> Hi,
>>   Attached update for monica to 4.0.0 - breaking change of php 8.1+
>> dependency, so won't be there on sparc64.
>> Full changelog at https://github.com/monicahq/monica/releases/tag/v4.0.0
>>
>> OK?
> have only built the package but looks good to me.  nit below:
>
>> [...]
>> --- Makefile 7 Jun 2022 18:59:10 -   1.2
>> +++ Makefile 8 Apr 2023 02:07:53 -
>> [...]
>>   # AGPL-3.0
>>  PERMIT_PACKAGE =Yes
>> +
>> +MODPHP_VERSION= 8.1
>>   MODULES =  lang/php
> I'd set MODPHP_VERSION *after* MODULES.
will do!
> also
>
>>  Index: distinfo
>> ===
>> RCS file: /cvs/ports/productivity/monica/distinfo,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 distinfo
>> --- distinfo 21 May 2022 00:57:36 -  1.1.1.1
>> +++ distinfo 8 Apr 2023 02:07:53 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (monica-v3.7.0.tar.bz2) =
>> YqGGMXRRqPnji9NoQTqX80lYaFxnANQ+WgIaYBedU+4=
>> -SIZE (monica-v3.7.0.tar.bz2) = 27282164
>> +SHA256 (monica-v4.0.0.tar.bz2) =
>> uHsRCO7P5w1JmKDwyLUVjK6NwnTF2mjsz0hOnPrms+w=
> the patch is mangled :/
>
> Managed to get back the diff by manually editing the makefile, running
> `make makesum' and update-plist.
Serves me right for deciding to try trusting thunderbird, bah
>> +SIZE (monica-v4.0.0.tar.bz2) = 21978004



Re: [new] sysutils/awscliv2, devel/py-awscrt

2023-04-15 Thread Stuart Henderson
On 2023/04/15 13:45, Antoine Jacoutot wrote:
> On Fri, Apr 07, 2023 at 07:44:40AM -0600, Joel Knight wrote:
> > Hi ports@,
> > 
> > On Tue, Mar 28, 2023 at 10:03 PM Joel Knight  wrote:
> > >
> > > Hi.
> > >
> > > Linked below are two new (and tightly coupled) ports: the AWS CLIv2
> > > and the Python bindings for the AWS Common Runtime.
> > >
> > > Given that AWS releases v1 and v2 of their CLI as independent
> > > products, I've elected to create  CLIv2 as a new port; the CLIv2 port
> > > does not replace sysutils/awscli, the v1 port.
> > >
> > > Unlike the CLIv1, CLIv2 depends on the AWS CRT. I don't know if the
> > > CRT will build on non-amd64 arches. I already know it doesn't build on
> > > arm64. For now, I've set ONLY_FOR_ARCHS to amd64 in both ports.
> > >
> > > I've (presumptively) set myself as MAINTAINER as I'm volunteering to
> > > maintain these ports.
> > 
> > Still looking for feedback on these two ports. Even if you aren't able
> > to test the port, it would be helpful to have feedback on the contents
> > of the tarball.
> > 
> > Attaching the tarball in case that's preferable to downloading it from a 
> > link.
> 
> Hi.
> 
> A few things:
> 
> - I think we also need a @conflict marker in sysutils/awscli

that, or set the PKGNAME base to awscli (i.e. awscli-1.xx and
awscli-2.xx) which I think will automatically conflict and would
be a bit more 'discoverable' for users (though with that, it
does want "@option is-branch")

Re: "Don't know what other arches this will build on", that's not a
reason to restrict archs. Remove ONLY_FOR_ARCHS and we can add it
if builds fail.

Nitpicking but we can get rid of $V -

--
V = 2.11.6
DISTNAME =  awscliv2-${V}

GH_ACCOUNT =aws
GH_PROJECT =aws-cli
GH_TAGNAME =$V

MODPY_EGG_VERSION = $V
--
MODPY_EGG_VERSION = 2.11.6
DISTNAME =  awscliv2-${MODPY_EGG_VERSION}
GH_ACCOUNT =aws
GH_PROJECT =aws-cli
GH_TAGNAME =${MODPY_EGG_VERSION}
--
(or just set PKGNAME instead of overriding DISTNAME; personally
I prefer to keep the default distfile name as long as it's sane)

> - add a comment to explain the reason for setting USE_NOEXECONLY

yep

> - if llvm is installed, the wrong ar is used by py-awscrt
>   -- CMAKE_AR found: /usr/local/bin/llvm-ar

This is because it's not using standard ports build arguments for
cmake as would be used by the cmake module (there are a bunch of
CONFIGURE_ARGS lines to override various detected paths and other
settings).

The cc command lines are hidden in the output but I bet they are not
using proper CFLAGS etc too.

Not sure the best way to deal with this, but ideally it would use
things from cmake.port.mk directly somehow rather than having to
replicate and sync when things change..

> I also think these diffs are needed:
> 
> 
> diff -ruN /tmp/devel/py-awscrt/Makefile devel/py-awscrt/Makefile
> --- /tmp/devel/py-awscrt/Makefile Tue Mar 28 21:36:29 2023
> +++ devel/py-awscrt/Makefile  Sat Apr 15 13:21:28 2023
> @@ -19,7 +19,10 @@
>  MODULES =lang/python
>  
>  MODPY_PI =   Yes
> -MODPY_SETUPTOOLS =   Yes
> +MODPY_PYBUILD =  setuptools
> +
> +FLAVORS =python3
> +FLAVOR = python3
>  
>  BUILD_DEPENDS += devel/cmake
>  
> diff -ruN /tmp/devel/py-awscrt/pkg/PLIST devel/py-awscrt/pkg/PLIST
[..]

+1 for this

> diff -ruN /tmp/sysutils/awscliv2/Makefile sysutils/awscliv2/Makefile
> --- /tmp/sysutils/awscliv2/Makefile   Wed Mar 29 05:29:52 2023
> +++ sysutils/awscliv2/MakefileSat Apr 15 13:35:37 2023
> @@ -24,13 +24,16 @@
>  
>  MODPY_PYBUILD =  flit_core
>  
> -RUN_DEPENDS +=   devel/py-awscrt>=0.16.11
> +FLAVORS =python3 
> +FLAVOR = python3

I think not this one, it's a standalone thing rather than a py-*



Re: [new] sysutils/awscliv2, devel/py-awscrt

2023-04-15 Thread Antoine Jacoutot
On Sat, Apr 15, 2023 at 01:47:36PM +0100, Stuart Henderson wrote:
> On 2023/04/15 13:45, Antoine Jacoutot wrote:
> > On Fri, Apr 07, 2023 at 07:44:40AM -0600, Joel Knight wrote:
> > > Hi ports@,
> > > 
> > > On Tue, Mar 28, 2023 at 10:03 PM Joel Knight  
> > > wrote:
> > > >
> > > > Hi.
> > > >
> > > > Linked below are two new (and tightly coupled) ports: the AWS CLIv2
> > > > and the Python bindings for the AWS Common Runtime.
> > > >
> > > > Given that AWS releases v1 and v2 of their CLI as independent
> > > > products, I've elected to create  CLIv2 as a new port; the CLIv2 port
> > > > does not replace sysutils/awscli, the v1 port.
> > > >
> > > > Unlike the CLIv1, CLIv2 depends on the AWS CRT. I don't know if the
> > > > CRT will build on non-amd64 arches. I already know it doesn't build on
> > > > arm64. For now, I've set ONLY_FOR_ARCHS to amd64 in both ports.
> > > >
> > > > I've (presumptively) set myself as MAINTAINER as I'm volunteering to
> > > > maintain these ports.
> > > 
> > > Still looking for feedback on these two ports. Even if you aren't able
> > > to test the port, it would be helpful to have feedback on the contents
> > > of the tarball.
> > > 
> > > Attaching the tarball in case that's preferable to downloading it from a 
> > > link.
> > 
> > Hi.
> > 
> > A few things:
> > 
> > - I think we also need a @conflict marker in sysutils/awscli
> 
> that, or set the PKGNAME base to awscli (i.e. awscli-1.xx and
> awscli-2.xx) which I think will automatically conflict and would
> be a bit more 'discoverable' for users (though with that, it
> does want "@option is-branch")
> 
> Re: "Don't know what other arches this will build on", that's not a
> reason to restrict archs. Remove ONLY_FOR_ARCHS and we can add it
> if builds fail.
> 
> Nitpicking but we can get rid of $V -
> 
> --
> V =   2.11.6
> DISTNAME =awscliv2-${V}
> 
> GH_ACCOUNT =  aws
> GH_PROJECT =  aws-cli
> GH_TAGNAME =  $V
> 
> MODPY_EGG_VERSION =   $V
> --
> MODPY_EGG_VERSION =   2.11.6
> DISTNAME =awscliv2-${MODPY_EGG_VERSION}
> GH_ACCOUNT =  aws
> GH_PROJECT =  aws-cli
> GH_TAGNAME =  ${MODPY_EGG_VERSION}
> --
> (or just set PKGNAME instead of overriding DISTNAME; personally
> I prefer to keep the default distfile name as long as it's sane)
> 
> > - add a comment to explain the reason for setting USE_NOEXECONLY
> 
> yep
> 
> > - if llvm is installed, the wrong ar is used by py-awscrt
> >   -- CMAKE_AR found: /usr/local/bin/llvm-ar
> 
> This is because it's not using standard ports build arguments for
> cmake as would be used by the cmake module (there are a bunch of
> CONFIGURE_ARGS lines to override various detected paths and other
> settings).
> 
> The cc command lines are hidden in the output but I bet they are not
> using proper CFLAGS etc too.
> 
> Not sure the best way to deal with this, but ideally it would use
> things from cmake.port.mk directly somehow rather than having to
> replicate and sync when things change..
> 
> > I also think these diffs are needed:
> > 
> > 
> > diff -ruN /tmp/devel/py-awscrt/Makefile devel/py-awscrt/Makefile
> > --- /tmp/devel/py-awscrt/Makefile   Tue Mar 28 21:36:29 2023
> > +++ devel/py-awscrt/MakefileSat Apr 15 13:21:28 2023
> > @@ -19,7 +19,10 @@
> >  MODULES =  lang/python
> >  
> >  MODPY_PI = Yes
> > -MODPY_SETUPTOOLS = Yes
> > +MODPY_PYBUILD =setuptools
> > +
> > +FLAVORS =  python3
> > +FLAVOR =   python3
> >  
> >  BUILD_DEPENDS +=   devel/cmake
> >  
> > diff -ruN /tmp/devel/py-awscrt/pkg/PLIST devel/py-awscrt/pkg/PLIST
> [..]
> 
> +1 for this
> 
> > diff -ruN /tmp/sysutils/awscliv2/Makefile sysutils/awscliv2/Makefile
> > --- /tmp/sysutils/awscliv2/Makefile Wed Mar 29 05:29:52 2023
> > +++ sysutils/awscliv2/Makefile  Sat Apr 15 13:35:37 2023
> > @@ -24,13 +24,16 @@
> >  
> >  MODPY_PYBUILD =flit_core
> >  
> > -RUN_DEPENDS += devel/py-awscrt>=0.16.11
> > +FLAVORS =  python3 
> > +FLAVOR =   python3
> 
> I think not this one, it's a standalone thing rather than a py-*

Yes stupid me. Drop the FLAVOR*


-- 
Antoine



Re: neovim and treesitter updates

2023-04-15 Thread Laurent Cheylus
On Thu, 13 Apr 2023 09:42:43 +0100, Laurence Tratt wrote:
> Updating to neovim-0.9.0 requires updating treesitter too, as the former
> requires a new function in the latter. Patches to both below -- "probably
> best if people on ports test it" from edd@.

tree-sitter 0.28.0 and neovim-0.9.0 builds OK on current/amd64.

Tests OK for neovim 0.9.0 with my config/plugins (lualine, bufferline, 
nvim-lspconfig, cmp, nvim-treesitter...).

Thanks for this update of Neovim 0.9.0 port.

Laurent



Re: [new] x11/xfiles

2023-04-15 Thread Omar Polo
Sorry for the delay!

On 2023/04/05 16:04:36 -0300, Lucas de Sena  wrote:
> > One thing that I could never make to work is dmenu: I have it
> > installed, but upon ctrl-g I get this error printed on the terminal
> > where I started xfiles:
> > 
> > X Error of failed request:  BadMatch (invalid parameter attributes)
> >   Major opcode of failed request:  62 (X_CopyArea)
> >   Serial number of failed request:  69
> >   Current serial number in output stream:  70
> > 
> > but this is not an issue with the port :)
> 
> That's a bug on dmenu side.
> 
> When asked to be embedded into another window, dmenu creates its own
> window directly inside the embedder/parent window, inheriting the
> colormap, color depth and visual from it.  However, all the drawing
> operations that dmenu does use the default colormap, color depth and
> visual from X11's root window.
> 
> The error happens because XFiles (the embedder window) and consequenctly
> dmenu (the embedded window) have a 32-bit color depth, with alpha
> channel for transparency; while the root window has a 24-bit color
> depth, without alpha channel.  When commiting the drawing into dmenu's
> window with the X_CopyArea request, a BadMatch error occurs (because the
> colormap and depth do not match).
> 
> A solution for dmenu developers could be to either simply use the
> default X11 colormap, color depth, and visual from the root window
> (rather than inheriting from the parent); or create the dmenu window
> under X11 root window and them reparent it to the embedder.
> 
> dmenu's alpha patch may fix this bug, but I have not tried it.

I tried with a dmenu clone I wrote some time ago and with that it
works fine :)

(probably because it uses 32-bit color depth too, dunno)

> > P.S.: maybe, since xfiles(1) mentions xfilesctl and xfilesthumb we
> >   could install them in /usr/local/bin and tell users to put their
> >   own modified version in ~/bin if wanted.  It'd be slightly more
> >   user-friendly I guess.
> 
> The user is encouraged to build their own xfilesctl and xfilesthumb
> script, so I think we should install them as examples rather than
> installing them on the system.

Agreed


I'm attaching a slightly tweaked version your port:

 - alphabetically sorted MAKE_FLAGS entries

 - README tweaked to follow the standard template, plus some other
   minor tweaks.

If you're fine with it, the attached port is ok op@ to import.

Thanks!



xfiles.tar.gz
Description: GNU Zip compressed data


Re: [update] net/transmission 4.0.2

2023-04-15 Thread Klemens Nanni
On Tue, Apr 11, 2023 at 06:57:49PM -0400, Josh Grosse wrote:
> diff --git a/net/transmission/pkg/PLIST-main b/net/transmission/pkg/PLIST-main
> index 622eb4cdf94..cb16269a77d 100644
> --- a/net/transmission/pkg/PLIST-main
> +++ b/net/transmission/pkg/PLIST-main
> @@ -22,81 +22,50 @@
>  @man man/man1/transmission-remote.1
>  @man man/man1/transmission-show.1
>  @comment share/applications/

update-plist(1) kept moving entries like share/icons/, etc. from -gtk and -qt.
In the end all just prefixed them all with "@comment " to stop it and have
`make update-plist' no longer yield anything.

This seems like a bug in update-plist(1)... which I won't be hunting down.



Re: [New] security/Nuclei 2.9.0

2023-04-15 Thread Omar Polo
On 2023/04/14 21:30:26 +0800, lux  wrote:
> On Wed, 2023-04-12 at 21:58 +0200, Omar Polo wrote:
> > I haven't tested it, but the build ends with a
> > 
> > : zsyscall_openbsd_amd64.s:213
> > : (syscall/zsyscall_openbsd_amd64.s:213)([...]/go-link-
> > 1246028766/go.o:
> > : (syscall.libc_syscall_trampoline.abi0)): warning: syscall() may go
> > : away, please rewrite code to use direct calls
> > 
> > which hints that it may broke a runtime.
> > 
> 
> This warning comes from lib/libc/dlfcn/init.c:
> 
> #if defined(APIWARN)
> __warn_references(syscall,
>     "syscall() may go away, please rewrite code to use direct calls");
> #endif
> 
> I think we may need to wait for the Go language upstream code to make
> changes.

Yep, it comes since some dependency of nuclei is calling syscall()
directly.  Don't know how to tell which it is.  However, that doesn't
imply that the port is broken, it's just a hint that it *might* be so.
I haven't tested, beside a very brief test, so can't say for sure.  If
you've tested it throughfully then it's fine.

(this error may even go away when upstream updates their deps.)



Re: Update fonts/ibm-plex to version 6.2.0

2023-04-15 Thread Omar Polo
Committed, thanks!

On 2023/04/14 11:53:21 -0400, Josiah Frentsos  wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/fonts/ibm-plex/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile  10 Jan 2023 18:01:41 -  1.16
> +++ Makefile  14 Apr 2023 15:51:11 -
> @@ -1,7 +1,7 @@
>  COMMENT =IBM's corporate type family
>  
>  CATEGORIES = fonts
> -V =  6.1.1
> +V =  6.2.0
>  PKGNAME =ibm-plex-$V
>  
>  # SIL OFL 1.1
> Index: distinfo
> ===
> RCS file: /cvs/ports/fonts/ibm-plex/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo  10 Jan 2023 18:01:41 -  1.13
> +++ distinfo  14 Apr 2023 15:51:11 -
> @@ -1,4 +1,4 @@
> -SHA256 (ibm-plex-6.1.1/OpenType.zip) = 
> yTbs5G05ocsoHTw3iBxyaVAPzaXFu+3Lx88omJjqNv0=
> -SHA256 (ibm-plex-6.1.1/TrueType.zip) = 
> ugTKm0Zoai67MFV2p3iXthyIugyFI3q0oeBYHQG+nNQ=
> -SIZE (ibm-plex-6.1.1/OpenType.zip) = 36337645
> -SIZE (ibm-plex-6.1.1/TrueType.zip) = 47115012
> +SHA256 (ibm-plex-6.2.0/OpenType.zip) = 
> 2sNaHQ8RE+d2EgsTRuYZNgszHwpx8rfL1J9zMsMDeyw=
> +SHA256 (ibm-plex-6.2.0/TrueType.zip) = 
> Hex67nepHow7+cm/ztPVnTakAs+xeSsqPczrb0KaBRA=
> +SIZE (ibm-plex-6.2.0/OpenType.zip) = 36523894
> +SIZE (ibm-plex-6.2.0/TrueType.zip) = 47309206




Re: neovim and treesitter updates

2023-04-15 Thread Edd Barrett
Hi,

On Sat, Apr 15, 2023 at 03:35:53PM -, Laurent Cheylus wrote:
> Thanks for this update of Neovim 0.9.0 port.

A couple of tweaks on top of Laurie's work:

treesitter:
 - major bump and remove commented version (it's always the crate version).

neovim:
 - update tree-sitter dep minimum version
 - update static luv and luajit versions to those in cmake.deps/CMakeLists.txt
 - update test dir path so that `make test` works again

Diffs attached.

P.S. Lots of failing tests in textproc/tree-sitter (not introduced by Laurie's
diff). Has anyone tried to fix/report them?

Cheers!

-- 
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk
Index: Makefile
===
RCS file: /cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile20 Feb 2023 21:53:19 -  1.33
+++ Makefile15 Apr 2023 19:13:47 -
@@ -13,20 +13,20 @@ COMMENT =   continuation and extension of 
 
 GH_ACCOUNT =   neovim
 GH_PROJECT =   neovim
-GH_TAGNAME =   v0.8.3
+GH_TAGNAME =   v0.9.0
 
 CATEGORIES =   editors devel
 HOMEPAGE = https://neovim.io
 MAINTAINER =   Edd Barrett 
 
 # The versions listed here must match those in cmake.deps/CMakeLists.txt.
-LUV_VER =  1.44.2-1
-LUAJIT_VER =   633f265f67f322cbe2c5fd11d3e46d968ac220f7
+LUV_VER =  093a977b82077591baefe1e880d37dfa2730bd54
+LUAJIT_VER =   505e2c03de35e2718eef0d2d3660712e06dadf1f
 
-MASTER_SITES0 =
https://github.com/luvit/luv/releases/download/${LUV_VER}/
+MASTER_SITES0 =https://github.com/luvit/luv/archive/
 MASTER_SITES1 = https://github.com/LuaJIT/LuaJIT/archive/
 DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
-   luv-${LUV_VER}${EXTRACT_SUFX}:0 \
+   luv-{}${LUV_VER}${EXTRACT_SUFX}:0 \
luajit-{}${LUAJIT_VER}${EXTRACT_SUFX}:1
 
 # Neovim: Apache 2.0 + Vim License
@@ -65,7 +65,7 @@ LIB_DEPENDS = devel/gettext,-runtime \
devel/libvterm \
devel/msgpack \
devel/unibilium \
-   textproc/tree-sitter
+   textproc/tree-sitter>=0.20.8
 
 RUN_DEPENDS += devel/libmpack/lua \
devel/libmpack/main \
@@ -87,6 +87,7 @@ CONFIGURE_ARGS += -DPREFER_LUA=ON \
-DLUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
-DLUA_LIBRARIES=${MODLUA_LIB}
 .endif
+MAKE_ENV = CCACHE_DISABLE=true
 
 # Tests need gmake
 USE_GMAKE = Yes
@@ -182,7 +183,7 @@ pre-configure:
 do-test:
true
${SETENV} LC_CTYPE=en_US.UTF-8 \
-   ${MAKE_PROGRAM} -C ${WRKSRC}/src/nvim/testdir \
+   ${MAKE_PROGRAM} -C ${WRKSRC}/test/old/testdir \
HOME=${WRKBUILD} NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/editors/neovim/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo20 Feb 2023 21:53:19 -  1.18
+++ distinfo13 Apr 2023 19:45:33 -
@@ -1,6 +1,6 @@
-SHA256 (luajit-633f265f67f322cbe2c5fd11d3e46d968ac220f7.tar.gz) = 
JoHwpvYkpkqN+3Clo3fUlNrziWBELFR9nEaGdMGvo8I=
-SHA256 (luv-1.44.2-1.tar.gz) = PrXHvET2H7xBSOow4yIdQQJj4P+ihWcoUfwZ3r+eXDA=
-SHA256 (neovim-0.8.3.tar.gz) = rfRf8WDh2J9Rm2EUcy66A0ha5Gm+snkZsPek9rRCM8E=
-SIZE (luajit-633f265f67f322cbe2c5fd11d3e46d968ac220f7.tar.gz) = 1074237
-SIZE (luv-1.44.2-1.tar.gz) = 1465728
-SIZE (neovim-0.8.3.tar.gz) = 11406282
+SHA256 (luajit-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz) = 
Z8iDmbkBoi6aI29Ld+b+Oa8A9rcUTOndb1EUHZIfEHY=
+SHA256 (luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz) = 
Iis4tkJfCSYhjhTn2oFIH93m+WYMH+rCWlPm+1LohuY=
+SHA256 (neovim-0.9.0.tar.gz) = OdeRB8VNLzurytLNFXw5kkHAT2516YwY6K+vK7XoKTc=
+SIZE (luajit-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz) = 1075264
+SIZE (luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz) = 127241
+SIZE (neovim-0.9.0.tar.gz) = 11549103
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/neovim/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST   9 Jan 2023 11:08:40 -   1.17
+++ pkg/PLIST   13 Apr 2023 13:20:21 -
@@ -51,25 +51,24 @@ share/locale/zh_TW.UTF-8/LC_MESSAGES/nvi
 share/nvim/
 share/nvim/runtime/
 share/nvim/runtime/autoload/
+share/nvim/runtime/autoload/README.txt
 share/nvim/runtime/autoload/RstFold.vim
 share/nvim/runtime/autoload/ada.vim
 share/nvim/runtime/autoload/adacomplete.vim
 share/nvim/runtime/autoload/bitbake.vim
+share/nvim/runtime/autoload/ccomplete.lua
 share/nvim/runtime/autoload/ccomplete.vim
 share/nvim/runtime/autoload/clojurecomplete.vim
 share/nvim/runtime/autoload/context.vim
 share/nvim/runtime/autoload/contextcomplete.vim
 share/nvim/runtime/autoload/csscomplete.vim
 share/nvim/runtime/autoload/decada.vim
-share/nvim/runtime/autoload

Re: mips64 bulk build report

2023-04-15 Thread Volker Schlecht

On 4/15/23 12:14, v...@openbsd.org wrote:

http://build-failures.rhaalovely.net/mips64/2023-04-08/devel/ocaml-menhir.log


Pinging re: the patch that I sent for the failing sparc64 build...
Index: Makefile
===
RCS file: /cvs/ports/devel/ocaml-menhir/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile	4 Apr 2023 10:28:14 -	1.25
+++ Makefile	15 Apr 2023 21:23:43 -
@@ -3,6 +3,7 @@ COMMENT =		OCaml parser generator for LR
 V =			20211012
 DISTNAME =		menhir-${V}
 PKGNAME =		ocaml-${DISTNAME}
+REVISION =		0
 
 MASTER_SITES =		https://gitlab.inria.fr/fpottier/menhir/-/archive/${V}/
 
Index: pkg/PFRAG.native
===
RCS file: /cvs/ports/devel/ocaml-menhir/pkg/PFRAG.native,v
retrieving revision 1.5
diff -u -p -r1.5 PFRAG.native
--- pkg/PFRAG.native	4 Apr 2023 10:28:14 -	1.5
+++ pkg/PFRAG.native	15 Apr 2023 21:23:43 -
@@ -1,6 +1,8 @@
 %%dynlink%%
+lib/ocaml/menhirLib/menhirLib.a
 lib/ocaml/menhirLib/menhirLib.cmx
 lib/ocaml/menhirLib/menhirLib.cmxa
+lib/ocaml/menhirSdk/menhirSdk.a
 lib/ocaml/menhirSdk/menhirSdk.cmx
 lib/ocaml/menhirSdk/menhirSdk.cmxa
 lib/ocaml/menhirSdk/menhirSdk__Cmly_api.cmx
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ocaml-menhir/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST	4 Apr 2023 10:28:14 -	1.14
+++ pkg/PLIST	15 Apr 2023 21:23:43 -
@@ -9,7 +9,6 @@ lib/ocaml/menhir/dune-package
 lib/ocaml/menhirLib/
 lib/ocaml/menhirLib/META
 lib/ocaml/menhirLib/dune-package
-lib/ocaml/menhirLib/menhirLib.a
 lib/ocaml/menhirLib/menhirLib.cma
 lib/ocaml/menhirLib/menhirLib.cmi
 lib/ocaml/menhirLib/menhirLib.cmt
@@ -25,7 +24,6 @@ lib/ocaml/menhirSdk/cmly_read.mli
 lib/ocaml/menhirSdk/dune-package
 lib/ocaml/menhirSdk/keyword.ml
 lib/ocaml/menhirSdk/keyword.mli
-lib/ocaml/menhirSdk/menhirSdk.a
 lib/ocaml/menhirSdk/menhirSdk.cma
 lib/ocaml/menhirSdk/menhirSdk.cmi
 lib/ocaml/menhirSdk/menhirSdk.cmt


Re: [new] x11/xfiles

2023-04-15 Thread Lucas de Sena
On 2023-04-15, Omar Polo wrote:
> If you're fine with it, the attached port is ok op@ to import.

It's fine, thanks.

I just bumped to version 1.0.4 with a bugfix.
The attached port has the bumped version and updated distinfo.

Lucas de Sena.


xfiles.tar.gz
Description: application/tar-gz


[new] net/trurl-0.4

2023-04-15 Thread Nekobit
This is a port of the trurl package (https://github.com/curl/trurl).

Information for inst:trurl-0.4

Comment:
command line tool for URL parsing and manipulation

Description:
trurl is a command line tool for URL parsing and manipulation.
It utilizes libcurl to create and manipulate paths, making it
a handy tool for shell scripters.

Maintainer: Nekobit 

WWW: https://curl.se/trurl/

Please let me know if there are any issues or changes I need to make.


trurl.tar.gz
Description: application/gzip


UPDATE: FFmpeg 4.4.4

2023-04-15 Thread Brad Smith
Here is an update to FFmpeg 4.4.4.


Index: graphics/ffmpeg/Makefile
===
RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.231
diff -u -p -u -p -r1.231 Makefile
--- graphics/ffmpeg/Makefile24 Jan 2023 14:13:12 -  1.231
+++ graphics/ffmpeg/Makefile16 Apr 2023 03:12:26 -
@@ -1,8 +1,7 @@
 COMMENT=   audio/video converter and streamer
 
-V= 4.4.3
+V= 4.4.4
 DISTNAME=  ffmpeg-${V}
-REVISION=  3
 EPOCH= 1
 CATEGORIES=graphics multimedia
 MASTER_SITES=  https://ffmpeg.org/releases/
Index: graphics/ffmpeg/distinfo
===
RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 distinfo
--- graphics/ffmpeg/distinfo4 Dec 2022 20:12:36 -   1.65
+++ graphics/ffmpeg/distinfo16 Apr 2023 03:12:37 -
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-4.4.3.tar.xz) = bFtsGV5hU0dmoLX+FqzJGRcMiDNiYSgW0KHH9PlHAG4=
-SIZE (ffmpeg-4.4.3.tar.xz) = 9566020
+SHA256 (ffmpeg-4.4.4.tar.xz) = 6As4DVlcgJBg9m+WpdhJUR70p2omt26s9XeLlMNXAwk=
+SIZE (ffmpeg-4.4.4.tar.xz) = 9565584
Index: x11/mplayer/Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.326
diff -u -p -u -p -r1.326 Makefile
--- x11/mplayer/Makefile9 Apr 2023 20:03:20 -   1.326
+++ x11/mplayer/Makefile16 Apr 2023 03:26:49 -
@@ -1,8 +1,9 @@
 COMMENT=   movie player supporting many formats
 
 V= 20230409
-FFMPEG_V=  4.4.3
+FFMPEG_V=  4.4.4
 DISTNAME=  mplayer-${V}
+REVISION=  0
 CATEGORIES=x11 multimedia
 MASTER_SITES=  https://comstyle.com/source/
 EXTRACT_SUFX=  .tar.xz



[new] games/open-syobon-action-0.3

2023-04-15 Thread Nekobit
This is a port of the classic OpenSyobonAction game.

It includes several OpenBSD specific patches to make it run and install,
adds pledge(2) support for very little reason besides the code being
incredibly messy (decompile, mainly), fixes a memleak, and has a
convenient .desktop file.

Information for inst:open-syobon-action-0.3

Comment:
Port of the unforgiving Japanese platformer

Description:
Open Syobon Action is an open-source cross-platform port of the 
unforgiving Japanese platformer using SDL.

Maintainer: Nekobit 

WWW: https://github.com/akemin-dayo/OpenSyobonAction


open-syobon-action.tar.gz
Description: application/gzip


[maintainer update] lang/abcl-1.9.1

2023-04-15 Thread Timo Myyrä
Hi,

Here's small bump to ABCL port.
Release details: 
https://abcl-dev.blogspot.com/2023/02/abcl-191-never-use-dot-oh.html

Timo

diff /usr/ports
commit - 9e018f7a7b38c947fedc6adbadada1a4d72e6b1c
path + /usr/ports
blob - 398bbf58fe356886316e50ad51893697575b81ea
file + lang/abcl/Makefile
--- lang/abcl/Makefile
+++ lang/abcl/Makefile
@@ -1,5 +1,5 @@
 COMMENT =  Common Lisp dialect for the Java Virtual Machine
-V =1.9.0
+V =1.9.1
 DISTNAME = abcl-src-${V}
 PKGNAME =  abcl-${V}
 PKG_ARCH = *
blob - db6cfff0eed2677aa3d80cd67a04bc13e62cc6d1
file + lang/abcl/distinfo
--- lang/abcl/distinfo
+++ lang/abcl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (abcl-src-1.9.0.tar.gz) = oStchPKINL2Yjjra4K0q1MxsRR2eRPPAhT0AcVjBmGk=
-SIZE (abcl-src-1.9.0.tar.gz) = 2470791
+SHA256 (abcl-src-1.9.1.tar.gz) = pbxnfJRB9KgzwgpUG93Rb/+SZIRmkd6aHa9mmfj/EeI=
+SIZE (abcl-src-1.9.1.tar.gz) = 2598026
blob - a0e14d558065211bc171a988e45a902645bb4388
file + lang/abcl/files/abcl_completions
--- lang/abcl/files/abcl_completions
+++ lang/abcl/files/abcl_completions
@@ -543,6 +543,8 @@ java:define-java-class
 java:canonicalize-java-type
 java:canonicalize-jproxy-interfaces
 java:chain
+java:classloader
+java:context-classloader
 java:define-java-class
 java:describe-java-object
 java:dump-classpath
@@ -622,6 +624,7 @@ jvm:%%emit
 java:runtime-class-add-methods
 java:unregister-java-exception
 java:vector-from-jarray
+java:with-classloader
 jvm:%%emit
 jvm:%define-opcode
 jvm:%emit
@@ -695,6 +698,7 @@ jvm:class-name-from-filespec
 jvm:class-file-p
 jvm:class-method
 jvm:class-methods-by-name
+jvm:class-name->type-signature
 jvm:class-name-from-filespec
 jvm:class-remove-method
 jvm:code-add-attribute
@@ -1014,6 +1018,7 @@ jvm:map-flags
 jvm:make-unwind-protect-node
 jvm:make-var-ref
 jvm:make-variable
+jvm:map-array-type
 jvm:map-flags
 jvm:map-method-name
 jvm:map-primitive-type
@@ -3039,6 +3044,7 @@ threads:get-mutex
 third
 threads:current-thread
 threads:destroy-thread
+threads:get-java-thread
 threads:get-mutex
 threads:interrupt-thread
 threads:mailbox-empty-p
@@ -3311,7 +3317,3 @@ zerop
 y-or-n-p
 yes-or-no-p
 zerop
--structure-p
-y-or-n-p
-yes-or-no-p
-zerop
blob - 7c4bd0c198187396e901d508a83b7eaf8ef01051
file + lang/abcl/pkg/PLIST
--- lang/abcl/pkg/PLIST
+++ lang/abcl/pkg/PLIST
@@ -234,6 +234,7 @@ abcl/src/org/armedbear/lisp/clos.lisp
 abcl/src/org/armedbear/lisp/cell_error_name.java
 abcl/src/org/armedbear/lisp/chars.lisp
 abcl/src/org/armedbear/lisp/check-type.lisp
+abcl/src/org/armedbear/lisp/classloader.lisp
 abcl/src/org/armedbear/lisp/clos.lisp
 abcl/src/org/armedbear/lisp/coerce.lisp
 abcl/src/org/armedbear/lisp/collect.lisp



[maintainer update] x11/pekwm-0.3.0

2023-04-15 Thread Timo Myyrä
Hi,

Here's an update for the pekwm. Briefly tested on amd64.

Timo

diff /usr/ports
commit - 9e018f7a7b38c947fedc6adbadada1a4d72e6b1c
path + /usr/ports
blob - 4a38f474b830a9a79bb9c62d830c8542596d5ba7
file + x11/pekwm/Makefile
--- x11/pekwm/Makefile
+++ x11/pekwm/Makefile
@@ -1,7 +1,7 @@
 COMMENT=   aewm++ based pretty themable window manager
 
 DISTNAME=  pekwm-${V}
-V= 0.2.1
+V= 0.3.0
 CATEGORIES=x11
 
 HOMEPAGE=  https://www.pekwm.se/
@@ -12,8 +12,8 @@ WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c f
 PERMIT_PACKAGE=Yes
 
 # uses pledge()
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c fontconfig freetype
+WANTLIB += jpeg m png ${COMPILER_LIBCXX}
 
 COMPILER = base-clang ports-gcc base-gcc
 
blob - e780505f9b46912d82a64933a8781578b9e5f86d
file + x11/pekwm/distinfo
--- x11/pekwm/distinfo
+++ x11/pekwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.2.1.tar.gz) = AV5uud/8gW+i1Km4yzRaUolPTcpaAdBhLzAkLbh+DlA=
-SIZE (pekwm-0.2.1.tar.gz) = 943072
+SHA256 (pekwm-0.3.0.tar.gz) = l+D101bki5Sj1mLzrwovtp7xvA84LqTF2LufTs5IFiQ=
+SIZE (pekwm-0.3.0.tar.gz) = 1210295
blob - a2ed7ab39f72d9e5d72634eaf9d8572e4f6c8e16
file + x11/pekwm/patches/patch-CMakeLists_txt
--- x11/pekwm/patches/patch-CMakeLists_txt
+++ x11/pekwm/patches/patch-CMakeLists_txt
@@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -67,6 +67,7 @@ int main() { std::stof(\"42.0\"); }
+@@ -81,6 +81,7 @@ int main() { std::stof(\"42.0\"); }
  set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
  
  # Look for platform specific methods
blob - /dev/null
file + x11/pekwm/patches/patch-src_CfgParserSource_cc (mode 644)
--- /dev/null
+++ x11/pekwm/patches/patch-src_CfgParserSource_cc
@@ -0,0 +1,14 @@
+backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
+
+Index: src/CfgParserSource.cc
+--- src/CfgParserSource.cc.orig
 src/CfgParserSource.cc
+@@ -144,7 +144,7 @@ CfgParserSourceCommand::open(void)
+   std::string path(Util::getEnv("PATH"));
+   path = _command_path + ":" + path;
+   env.override("PATH", path);
+-  execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), nullptr,
++  execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), NULL,
+  env.getCEnv());
+ 
+   ::close (STDOUT_FILENO);
blob - /dev/null
file + x11/pekwm/patches/patch-src_Util_cc (mode 644)
--- /dev/null
+++ x11/pekwm/patches/patch-src_Util_cc
@@ -0,0 +1,14 @@
+backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
+
+Index: src/Util.cc
+--- src/Util.cc.orig
 src/Util.cc
+@@ -191,7 +191,7 @@ namespace Util {
+   case 0:
+   setsid();
+   execlp(PEKWM_SH, PEKWM_SH, "-c", command.c_str(),
+- static_cast(0));
++ NULL);
+   P_ERR("execlp failed: " << strerror(errno));
+   exit(1);
+   case -1:
blob - /dev/null
file + x11/pekwm/patches/patch-src_pekwm_cc (mode 644)
--- /dev/null
+++ x11/pekwm/patches/patch-src_pekwm_cc
@@ -0,0 +1,14 @@
+backport commit fix dd7b96cdcc6e0430b8f737a6fc5287f476476a85
+
+Index: src/pekwm.cc
+--- src/pekwm.cc.orig
 src/pekwm.cc
+@@ -100,7 +100,7 @@ handleOkResult(char *path, char **argv, int read_fd)
+   } else {
+   command = "exec " + command;
+   execl(PEKWM_SH, PEKWM_SH , "-c", command.c_str(),
+-static_cast(0));
++NULL);
+   }
+ 
+   std::cerr << "failed to run restart command: "
blob - 806341a75110e87e95a5b679298cb45cef4cfa71
file + x11/pekwm/patches/patch-src_pekwm_wm_cc
--- x11/pekwm/patches/patch-src_pekwm_wm_cc
+++ x11/pekwm/patches/patch-src_pekwm_wm_cc
@@ -1,27 +1,18 @@
 Index: src/pekwm_wm.cc
 --- src/pekwm_wm.cc.orig
 +++ src/pekwm_wm.cc
-@@ -21,7 +21,7 @@
- 
- extern "C" {
- #include 
--#include  // execlp
-+#include  // execlp,pledge
- }
- 
- /**
-@@ -141,6 +141,14 @@ main(int argc, char **argv)
- << "using configuration at " << config_file);
- 
-   WindowManager *wm = WindowManager::start(config_file, replace, 
synchronous);
-+
-+#if PEKWM_HAVE_PLEDGE
-+  if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) {
-+  cerr << "failed to pledge" << endl;
-+  return 1;
-+  }
-+#endif
-+
+@@ -181,6 +181,14 @@ main(int argc, char **argv)
+   WindowManager::start(config_file, replace, synchronous);
if (wm) {
try {
++
++#if PEKWM_HAVE_PLEDGE
++  if (pledge("stdio rpath wpath cpath proc exec", NULL) 
== -1) {
++  std::cerr << "failed to pledge" << std::endl;
++  return 1;
++  }
++#endif
++