Re: CVS: cvs.openbsd.org: ports

2024-06-10 Thread Antoine Jacoutot
On Sun, Jun 09, 2024 at 04:32:14AM -0600, Klemens Nanni wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2024/06/09 04:32:14
> 
> Modified files:
>   sysutils/gitlab-cli: Makefile distinfo modules.inc 
>   sysutils/gitlab-cli/pkg: PLIST 
> 
> Log message:
> update to gitlab-cli 1.41.0

@bin bin/INS@cNZDYsSKWm
That doesn't look right and it doesn't package.

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-06-09 Thread Antoine Jacoutot
On Sun, Jun 09, 2024 at 03:01:46AM -0600, Antoine Jacoutot wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ajacou...@cvs.openbsd.org   2024/06/09 03:01:46
> 
> Modified files:
>   x11/xkbcommon  : Makefile 
> 
> Log message:
> Add BDEP on textproc/icu4c; needed to build some tests.

This was reported by naddy@

-- 
Antoine



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: CVS: cvs.openbsd.org: ports

2024-05-29 Thread Antoine Jacoutot
On Tue, May 28, 2024 at 02:19:30PM -0600, Sebastian Reitenbach wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sebas...@cvs.openbsd.org2024/05/28 14:19:30
> 
> Added files:
>   devel/ruby-json_pure: Makefile distinfo 
> 
> Log message:
> re-add devel/ruby-json_pure
> 
> This is a implementation of the JSON specification according to RFC 4627. You
> can think of it as a low fat alternative to XML, if you want to store data to
> disk or transmit it over a network rather than use a verbose markup language.
> 
> OK jeremy@

No DESCR, no PLIST?

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-05-28 Thread Edd Barrett
On Tue, May 28, 2024 at 01:05:21PM -0600, Edd Barrett wrote:
> Diff from Laurent Cheylus, input from jca@, thanks both.

This was also OK jca@. Sorry forgot to mention.

-- 
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk



Re: CVS: cvs.openbsd.org: ports

2024-05-24 Thread Landry Breuil
Le Fri, May 24, 2024 at 01:31:38AM -0600, Landry Breuil a écrit :
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   lan...@cvs.openbsd.org  2024/05/24 01:31:38
> 
> Modified files:
>   graphics/tiff  : Makefile 
> Added files:
>   graphics/tiff/patches: patch-libtiff_CMakeLists_txt 
> 
> Log message:
> graphics/tiff: make sure -lm in Libs.private does have .so.X.Y suffix
  NOT--^



Re: CVS: cvs.openbsd.org: ports

2024-05-23 Thread Stuart Henderson
On 2024/05/22 05:54, Rafael Sadowski wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   rsadow...@cvs.openbsd.org   2024/05/22 05:54:42
> 
> Modified files:
>   x11/kde-plasma/kwin: Makefile 
> 
> Log message:
> Remove REVISON bump (Missed in update diff)
> 

Please just leave that if it happens again, an extra REVISION isn't a
problem and you don't know when somebody might have started a build.



Re: CVS: cvs.openbsd.org: ports

2024-05-16 Thread Thomas Frohwein
On Mon, May 13, 2024 at 08:47:04PM -0600, Thomas Frohwein wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2024/05/13 20:47:04
> 
> Modified files:
>   lang/rsm   : Makefile distinfo 
> Added files:
>   lang/rsm/patches: patch-Makefile 
> Removed files:
>   lang/rsm/patches: patch-BSDmakefile 
> 
> Log message:
> update to RSM 1.80.4
> 
> Release notes at:
> https://gitlab.com/Reference-Standard-M/rsm/-/release
> 

Wrong link for the release notes, pointed out to me by upstream. They
are at: https://gitlab.com/Reference-Standard-M/rsm/-/releases



Re: CVS: cvs.openbsd.org: ports

2024-05-06 Thread Stuart Henderson
On 2024/05/03 08:40, Stuart Henderson wrote:
> On 2024/05/03 08:14, Antoine Jacoutot wrote:
> > On Tue, Apr 30, 2024 at 08:30:46AM -0600, Jeremy Evans wrote:
> > > CVSROOT:  /cvs
> > > Module name:  ports
> > > Changes by:   jer...@cvs.openbsd.org  2024/04/30 08:30:46
> > > 
> > > Modified files:
> > >   security/suricata: Makefile distinfo 
> > > 
> > > Log message:
> > > Update to suricata 7.0.5
> > > 
> > > Fixes CVE-2024-32663 CVE-2024-32664 CVE-2024-32867
> > > 
> > > OK gonzalo@
> > 
> > Making all in qa
> > Making all in coccinelle
> > Making all in rules
> > Making all in doc
> > Making all in userguide
> > RELEASE_DATE=2024-04-23  sysconfdir=/etc  localstatedir=/var  version=7.0.5 
> >  /usr/local/bin/sphinx-build -W -b man -d _build/doctrees  
> > ../../doc/userguide _build/man
> > Running Sphinx v7.3.7
> > 
> > Extension error:
> > Could not import extension sphinx.builders.linkcheck (exception: cannot 
> > import name 'JSONDecodeError' from 'simplejson' (unknown location))
> 
> We've seen this on a few things using sphinx now (from before the sphinx
> updates).
> 
> I think it may be related to py-requests picking up and preferring an
> installed "py3-simplejson" over the Python built-in json module, but I
> can't replicate the problem here.
> 
> (IIUC the "simplejson" module evolved into the "json" built-in in Python
> 3; simplejson used to be faster so some software preferred it for that
> reason, but it seems now the only reason to use it is for code that
> wants backwards compat with old Python).
> 
> requests doesn't want to change this until a major version bump.
> 
> simplejson is only listed as a dep for these ports:
> 
> mail/mailparser
> net/seafile/seafile (though the code no longer uses it)
> www/woob
> 
> I think it probably makes sense to patch these to use json instead of
> simplejson and then remove simplejson.

I do still think that would probably make sense, but looking again,
these are only RDEP for ports which shouldn't be installed during a
bulk, so I don't think it can be that.

Hrmmm...

> I've tested mailparser's json functionality with this change and no
> problem. I don't really know how to test woob, I have a lot of errors
> with the existing version, I managed to get useful data out of some
> backends and that didn't change after patching (and upstream already
> allows "json" as a fallback more most things anyway, so I don't expect
> problems).
> 
> Would anyone else like to check these? (maintainers CC'd).
> 
> 
> Index: mail/mailparser/Makefile
> ===
> RCS file: /cvs/ports/mail/mailparser/Makefile,v
> diff -u -p -r1.1.1.1 Makefile
> --- mail/mailparser/Makefile  18 Apr 2024 09:28:41 -  1.1.1.1
> +++ mail/mailparser/Makefile  3 May 2024 07:17:17 -
> @@ -1,6 +1,7 @@
>  COMMENT =wrapper for 'email' in Python's standard library
>  
>  MODPY_EGG_VERSION =  3.15.0
> +REVISION =   0
>  DISTNAME =   mail-parser-${MODPY_EGG_VERSION}
>  PKGNAME =mailparser-${MODPY_EGG_VERSION}
>  
> @@ -12,8 +13,8 @@ PERMIT_PACKAGE =Yes
>  MODULES =lang/python
>  MODPY_PYBUILD =  setuptools
>  MODPY_PI =   Yes
> +NO_TEST =Yes
>  
> -RUN_DEPENDS =devel/py-simplejson${MODPY_FLAVOR} \
> - devel/py-six${MODPY_FLAVOR}
> +RUN_DEPENDS =devel/py-six${MODPY_FLAVOR}
>  
>  .include 
> Index: mail/mailparser/patches/patch-mailparser_mailparser_py
> ===
> RCS file: mail/mailparser/patches/patch-mailparser_mailparser_py
> diff -N mail/mailparser/patches/patch-mailparser_mailparser_py
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ mail/mailparser/patches/patch-mailparser_mailparser_py3 May 2024 
> 07:17:17 -
> @@ -0,0 +1,12 @@
> +Index: mailparser/mailparser.py
> +--- mailparser/mailparser.py.orig
>  mailparser/mailparser.py
> +@@ -25,7 +25,7 @@ import os
> + 
> + import ipaddress
> + import six
> +-import simplejson as json
> ++import json
> + 
> + from .const import (
> + ADDRESSES_HEADERS,
> Index: mail/mailparser/patches/patch-mailparser_utils_py
> ===
> RCS file: mail/mailparser/patches/patch-mailparser_utils_py
> diff -N mail/mailparser/patches/patch-mailparser_utils_py
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ mail/mailparser/patches/patch-mailparser_utils_py 3 May 2024 07:17:17 
> -
> @@ -0,0 +1,12 @@
> +Index: mailparser/utils.py
> +--- mailparser/utils.py.orig
>  mailparser/utils.py
> +@@ -33,7 +33,7 @@ import logging
> + import os
> + import random
> + import re
> +-import simplejson as json
> ++import json
> + import string
> + import subprocess
> + import sys
> Index: net/seafile/seafile/Makefile
> ===
> RCS file: 

Re: CVS: cvs.openbsd.org: ports

2024-05-06 Thread Solene Rapenne
On Mon, May 06, 2024 at 02:55:54AM GMT, Solene Rapenne wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sol...@cvs.openbsd.org  2024/05/06 02:55:54
> 
> Modified files:
>   audio/cozy : Makefile 
> 
> Log message:
> remove useless dependency x11/gnome/libadwaita
> cozy moved to gtk4 and this is not required anymore
> 
> spotted by ajacoutot@
> 

I meant libhandy and not libadwaita



Re: CVS: cvs.openbsd.org: ports

2024-05-06 Thread Solene Rapenne
On Mon, May 06, 2024 at 08:44:59AM GMT, Antoine Jacoutot wrote:
> On Sun, May 05, 2024 at 05:11:56PM -0600, Solene Rapenne wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: sol...@cvs.openbsd.org  2024/05/05 17:11:56
> > 
> > Modified files:
> > audio/cozy : Makefile 
> > 
> > Log message:
> > unbreak build by adding x11/gnome/libadwaita
> > 
> > spotted by tb@
> 
> It's weird to depend both on x11/gnome/libadwaita (gtk4) and x11/libhandy 
> (gtk3).
> You sure it needs both?
> 
> -- 
> Antoine

it packages fine without libhandy indeed, I didn't know these
packages were tied to a gtk version, and cozy switched to gtk4 with
this version, thanks for the review



Re: CVS: cvs.openbsd.org: ports

2024-05-06 Thread Antoine Jacoutot
On Sun, May 05, 2024 at 05:11:56PM -0600, Solene Rapenne wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sol...@cvs.openbsd.org  2024/05/05 17:11:56
> 
> Modified files:
>   audio/cozy : Makefile 
> 
> Log message:
> unbreak build by adding x11/gnome/libadwaita
> 
> spotted by tb@

It's weird to depend both on x11/gnome/libadwaita (gtk4) and x11/libhandy 
(gtk3).
You sure it needs both?

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-05-03 Thread Stuart Henderson
On 2024/05/03 08:14, Antoine Jacoutot wrote:
> On Tue, Apr 30, 2024 at 08:30:46AM -0600, Jeremy Evans wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: jer...@cvs.openbsd.org  2024/04/30 08:30:46
> > 
> > Modified files:
> > security/suricata: Makefile distinfo 
> > 
> > Log message:
> > Update to suricata 7.0.5
> > 
> > Fixes CVE-2024-32663 CVE-2024-32664 CVE-2024-32867
> > 
> > OK gonzalo@
> 
> Making all in qa
> Making all in coccinelle
> Making all in rules
> Making all in doc
> Making all in userguide
> RELEASE_DATE=2024-04-23  sysconfdir=/etc  localstatedir=/var  version=7.0.5  
> /usr/local/bin/sphinx-build -W -b man -d _build/doctrees  ../../doc/userguide 
> _build/man
> Running Sphinx v7.3.7
> 
> Extension error:
> Could not import extension sphinx.builders.linkcheck (exception: cannot 
> import name 'JSONDecodeError' from 'simplejson' (unknown location))

We've seen this on a few things using sphinx now (from before the sphinx
updates).

I think it may be related to py-requests picking up and preferring an
installed "py3-simplejson" over the Python built-in json module, but I
can't replicate the problem here.

(IIUC the "simplejson" module evolved into the "json" built-in in Python
3; simplejson used to be faster so some software preferred it for that
reason, but it seems now the only reason to use it is for code that
wants backwards compat with old Python).

requests doesn't want to change this until a major version bump.

simplejson is only listed as a dep for these ports:

mail/mailparser
net/seafile/seafile (though the code no longer uses it)
www/woob

I think it probably makes sense to patch these to use json instead of
simplejson and then remove simplejson.

I've tested mailparser's json functionality with this change and no
problem. I don't really know how to test woob, I have a lot of errors
with the existing version, I managed to get useful data out of some
backends and that didn't change after patching (and upstream already
allows "json" as a fallback more most things anyway, so I don't expect
problems).

Would anyone else like to check these? (maintainers CC'd).


Index: mail/mailparser/Makefile
===
RCS file: /cvs/ports/mail/mailparser/Makefile,v
diff -u -p -r1.1.1.1 Makefile
--- mail/mailparser/Makefile18 Apr 2024 09:28:41 -  1.1.1.1
+++ mail/mailparser/Makefile3 May 2024 07:17:17 -
@@ -1,6 +1,7 @@
 COMMENT =  wrapper for 'email' in Python's standard library
 
 MODPY_EGG_VERSION =3.15.0
+REVISION = 0
 DISTNAME = mail-parser-${MODPY_EGG_VERSION}
 PKGNAME =  mailparser-${MODPY_EGG_VERSION}
 
@@ -12,8 +13,8 @@ PERMIT_PACKAGE =  Yes
 MODULES =  lang/python
 MODPY_PYBUILD =setuptools
 MODPY_PI = Yes
+NO_TEST =  Yes
 
-RUN_DEPENDS =  devel/py-simplejson${MODPY_FLAVOR} \
-   devel/py-six${MODPY_FLAVOR}
+RUN_DEPENDS =  devel/py-six${MODPY_FLAVOR}
 
 .include 
Index: mail/mailparser/patches/patch-mailparser_mailparser_py
===
RCS file: mail/mailparser/patches/patch-mailparser_mailparser_py
diff -N mail/mailparser/patches/patch-mailparser_mailparser_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mail/mailparser/patches/patch-mailparser_mailparser_py  3 May 2024 
07:17:17 -
@@ -0,0 +1,12 @@
+Index: mailparser/mailparser.py
+--- mailparser/mailparser.py.orig
 mailparser/mailparser.py
+@@ -25,7 +25,7 @@ import os
+ 
+ import ipaddress
+ import six
+-import simplejson as json
++import json
+ 
+ from .const import (
+ ADDRESSES_HEADERS,
Index: mail/mailparser/patches/patch-mailparser_utils_py
===
RCS file: mail/mailparser/patches/patch-mailparser_utils_py
diff -N mail/mailparser/patches/patch-mailparser_utils_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mail/mailparser/patches/patch-mailparser_utils_py   3 May 2024 07:17:17 
-
@@ -0,0 +1,12 @@
+Index: mailparser/utils.py
+--- mailparser/utils.py.orig
 mailparser/utils.py
+@@ -33,7 +33,7 @@ import logging
+ import os
+ import random
+ import re
+-import simplejson as json
++import json
+ import string
+ import subprocess
+ import sys
Index: net/seafile/seafile/Makefile
===
RCS file: /cvs/ports/net/seafile/seafile/Makefile,v
diff -u -p -r1.54 Makefile
--- net/seafile/seafile/Makefile4 Mar 2024 06:21:15 -   1.54
+++ net/seafile/seafile/Makefile3 May 2024 07:17:17 -
@@ -5,6 +5,7 @@ GH_PROJECT =seafile
 # this commit is from the "v9.0.5" tag
 GH_COMMIT =b5c8e027ad50a1422f27d218c13f82a8f10018d2
 DISTNAME = seafile-daemon-9.0.50pl20240228
+REVISION = 0
 
 SHARED_LIBS =  seafile 4.0
 
@@ -17,7 +18,6 @@ 

Re: CVS: cvs.openbsd.org: ports

2024-05-03 Thread Antoine Jacoutot
On Tue, Apr 30, 2024 at 08:30:46AM -0600, Jeremy Evans wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   jer...@cvs.openbsd.org  2024/04/30 08:30:46
> 
> Modified files:
>   security/suricata: Makefile distinfo 
> 
> Log message:
> Update to suricata 7.0.5
> 
> Fixes CVE-2024-32663 CVE-2024-32664 CVE-2024-32867
> 
> OK gonzalo@

Making all in qa
Making all in coccinelle
Making all in rules
Making all in doc
Making all in userguide
RELEASE_DATE=2024-04-23  sysconfdir=/etc  localstatedir=/var  version=7.0.5  
/usr/local/bin/sphinx-build -W -b man -d _build/doctrees  ../../doc/userguide 
_build/man
Running Sphinx v7.3.7

Extension error:
Could not import extension sphinx.builders.linkcheck (exception: cannot import 
name 'JSONDecodeError' from 'simplejson' (unknown location))


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-05-02 Thread Stuart Henderson
On 2024/04/27 05:30, Frederic Cambus wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   fcam...@cvs.openbsd.org 2024/04/27 05:30:59
> 
> Log message:
> Import audio/furnace.
> 
> Furnace is a tool which allows you to create music using sound chips
> ("chiptune"), most from the 8/16-bit era.
> 
> It has a large selection of features and sound chips. From the NES, SNES
> and Genesis to ES5506, VIC-20 or even Arcade, Furnace has most likely
> covered your target with many presets to choose from.
> 
> Every chip is emulated using many emulation cores, therefore the sound
> that Furnace produces is authentic to that of real hardware.
> 
> OK solene@
> 
> Status:
> 
> Vendor Tag:   fcambus
> Release Tags: fcambus_20240427
> 
> N ports/audio/furnace/Makefile
> N ports/audio/furnace/distinfo
> N ports/audio/furnace/patches/patch-extern_igfd_ImGuiFileDialog_cpp
> N ports/audio/furnace/patches/patch-CMakeLists_txt
> N ports/audio/furnace/pkg/DESCR
> N ports/audio/furnace/pkg/PLIST
> 
> No conflicts created by this import
> 

i386: probably requires either asm changes, or maybe building without PIE

/pobj/furnace-0.6.2/furnace-0.6.2/extern/ESFMu/esfm.c:1855:5: error: inline 
assembly requires more registers than available
"movzbl  %b[wave], %%eax \n\t"
^
1 error generated.



Re: CVS: cvs.openbsd.org: ports

2024-04-26 Thread Stuart Henderson
On 2024/04/21 14:55, Frederic Cambus wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   fcam...@cvs.openbsd.org 2024/04/21 14:55:33
> 
> Modified files:
>   emulators/hatari: Makefile distinfo 
>   emulators/hatari/patches: patch-CMakeLists_txt 
>   emulators/hatari/pkg: PLIST 
> 
> Log message:
> Update hatari to 2.5.0 and take back maintainership.
> 

Hidden dep on capstone, either needs disabling or LIB_DEPENDS.



Re: CVS: cvs.openbsd.org: ports

2024-04-25 Thread Solène Rapenne

Le 25/04/2024 à 16:44, Frederic Cambus a écrit :

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2024/04/25 08:44:10

Modified files:
misc   : Makefile
Removed files:
misc/gone  : Makefile distinfo
misc/gone/patches: patch-Makefile_in
misc/gone/pkg  : DESCR PLIST

Log message:
Remove misc/gone.

Last release is from 2003 and the program is crashing on at least amd64
and arm64 when entering a passphrase.

$ gone
Password:
Segmentation fault (core dumped)

OK solene@



seems gone is gone :-D



Re: CVS: cvs.openbsd.org: ports

2024-04-20 Thread Stuart Henderson
On 2024/04/19 21:48, Solene Rapenne wrote:
> On Fri, Apr 19, 2024 at 09:41:15PM GMT, Solene Rapenne wrote:
> > On Fri, Apr 19, 2024 at 07:07:22AM GMT, Stuart Henderson wrote:
> > > CVSROOT:  /cvs
> > > Module name:  ports
> > > Changes by:   st...@cvs.openbsd.org   2024/04/19 07:07:22
> > > 
> > > Modified files:
> > >   textproc/py-docutils: Makefile distinfo 
> > >   textproc/py-docutils/pkg: PLIST 
> > > 
> > > Log message:
> > > update to py3-docutils-0.21.1
> > > 
> > 
> > fail to build on amd64
> > 
> > >>> Running build in textproc/py-docutils,python3 at 1713555354.66
> > ===> textproc/py-docutils,python3
> > ===>  Checking files for py3-docutils-0.21.1
> > `/data/distfiles/docutils-0.21.1.tar.gz' is up to date.
> > >> (SHA256) docutils-0.21.1.tar.gz: OK
> > ===>  Extracting for py3-docutils-0.21.1
> > ===>  Patching for py3-docutils-0.21.1
> > ===>  Compiler link: clang -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
> > /usr/bin/clang
> > ===>  Compiler link: clang++ -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
> > /usr/bin/clang++
> > ===>  Compiler link: cc -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
> > /usr/bin/cc
> > ===>  Compiler link: c++ -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
> > /usr/bin/c++
> > ===>  Generating configure for py3-docutils-0.21.1
> > ===>  Configuring for py3-docutils-0.21.1
> > ===>  Building for py3-docutils-0.21.1
> > * Getting build dependencies for wheel...
> > 
> > Traceback (most recent call last):
> >   File "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_impl.py", 
> > line 321, in _call_hook
> > raise BackendUnavailable(data.get('traceback', ''))
> > pyproject_hooks._impl.BackendUnavailable: Traceback (most recent call last):
> >   File 
> > "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_in_process/_in_process.py",
> >  line 77, in _build_backend
> > obj = import_module(mod_path)
> >   File "/usr/local/lib/python3.10/importlib/__init__.py", line 126, in 
> > import_module
> > return _bootstrap._gcd_import(name[level:], package, level)
> >   File "", line 1050, in _gcd_import
> >   File "", line 1027, in _find_and_load
> >   File "", line 992, in _find_and_load_unlocked
> >   File "", line 241, in 
> > _call_with_frames_removed
> >   File "", line 1050, in _gcd_import
> >   File "", line 1027, in _find_and_load
> >   File "", line 1004, in 
> > _find_and_load_unlocked
> > ModuleNotFoundError: No module named 'flit_core'
> > 
> > ERROR Backend 'flit_core.buildapi' is not available.
> > *** Error 1 in textproc/py-docutils 
> > (/data/ports/lang/python/python.port.mk:370 'do-build': @: ; if [ -e 
> > /tmp/pobj/py-docutils-0.21.1-python...)
> > *** Error 2 in textproc/py-docutils 
> > (/data/ports/infrastructure/mk/bsd.port.mk:3057 
> > '/tmp/pobj/py-docutils-0.21.1-python3/.build_done': @cd ...)
> > *** Error 2 in textproc/py-docutils 
> > (/data/ports/infrastructure/mk/bsd.port.mk:2704 'build': 
> > @lock=py3-docutils-0.21.1;  export _LOCKS_HELD=...)
> > ===> Exiting textproc/py-docutils,python3 with an error
> > 
> 
> this diff seems to work for me
> 
> ok?
> 
> diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
> index 300c8d4caf4..dca2c5b5e80 100644
> --- a/textproc/py-docutils/Makefile
> +++ b/textproc/py-docutils/Makefile
> @@ -4,6 +4,7 @@ MODPY_EGG_VERSION= 0.21.1
>  DISTNAME=docutils-${MODPY_EGG_VERSION}
>  PKGNAME= py-${DISTNAME}
>  CATEGORIES=  textproc
> +REVISION=0
>  
>  HOMEPAGE=https://docutils.sourceforge.io/
>  
> @@ -15,6 +16,8 @@ MODULES=lang/python
>  MODPY_PI=Yes
>  MODPY_PYBUILD=   setuptools
>  
> +BUILD_DEPENDS=   devel/py-flit_core${MODPY_FLAVOR}
> +
>  RUN_DEPENDS= textproc/py-pygments${MODPY_FLAVOR}
>  
>  FLAVORS= python3
> 

Thanks, I've fixed it this way:

-MODPY_PYBUILD= setuptools
+MODPY_PYBUILD= flit_core



Re: CVS: cvs.openbsd.org: ports

2024-04-19 Thread Solene Rapenne
On Fri, Apr 19, 2024 at 09:41:15PM GMT, Solene Rapenne wrote:
> On Fri, Apr 19, 2024 at 07:07:22AM GMT, Stuart Henderson wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: st...@cvs.openbsd.org   2024/04/19 07:07:22
> > 
> > Modified files:
> > textproc/py-docutils: Makefile distinfo 
> > textproc/py-docutils/pkg: PLIST 
> > 
> > Log message:
> > update to py3-docutils-0.21.1
> > 
> 
> fail to build on amd64
> 
> >>> Running build in textproc/py-docutils,python3 at 1713555354.66
> ===> textproc/py-docutils,python3
> ===>  Checking files for py3-docutils-0.21.1
> `/data/distfiles/docutils-0.21.1.tar.gz' is up to date.
> >> (SHA256) docutils-0.21.1.tar.gz: OK
> ===>  Extracting for py3-docutils-0.21.1
> ===>  Patching for py3-docutils-0.21.1
> ===>  Compiler link: clang -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
> /usr/bin/clang
> ===>  Compiler link: clang++ -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
> /usr/bin/clang++
> ===>  Compiler link: cc -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
> /usr/bin/cc
> ===>  Compiler link: c++ -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
> /usr/bin/c++
> ===>  Generating configure for py3-docutils-0.21.1
> ===>  Configuring for py3-docutils-0.21.1
> ===>  Building for py3-docutils-0.21.1
> * Getting build dependencies for wheel...
> 
> Traceback (most recent call last):
>   File "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_impl.py", 
> line 321, in _call_hook
> raise BackendUnavailable(data.get('traceback', ''))
> pyproject_hooks._impl.BackendUnavailable: Traceback (most recent call last):
>   File 
> "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_in_process/_in_process.py",
>  line 77, in _build_backend
> obj = import_module(mod_path)
>   File "/usr/local/lib/python3.10/importlib/__init__.py", line 126, in 
> import_module
> return _bootstrap._gcd_import(name[level:], package, level)
>   File "", line 1050, in _gcd_import
>   File "", line 1027, in _find_and_load
>   File "", line 992, in _find_and_load_unlocked
>   File "", line 241, in _call_with_frames_removed
>   File "", line 1050, in _gcd_import
>   File "", line 1027, in _find_and_load
>   File "", line 1004, in _find_and_load_unlocked
> ModuleNotFoundError: No module named 'flit_core'
> 
> ERROR Backend 'flit_core.buildapi' is not available.
> *** Error 1 in textproc/py-docutils 
> (/data/ports/lang/python/python.port.mk:370 'do-build': @: ; if [ -e 
> /tmp/pobj/py-docutils-0.21.1-python...)
> *** Error 2 in textproc/py-docutils 
> (/data/ports/infrastructure/mk/bsd.port.mk:3057 
> '/tmp/pobj/py-docutils-0.21.1-python3/.build_done': @cd ...)
> *** Error 2 in textproc/py-docutils 
> (/data/ports/infrastructure/mk/bsd.port.mk:2704 'build': 
> @lock=py3-docutils-0.21.1;  export _LOCKS_HELD=...)
> ===> Exiting textproc/py-docutils,python3 with an error
> 

this diff seems to work for me

ok?

diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 300c8d4caf4..dca2c5b5e80 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -4,6 +4,7 @@ MODPY_EGG_VERSION= 0.21.1
 DISTNAME=  docutils-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=textproc
+REVISION=  0
 
 HOMEPAGE=  https://docutils.sourceforge.io/
 
@@ -15,6 +16,8 @@ MODULES=  lang/python
 MODPY_PI=  Yes
 MODPY_PYBUILD= setuptools
 
+BUILD_DEPENDS= devel/py-flit_core${MODPY_FLAVOR}
+
 RUN_DEPENDS=   textproc/py-pygments${MODPY_FLAVOR}
 
 FLAVORS=   python3



Re: CVS: cvs.openbsd.org: ports

2024-04-19 Thread Solene Rapenne
On Fri, Apr 19, 2024 at 07:07:22AM GMT, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2024/04/19 07:07:22
> 
> Modified files:
>   textproc/py-docutils: Makefile distinfo 
>   textproc/py-docutils/pkg: PLIST 
> 
> Log message:
> update to py3-docutils-0.21.1
> 

fail to build on amd64

>>> Running build in textproc/py-docutils,python3 at 1713555354.66
===> textproc/py-docutils,python3
===>  Checking files for py3-docutils-0.21.1
`/data/distfiles/docutils-0.21.1.tar.gz' is up to date.
>> (SHA256) docutils-0.21.1.tar.gz: OK
===>  Extracting for py3-docutils-0.21.1
===>  Patching for py3-docutils-0.21.1
===>  Compiler link: clang -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
/usr/bin/clang
===>  Compiler link: clang++ -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
/usr/bin/clang++
===>  Compiler link: cc -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache /usr/bin/cc
===>  Compiler link: c++ -> env  CCACHE_DIR=/tmp/pobj/.ccache  ccache 
/usr/bin/c++
===>  Generating configure for py3-docutils-0.21.1
===>  Configuring for py3-docutils-0.21.1
===>  Building for py3-docutils-0.21.1
* Getting build dependencies for wheel...

Traceback (most recent call last):
  File "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_impl.py", line 
321, in _call_hook
raise BackendUnavailable(data.get('traceback', ''))
pyproject_hooks._impl.BackendUnavailable: Traceback (most recent call last):
  File 
"/usr/local/lib/python3.10/site-packages/pyproject_hooks/_in_process/_in_process.py",
 line 77, in _build_backend
obj = import_module(mod_path)
  File "/usr/local/lib/python3.10/importlib/__init__.py", line 126, in 
import_module
return _bootstrap._gcd_import(name[level:], package, level)
  File "", line 1050, in _gcd_import
  File "", line 1027, in _find_and_load
  File "", line 992, in _find_and_load_unlocked
  File "", line 241, in _call_with_frames_removed
  File "", line 1050, in _gcd_import
  File "", line 1027, in _find_and_load
  File "", line 1004, in _find_and_load_unlocked
ModuleNotFoundError: No module named 'flit_core'

ERROR Backend 'flit_core.buildapi' is not available.
*** Error 1 in textproc/py-docutils (/data/ports/lang/python/python.port.mk:370 
'do-build': @: ; if [ -e /tmp/pobj/py-docutils-0.21.1-python...)
*** Error 2 in textproc/py-docutils 
(/data/ports/infrastructure/mk/bsd.port.mk:3057 
'/tmp/pobj/py-docutils-0.21.1-python3/.build_done': @cd ...)
*** Error 2 in textproc/py-docutils 
(/data/ports/infrastructure/mk/bsd.port.mk:2704 'build': 
@lock=py3-docutils-0.21.1;  export _LOCKS_HELD=...)
===> Exiting textproc/py-docutils,python3 with an error



Re: CVS: cvs.openbsd.org: ports

2024-04-17 Thread Stuart Henderson
On 2024/04/17 09:06, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2024/04/17 09:06:14
> 
> Modified files:
>   security/py-fastecdsa: Makefile 
> Removed files:
>   security/py-fastecdsa/patches: 
>  
> patch-fastecdsa_tests_test_rfc6979_ecdsa_py 
>  
> patch-fastecdsa_tests_test_whycheproof_vectors_py 
> 
> Log message:
> avoid some annoying patching with a judicious symlink. still annoying but
> less so, and there's some general problem in our pytest infrastructure where
> it doesn't work well for Python modules that include compiled extensions.
> 

that was ok tb@



Re: CVS: cvs.openbsd.org: ports

2024-04-17 Thread Pavel Korovin
On 04/17, Pavel Korovin wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   p...@cvs.openbsd.org2024/04/17 07:02:36
> 
> Modified files:
>   www/opensearch-dashboards: Makefile distinfo 
>   www/opensearch-dashboards/patches: 
>  
> patch-src_setup_node_env_node_version_validator_js 
>   www/opensearch-dashboards/pkg: PLIST 
> 
> Log message:
> Update opensearch-dashboards 2.11.1 -> 2.13.3
 ^^
 fat fingers, 2.13.0 of course

Sorry.

-- 
With best regards,
Pavel Korovin



Re: CVS: cvs.openbsd.org: ports

2024-04-16 Thread Antoine Jacoutot
On Mon, Apr 15, 2024 at 03:15:11PM -0600, Frederic Cambus wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   fcam...@cvs.openbsd.org 2024/04/15 15:15:11
> 
> Modified files:
>   textproc/yq: Makefile distinfo 
> 
> Log message:
> Update yq to 3.3.0.


>>> Running package in textproc/yq at 1713259881.55
===> textproc/yq
===>  Faking installation for yq-3.3.0
===>  Building package for yq-3.3.0
Create /exopi-cvs/ports/packages/amd64/all/yq-3.3.0.tgz
Creating package yq-3.3.0
checksumming|**   | 88%
Error: 
/exopi-obj/pobj/yq-3.3.0/fake-amd64/usr/local/lib/python3.10/site-packages/yq/__pycache__/version.cpython-310.opt-1.pyc
 does not exist
Error: 
/exopi-obj/pobj/yq-3.3.0/fake-amd64/usr/local/lib/python3.10/site-packages/yq/__pycache__/version.cpython-310.pyc
 does not exist
Error: 
/exopi-obj/pobj/yq-3.3.0/fake-amd64/usr/local/lib/python3.10/site-packages/yq/version.py
 does not exist
pkg_create: can't continue
*** Error 1 in textproc/yq (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2243 
'/exopi-cvs/ports/packages/amd64/all/yq-3.3.0.tgz': @trap "c...)
*** Error 2 in textproc/yq (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2725 
'_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPEND...)
*** Error 2 in textproc/yq (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2704 
'package': @lock=yq-3.3.0;  export _LOCKS_HELD=" yq-3.3.0"; ...)
===> Exiting textproc/yq with an error



-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-04-16 Thread Paco Esteban
On Tue, 16 Apr 2024, Paco Esteban wrote:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   p...@cvs.openbsd.org2024/04/16 04:05:22
> 
> Modified files:
>   net/go-sendxmpp: Makefile distinfo modules.inc 
> 
> Log message:
> update of net/py-nbxmpp to 4.5.4

This was, of course, update net/go-sendxmpp to 0.10.0

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: CVS: cvs.openbsd.org: ports (textproc/ripgrep)

2024-04-13 Thread Sebastien Marie
Theo Buehler  writes:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2024/04/13 18:16:34
>
> Modified files:
>   textproc/ripgrep: Makefile 
>
> Log message:
> drop maintainer

is it intented ?

the commit message doesn't correspond to the patch (it could happen),
and the patch is weird (does ripgrep do not depend on c, pthread and
c++abi at all ?)
 
Below is the diff which was commited.
-- 
Sebastien Marie


===
RCS file: /cvsrepo/anoncvs/cvs/ports/textproc/ripgrep/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ports/textproc/ripgrep/Makefile 2024/04/14 00:14:15 1.33
+++ ports/textproc/ripgrep/Makefile 2024/04/14 00:16:34 1.34
@@ -3,14 +3,12 @@
 GH_ACCOUNT =   BurntSushi
 GH_PROJECT =   ripgrep
 GH_TAGNAME =   14.1.0
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   textproc sysutils
 
 # Unlicense/MIT
 PERMIT_PACKAGE =   Yes
-
-WANTLIB += ${MODCARGO_WANTLIB}
 
 MAINTAINER =   Theo Buehler 



Re: CVS: cvs.openbsd.org: ports

2024-04-12 Thread giovanni

On 4/12/24 11:17, Giovanni Bechis wrote:

CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2024/04/12 03:17:42

Modified files:
www/apache-httpd: Tag: OPENBSD_7_5 Makefile distinfo
www/apache-httpd/patches: Tag: OPENBSD_7_5
  patch-docs_man_htpasswd_1
  patch-modules_ssl_ssl_engine_init_c
Removed files:
www/apache-httpd/patches: Tag: OPENBSD_7_5
  patch-modules_filters_mod_xml2enc_c
  patch-modules_ssl_ssl_private_h

Log message:
Update to 2.4.59
fixes CVE-2024-27316, CVE-2024-24795 and CVE-2023-38709
Also fix a regression that causes the default DH parameters for a key
no longer set and thus effectively disabling DH ciphers when no explicit
DH parameters are set.


this was ok sthen@


OpenPGP_signature.asc
Description: OpenPGP digital signature


Re: CVS: cvs.openbsd.org: ports

2024-03-31 Thread Stuart Henderson
On 2024/03/30 14:46, Antoine Jacoutot wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ajacou...@cvs.openbsd.org   2024/03/30 14:46:48
> 
> Modified files:
>   graphics/gimp/snapshot: Makefile distinfo 
>   graphics/gimp/snapshot/patches: patch-app_core_gimp-utils_c 
>   patch-app_main_c 
>   
> patch-libgimpwidgets_gimpwidgets-private_c 
>   patch-meson_build 
>   graphics/gimp/snapshot/pkg: PLIST 
> 
> Log message:
> Update to gimp-2.99.18.
> 

I looked at this before but ran out of time with 7.5 lock, I think there
was some problem with lua plugins wanting lua-lgi (we don't have any
infrastructure for building extensions with luajit yet).



Re: CVS: cvs.openbsd.org: ports

2024-03-30 Thread Brad Smith

On 2024-03-30 4:43 p.m., Antoine Jacoutot wrote:

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2024/03/30 14:43:30

Modified files:
graphics/lcms2 : Makefile distinfo

Log message:
Update to lcms2-2.16.


There is a major bump missing. removed: cmsGetToneCurveParams


Re: CVS: cvs.openbsd.org: ports

2024-03-29 Thread Theo Buehler
On Fri, Mar 29, 2024 at 09:23:40AM +0100, Antoine Jacoutot wrote:
> On Thu, 2024-03-28 at 18:23 -0600, Theo Buehler wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: t...@cvs.openbsd.org2024/03/28 18:23:05
> > 
> > Modified files:
> > security/rust-openssl-tests: Makefile distinfo 
> > 
> > Log message:
> > Update to rust-openssl-tests 20240329
> > 
> 
> Hello.
> 
> Does not patch.

cvs is too hard. fixed, thanks

> 
> [modcargo] Removing libsrc for openssl-src-300.2.3+3.2.1
> ===>  Patching for rust-openssl-tests-20240329
> ===>   Applying OpenBSD patch patch-openssl-sys_build_main_rs
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --
> |The LibreSSL version in -current isn't explicitly supported.
> |
> |Index: openssl-sys/build/main.rs
> |--- openssl-sys/build/main.rs.orig 
> |+++ openssl-sys/build/main.rs
> --
> Patching file openssl-sys/build/main.rs using Plan A...
> Hunk #1 failed at 303.
> 1 out of 1 hunks failed--saving rejects to openssl-sys/build/main.rs.rej
> done
> ***>   patch-openssl-sys_build_main_rs did not apply cleanly
> ===>   Failed patches:
> patch-openssl-sys_build_main_rs
> 
> -- 
> Antoine



Re: CVS: cvs.openbsd.org: ports

2024-03-29 Thread Antoine Jacoutot
On Thu, 2024-03-28 at 18:23 -0600, Theo Buehler wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2024/03/28 18:23:05
> 
> Modified files:
>   security/rust-openssl-tests: Makefile distinfo 
> 
> Log message:
> Update to rust-openssl-tests 20240329
> 

Hello.

Does not patch.

[modcargo] Removing libsrc for openssl-src-300.2.3+3.2.1
===>  Patching for rust-openssl-tests-20240329
===>   Applying OpenBSD patch patch-openssl-sys_build_main_rs
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|The LibreSSL version in -current isn't explicitly supported.
|
|Index: openssl-sys/build/main.rs
|--- openssl-sys/build/main.rs.orig 
|+++ openssl-sys/build/main.rs
--
Patching file openssl-sys/build/main.rs using Plan A...
Hunk #1 failed at 303.
1 out of 1 hunks failed--saving rejects to openssl-sys/build/main.rs.rej
done
***>   patch-openssl-sys_build_main_rs did not apply cleanly
===>   Failed patches:
patch-openssl-sys_build_main_rs

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-03-29 Thread Antoine Jacoutot
On Thu, 2024-03-28 at 04:31 -0600, Robert Nagy wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   rob...@cvs.openbsd.org  2024/03/28 04:31:39
> 
> Modified files:
>   mail/grommunio/web: distinfo 
>   mail/grommunio/web/pkg: PLIST 
> 
> Log message:
> fixup plist
> 

Cannot fetch :-)

===>  Checking files for grommunio-web-3.7
>> Fetch 
>> https://nerd.hu/distfiles/d30c5373ec8715cf4e51c453a661b6d8478ba254.tar.gz
d30c5373ec8715cf4e51c4... 100% 
|***| 32611 KB00:10 
   
>> Size does not match for grommunio/grommunio-web-3.7-d30c5373.tar.gz
>> Fetch 
>> http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles/grommunio/grommunio-web-3.7-d30c5373.tar.gz
ftp: Error retrieving 
http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles/grommunio/grommunio-web-3.7-d30c5373.tar.gz:
 404
Not Found
*** Error 1 in . (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:3304 
'/exopi-cvs/ports/distfiles/grommunio/grommunio-
web-3.7-d30c5373.tar.gz')
*** Error 2 in . (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2578 
'_internal-fetch': @cd /exopi-
cvs/ports/mail/grommunio/web && PKGPATH=...)
*** Error 2 in /exopi-cvs/ports/mail/grommunio/web 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2704 'fetch':
@lock=grommunio-web-3.7;  e...)


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-03-28 Thread Gleydson Soares
> Failed to package.
> 
> 
> ===>  Faking installation for plan9port-20240109
> cd 
> /exopi-obj/pobj/plan9port-20240109/plan9port-be7c68f6954f7dcaa53403e0f600716f65a13d32
>  && sed -i 's#/usr/local#/usr/local#'  `cat lib/moveplan9.files`
> find 
> /exopi-obj/pobj/plan9port-20240109/plan9port-be7c68f6954f7dcaa53403e0f600716f65a13d32
>  \( -name .github -o -name .gitignore -o -name .gitkeep \)  -exec rm -rf {} \;
> find: 
> /exopi-obj/pobj/plan9port-20240109/plan9port-be7c68f6954f7dcaa53403e0f600716f65a13d32/.github:
>  No such file or directory
> *** Error 1 in plan9/plan9port (Makefile:45 'do-install')

fixed!



Re: CVS: cvs.openbsd.org: ports

2024-03-28 Thread Antoine Jacoutot
On Tue, Mar 26, 2024 at 08:11:50PM -0600, Gleydson Soares wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   gsoa...@cvs.openbsd.org 2024/03/26 20:11:50
> 
> Modified files:
>   plan9/plan9port: Makefile distinfo 
>   plan9/plan9port/pkg: PLIST 
> 
> Log message:

Failed to package.


===>  Faking installation for plan9port-20240109
cd 
/exopi-obj/pobj/plan9port-20240109/plan9port-be7c68f6954f7dcaa53403e0f600716f65a13d32
 && sed -i 's#/usr/local#/usr/local#'  `cat lib/moveplan9.files`
find 
/exopi-obj/pobj/plan9port-20240109/plan9port-be7c68f6954f7dcaa53403e0f600716f65a13d32
 \( -name .github -o -name .gitignore -o -name .gitkeep \)  -exec rm -rf {} \;
find: 
/exopi-obj/pobj/plan9port-20240109/plan9port-be7c68f6954f7dcaa53403e0f600716f65a13d32/.github:
 No such file or directory
*** Error 1 in plan9/plan9port (Makefile:45 'do-install')


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-03-26 Thread Gleydson Soares
On 26 Mar 20:11, Gleydson Soares wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   gsoa...@cvs.openbsd.org 2024/03/26 20:11:50
> 
> Modified files:
>   plan9/plan9port: Makefile distinfo 
>   plan9/plan9port/pkg: PLIST 
> 
> Log message:

update to plan9port-20240109
while here, turn on building on arm64

OK sthen@



Re: CVS: cvs.openbsd.org: ports

2024-03-25 Thread Matthias Kilian
On Mon, Mar 25, 2024 at 02:51:09PM -0600, Matthias Kilian wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2024/03/25 14:51:09
> 
> Added files:
>   graphics/inkscape/patches: 
>  
> patch-src_extension_internal_pdfinput_svg-builder_cpp 
> 
> Log message:
> Fix build with poppler-24.03.0.

Forgot to mention that this was ok by rsadowski@ (maintainer).



Re: CVS: cvs.openbsd.org: ports

2024-03-24 Thread Stuart Henderson
oops, I don't understand why - will investigate and fix one way or
another.

On 2024/03/24 07:17, Antoine Jacoutot wrote:
> On Sat, Mar 23, 2024 at 06:35:27AM -0600, Stuart Henderson wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: st...@cvs.openbsd.org   2024/03/23 06:35:27
> > 
> > Modified files:
> > lang/python: Makefile.inc 
> > lang/python/3.10: Makefile 
> > lang/python/3.10/pkg: PLIST-main 
> > lang/python/3.11: Makefile 
> > Added files:
> > lang/python/3.10/files: EXTERNALLY-MANAGED 
> > lang/python/3.11/files: EXTERNALLY-MANAGED 
> > 
> > Log message:
> > Include an EXTERNALLY-MANAGED file in the Python packages, which triggers
> > a warning if users attempt to install modules system-wide outside the
> > ports/packages system.  ok kmos@
> 
> This seems to break lang/python/2.7
> 
> /exopi-obj/pobj/Python-2.7.18/bin/install -c -m 755 
> /exopi-obj/pobj/Python-2.7.18/Python-2.7.18/Tools/scripts/pydoc  
> /exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin/pydoc2.7
> /exopi-obj/pobj/Python-2.7.18/bin/install -c -m 755 
> /exopi-obj/pobj/Python-2.7.18/Python-2.7.18/idle 
> /exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin/idle2.7
> cd /exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin && ln -sf idle2.7 
> idle2
> mv /exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin/pydoc 
> /exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin/pydoc2
> /exopi-obj/pobj/Python-2.7.18/bin/install -c -m 755 
> /exopi-obj/pobj/Python-2.7.18/Python-2.7.18/Tools/scripts/2to3  
> /exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin/python2.7-2to3
> [ -e /exopi-cvs/ports/lang/python/2.7/files/EXTERNALLY-MANAGED ] &&  
> /exopi-obj/pobj/Python-2.7.18/bin/install -c -m 644 
> /exopi-cvs/ports/lang/python/2.7/files/EXTERNALLY-MANAGED  
> /exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/lib/pyt
> hon2.7/EXTERNALLY-MANAGED # PEP-668
> *** Error 1 in lang/python/2.7 (../Makefile.inc:210 'post-install')
> 
> 
> -- 
> Antoine



Re: CVS: cvs.openbsd.org: ports

2024-03-24 Thread Antoine Jacoutot
On Sat, Mar 23, 2024 at 06:35:27AM -0600, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2024/03/23 06:35:27
> 
> Modified files:
>   lang/python: Makefile.inc 
>   lang/python/3.10: Makefile 
>   lang/python/3.10/pkg: PLIST-main 
>   lang/python/3.11: Makefile 
> Added files:
>   lang/python/3.10/files: EXTERNALLY-MANAGED 
>   lang/python/3.11/files: EXTERNALLY-MANAGED 
> 
> Log message:
> Include an EXTERNALLY-MANAGED file in the Python packages, which triggers
> a warning if users attempt to install modules system-wide outside the
> ports/packages system.  ok kmos@

This seems to break lang/python/2.7

/exopi-obj/pobj/Python-2.7.18/bin/install -c -m 755 
/exopi-obj/pobj/Python-2.7.18/Python-2.7.18/Tools/scripts/pydoc  
/exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin/pydoc2.7
/exopi-obj/pobj/Python-2.7.18/bin/install -c -m 755 
/exopi-obj/pobj/Python-2.7.18/Python-2.7.18/idle 
/exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin/idle2.7
cd /exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin && ln -sf idle2.7 
idle2
mv /exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin/pydoc 
/exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin/pydoc2
/exopi-obj/pobj/Python-2.7.18/bin/install -c -m 755 
/exopi-obj/pobj/Python-2.7.18/Python-2.7.18/Tools/scripts/2to3  
/exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/bin/python2.7-2to3
[ -e /exopi-cvs/ports/lang/python/2.7/files/EXTERNALLY-MANAGED ] &&  
/exopi-obj/pobj/Python-2.7.18/bin/install -c -m 644 
/exopi-cvs/ports/lang/python/2.7/files/EXTERNALLY-MANAGED  
/exopi-obj/pobj/Python-2.7.18/fake-amd64/usr/local/lib/pyt
hon2.7/EXTERNALLY-MANAGED # PEP-668
*** Error 1 in lang/python/2.7 (../Makefile.inc:210 'post-install')


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-03-18 Thread Lucas Raab
On Mon, Mar 18, 2024 at 04:37:45PM -0600, Lucas Raab wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   lr...@cvs.openbsd.org   2024/03/18 16:37:45
> 
> Modified files:
>   sysutils/grafana: Makefile distinfo 
>   sysutils/grafana/patches: patch-conf_sample_ini 
>   sysutils/grafana/pkg: PLIST 
> 
> Log message:
> sysutils/grafana: update to 10.4.0
> 
oops, this was also ok landry@



Re: CVS: cvs.openbsd.org: ports

2024-03-10 Thread Stuart Henderson
On 2024/03/10 08:38, Antoine Jacoutot wrote:
> On Fri, Mar 08, 2024 at 05:17:12AM -0700, Volker Schlecht wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: vol...@cvs.openbsd.org  2024/03/08 05:17:12
> > 
> > Modified files:
> > lang/erlang: erlang.port.mk 
> > 
> > Log message:
> > erlang.port.mk: Fix typo leading to problems with the default flavor of
> > rebar3
> > 
> > Tested by rebuilding rebar3 which is the only current consumer of this.
> > 
> > Identified by and reads ok to sthen@
> 
> I am still getting this error on exopi:
> 
> | Assuming the old and new builds were done correctly
> | (fully up-to-date ports tree including relevant MODULES),
> | then someone probably forgot to bump a REVISION.
> | (see bsd.port.mk(5), PACKAGE_REPOSITORY) 
> --- /exopi-cvs/ports/plist/amd64/erl25-rebar3-3.22.1p0
> +++ /exopi-cvs/ports/plist/amd64/erl25-rebar3-3.22.1p0-new
> @@ -1,6 +1,6 @@
>  @name erl25-rebar3-3.22.1p0
>  @version 12
> -@comment pkgpath=devel/rebar3 ftp=yes
> +@comment pkgpath=devel/rebar3,erlang25 ftp=yes
>  @arch amd64
>  +DESC
>  @sha gDfmwzDzFGO1jwjKp3mdlTQnFGTOtDY3VhNETU50jkU=
> *** Error 1 in devel/rebar3 
> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2243 
> '/exopi-cvs/ports/packages/amd64/all/erl25-rebar3-3.22.1p0.tgz')
> 
> 
> 
> 
> -- 
> Antoine
> 

I've just bumped REVISION in rebar3, it hadn't been bumped since the
erlang.port.mk change and probably needs to be. Hopefully shouldn't show
up again after that..



Re: CVS: cvs.openbsd.org: ports

2024-03-09 Thread Antoine Jacoutot
On Fri, Mar 08, 2024 at 05:17:12AM -0700, Volker Schlecht wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   vol...@cvs.openbsd.org  2024/03/08 05:17:12
> 
> Modified files:
>   lang/erlang: erlang.port.mk 
> 
> Log message:
> erlang.port.mk: Fix typo leading to problems with the default flavor of
> rebar3
> 
> Tested by rebuilding rebar3 which is the only current consumer of this.
> 
> Identified by and reads ok to sthen@

I am still getting this error on exopi:

| Assuming the old and new builds were done correctly
| (fully up-to-date ports tree including relevant MODULES),
| then someone probably forgot to bump a REVISION.
| (see bsd.port.mk(5), PACKAGE_REPOSITORY) 
--- /exopi-cvs/ports/plist/amd64/erl25-rebar3-3.22.1p0
+++ /exopi-cvs/ports/plist/amd64/erl25-rebar3-3.22.1p0-new
@@ -1,6 +1,6 @@
 @name erl25-rebar3-3.22.1p0
 @version 12
-@comment pkgpath=devel/rebar3 ftp=yes
+@comment pkgpath=devel/rebar3,erlang25 ftp=yes
 @arch amd64
 +DESC
 @sha gDfmwzDzFGO1jwjKp3mdlTQnFGTOtDY3VhNETU50jkU=
*** Error 1 in devel/rebar3 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2243 
'/exopi-cvs/ports/packages/amd64/all/erl25-rebar3-3.22.1p0.tgz')




-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-03-04 Thread Antoine Jacoutot
OK maybe with an XXX regarding JUPYTER_PACKAGING_SKIP_NPM=1 in the environment 
which is supposed to be the proper way but doesn’t work ?

Thanks. 

—
Antoine

> On Mar 4, 2024, at 10:19, Stuart Henderson  wrote:
> 
> On 2024/03/04 08:43, Antoine Jacoutot wrote:
>>> On Wed, Feb 28, 2024 at 04:58:35PM -0700, Daniel Dickman wrote:
>>> CVSROOT:/cvs
>>> Module name:ports
>>> Changes by:dan...@cvs.openbsd.org2024/02/28 16:58:35
>>> 
>>> Log message:
>>>import py-jupyter_server
>>> 
>>>ok sthen@
>>> 
>>>Status:
>>> 
>>>Vendor Tag:daniel
>>>Release Tags:daniel_20240228
>>> 
>>>N ports/devel/py-jupyter_server/Makefile
>>>N ports/devel/py-jupyter_server/distinfo
>>>N ports/devel/py-jupyter_server/pkg/DESCR
>>>N ports/devel/py-jupyter_server/pkg/PLIST
>>> 
>>>No conflicts created by this import
>> 
>> Failed to build in my last bulk.
>> 
> Building on exopi-5 under devel/py-jupyter_server,python3
>>BDEPENDS = 
>> [lang/python/3.10;devel/py-installer,python3;devel/pre-commit,python3;devel/py-jupyter_packaging,python3;devel/py-build,python3]
>>DIST = [devel/py-jupyter_server,python3:jupyter_server-1.24.0.tar.gz]
>>FULLPKGNAME = py3-jupyter_server-1.24.0
>>RDEPENDS = 
>> [net/py-websocket-client,python3;sysutils/py-prometheus_client,python3;devel/py-jupyter_client,python3;www/py-tornado,python3;devel/py-nbformat,python3;security/py-argon2-cffi,python3;lang/python/3.10;devel/py-traitlets,python3;devel/py-nbconvert,python3;net/py-anyio,python3;devel/py-jupyter_core,python3;devel/py-send2trash,python3;www/py-terminado,python3;net/py-zmq,python3;sysutils/py-packaging,python3;www/py-jinja2,python3]
>> (Junk lock obtained for exopi-5 at 1709511649.59)
> Running depends in devel/py-jupyter_server,python3 at 1709511649.68
>>   last junk was in x11/qt6/qtwebengine
>> /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 
>> py3-installer-0.7.0 py3-jupyter_packaging-0.12.3
>> was: /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 
>> py3-installer-0.7.0 py3-jupyter_packaging-0.12.3 python-3.10.13p0
>> /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 
>> py3-installer-0.7.0 py3-jupyter_packaging-0.12.3
>> The following new rcscripts were installed: /etc/rc.d/gitdaemon
>> See rcctl(8) for details.
>> New and changed readme(s):
>>/usr/local/share/doc/pkg-readmes/git
> Running show-prepare-results in devel/py-jupyter_server,python3 at 
> 1709511659.84
>> ===> devel/py-jupyter_server,python3
>> ===> Building from scratch py3-jupyter_server-1.24.0
>> ===> py3-jupyter_server-1.24.0 depends on: pre-commit-* -> pre-commit-3.6.2p0
>> ===> py3-jupyter_server-1.24.0 depends on: python->=3.10,<3.11 -> 
>> python-3.10.13p0
>> ===> py3-jupyter_server-1.24.0 depends on: py3-build-* -> py3-build-1.0.3
>> ===> py3-jupyter_server-1.24.0 depends on: py3-installer-* -> 
>> py3-installer-0.7.0
>> ===> py3-jupyter_server-1.24.0 depends on: py3-jupyter_packaging-* -> 
>> py3-jupyter_packaging-0.12.3
>> pre-commit-3.6.2p0
>> py3-build-1.0.3
>> py3-installer-0.7.0
>> py3-jupyter_packaging-0.12.3
>> python-3.10.13p0
>> Don't run junk because nojunk in x11/qt6/qtwebengine
>> (Junk lock released for exopi-5 at 1709511661.00)
>> distfiles size=456590
> Running build in devel/py-jupyter_server,python3 at 1709511661.04
>> ===> devel/py-jupyter_server,python3
>> ===>  Checking files for py3-jupyter_server-1.24.0
>> `/exopi-cvs/ports/distfiles/jupyter_server-1.24.0.tar.gz' is up to date.
 (SHA256) jupyter_server-1.24.0.tar.gz: OK
>> ===>  Extracting for py3-jupyter_server-1.24.0
>> ===>  Patching for py3-jupyter_server-1.24.0
>> ===>  Compiler link: clang -> /usr/bin/clang
>> ===>  Compiler link: clang++ -> /usr/bin/clang++
>> ===>  Compiler link: cc -> /usr/bin/cc
>> ===>  Compiler link: c++ -> /usr/bin/c++
>> ===>  Generating configure for py3-jupyter_server-1.24.0
>> ===>  Configuring for py3-jupyter_server-1.24.0
>> ===>  Building for py3-jupyter_server-1.24.0
>> * Getting build dependencies for wheel...
>> running egg_info
>> writing jupyter_server.egg-info/PKG-INFO
>> writing dependency_links to jupyter_server.egg-info/dependency_links.txt
>> writing entry points to jupyter_server.egg-info/entry_points.txt
>> writing requirements to jupyter_server.egg-info/requires.txt
>> writing top-level names to jupyter_server.egg-info/top_level.txt
>> reading manifest file 'jupyter_server.egg-info/SOURCES.txt'
>> reading manifest template 'MANIFEST.in'
>> warning: no previously-included files found matching 'docs/#*'
>> no previously-included directories found matching 'docs/build'
>> no previously-included directories found matching 'docs/gh-pages'
>> no previously-included directories found matching 'docs/dist'
>> warning: no previously-included files matching '*~' found anywhere in 
>> distribution
>> warning: no previously-included files matching '*.pyo' found anywhere in 
>> distribution
>> 

Re: CVS: cvs.openbsd.org: ports

2024-03-04 Thread Stuart Henderson
On 2024/03/04 08:43, Antoine Jacoutot wrote:
> On Wed, Feb 28, 2024 at 04:58:35PM -0700, Daniel Dickman wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: dan...@cvs.openbsd.org  2024/02/28 16:58:35
> > 
> > Log message:
> > import py-jupyter_server
> > 
> > ok sthen@
> > 
> > Status:
> > 
> > Vendor Tag: daniel
> > Release Tags:   daniel_20240228
> > 
> > N ports/devel/py-jupyter_server/Makefile
> > N ports/devel/py-jupyter_server/distinfo
> > N ports/devel/py-jupyter_server/pkg/DESCR
> > N ports/devel/py-jupyter_server/pkg/PLIST
> > 
> > No conflicts created by this import
> 
> Failed to build in my last bulk.
> 
> >>> Building on exopi-5 under devel/py-jupyter_server,python3
> BDEPENDS = 
> [lang/python/3.10;devel/py-installer,python3;devel/pre-commit,python3;devel/py-jupyter_packaging,python3;devel/py-build,python3]
> DIST = [devel/py-jupyter_server,python3:jupyter_server-1.24.0.tar.gz]
> FULLPKGNAME = py3-jupyter_server-1.24.0
> RDEPENDS = 
> [net/py-websocket-client,python3;sysutils/py-prometheus_client,python3;devel/py-jupyter_client,python3;www/py-tornado,python3;devel/py-nbformat,python3;security/py-argon2-cffi,python3;lang/python/3.10;devel/py-traitlets,python3;devel/py-nbconvert,python3;net/py-anyio,python3;devel/py-jupyter_core,python3;devel/py-send2trash,python3;www/py-terminado,python3;net/py-zmq,python3;sysutils/py-packaging,python3;www/py-jinja2,python3]
> (Junk lock obtained for exopi-5 at 1709511649.59)
> >>> Running depends in devel/py-jupyter_server,python3 at 1709511649.68
>last junk was in x11/qt6/qtwebengine
> /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 
> py3-installer-0.7.0 py3-jupyter_packaging-0.12.3
> was: /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 
> py3-installer-0.7.0 py3-jupyter_packaging-0.12.3 python-3.10.13p0
> /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 
> py3-installer-0.7.0 py3-jupyter_packaging-0.12.3
> The following new rcscripts were installed: /etc/rc.d/gitdaemon
> See rcctl(8) for details.
> New and changed readme(s):
> /usr/local/share/doc/pkg-readmes/git
> >>> Running show-prepare-results in devel/py-jupyter_server,python3 at 
> >>> 1709511659.84
> ===> devel/py-jupyter_server,python3
> ===> Building from scratch py3-jupyter_server-1.24.0
> ===> py3-jupyter_server-1.24.0 depends on: pre-commit-* -> pre-commit-3.6.2p0
> ===> py3-jupyter_server-1.24.0 depends on: python->=3.10,<3.11 -> 
> python-3.10.13p0
> ===> py3-jupyter_server-1.24.0 depends on: py3-build-* -> py3-build-1.0.3
> ===> py3-jupyter_server-1.24.0 depends on: py3-installer-* -> 
> py3-installer-0.7.0
> ===> py3-jupyter_server-1.24.0 depends on: py3-jupyter_packaging-* -> 
> py3-jupyter_packaging-0.12.3
> pre-commit-3.6.2p0
> py3-build-1.0.3
> py3-installer-0.7.0
> py3-jupyter_packaging-0.12.3
> python-3.10.13p0
> Don't run junk because nojunk in x11/qt6/qtwebengine
> (Junk lock released for exopi-5 at 1709511661.00)
> distfiles size=456590
> >>> Running build in devel/py-jupyter_server,python3 at 1709511661.04
> ===> devel/py-jupyter_server,python3
> ===>  Checking files for py3-jupyter_server-1.24.0
> `/exopi-cvs/ports/distfiles/jupyter_server-1.24.0.tar.gz' is up to date.
> >> (SHA256) jupyter_server-1.24.0.tar.gz: OK
> ===>  Extracting for py3-jupyter_server-1.24.0
> ===>  Patching for py3-jupyter_server-1.24.0
> ===>  Compiler link: clang -> /usr/bin/clang
> ===>  Compiler link: clang++ -> /usr/bin/clang++
> ===>  Compiler link: cc -> /usr/bin/cc
> ===>  Compiler link: c++ -> /usr/bin/c++
> ===>  Generating configure for py3-jupyter_server-1.24.0
> ===>  Configuring for py3-jupyter_server-1.24.0
> ===>  Building for py3-jupyter_server-1.24.0
> * Getting build dependencies for wheel...
> running egg_info
> writing jupyter_server.egg-info/PKG-INFO
> writing dependency_links to jupyter_server.egg-info/dependency_links.txt
> writing entry points to jupyter_server.egg-info/entry_points.txt
> writing requirements to jupyter_server.egg-info/requires.txt
> writing top-level names to jupyter_server.egg-info/top_level.txt
> reading manifest file 'jupyter_server.egg-info/SOURCES.txt'
> reading manifest template 'MANIFEST.in'
> warning: no previously-included files found matching 'docs/#*'
> no previously-included directories found matching 'docs/build'
> no previously-included directories found matching 'docs/gh-pages'
> no previously-included directories found matching 'docs/dist'
> warning: no previously-included files matching '*~' found anywhere in 
> distribution
> warning: no previously-included files matching '*.pyo' found anywhere in 
> distribution
> no previously-included directories found matching '.git'
> no previously-included directories found matching '**/.ipynb_checkpoints'
> no previously-included directories found matching '**/.pytest_cache'
> no previously-included directories found matching 

Re: CVS: cvs.openbsd.org: ports

2024-03-03 Thread Antoine Jacoutot
On Wed, Feb 28, 2024 at 04:58:35PM -0700, Daniel Dickman wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   dan...@cvs.openbsd.org  2024/02/28 16:58:35
> 
> Log message:
> import py-jupyter_server
> 
> ok sthen@
> 
> Status:
> 
> Vendor Tag:   daniel
> Release Tags: daniel_20240228
> 
> N ports/devel/py-jupyter_server/Makefile
> N ports/devel/py-jupyter_server/distinfo
> N ports/devel/py-jupyter_server/pkg/DESCR
> N ports/devel/py-jupyter_server/pkg/PLIST
> 
> No conflicts created by this import

Failed to build in my last bulk.

>>> Building on exopi-5 under devel/py-jupyter_server,python3
BDEPENDS = 
[lang/python/3.10;devel/py-installer,python3;devel/pre-commit,python3;devel/py-jupyter_packaging,python3;devel/py-build,python3]
DIST = [devel/py-jupyter_server,python3:jupyter_server-1.24.0.tar.gz]
FULLPKGNAME = py3-jupyter_server-1.24.0
RDEPENDS = 
[net/py-websocket-client,python3;sysutils/py-prometheus_client,python3;devel/py-jupyter_client,python3;www/py-tornado,python3;devel/py-nbformat,python3;security/py-argon2-cffi,python3;lang/python/3.10;devel/py-traitlets,python3;devel/py-nbconvert,python3;net/py-anyio,python3;devel/py-jupyter_core,python3;devel/py-send2trash,python3;www/py-terminado,python3;net/py-zmq,python3;sysutils/py-packaging,python3;www/py-jinja2,python3]
(Junk lock obtained for exopi-5 at 1709511649.59)
>>> Running depends in devel/py-jupyter_server,python3 at 1709511649.68
   last junk was in x11/qt6/qtwebengine
/usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 
py3-installer-0.7.0 py3-jupyter_packaging-0.12.3
was: /usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 
py3-installer-0.7.0 py3-jupyter_packaging-0.12.3 python-3.10.13p0
/usr/sbin/pkg_add -aI -Drepair pre-commit-3.6.2p0 py3-build-1.0.3 
py3-installer-0.7.0 py3-jupyter_packaging-0.12.3
The following new rcscripts were installed: /etc/rc.d/gitdaemon
See rcctl(8) for details.
New and changed readme(s):
/usr/local/share/doc/pkg-readmes/git
>>> Running show-prepare-results in devel/py-jupyter_server,python3 at 
>>> 1709511659.84
===> devel/py-jupyter_server,python3
===> Building from scratch py3-jupyter_server-1.24.0
===> py3-jupyter_server-1.24.0 depends on: pre-commit-* -> pre-commit-3.6.2p0
===> py3-jupyter_server-1.24.0 depends on: python->=3.10,<3.11 -> 
python-3.10.13p0
===> py3-jupyter_server-1.24.0 depends on: py3-build-* -> py3-build-1.0.3
===> py3-jupyter_server-1.24.0 depends on: py3-installer-* -> 
py3-installer-0.7.0
===> py3-jupyter_server-1.24.0 depends on: py3-jupyter_packaging-* -> 
py3-jupyter_packaging-0.12.3
pre-commit-3.6.2p0
py3-build-1.0.3
py3-installer-0.7.0
py3-jupyter_packaging-0.12.3
python-3.10.13p0
Don't run junk because nojunk in x11/qt6/qtwebengine
(Junk lock released for exopi-5 at 1709511661.00)
distfiles size=456590
>>> Running build in devel/py-jupyter_server,python3 at 1709511661.04
===> devel/py-jupyter_server,python3
===>  Checking files for py3-jupyter_server-1.24.0
`/exopi-cvs/ports/distfiles/jupyter_server-1.24.0.tar.gz' is up to date.
>> (SHA256) jupyter_server-1.24.0.tar.gz: OK
===>  Extracting for py3-jupyter_server-1.24.0
===>  Patching for py3-jupyter_server-1.24.0
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
===>  Generating configure for py3-jupyter_server-1.24.0
===>  Configuring for py3-jupyter_server-1.24.0
===>  Building for py3-jupyter_server-1.24.0
* Getting build dependencies for wheel...
running egg_info
writing jupyter_server.egg-info/PKG-INFO
writing dependency_links to jupyter_server.egg-info/dependency_links.txt
writing entry points to jupyter_server.egg-info/entry_points.txt
writing requirements to jupyter_server.egg-info/requires.txt
writing top-level names to jupyter_server.egg-info/top_level.txt
reading manifest file 'jupyter_server.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no previously-included files found matching 'docs/#*'
no previously-included directories found matching 'docs/build'
no previously-included directories found matching 'docs/gh-pages'
no previously-included directories found matching 'docs/dist'
warning: no previously-included files matching '*~' found anywhere in 
distribution
warning: no previously-included files matching '*.pyo' found anywhere in 
distribution
no previously-included directories found matching '.git'
no previously-included directories found matching '**/.ipynb_checkpoints'
no previously-included directories found matching '**/.pytest_cache'
no previously-included directories found matching '**/.coverage'
no previously-included directories found matching '**/.pytest_cache'
adding license file 'COPYING.md'
writing manifest file 'jupyter_server.egg-info/SOURCES.txt'
* Building wheel...
npm ERR! code ENOTFOUND
npm ERR! syscall 

Re: CVS: cvs.openbsd.org: ports

2024-02-28 Thread Theo Buehler
On Wed, Feb 28, 2024 at 02:08:45PM +, Brian Callahan wrote:
> On 2/28/2024 5:36 AM, Theo Buehler wrote:
> > On Sun, Feb 25, 2024 at 06:43:48AM -0700, Brian Callahan wrote:
> >> CVSROOT:   /cvs
> >> Module name:   ports
> >> Changes by:bcal...@cvs.openbsd.org 2024/02/25 06:43:48
> >>
> >> Modified files:
> >>fonts/unifont  : Makefile distinfo 
> >>fonts/unifont/pkg: PLIST 
> >>
> >> Log message:
> >> Update to unifont-15.1.05, no longer ships ttf fonts, only otf fonts
> >>
> > 
> > This update broke audio/ocp:
> > 
> > checking for freetype2... yes
> > checking for /usr/local/share/fonts/unifont/unifont.ttf... no
> > checking for /usr/local/share/fonts/opentype/unifont/unifont.otf... no
> > configure: error: /usr/local/share/fonts/unifont/unifont.ttf and 
> > /usr/local/share/fonts/opentype/unifont/unifont.otf (unifont.ttf and 
> > unifont.otf) not found - please use --with-unifontdir-ttf=/dir/ or 
> > --with-unifontdir-otf or --with-unifont-ttf=/dir/file or 
> > --with-unifont-otf=/dir/file (needed by X11, SDL1.x and SDL2)
> > 
> 
> Yup. Naddy alerted me yesterday. Here's the diff to fix.
> Note that on my machine, the sdl client doesn't work. But it also
> doesn't work when I rolled back Unifont and used the TTF fonts.

Thanks. Diff makes sense and having the build passing is better than
the current state.

ok tb

> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/ocp/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile  6 Sep 2023 15:20:31 -   1.35
> +++ Makefile  27 Feb 2024 13:17:52 -
> @@ -3,6 +3,7 @@ BROKEN-alpha =arctar.c:384: internal co
>  COMMENT =UNIX port of Open Cubic Player
>  
>  DISTNAME =   ocp-0.2.106
> +REVISION =   0
>  CATEGORIES = audio
>  
>  HOMEPAGE =   https://stian.cubic.org/project-ocp.php
> @@ -55,7 +56,7 @@ CONFIGURE_ARGS = --with-dir-suffix="" \
>--without-x11 \
>--without-update-desktop-database \
>--without-update-mime-database \
> -  --with-unifontdir-ttf=${PREFIX}/share/fonts/unifont
> +  --with-unifontdir-otf=${PREFIX}/share/fonts/unifont
>  
>  USE_GMAKE =  Yes
>  



Re: CVS: cvs.openbsd.org: ports

2024-02-28 Thread Brian Callahan
On 2/28/2024 5:36 AM, Theo Buehler wrote:
> On Sun, Feb 25, 2024 at 06:43:48AM -0700, Brian Callahan wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by:  bcal...@cvs.openbsd.org 2024/02/25 06:43:48
>>
>> Modified files:
>>  fonts/unifont  : Makefile distinfo 
>>  fonts/unifont/pkg: PLIST 
>>
>> Log message:
>> Update to unifont-15.1.05, no longer ships ttf fonts, only otf fonts
>>
> 
> This update broke audio/ocp:
> 
> checking for freetype2... yes
> checking for /usr/local/share/fonts/unifont/unifont.ttf... no
> checking for /usr/local/share/fonts/opentype/unifont/unifont.otf... no
> configure: error: /usr/local/share/fonts/unifont/unifont.ttf and 
> /usr/local/share/fonts/opentype/unifont/unifont.otf (unifont.ttf and 
> unifont.otf) not found - please use --with-unifontdir-ttf=/dir/ or 
> --with-unifontdir-otf or --with-unifont-ttf=/dir/file or 
> --with-unifont-otf=/dir/file (needed by X11, SDL1.x and SDL2)
> 

Yup. Naddy alerted me yesterday. Here's the diff to fix.
Note that on my machine, the sdl client doesn't work. But it also
doesn't work when I rolled back Unifont and used the TTF fonts.

~Brian
Index: Makefile
===
RCS file: /cvs/ports/audio/ocp/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile6 Sep 2023 15:20:31 -   1.35
+++ Makefile27 Feb 2024 13:17:52 -
@@ -3,6 +3,7 @@ BROKEN-alpha =  arctar.c:384: internal co
 COMMENT =  UNIX port of Open Cubic Player
 
 DISTNAME = ocp-0.2.106
+REVISION = 0
 CATEGORIES =   audio
 
 HOMEPAGE = https://stian.cubic.org/project-ocp.php
@@ -55,7 +56,7 @@ CONFIGURE_ARGS = --with-dir-suffix="" \
 --without-x11 \
 --without-update-desktop-database \
 --without-update-mime-database \
---with-unifontdir-ttf=${PREFIX}/share/fonts/unifont
+--with-unifontdir-otf=${PREFIX}/share/fonts/unifont
 
 USE_GMAKE =Yes
 


Re: CVS: cvs.openbsd.org: ports

2024-02-28 Thread Theo Buehler
On Sun, Feb 25, 2024 at 06:43:48AM -0700, Brian Callahan wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   bcal...@cvs.openbsd.org 2024/02/25 06:43:48
> 
> Modified files:
>   fonts/unifont  : Makefile distinfo 
>   fonts/unifont/pkg: PLIST 
> 
> Log message:
> Update to unifont-15.1.05, no longer ships ttf fonts, only otf fonts
> 

This update broke audio/ocp:

checking for freetype2... yes
checking for /usr/local/share/fonts/unifont/unifont.ttf... no
checking for /usr/local/share/fonts/opentype/unifont/unifont.otf... no
configure: error: /usr/local/share/fonts/unifont/unifont.ttf and 
/usr/local/share/fonts/opentype/unifont/unifont.otf (unifont.ttf and 
unifont.otf) not found - please use --with-unifontdir-ttf=/dir/ or 
--with-unifontdir-otf or --with-unifont-ttf=/dir/file or 
--with-unifont-otf=/dir/file (needed by X11, SDL1.x and SDL2)



Re: CVS: cvs.openbsd.org: ports

2024-02-27 Thread Stuart Henderson
the glslang update breaks godot4.

c++ -o modules/gltf/gltf_document.linuxbsd.template_release.o -c -std=gnu++17 
-O2 -pipe -Wno-deprecated-register -Wctor-dtor-privacy -Wnon-virtual-dtor -O2 
-pipe -pipe -Wall -Wextra -Wwrite-strings -Wno-unused-parameter -isystem 
thirdparty/glad -DNDEBUG -DNO_EDITOR_SPLASH -DTOUCH_ENABLED 
-DFONTCONFIG_ENABLED -DSNDIO_ENABLED -DDBUS_ENABLED -DSPEECHD_ENABLED 
-DXKB_ENABLED -DLINUXBSD_ENABLED -DUNIX_ENABLED -D_FILE_OFFSET_BITS=64 
-DX11_ENABLED -DVULKAN_ENABLED -DGLES3_ENABLED -DMINIZIP_ENABLED 
-DBROTLI_ENABLED -DUSE_VOLK -DVK_USE_PLATFORM_XLIB_KHR -DGLAD_ENABLED 
-DGLES_OVER_GL -Ithirdparty/libpng -Ithirdparty/volk -Ithirdparty/vulkan 
-Ithirdparty/vulkan/include -Ithirdparty/zlib -Ithirdparty/brotli/include 
-Iplatform/linuxbsd -I/usr/include/miniupnpc -I. -I/usr/local/include 
-I/usr/local/include/webp -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 
-I/usr/local/include/dbus-1.0 -I/usr/local/lib/dbus-1.0/include 
-I/usr/local/include/speech-dispatcher -I/usr/local/include/glib-2.0 
-I/usr/local/lib/glib-2.0/include modules/gltf/gltf_document.cpp
modules/glslang/register_types.cpp:37:10: fatal error: 
'glslang/Include/Types.h' file not found
#include 
 ^
1 error generated.
scons: *** [modules/glslang/register_types.linuxbsd.template_release.o] Error 1

On 2024/02/24 19:43, Thomas Frohwein wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2024/02/24 19:43:36
> 
> Modified files:
>   graphics/glslang: Makefile distinfo 
>   graphics/glslang/patches: patch-StandAlone_CMakeLists_txt 
>   graphics/glslang/pkg: PLIST 
>   graphics/spirv-headers: Makefile distinfo 
>   graphics/spirv-tools: Makefile distinfo 
>   graphics/vulkan-headers: Makefile distinfo 
>   graphics/vulkan-headers/patches: 
>patch-registry_apiconventions_py 
>patch-registry_cgenerator_py 
>patch-registry_generator_py 
>patch-registry_reg_py 
>
> patch-registry_spec_tools_conventions_py 
>patch-registry_vkconventions_py 
>   graphics/vulkan-headers/pkg: PLIST 
>   graphics/vulkan-loader: Makefile distinfo 
>   graphics/vulkan-loader/pkg: PLIST 
>   graphics/vulkan-tools: Makefile distinfo 
>   graphics/vulkan-validation-layers: Makefile distinfo 
> Removed files:
>   graphics/vulkan-headers/patches: patch-registry_genvk_py 
>   graphics/vulkan-validation-layers/patches: 
>  
> patch-layers_vulkan_generated_vk_extension_helper_h 
> 
> Log message:
> update vulkan ports to latest SDK release 1.3.275.0
> testing and ok op@
> 



Re: CVS: cvs.openbsd.org: ports

2024-02-25 Thread Stuart Henderson
On 2024/02/24 22:51, Daniel Dickman wrote:
> 
> 
> On Wed, 21 Feb 2024, Anthony J. Bentley wrote:
> 
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: bent...@cvs.openbsd.org 2024/02/21 22:44:26
> > 
> > Modified files:
> > emulators/gambatte: Makefile 
> > 
> > Log message:
> > Python 2 is only used for tests; fix {BUILD,RUN}_DEPENDS.
> > 
> > 
> 
> Surprisingly I think this might now need an explicit:
> 
> TEST_DEPENDS = lang/python/${MODPY_VERSION}
> 
> Without Python already installed and without a TDEP on py-test, there's 
> nothing to force python to be installed.

pytest is python3-only so that wouldn't help anyway.

> And the latest commit now hides the fact that gambatte is a consumer of 
> python2 from show-reverse-deps.
> 
> Maybe something that should be fixed in python.port.mk? I haven't looked 
> too closely what the python module does for tests. On the other hand there 
> are probably very few ports left with TDEPs on python 2 so might not be 
> worth fixing centrally...

I first thought that TEST_DEPENDS (either lang/python/${MODPY_VERSION}
or ${MODPY_RUN_DEPENDS}) would be the right thing to do, but then I
spotted MODPY_TESTDEP so actually I think we need:

Index: python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.183
diff -u -p -r1.183 python.port.mk
--- python.port.mk  22 Dec 2023 12:51:20 -  1.183
+++ python.port.mk  25 Feb 2024 10:37:30 -
@@ -132,6 +132,8 @@ NO_TEST = Yes
 MODPY_TEST_DEPENDS =   ${RUN_DEPENDS}
 MODPY_TEST_DEPENDS +=  devel/py-test${MODPY_FLAVOR}
 .  endif
+.else
+MODPY_TEST_DEPENDS =   ${MODPY_RUN_DEPENDS}
 .endif
 
 .if ${NO_BUILD:L} == "no"



Re: CVS: cvs.openbsd.org: ports

2024-02-24 Thread Anthony J. Bentley
Daniel Dickman writes:
> Surprisingly I think this might now need an explicit:
>
> TEST_DEPENDS = lang/python/${MODPY_VERSION}
>
> Without Python already installed and without a TDEP on py-test, there's 
> nothing to force python to be installed.
>
> And the latest commit now hides the fact that gambatte is a consumer of 
> python2 from show-reverse-deps.
>
> Maybe something that should be fixed in python.port.mk? I haven't looked 
> too closely what the python module does for tests. On the other hand there 
> are probably very few ports left with TDEPs on python 2 so might not be 
> worth fixing centrally...

python-module(5) says:

 The module also appends to

 -   RUN_DEPENDS unless MODPY_RUNDEP is set to No,

 -   BUILD_DEPENDS unless MODPY_BUILDDEP is set to No or NO_BUILD is set
 to Yes,

 -   TEST_DEPENDS if MODPY_PYTEST is set to Yes unless MODPY_TESTDEP is
 set to No.

I misinterpreted that as saying that setting MODPY_TESTDEP to Yes would
also append Python to TEST_DEPENDS. The actual behavior seems pretty
unintuitive to me. It's not limited to Python 2 either.



Re: CVS: cvs.openbsd.org: ports

2024-02-24 Thread Daniel Dickman



On Wed, 21 Feb 2024, Anthony J. Bentley wrote:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   bent...@cvs.openbsd.org 2024/02/21 22:44:26
> 
> Modified files:
>   emulators/gambatte: Makefile 
> 
> Log message:
> Python 2 is only used for tests; fix {BUILD,RUN}_DEPENDS.
> 
> 

Surprisingly I think this might now need an explicit:

TEST_DEPENDS = lang/python/${MODPY_VERSION}

Without Python already installed and without a TDEP on py-test, there's 
nothing to force python to be installed.

And the latest commit now hides the fact that gambatte is a consumer of 
python2 from show-reverse-deps.

Maybe something that should be fixed in python.port.mk? I haven't looked 
too closely what the python module does for tests. On the other hand there 
are probably very few ports left with TDEPs on python 2 so might not be 
worth fixing centrally...



Re: CVS: cvs.openbsd.org: ports

2024-02-24 Thread Theo Buehler
On Fri, Feb 23, 2024 at 08:56:44PM -0700, Thomas Frohwein wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2024/02/23 20:56:44
> 
> Modified files:
>   lang/hashlink  : Makefile distinfo 
>   lang/hashlink/patches: patch-Makefile 
> 
> Log message:
> update hashlink to 'latest' tag from 2 weeks ago; tested with Into the
> Necrovale, Dead Cells, and Northgard.
> 
> hashlink has the unfortunate habit of placing tag "latest" without
> further description at times, and in this case this is used by latest
> versions of Into the Necrovale and is required because of a new binding
> that has been introduced.
> 

Fails to patch:

>>> Building on localhost under lang/hashlink
BDEPENDS = 
[databases/sqlite3;devel/libuv;graphics/jpeg;security/polarssl;audio/libvorbis;devel/sdl2;graphics/png;audio/openal;devel/gmake]
DIST = 
[lang/hashlink:HaxeFoundation-hashlink-20df6529c932f7e9ab4e1c528a0321723f2d09ae.tar.gz]
FULLPKGNAME = hashlink-1.14pl0
RDEPENDS = 
[security/polarssl;audio/libvorbis;audio/openal;devel/sdl2;graphics/png;databases/sqlite3;devel/libuv;graphics/jpeg]
(Junk lock obtained for localhost at 1708827900.56)
>>> Running depends in lang/hashlink at 1708827900.57
/usr/sbin/pkg_add -aI -Drepair gmake-4.4.1 jpeg-3.0.1p0v0 libuv-1.48.0 
libvorbis-1.3.7 mbedtls-2.28.0p0 openal-1.23.1v0 png-1.6.42 sdl2-2.30.0p0 
sqlite3-3.44.2
was: /usr/sbin/pkg_add -aI -Drepair gmake-4.4.1 jpeg-3.0.1p0v0 libuv-1.48.0 
libvorbis-1.3.7 mbedtls-2.28.0p0 openal-1.23.1v0 png-1.6.42 sdl2-2.30.0p0 
sqlite3-3.44.2
/usr/sbin/pkg_add -aI -Drepair gmake-4.4.1 jpeg-3.0.1p0v0 libuv-1.48.0 
libvorbis-1.3.7 mbedtls-2.28.0p0 openal-1.23.1v0 png-1.6.42 sdl2-2.30.0p0 
sqlite3-3.44.2
>>> Running show-prepare-results in lang/hashlink at 1708827901.55
===> lang/hashlink
===> Building from scratch hashlink-1.14pl0
===> hashlink-1.14pl0 depends on: gmake-* -> gmake-4.4.1
===> hashlink-1.14pl0 depends on: libvorbis-* -> libvorbis-1.3.7
===> hashlink-1.14pl0 depends on: openal-* -> openal-1.23.1v0
===> hashlink-1.14pl0 depends on: sqlite3-* -> sqlite3-3.44.2
===> hashlink-1.14pl0 depends on: libuv-* -> libuv-1.48.0
===> hashlink-1.14pl0 depends on: sdl2-* -> sdl2-2.30.0p0
===> hashlink-1.14pl0 depends on: jpeg-* -> jpeg-3.0.1p0v0
===> hashlink-1.14pl0 depends on: png-* -> png-1.6.42
===> hashlink-1.14pl0 depends on: mbedtls-* -> mbedtls-2.28.0p0
===>  Verifying specs:  GL SDL2 c m mbedcrypto mbedtls mbedx509 openal png 
pthread sqlite3 turbojpeg uv vorbisfile z
===>  found GL.19.0 SDL2.0.15 c.98.0 m.10.1 mbedcrypto.5.0 mbedtls.7.0 
mbedx509.3.2 openal.5.0 png.18.0 pthread.27.1 sqlite3.37.26 turbojpeg.0.2 
uv.4.2 vorbisfile.6.0 z.7.0
gmake-4.4.1
jpeg-3.0.1p0v0
libuv-1.48.0
libvorbis-1.3.7
mbedtls-2.28.0p0
openal-1.23.1v0
png-1.6.42
sdl2-2.30.0p0
sqlite3-3.44.2
(Junk lock released for localhost at 1708827903.35)
distfiles size=4623798
>>> Running build in lang/hashlink at 1708827903.36
===> lang/hashlink
===>  Checking files for hashlink-1.14pl0
`/data/distfiles/HaxeFoundation-hashlink-20df6529c932f7e9ab4e1c528a0321723f2d09ae.tar.gz'
 is up to date.
>> (SHA256) 
>> HaxeFoundation-hashlink-20df6529c932f7e9ab4e1c528a0321723f2d09ae.tar.gz: OK
===>  Extracting for hashlink-1.14pl0
rm -rf /tmp/pobj/hashlink-1.14pl0/include/{fmt,turbojpeg}
===>  Patching for hashlink-1.14pl0
Can't open libs/uv/uv.c: No such file or directory.
Can't open src/hl.h: No such file or directory.
Can't open src/std/socket.c: No such file or directory.
Can't open src/std/thread.c: No such file or directory.
===>   Applying OpenBSD patch patch-Makefile
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|remove -m$(ARCH)
|add versioning to libhl
|{CFLAGS} -> (CFLAGS) to not get picked up by SUBST_CMD
|remove Linux's 32-/64-bit detection
|remove Darwin detection in install target (breaks 'make fake')
|build libhl_module.so and install hl/hl_module.h and hl/opcodes.h
|install headers (and hlc_main.c) in include/hl/
|
|Index: Makefile
|--- Makefile.orig
|+++ Makefile
--
File to patch: 
No file found--skip this patch? [y] 
Skipping patch...
Hunk #1 ignored at 1.
Hunk #2 ignored at 39.
Hunk #3 ignored at 75.
Hunk #4 ignored at 142.
Hunk #5 ignored at 160.
Hunk #6 ignored at 180.
Hunk #7 ignored at 283.
7 out of 7 hunks ignored--saving rejects to Oops.rej
done
***>   patch-Makefile did not apply cleanly
===>   Applying OpenBSD patch patch-libs_mysql_socket_c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|fix ifdef's
|
|Index: libs/mysql/socket.c
|--- libs/mysql/socket.c.orig
|+++ libs/mysql/socket.c
--
File to patch: 
No file found--skip this patch? [y] 
Skipping patch...
Hunk #1 ignored at 74.
Hunk #2 ignored at 117.
2 out of 2 hunks ignored--saving rejects to Oops.rej
done
***>   patch-libs_mysql_socket_c did not apply cleanly
===>   Applying OpenBSD patch 

Re: CVS: cvs.openbsd.org: ports

2024-02-24 Thread Stuart Henderson
On 2024/02/24 08:39, Bjorn Ketelaars wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   b...@cvs.openbsd.org2024/02/24 08:39:44
> 
> Modified files:
>   devel/quirks   : Makefile 
>   devel/quirks/files: Quirks.pm 
> 
> Log message:
> Add quirk for the rename unison => unison-gui
> 
> OK jca@
> 

Are you sure about that? It seems problematic:

$ make show=PKGNAMES
unison-2.53.4 unison-gui-2.53.4



Re: CVS: cvs.openbsd.org: ports

2024-02-24 Thread Thomas Frohwein
On Sat, Feb 24, 2024 at 07:48:00AM -0700, Thomas Frohwein wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2024/02/24 07:48:00
> 
> Log message:
> import graphics/volk, a dynamic loader for the vulkan library and now a
> dependency for vulkan-tools. ok op@

Was also built and tested by Jose Maldonado - thanks!

> DESCR:
> volk is a meta-loader for Vulkan. It allows you to dynamically load 
> entrypoints
> required to use Vulkan without linking to vulkan-1.dll or statically 
> linking
> Vulkan loader. Additionally, volk simplifies the use of Vulkan extensions 
> by
> automatically loading all associated entrypoints. Finally, volk enables 
> loading
> Vulkan entrypoints directly from the driver which can increase 
> performance by
> skipping loader dispatch overhead.
> 
> Status:
> 
> Vendor Tag:   thfr
> Release Tags: thfr_20240224
> 
> N ports/graphics/volk/Makefile
> N ports/graphics/volk/distinfo
> N ports/graphics/volk/patches/patch-CMakeLists_txt
> N ports/graphics/volk/pkg/DESCR
> N ports/graphics/volk/pkg/PLIST
> 
> No conflicts created by this import
> 



Re: CVS: cvs.openbsd.org: ports

2024-02-20 Thread Stuart Henderson
On 2024/02/20 14:47, Landry Breuil wrote:
> forgot to mention: building with PGO is now disabled as upstream
> switched builds to llvm 17 and we cant reuse upstream profdata with our
> clang 16 - cf #1876094

oh, wonder if I should retry it on i386...



Re: CVS: cvs.openbsd.org: ports

2024-02-20 Thread Landry Breuil
Le Tue, Feb 20, 2024 at 06:42:01AM -0700, Landry Breuil a écrit :
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   lan...@cvs.openbsd.org  2024/02/20 06:42:01
> 
> Modified files:
>   www/mozilla-firefox: Makefile distinfo 
>   www/mozilla-firefox/patches: 
>
> patch-third_party_libwebrtc_common_audio_common_audio_c_gn_moz_build 
>
> patch-third_party_libwebrtc_common_audio_third_party_spl_sqrt_floor_spl_sqrt_floor_gn_moz_build
>  
>
> patch-third_party_libwebrtc_modules_audio_processing_aecm_aecm_core_gn_moz_build
>  
>
> patch-third_party_libwebrtc_modules_desktop_capture_desktop_capture_gn_moz_build
>  
>
> patch-xpcom_reflect_xptcall_md_unix_moz_build 
>   www/firefox-i18n: Makefile.inc distinfo 
> 
> Log message:
> www/mozilla-firefox: update to 123.0.
> 
> see https://www.mozilla.org/en-US/firefox/123.0/releasenotes/
> fixes https://www.mozilla.org/en-US/security/advisories/mfsa2024-05/
> 
> add links to upstream commits for #1876554 & #1879656

forgot to mention: building with PGO is now disabled as upstream
switched builds to llvm 17 and we cant reuse upstream profdata with our
clang 16 - cf #1876094



Re: CVS: cvs.openbsd.org: ports

2024-02-17 Thread Stuart Henderson
On 2024/02/14 01:20, Alexandre Ratchov wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ratc...@cvs.openbsd.org 2024/02/14 01:20:26
> 
> Modified files:
>   devel/geany: Makefile distinfo 
>   devel/geany/patches: patch-scintilla_src_RunStyles_cxx 
>   devel/geany/pkg: PLIST 
> 
> Log message:
> devel/geany: Update to version 2.0.
> 
> ok and help from tb, kn, and Victor Kukshiev (maintainer)
> 

Broken on 32-bit:

src/CellBuffer.cxx:216:39: error: cannot initialize a parameter of type 'const
int *' with an lvalue of type 'const Sci::Position *' (aka 'const long *')
starts.InsertPartitions(lineAsPos, positions, lines);
   ^
src/CellBuffer.cxx:180:2: note: in instantiation of member function
'LineVector::InsertLines' requested here
LineVector() : starts(256), perLine(nullptr),
activeIndices(LineCharacterIndexType::None) {
^
/usr/include/c++/v1/__memory/unique_ptr.h:686:30: note: in instantiation of
member function 'LineVector::LineVector' requested here
  return unique_ptr<_Tp>(new _Tp(_VSTD::forward<_Args>(__args)...));
 ^
src/CellBuffer.cxx:620:14: note: in instantiation of function template
specialization 'std::make_unique>' requested here
plv = std::make_unique>();
   ^
./src/Partitioning.h:102:46: note: passing argument to parameter 'positions'
here
void InsertPartitions(T partition, const T *positions, size_t length)
{
^
1 error generated.


Looks like it might need patch-src_CellBuffer_cxx from editors/scintilla



Re: CVS: cvs.openbsd.org: ports

2024-02-16 Thread Tobias Heider
On Fri, Feb 16, 2024 at 03:49:10PM -0700, Tobias Heider wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   to...@cvs.openbsd.org   2024/02/16 15:49:10
> 
> Modified files:
>   lang/qbe   : Makefile distinfo 
> Removed files:
>   lang/qbe/patches: patch-all_h patch-amd64_emit_c 
> patch-arm64_emit_c patch-emit_c patch-ops_h 
> patch-parse_c patch-rv64_emit_c 
> 
> Log message:
> lang/qbe: Update to 1.2
> 

+ ok bcallah@



Re: CVS: cvs.openbsd.org: ports

2024-02-16 Thread Otto Moerbeek
On Fri, Feb 16, 2024 at 07:01:22AM -0700, Otto Moerbeek wrote:

> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   o...@cvs.openbsd.org2024/02/16 07:01:22
> 
> Modified files:
>   net/dnsdist: Makefile distinfo 
>   net/dnsdist/patches: patch-configure_ac 
>   net/dnsdist/pkg: DESCR 
> 
> Log message:
> Update to dnsdist 1.9.0, introducing a -h2 flavor for incoming DoQ and DoH3

ehh -h3

> 
> This also drops the h2o dependenccy
> 



Re: CVS: cvs.openbsd.org: ports

2024-02-15 Thread Theo Buehler
On Thu, Feb 15, 2024 at 01:02:37AM -0700, Theo Buehler wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2024/02/15 01:02:37
> 
> Modified files:
>   wayland/wf-config: Makefile 
> 
> Log message:
> wf-config: add BDEP on cmake
> 
> Like wayfire, gmp is detected using the .cmake files.
> 
> ok landry (maintainer)
> 

This should have said glm, not gmp



Re: CVS: cvs.openbsd.org: ports

2024-02-13 Thread Claudio Jeker
On Tue, Feb 13, 2024 at 03:27:32AM -0700, Claudio Jeker wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   clau...@cvs.openbsd.org 2024/02/13 03:27:32
> 
> Modified files:
>   devel/boost: Makefile 
> Added files:
>   devel/boost/files: jump_sparc64_sysv_elf_gas.S 
>  make_sparc64_sysv_elf_gas.S 
>  ontop_sparc64_sysv_elf_gas.S 
>   devel/boost/patches: patch-libs_context_build_Jamfile_v2 
> 
> Log message:
> Add boost-context support for sparc64.
> 
> This is based on the work done for PHP and passes all tests in boost-context.
> OK rsadowski@

Also OK sthen@ 

-- 
:wq Claudio



Re: CVS: cvs.openbsd.org: ports

2024-02-11 Thread Antoine Jacoutot
On Sat, Feb 10, 2024 at 08:39:40AM -0700, Ian Darwin wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   i...@cvs.openbsd.org2024/02/10 08:39:40
> 
> Modified files:
>   cad/opencascade: Makefile distinfo 
>   cad/opencascade/patches: patch-CMakeLists_txt 
>patch-src_Standard_Standard_CString_cxx 
>   cad/opencascade/pkg: PLIST 
> 
> Log message:
> Update opencascade to 7.8.0, from maintainer Johannes Thyssen Tishman.
> Both downstream consumers kicad & prusaslicer built & lightly tested by me.
> ok tracey@. Looks good to Renato Aguiar (prusaslicer maintainer).

It might have broken cad/kicad:

-- Found OCC: /usr/local/include/opencascade (found version "7.8.0")

*** OpenCascade library missing ***
Could not find a library for TKIGES at /usr/local/lib
Verify your OpenCascade installation or pass CMake
  the library directory as '-DOCC_LIBRARY_DIR='

CMake Error at CMakeModules/FindOCC.cmake:191 (message): 
Call Stack (most recent call first):
  CMakeLists.txt:741 (find_package)


-- Configuring incomplete, errors occurred!
*** Error 1 in cad/kicad (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:3020 
'do-configure': @cd /exopi-obj/pobj/kicad-6.0.11/build-amd64 &...)



-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-02-09 Thread Theo Buehler
On Thu, Feb 08, 2024 at 02:38:42PM -0700, Sebastian Reitenbach wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sebas...@cvs.openbsd.org2024/02/08 14:38:42
> 
> Modified files:
>   sysutils/ruby-puppet-syntax: Makefile distinfo 
>   sysutils/ruby-puppet-syntax/pkg: PLIST 
> 
> Log message:
> update 3.3.0 -> 4.0.0
> 

Fails to build here

>>> Building on localhost under sysutils/ruby-puppet-syntax
BDEPENDS = [sysutils/ruby-puppet/7;lang/ruby/3.2]
DIST = [sysutils/ruby-puppet-syntax:puppet-syntax-4.0.0.gem]
FULLPKGNAME = ruby32-puppet-syntax-4.0.0
RDEPENDS = [lang/ruby/3.2;sysutils/ruby-puppet/7]
(Junk lock obtained for localhost at 1707536935.34)
>>> Running depends in sysutils/ruby-puppet-syntax at 1707536935.35
   last junk was in net/p5-Net-Server-SS-PreFork
/usr/sbin/pkg_add -aI -Drepair puppet-7.28.0 ruby-3.2.3
was: /usr/sbin/pkg_add -aI -Drepair puppet-7.28.0 ruby-3.2.3
/usr/sbin/pkg_add -aI -Drepair puppet-7.28.0 ruby-3.2.3
The following new rcscripts were installed: /etc/rc.d/puppet
See rcctl(8) for details.
--- +puppet-7.28.0 ---
You may wish to add /usr/local/lib/ruby/gems/3.2/gems/puppet-7.28.0/man to 
/etc/man.conf
>>> Running show-prepare-results in sysutils/ruby-puppet-syntax at 1707536938.82
===> sysutils/ruby-puppet-syntax
===> Building from scratch ruby32-puppet-syntax-4.0.0
===> ruby32-puppet-syntax-4.0.0 depends on: puppet-* -> puppet-7.28.0
===> ruby32-puppet-syntax-4.0.0 depends on: ruby->=3.2.0,<3.3 -> ruby-3.2.3
puppet-7.28.0
ruby-3.2.3
(Junk lock released for localhost at 1707536939.22)
distfiles size=22016
>>> Running build in sysutils/ruby-puppet-syntax at 1707536939.23
===> sysutils/ruby-puppet-syntax
===>  Checking files for ruby32-puppet-syntax-4.0.0
`/data/distfiles/puppet-syntax-4.0.0.gem' is up to date.
>> (SHA256) puppet-syntax-4.0.0.gem: OK
===>  Extracting for ruby32-puppet-syntax-4.0.0
===>  Patching for ruby32-puppet-syntax-4.0.0
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
===>  Generating configure for ruby32-puppet-syntax-4.0.0
===>  Configuring for ruby32-puppet-syntax-4.0.0
===>  Building for ruby32-puppet-syntax-4.0.0
if [ -f /tmp/pobj/puppet-syntax-4.0.0-ruby32/puppet-syntax-4.0.0/.metadata ]; 
then  cd /tmp/pobj/puppet-syntax-4.0.0-ruby32/puppet-syntax-4.0.0 && gzip 
.metadata &&  mv -f .metadata.gz 
/tmp/pobj/puppet-syntax-4.0.0-ruby32/gem-content/metadata.gz;  fi;  cd 
/tmp/pobj/puppet-syntax-4.0.0-ruby32/puppet-syntax-4.0.0 && pax -wz -s 
'/.*\.orig\.port$//'  -x ustar -o write_opt=nodir . 
>/tmp/pobj/puppet-syntax-4.0.0-ruby32/gem-content/data.tar.gz;  cd 
/tmp/pobj/puppet-syntax-4.0.0-ruby32/gem-content && tar -cf 
/tmp/pobj/puppet-syntax-4.0.0-ruby32/puppet-syntax-4.0.0.gem *.gz;  mkdir -p 
/tmp/pobj/puppet-syntax-4.0.0-ruby32/gem-tmp/.gem;  env -i 
PORTSDIR="/usr/ports" LIBTOOL="/usr/bin/libtool"  
PATH='/tmp/pobj/puppet-syntax-4.0.0-ruby32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin'
 PREFIX='/usr/local'  LOCALBASE='/usr/local' X11BASE='/usr/X11R6'  CFLAGS='-O2 
-pipe'  TRUEPREFIX='/usr/local' DESTDIR=''  
HOME='/puppet-syntax-4.0.0_writes_to_HOME' PICFLAG="-fpic"  BINGRP=bin 
BINOWN=root BINMODE=755 NONBINMODE=644  DIRMODE=755  INSTALL_COPY=-c 
INSTALL_STRIP=-s  MANGRP=bin MANOWN=root MANMODE=644 
BSD_INSTALL_PROGRAM="/tmp/pobj/puppet-syntax-4.0.0-ruby32/bin/install -c -s -m 
755"  BSD_INSTALL_SCRIPT="/tmp/pobj/puppet-syntax-4.0.0-ruby32/bin/install -c 
-m 755"  BSD_INSTALL_DATA="/tmp/pobj/puppet-syntax-4.0.0-ruby32/bin/install -c 
-m 644"  BSD_INSTALL_MAN="/tmp/pobj/puppet-syntax-4.0.0-ruby32/bin/install -c 
-m 644"  
BSD_INSTALL_PROGRAM_DIR="/tmp/pobj/puppet-syntax-4.0.0-ruby32/bin/install -d -m 
755"  BSD_INSTALL_SCRIPT_DIR="/tmp/pobj/puppet-syntax-4.0.0-ruby32/bin/install 
-d -m 755"  
BSD_INSTALL_DATA_DIR="/tmp/pobj/puppet-syntax-4.0.0-ruby32/bin/install -d -m 
755"  BSD_INSTALL_MAN_DIR="/tmp/pobj/puppet-syntax-4.0.0-ruby32/bin/install -d 
-m 755" HOME=`dirname /tmp/pobj/puppet-syntax-4.0.0-ruby32/gem-tmp/.gem` 
GEM_HOME=/tmp/pobj/puppet-syntax-4.0.0-ruby32/gem-tmp/.gem  make="make V=1"  
/usr/local/bin/gem32 install --local -N --no-force --verbose --backtrace 
--user-install /tmp/pobj/puppet-syntax-4.0.0-ruby32/puppet-syntax-4.0.0.gem  -- 
ERROR:  Could not find a valid gem 'rake' (~> 13.1) (required by 
'/tmp/pobj/puppet-syntax-4.0.0-ruby32/puppet-syntax-4.0.0.gem' (>= 0)) in any 
repository
*** Error 2 in sysutils/ruby-puppet-syntax 
(/usr/ports/lang/ruby/ruby.port.mk:237 'do-build')
*** Error 2 in sysutils/ruby-puppet-syntax 
(/usr/ports/infrastructure/mk/bsd.port.mk:3055 
'/tmp/pobj/puppet-syntax-4.0.0-ruby32/.build_done')
*** Error 2 in sysutils/ruby-puppet-syntax 
(/usr/ports/infrastructure/mk/bsd.port.mk:2702 'build': 
@lock=ruby32-puppet-syntax-4.0.0;  export...)
===> Exiting sysutils/ruby-puppet-syntax with an 

Re: CVS: cvs.openbsd.org: ports

2024-02-09 Thread Antoine Jacoutot
On Fri, Feb 09, 2024 at 07:22:56PM +0100, Tobias Heider wrote:
> On Wed, Feb 07, 2024 at 01:11:07PM -0700, Antoine Jacoutot wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: ajacou...@cvs.openbsd.org   2024/02/07 13:11:07
> > 
> > Modified files:
> > www/webkitgtk4 : Tag: OPENBSD_7_4 Makefile distinfo 
> > www/webkitgtk4/patches: Tag: OPENBSD_7_4 
> > 
> > patch-Source_JavaScriptCore_assembler_ARMv7Assembler_h 
> > 
> > Log message:
> > Update to webkitgtk40-2.42.5.
> > 
> 
> This is weirdly broken on macppc. It seems like they forgot to include a 
> commit
> in the release.
> 
> In LowLevelInterpreter.cpp:339 they use a variable t6 which does not exist in 
> the
> release tarball. It is there in the github repo.
> Does the build work on other archs?

This is being fixed by sthen

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-02-09 Thread Tobias Heider
On Wed, Feb 07, 2024 at 01:11:07PM -0700, Antoine Jacoutot wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ajacou...@cvs.openbsd.org   2024/02/07 13:11:07
> 
> Modified files:
>   www/webkitgtk4 : Tag: OPENBSD_7_4 Makefile distinfo 
>   www/webkitgtk4/patches: Tag: OPENBSD_7_4 
>   
> patch-Source_JavaScriptCore_assembler_ARMv7Assembler_h 
> 
> Log message:
> Update to webkitgtk40-2.42.5.
> 

This is weirdly broken on macppc. It seems like they forgot to include a commit
in the release.

In LowLevelInterpreter.cpp:339 they use a variable t6 which does not exist in 
the
release tarball. It is there in the github repo.
Does the build work on other archs?



Re: CVS: cvs.openbsd.org: ports

2024-02-08 Thread Stuart Henderson
On 2024/02/08 14:25, Sebastian Reitenbach wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sebas...@cvs.openbsd.org2024/02/08 14:25:55
> 
> Modified files:
>   security/py-fickling: Makefile distinfo 
>   security/py-fickling/pkg: PLIST 
> 
> Log message:
> update 0.0.8 -> 0.1.2
> 

Looks like there's some cleaning to do:

Index: Makefile
===
RCS file: /cvs/ports/security/py-fickling/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile8 Feb 2024 21:25:55 -   1.13
+++ Makefile8 Feb 2024 22:12:22 -
@@ -1,8 +1,9 @@
 COMMENT =  analyze Python pickle object serializations
 
 MODPY_EGG_VERSION = 0.1.2
+REVISION = 0
 DISTNAME = fickling-${MODPY_EGG_VERSION}
-PKGNAME =   py-${DISTNAME}
+PKGNAME =  py-${DISTNAME}
 CATEGORIES =   security
 
 MAINTAINER =   Sebastian Reitenbach 
@@ -16,10 +17,5 @@ MODPY_PI =   Yes
 
 FLAVORS =  python3
 FLAVOR =   python3
-
-#BUILD_DEPENDS +=  devel/py-flit_core${MODPY_FLAVOR}
-# Only needed for python3.8, it's part of python3.9
-RUN_DEPENDS += devel/py-astunparse${MODPY_FLAVOR}
-
 
 .include 



Re: CVS: cvs.openbsd.org: ports

2024-02-08 Thread Robert Nagy
On 08/02/24 05:33 -0700, Robert Nagy wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   rob...@cvs.openbsd.org  2024/02/08 05:33:18
> 
> Modified files:
>   multimedia/libvpx: Makefile 
>   multimedia/libvpx/patches: patch-libs_mk 
> Added files:
>   multimedia/libvpx/patches: patch-build_make_configure_sh 
> 
> Log message:
> fix target os detection by executing ${CC} instead of gcc and enable 
> optimizations
> 
> this should unbreak video conferencing with chromium

that was ok aja@



Re: CVS: cvs.openbsd.org: ports

2024-02-01 Thread Landry Breuil
Le Thu, Feb 01, 2024 at 07:47:32PM +0100, Solène Rapenne a écrit :
> Le jeudi 01 février 2024 à 07:11 -0700, Landry Breuil a écrit :
> 
> > > CVSROOT: /cvs  
> > > Module name: ports  
> > > Changes by: 
> > > [[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org)](mailto:[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org))
> > >  2024/02/01 07:11:12  
> > >  
> > > Modified files:  
> > > www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile  
> > > Added files:  
> > > www/mozilla-firefox/patches: Tag: OPENBSD_7_4  
> > >   
> > > patch-third_party_libwebrtc_modules_video_capture_video_capture_facto  
> > > ry_cc  
> > >  
> > > Log message:  
> > > www/mozilla-firefox: MFC fix webcam detection  
> > >  
> > > gypped from 
> > > [[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248)](mailto:[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248))
> > >   
> > > cf #1878010  
> > >
> 
> 
> this doesn't compile on arm64 (I made sure the whole ports tree is up to date)
> I think this failed one or two commits earlier

then that's probably the update to 122... but afaict it built fine on
-current. You'll need to find the real failure from the logs :)



Re: CVS: cvs.openbsd.org: ports

2024-02-01 Thread Stuart Henderson

The error message is probably a few pages up.

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

On 1 February 2024 18:48:07 Solène Rapenne  wrote:


Le jeudi 01 février 2024 à 07:11 -0700, Landry Breuil a écrit :


> CVSROOT: /cvs
> Module name: ports
> Changes by: 
[[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org)](mailto:[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org)) 
2024/02/01 07:11:12

>
> Modified files:
> www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile
> Added files:
> www/mozilla-firefox/patches: Tag: OPENBSD_7_4
>
> patch-third_party_libwebrtc_modules_video_capture_video_capture_facto
> ry_cc
>
> Log message:
> www/mozilla-firefox: MFC fix webcam detection
>
> gypped from 
[[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248)](mailto:[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248))

> cf #1878010
>



this doesn't compile on arm64 (I made sure the whole ports tree is up to date)
I think this failed one or two commits earlier

gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/config/external/sqlite'
gmake[3]: Entering directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src'

mkdir -p '.deps/'
third_party/sqlite3/src/sqlite3.o
/build/tmp/pobj//firefox-122.0/bin/cc -std=gnu99 -o sqlite3.o -c -flto=thin 
-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -DNDEBUG=1 
-DTRIMMED=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_THREADSAFE=1 
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 
-DSQLITE_DEFAULT_PAGE_SIZE=32768 -DSQLITE_MAX_DEFAULT_PAGE_SIZE=32768 
-DSQLITE_OMIT_COMPILEOPTION_DIAGS=1 -DSQLITE_OMIT_DEPRECATED 
-DSQLITE_OMIT_BUILTIN_TEST -DSQLITE_TEMP_STORE=2 
'-DSQLITE_TEMP_FILE_PREFIX="mz_etilqs_"' -DSQLITE_ENABLE_MATH_FUNCTIONS 
-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1572864 
-I/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/dist/include 
-I/usr/local/include/nspr -I/usr/local/include/nss 
-I/usr/local/include/nspr 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/dist/include/nss 
-I/usr/local/include -include 
/build/tmp/pobj/firefox-122.0/build-aarch64/mozilla-config.h 
-DMOZILLA_CLIENT -Wno-backend-plugin -O2 -pipe -g -fPIC -ffunction-sections 
-fdata-sections -fno-math-errno -pthread -pipe -gdwarf-4 -O2 -pipe -g 
-fomit-frame-pointer -funwind-tables -Wall -Wbitfield-enum-conversion 
-Wempty-body -Wformat-type-confusion -Wignored-qualifiers -Wpointer-arith 
-Wshadow-field-in-constructor-modified -Wsign-compare 
-Wtautological-constant-in-range-compare -Wtype-limits 
-Wno-error=tautological-type-limit-compare -Wunreachable-code 
-Wunreachable-code-return -Wunused-but-set-parameter -Wclass-varargs 
-Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis 
-Wno-range-loop-analysis -Wenum-compare-conditional -Wenum-float-conversion 
-Wstring-conversion -Wno-error=deprecated-declarations 
-Wno-error=array-bounds -Wno-error=free-nonheap-object 
-Wno-error=atomic-alignment -Wformat -Wformat-security 
-Werror=implicit-function-declaration -Wno-psabi -Wthread-safety 
-Wno-error=builtin-macro-redefined -Wno-unknown-warning-option 
-Wno-sign-compare -Wno-type-limits -fno-strict-aliasing -ffp-contract=off 
-fprofile-use=/build/tmp/pobj//firefox-122.0/merged.profdata 
-Wno-error=backend-plugin -MD -MP -MF .deps/sqlite3.o.pp   
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/media/libvpx'
gmake[2]: *** 
[/build/tmp/pobj/firefox-122.0/firefox-122.0/config/recurse.mk:72: 
media/libvpx/target-objects] Error 2

gmake[2]: *** Waiting for unfinished jobs
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:88121:3: 
warning: 'return' will never be executed [-Wunreachable-code-return]

return;
^~
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:92699:10: 
warning: 'return' will never be executed [-Wunreachable-code-return]

return 0;
^
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:173973:9: 
warning: code will never be executed [-Wunreachable-code]

YYMINORTYPE yylhsminor;
^~~
3 warnings generated.
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src'

fts5parse.sql:1012:9: warning: code will never be executed [-Wunreachable-code]
fts5YYMINORTYPE fts5yylhsminor;
^~~
1 warning generated.
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/ext'
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/browser/app'

gmake[2]: Leaving directory '/build/tmp/pobj/firefox-122.0/build-aarch64'
gmake[1]: *** 
[/build/tmp/pobj/firefox-122.0/firefox-122.0/config/recurse.mk:34: compile] 
Error 2

gmake[1]: 

Re: CVS: cvs.openbsd.org: ports

2024-02-01 Thread Solène Rapenne
Le jeudi 01 février 2024 à 07:11 -0700, Landry Breuil a écrit :

> > CVSROOT: /cvs  
> > Module name: ports  
> > Changes by: 
> > [[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org)](mailto:[lan...@cvs.openbsd.org](mailto:lan...@cvs.openbsd.org))
> >  2024/02/01 07:11:12  
> >  
> > Modified files:  
> > www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile  
> > Added files:  
> > www/mozilla-firefox/patches: Tag: OPENBSD_7_4  
> >   
> > patch-third_party_libwebrtc_modules_video_capture_video_capture_facto  
> > ry_cc  
> >  
> > Log message:  
> > www/mozilla-firefox: MFC fix webcam detection  
> >  
> > gypped from 
> > [[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248)](mailto:[freebsd/freebsd-ports@53a70f1248](mailto:freebsd/freebsd-ports@53a70f1248))
> >   
> > cf #1878010  
> >


this doesn't compile on arm64 (I made sure the whole ports tree is up to date)
I think this failed one or two commits earlier

gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/config/external/sqlite'  
gmake[3]: Entering directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src'  
mkdir -p '.deps/'  
third_party/sqlite3/src/sqlite3.o  
/build/tmp/pobj//firefox-122.0/bin/cc -std=gnu99 -o sqlite3.o -c -flto=thin 
-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -DNDEBUG=1 
-DTRIMMED=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_THREADSAFE=1 
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 
-DSQLITE_DEFAULT_PAGE_SIZE=32768 -DSQLITE_MAX_DEFAULT_PAGE_SIZE=32768 
-DSQLITE_OMIT_COMPILEOPTION_DIAGS=1 -DSQLITE_OMIT_DEPRECATED 
-DSQLITE_OMIT_BUILTIN_TEST -DSQLITE_TEMP_STORE=2 
'-DSQLITE_TEMP_FILE_PREFIX="mz_etilqs_"' -DSQLITE_ENABLE_MATH_FUNCTIONS 
-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1572864 
-I/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/dist/include 
-I/usr/local/include/nspr -I/usr/local/include/nss -I/usr/local/include/nspr 
-I/build/tmp/pobj/firefox-122.0/build-aarch64/dist/include/nss 
-I/usr/local/include -include 
/build/tmp/pobj/firefox-122.0/build-aarch64/mozilla-config.h -DMOZILLA_CLIENT 
-Wno-backend-plugin -O2 -pipe -g -fPIC -ffunction-sections -fdata-sections 
-fno-math-errno -pthread -pipe -gdwarf-4 -O2 -pipe -g -fomit-frame-pointer 
-funwind-tables -Wall -Wbitfield-enum-conversion -Wempty-body 
-Wformat-type-confusion -Wignored-qualifiers -Wpointer-arith 
-Wshadow-field-in-constructor-modified -Wsign-compare 
-Wtautological-constant-in-range-compare -Wtype-limits 
-Wno-error=tautological-type-limit-compare -Wunreachable-code 
-Wunreachable-code-return -Wunused-but-set-parameter -Wclass-varargs 
-Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis 
-Wno-range-loop-analysis -Wenum-compare-conditional -Wenum-float-conversion 
-Wstring-conversion -Wno-error=deprecated-declarations -Wno-error=array-bounds 
-Wno-error=free-nonheap-object -Wno-error=atomic-alignment -Wformat 
-Wformat-security -Werror=implicit-function-declaration -Wno-psabi 
-Wthread-safety -Wno-error=builtin-macro-redefined -Wno-unknown-warning-option 
-Wno-sign-compare -Wno-type-limits -fno-strict-aliasing -ffp-contract=off 
-fprofile-use=/build/tmp/pobj//firefox-122.0/merged.profdata 
-Wno-error=backend-plugin -MD -MP -MF .deps/sqlite3.o.pp   
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c  
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/media/libvpx'  
gmake[2]: *** 
[/build/tmp/pobj/firefox-122.0/firefox-122.0/config/recurse.mk:72: 
media/libvpx/target-objects] Error 2  
gmake[2]: *** Waiting for unfinished jobs  
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:88121:3:
 warning: 'return' will never be executed [-Wunreachable-code-return]  
return;  
^~  
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:92699:10:
 warning: 'return' will never be executed [-Wunreachable-code-return]  
return 0;  
^  
/build/tmp/pobj/firefox-122.0/firefox-122.0/third_party/sqlite3/src/sqlite3.c:173973:9:
 warning: code will never be executed [-Wunreachable-code]  
YYMINORTYPE yylhsminor;  
^~~  
3 warnings generated.  
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/src'  
fts5parse.sql:1012:9: warning: code will never be executed [-Wunreachable-code] 
 
fts5YYMINORTYPE fts5yylhsminor;  
^~~  
1 warning generated.  
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/third_party/sqlite3/ext'  
gmake[3]: Leaving directory 
'/build/tmp/pobj/firefox-122.0/build-aarch64/browser/app'  
gmake[2]: Leaving directory '/build/tmp/pobj/firefox-122.0/build-aarch64'  
gmake[1]: *** 
[/build/tmp/pobj/firefox-122.0/firefox-122.0/config/recurse.mk:34: compile] 
Error 2  

Re: CVS: cvs.openbsd.org: ports

2024-01-25 Thread Stuart Henderson
On 2024/01/25 11:09, Stuart Henderson wrote:
> On 2024/01/25 11:00, Solène Rapenne wrote:
> > I'll see how I can do this better without doing a full cvs up
> > every time on all 4 machines
> 
> I think you do really need to update to a consistent OPENBSD_7_4 ports
> tree on your build machines...

actually, I'm surprised you aren't nfs-serving /usr/ports from one of
the faster machines and mounting on the others?



Re: CVS: cvs.openbsd.org: ports

2024-01-25 Thread Stuart Henderson
On 2024/01/25 11:00, Solène Rapenne wrote:
> I'll see how I can do this better without doing a full cvs up
> every time on all 4 machines

I think you do really need to update to a consistent OPENBSD_7_4 ports
tree on your build machines...



Re: CVS: cvs.openbsd.org: ports

2024-01-25 Thread Solène Rapenne
Le jeudi 25 janvier 2024 à 10:52 +0100, Landry Breuil a écrit :
> Le Thu, Jan 25, 2024 at 10:00:15AM +0100, Solène Rapenne a écrit :
> > Le jeudi 25 janvier 2024 à 08:40 +0100, Landry Breuil a écrit :
> > > Le Wed, Jan 24, 2024 at 06:11:22PM +0100, Solène Rapenne a écrit :
> > > > On 23/01/2024 15:29, Landry Breuil wrote:
> > > > > CVSROOT:/cvs
> > > > > Module name:ports
> > > > > Changes by: lan...@cvs.openbsd.org   2024/01/23 07:29:57
> > > > > 
> > > > > Modified files:
> > > > > www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile distinfo
> > > > > Removed files:
> > > > > www/mozilla-firefox/patches: Tag: OPENBSD_7_4
> > > > >  
> > > > > patch-toolkit_xre_glxtest_glxtest_cpp
> > > > > 
> > > > > Log message:
> > > > > www/mozilla-firefox: MFC update to 122.0.
> > > > > 
> > > > > see https://www.mozilla.org/en-US/firefox/122.0/releasenotes/
> > > > > fixes https://www.mozilla.org/en-US/security/advisories/mfsa2024-01/
> > > > > 
> > > > > drop patch from #1868782, merged upstream
> > > > > 
> > > > 
> > > > for some reasons, doesn't compile on arm64 -stable , it didn't compile 
> > > > last
> > > > backport either but I didn't have the time to check why
> > > 
> > > if it's only on arm64-stable and amd64-stable built fine, i'd triple
> > > check that www/mozilla/mozilla.port.mk is at r1.163.2.1, cf
> > > https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/mozilla/mozilla.port.mk?only_with_tag=OPENBSD_7_4
> > > 
> > > >  ===>  Checking files for firefox-122.0
> > > >  `/mnt/distfiles/mozilla/firefox-122.0.source.tar.xz' is up to date.
> > > > > > No size recorded for mozilla/firefox-122.0.source-profdata.tar.xz
> > > 
> > > it should be prefixed with -repacked, as is the case since 121 was
> > > merged in 7.4 stable
> > > 
> > > can you check make show=DISTFILES.profdata ? here on my 7.4-stable tree
> > > its firefox-122.0.source-profdata-repacked.tar.xz
> > > 
> > > esr is probably the same thing.
> > > 
> > 
> > this is super weird, I have different results on arm64 and amd64 but
> > both distinfo have the same checksum
> > 
> > arm64-stable$ pwd
> > /home/ports/www/firefox-esr
> > arm64-stable$ make show=DISTFILES.profdata 
> > firefox-115.7.0esr.source-profdata.tar.xz
> > 
> > arm64-stable$ cd ../mozilla-firefox
> > arm64-stable$ make show=DISTFILES.profdata 
> > firefox-122.0.source-profdata.tar.xz
> 
> compare the content of www/mozilla/mozilla.port.mk, there's nothing
> arch-specific there afaict..
> 
> SHA256 (firefox-122.0.source-profdata-repacked.tar.xz) = 
> 5616619c86e99b64d207c319a49a77c8415f0f9d3ab26c6a5c132d85829e464f
> SHA256 (firefox-115.7.0esr.source-profdata-repacked.tar.xz) = 
> 5f47d1013cb00f4d59638a7f472ec92629d8331bf4ce7f451a137b5434c0840c
> 
> is what i have on the SITES.profdata.
> 

the directory www/mozilla wasn't updated on arm64 as it's not
part of a package that got updated, hence the issue.

the problem was on my side, thank you for the help

I'll see how I can do this better without doing a full cvs up
every time on all 4 machines



Re: CVS: cvs.openbsd.org: ports

2024-01-25 Thread Landry Breuil
Le Thu, Jan 25, 2024 at 10:00:15AM +0100, Solène Rapenne a écrit :
> Le jeudi 25 janvier 2024 à 08:40 +0100, Landry Breuil a écrit :
> > Le Wed, Jan 24, 2024 at 06:11:22PM +0100, Solène Rapenne a écrit :
> > > On 23/01/2024 15:29, Landry Breuil wrote:
> > > > CVSROOT:/cvs
> > > > Module name:ports
> > > > Changes by: lan...@cvs.openbsd.org   2024/01/23 07:29:57
> > > > 
> > > > Modified files:
> > > > www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile distinfo
> > > > Removed files:
> > > > www/mozilla-firefox/patches: Tag: OPENBSD_7_4
> > > >  
> > > > patch-toolkit_xre_glxtest_glxtest_cpp
> > > > 
> > > > Log message:
> > > > www/mozilla-firefox: MFC update to 122.0.
> > > > 
> > > > see https://www.mozilla.org/en-US/firefox/122.0/releasenotes/
> > > > fixes https://www.mozilla.org/en-US/security/advisories/mfsa2024-01/
> > > > 
> > > > drop patch from #1868782, merged upstream
> > > > 
> > > 
> > > for some reasons, doesn't compile on arm64 -stable , it didn't compile 
> > > last
> > > backport either but I didn't have the time to check why
> > 
> > if it's only on arm64-stable and amd64-stable built fine, i'd triple
> > check that www/mozilla/mozilla.port.mk is at r1.163.2.1, cf
> > https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/mozilla/mozilla.port.mk?only_with_tag=OPENBSD_7_4
> > 
> > >  ===>  Checking files for firefox-122.0
> > >  `/mnt/distfiles/mozilla/firefox-122.0.source.tar.xz' is up to date.
> > > > > No size recorded for mozilla/firefox-122.0.source-profdata.tar.xz
> > 
> > it should be prefixed with -repacked, as is the case since 121 was
> > merged in 7.4 stable
> > 
> > can you check make show=DISTFILES.profdata ? here on my 7.4-stable tree
> > its firefox-122.0.source-profdata-repacked.tar.xz
> > 
> > esr is probably the same thing.
> > 
> 
> this is super weird, I have different results on arm64 and amd64 but
> both distinfo have the same checksum
> 
> arm64-stable$ pwd
> /home/ports/www/firefox-esr
> arm64-stable$ make show=DISTFILES.profdata 
> firefox-115.7.0esr.source-profdata.tar.xz
> 
> arm64-stable$ cd ../mozilla-firefox
> arm64-stable$ make show=DISTFILES.profdata 
> firefox-122.0.source-profdata.tar.xz

compare the content of www/mozilla/mozilla.port.mk, there's nothing
arch-specific there afaict..

SHA256 (firefox-122.0.source-profdata-repacked.tar.xz) = 
5616619c86e99b64d207c319a49a77c8415f0f9d3ab26c6a5c132d85829e464f
SHA256 (firefox-115.7.0esr.source-profdata-repacked.tar.xz) = 
5f47d1013cb00f4d59638a7f472ec92629d8331bf4ce7f451a137b5434c0840c

is what i have on the SITES.profdata.



Re: CVS: cvs.openbsd.org: ports

2024-01-25 Thread Solène Rapenne
Le jeudi 25 janvier 2024 à 08:40 +0100, Landry Breuil a écrit :
> Le Wed, Jan 24, 2024 at 06:11:22PM +0100, Solène Rapenne a écrit :
> > On 23/01/2024 15:29, Landry Breuil wrote:
> > > CVSROOT:/cvs
> > > Module name:ports
> > > Changes by: lan...@cvs.openbsd.org   2024/01/23 07:29:57
> > > 
> > > Modified files:
> > > www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile distinfo
> > > Removed files:
> > > www/mozilla-firefox/patches: Tag: OPENBSD_7_4
> > >  patch-toolkit_xre_glxtest_glxtest_cpp
> > > 
> > > Log message:
> > > www/mozilla-firefox: MFC update to 122.0.
> > > 
> > > see https://www.mozilla.org/en-US/firefox/122.0/releasenotes/
> > > fixes https://www.mozilla.org/en-US/security/advisories/mfsa2024-01/
> > > 
> > > drop patch from #1868782, merged upstream
> > > 
> > 
> > for some reasons, doesn't compile on arm64 -stable , it didn't compile last
> > backport either but I didn't have the time to check why
> 
> if it's only on arm64-stable and amd64-stable built fine, i'd triple
> check that www/mozilla/mozilla.port.mk is at r1.163.2.1, cf
> https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/mozilla/mozilla.port.mk?only_with_tag=OPENBSD_7_4
> 
> >  ===>  Checking files for firefox-122.0
> >  `/mnt/distfiles/mozilla/firefox-122.0.source.tar.xz' is up to date.
> > > > No size recorded for mozilla/firefox-122.0.source-profdata.tar.xz
> 
> it should be prefixed with -repacked, as is the case since 121 was
> merged in 7.4 stable
> 
> can you check make show=DISTFILES.profdata ? here on my 7.4-stable tree
> its firefox-122.0.source-profdata-repacked.tar.xz
> 
> esr is probably the same thing.
> 

this is super weird, I have different results on arm64 and amd64 but
both distinfo have the same checksum

arm64-stable$ pwd
/home/ports/www/firefox-esr
arm64-stable$ make show=DISTFILES.profdata 
firefox-115.7.0esr.source-profdata.tar.xz

arm64-stable$ cd ../mozilla-firefox
arm64-stable$ make show=DISTFILES.profdata 
firefox-122.0.source-profdata.tar.xz


amd64-stable$ pwd 
/home/ports/www/firefox-esr
amd64-stable$ make show=DISTFILES.profdata 
firefox-115.7.0esr.source-profdata-repacked.tar.xz

amd64-stable$ cd ../mozilla-firefox 
amd64-stable$ make show=DISTFILES.profdata 
firefox-122.0.source-profdata-repacked.tar.xz



Re: CVS: cvs.openbsd.org: ports

2024-01-24 Thread Landry Breuil
Le Wed, Jan 24, 2024 at 06:11:22PM +0100, Solène Rapenne a écrit :
> On 23/01/2024 15:29, Landry Breuil wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: lan...@cvs.openbsd.org  2024/01/23 07:29:57
> > 
> > Modified files:
> > www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile distinfo
> > Removed files:
> > www/mozilla-firefox/patches: Tag: OPENBSD_7_4
> >  patch-toolkit_xre_glxtest_glxtest_cpp
> > 
> > Log message:
> > www/mozilla-firefox: MFC update to 122.0.
> > 
> > see https://www.mozilla.org/en-US/firefox/122.0/releasenotes/
> > fixes https://www.mozilla.org/en-US/security/advisories/mfsa2024-01/
> > 
> > drop patch from #1868782, merged upstream
> > 
> 
> for some reasons, doesn't compile on arm64 -stable , it didn't compile last
> backport either but I didn't have the time to check why

if it's only on arm64-stable and amd64-stable built fine, i'd triple
check that www/mozilla/mozilla.port.mk is at r1.163.2.1, cf
https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/mozilla/mozilla.port.mk?only_with_tag=OPENBSD_7_4

>  ===>  Checking files for firefox-122.0
>  `/mnt/distfiles/mozilla/firefox-122.0.source.tar.xz' is up to date.
> > > No size recorded for mozilla/firefox-122.0.source-profdata.tar.xz

it should be prefixed with -repacked, as is the case since 121 was
merged in 7.4 stable

can you check make show=DISTFILES.profdata ? here on my 7.4-stable tree
its firefox-122.0.source-profdata-repacked.tar.xz

esr is probably the same thing.



Re: CVS: cvs.openbsd.org: ports

2024-01-24 Thread Solène Rapenne

On 23/01/2024 15:29, Landry Breuil wrote:

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2024/01/23 07:29:57

Modified files:
www/mozilla-firefox: Tag: OPENBSD_7_4 Makefile distinfo
Removed files:
www/mozilla-firefox/patches: Tag: OPENBSD_7_4
 patch-toolkit_xre_glxtest_glxtest_cpp

Log message:
www/mozilla-firefox: MFC update to 122.0.

see https://www.mozilla.org/en-US/firefox/122.0/releasenotes/
fixes https://www.mozilla.org/en-US/security/advisories/mfsa2024-01/

drop patch from #1868782, merged upstream



for some reasons, doesn't compile on arm64 -stable , it didn't compile 
last backport either but I didn't have the time to check why


 ===>  Checking files for firefox-122.0
 `/mnt/distfiles/mozilla/firefox-122.0.source.tar.xz' is up to date.

No size recorded for mozilla/firefox-122.0.source-profdata.tar.xz
 *** Error 1 in . (/home/ports//infrastructure/mk/bsd.port.mk:3277 
'/mnt/distfiles/mozilla/firefox-122.0.source-profdata.tar.xz': 
@lock=firef...)
 *** Error 2 in . (/home/ports//infrastructure/mk/bsd.port.mk:2551 
'_internal-fetch': @cd /home/ports/www/mozilla-firefox && 
PKGPATH=www/mozi...)
 *** Error 2 in . (/home/ports//infrastructure/mk/bsd.port.mk:2769 
'/build/tmp/pobj//firefox-122.0/.extract_done': @cd 
/home/ports/www/mozill...)
 *** Error 2 in /home/ports/www/mozilla-firefox 
(/home/ports//infrastructure/mk/bsd.port.mk:2677 'all': 
@lock=firefox-122.0;  export _LOCKS_H...)


a similar error for the esr flavor

 ===>  Checking files for firefox-esr-115.7.0
 `/mnt/distfiles/mozilla/firefox-115.7.0esr.source.tar.xz' is up to date.
 `/mnt/distfiles/mozilla/firefox-115.7.0esr.source-profdata.tar.xz' is 
up to date.
 !!! Extra file 
'mozilla/firefox-115.7.0esr.source-profdata-repacked.tar.xz' in 
/home/ports/www/firefox-esr/distinfo

 !!! Read up on SUPDISTFILES in bsd.port.mk(5)
 *** Error 1 in . (/home/ports//infrastructure/mk/bsd.port.mk:2574 
'_internal-checksum': @grep 2>/dev/null ^SIZE 
/home/ports/www/firefox-esr/...)
 *** Error 2 in . (/home/ports//infrastructure/mk/bsd.port.mk:2769 
'/build/tmp/pobj//firefox-esr-115.7.0/.extract_done': @cd 
/home/ports/www/...)
 *** Error 2 in /home/ports/www/firefox-esr 
(/home/ports//infrastructure/mk/bsd.port.mk:2677 'all': 
@lock=firefox-esr-115.7.0;  export _LOCKS...)




Re: CVS: cvs.openbsd.org: ports

2024-01-21 Thread Thomas Frohwein
On Sun, Jan 21, 2024 at 05:19:23AM -0700, Sebastian Reitenbach wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sebas...@cvs.openbsd.org2024/01/21 05:19:23
> 
> Modified files:
>   audio/qsynth   : Makefile distinfo 
>   audio/qsynth/pkg: PLIST 
> Removed files:
>   audio/qsynth/patches: patch-Makefile_in 
> patch-src_qsynthChannelsForm_cpp 
> 
> Log message:
> update to 0.9.12
> 
> based on patch sent for 0.9.11 by rsadowski@
> switch to QT6 and cmake
> 

Fails to build here, not sure if I'm missing something...:

CMake Error at src/CMakeLists.txt:81 (qt_add_translation):
  Unknown CMake command "qt_add_translation".

Full configure log:

===> Building from scratch qsynth-0.9.12
===> qsynth-0.9.12 depends on: cmake-* -> cmake-3.27.7v0
===> qsynth-0.9.12 depends on: ninja-* -> ninja-1.11.1
===> qsynth-0.9.12 depends on: fluidsynth->=2.3.2 -> fluidsynth-2.3.4p0
===> qsynth-0.9.12 depends on: qt6-qtsvg->=6.5.2,<6.6 -> qt6-qtsvg-6.5.2
===> qsynth-0.9.12 depends on: qt6-qtbase->=6.5.2,<6.6 -> qt6-qtbase-6.5.2p1
===>  Verifying specs:  c++ c++abi pthread GL Qt6Core Qt6Gui Qt6Network Qt6Svg 
Qt6Widgets c fluidsynth m
===>  found c++.9.0 c++abi.6.0 pthread.27.1 GL.19.0 Qt6Core.3.0 Qt6Gui.4.0 
Qt6Network.2.0 Qt6Svg.1.1 Qt6Widgets.1.1 c.98.0 fluidsynth.3.0 m.10.1
===>  Checking files for qsynth-0.9.12
`/usr/ports/distfiles/qsynth-0.9.12.tar.gz' is up to date.
>> (SHA256) qsynth-0.9.12.tar.gz: OK
===>  Extracting for qsynth-0.9.12
===>  Patching for qsynth-0.9.12
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
===>  Generating configure for qsynth-0.9.12
===>  Configuring for qsynth-0.9.12
-- The C compiler identification is Clang 16.0.6
-- The CXX compiler identification is Clang 16.0.6
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /usr/ports/pobj/qsynth-0.9.12/bin/cc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /usr/ports/pobj/qsynth-0.9.12/bin/c++ - 
skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
fatal: not a git repository (or any parent up to mount point /usr)
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed
-- Check if compiler accepts -pthread
-- Check if compiler accepts -pthread - yes
-- Found Threads: TRUE  
-- Performing Test HAVE_STDATOMIC
-- Performing Test HAVE_STDATOMIC - Success
-- Found WrapAtomic: TRUE  
-- Found OpenGL: /usr/X11R6/lib/libGL.so.19.0   
-- Found WrapOpenGL: TRUE  
-- Found PkgConfig: /usr/bin/pkg-config (found version "0.29.2") 
-- Found XKB: /usr/local/lib/libxkbcommon.so.2.0 (found suitable version 
"1.6.0", minimum required is "0.5.0") 
-- Found Vulkan: /usr/local/lib/libvulkan.so.1.1 (found version "1.3.261") 
found components: glslangValidator missing components: glslc
-- Found WrapVulkanHeaders: /usr/local/include  
CMake Warning at CMakeLists.txt:116 (find_package):
  By not providing "FindQt6LinguistTools.cmake" in CMAKE_MODULE_PATH this
  project has asked CMake to find a package configuration file provided by
  "Qt6LinguistTools", but CMake did not find one.

  Could not find a package configuration file provided by "Qt6LinguistTools"
  with any of the following names:

Qt6LinguistToolsConfig.cmake
qt6linguisttools-config.cmake

  Add the installation prefix of "Qt6LinguistTools" to CMAKE_PREFIX_PATH or
  set "Qt6LinguistTools_DIR" to a directory containing one of the above
  files.  If "Qt6LinguistTools" provides a separate development package or
  SDK, be sure it has been installed.


-- Looking for lroundf
-- Looking for lroundf - found
-- Looking for 3 include files fcntl.h, ..., signal.h
-- Looking for 3 include files fcntl.h, ..., signal.h - found
-- Checking for module 'fluidsynth'
--   Found fluidsynth, version 2.3.4
-- Looking for fluid_synth_system_reset
-- Looking for fluid_synth_system_reset - found
-- Looking for fluid_synth_set_bank_offset
-- Looking for fluid_synth_set_bank_offset - found
-- Looking for fluid_synth_unset_program
-- Looking for fluid_synth_unset_program - found
-- Looking for fluid_version_str
-- Looking for fluid_version_str - found
-- Looking for fluid_settings_dupstr
-- Looking for fluid_settings_dupstr - found
-- Looking for fluid_preset_get_banknum
-- Looking for fluid_preset_get_banknum - found
-- Looking for fluid_preset_get_num
-- Looking for fluid_preset_get_num - found
-- Looking for fluid_preset_get_name
-- Looking for fluid_preset_get_name - found
-- Looking for fluid_preset_get_sfont
-- Looking for fluid_preset_get_sfont - found
-- Looking for fluid_sfont_get_id
-- Looking 

Re: CVS: cvs.openbsd.org: ports

2024-01-16 Thread Antoine Jacoutot
On Sun, Jan 14, 2024 at 01:40:45PM -0700, Sebastian Reitenbach wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sebas...@cvs.openbsd.org2024/01/14 13:40:45
> 
> Modified files:
>   www/sope   : Makefile distinfo 
> 
> Log message:
> update 5.8.4 -> 5.9.1

===>   Failed patches:
patch-SoObjects_SOGo_SOGoGCSFolder_m


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-01-05 Thread Klemens Nanni
On Fri, Jan 05, 2024 at 03:54:56PM +0100, Antoine Jacoutot wrote:
> Please don't hardcode /usr/local in daemon.

Sure, I've switched to TRUEPREFIX.



Re: CVS: cvs.openbsd.org: ports

2024-01-05 Thread Antoine Jacoutot
On Fri, Jan 05, 2024 at 03:04:51PM +, Klemens Nanni wrote:
> On Fri, Jan 05, 2024 at 03:54:56PM +0100, Antoine Jacoutot wrote:
> > Please don't hardcode /usr/local in daemon.
> 
> Sure, I've switched to TRUEPREFIX.

Thanks.

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-01-05 Thread Antoine Jacoutot
On Fri, Jan 05, 2024 at 07:49:06AM -0700, Klemens Nanni wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2024/01/05 07:49:06
> 
> Modified files:
>   audio/spotifyd : Makefile 
>   audio/spotifyd/pkg: PLIST README 
> Added files:
>   audio/spotifyd/files: spotifyd.conf 
>   audio/spotifyd/pkg: spotifyd.rc 
> 
> Log message:
> Provide rc.d(8) script plus dedicated user;  tests bket;  help ratchov

Please don't hardcode /usr/local in daemon.

-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2024-01-03 Thread Stuart Henderson
On 2024/01/03 07:14, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2024/01/03 07:14:15
> 
> Modified files:
>   www/azorius: Makefile 
> 
> Log message:
> mark BROKEN, same as www/honk
> 

err, NOT_FOR_ARCHS



Re: CVS: cvs.openbsd.org: ports

2024-01-03 Thread Stuart Henderson
On 2024/01/01 11:14, Daniel Dickman wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   dan...@cvs.openbsd.org  2024/01/01 11:14:59
> 
> Modified files:
>   lang/ocaml : Makefile distinfo 
>   lang/ocaml/pkg : PFRAG.native PLIST 
> Removed files:
>   lang/ocaml/patches: patch-Makefile_config_in patch-configure_ac 
> 
> Log message:
> update ocaml to 4.13.1
> 
> ok bket@, chrisz@
> 

Fails on i386:

checking whether fma works... no
configure: error: fma does not work, enable emulation with 
--enable-imprecise-c99-float-ops

gzipped config.log is attached.



config.log.gz
Description: application/gunzip


Re: CVS: cvs.openbsd.org: ports

2023-12-29 Thread Daniel Dickman



> On Dec 29, 2023, at 7:25 AM, Antoine Jacoutot  wrote:
> 
> On Wed, Dec 27, 2023 at 06:03:33PM -0700, Daniel Dickman wrote:
>> CVSROOT:/cvs
>> Module name:ports
>> Changes by:dan...@cvs.openbsd.org2023/12/27 18:03:33
>> 
>> Modified files:
>>www/jupyter-notebook: Makefile distinfo
>>www/jupyter-notebook/patches: patch-notebook_notebookapp_py
>>www/jupyter-notebook/pkg: PLIST
>> 
>> Log message:
>> update jupyter-notebook to 6.4.13
>> 
>> This update also cleans up the unneeded TDEP on nose which was removed
>> from version 6.3.0.
> 
> Doesn't build.
> 
> 
> ERROR Missing dependencies:
>wheel
>jupyter_packaging~=0.9
>wheel
> *** Error 1 in www/jupyter-notebook 
> (/exopi-cvs/ports/lang/python/python.port.mk:366 'do-build': @: ; if [ -e 
> /exopi-obj/pobj/jupyter-notebo...)

I have an update of Jupyter packaging to fix the missed dep on wheel. 

> 
> 
> --
> Antoine



Re: CVS: cvs.openbsd.org: ports

2023-12-29 Thread Antoine Jacoutot
On Wed, Dec 27, 2023 at 06:03:33PM -0700, Daniel Dickman wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   dan...@cvs.openbsd.org  2023/12/27 18:03:33
> 
> Modified files:
>   www/jupyter-notebook: Makefile distinfo 
>   www/jupyter-notebook/patches: patch-notebook_notebookapp_py 
>   www/jupyter-notebook/pkg: PLIST 
> 
> Log message:
> update jupyter-notebook to 6.4.13
> 
> This update also cleans up the unneeded TDEP on nose which was removed
> from version 6.3.0.

Doesn't build.


ERROR Missing dependencies:
wheel
jupyter_packaging~=0.9
wheel
*** Error 1 in www/jupyter-notebook 
(/exopi-cvs/ports/lang/python/python.port.mk:366 'do-build': @: ; if [ -e 
/exopi-obj/pobj/jupyter-notebo...)


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2023-12-28 Thread Stuart Henderson
On 2023/12/27 11:14, Aisha Tammy wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ai...@cvs.openbsd.org   2023/12/27 11:14:34
> 
> Modified files:
>   net/py-libknot : Makefile distinfo 
>   net/py-libknot/pkg: PLIST 
> 
> Log message:
> update to 3.3.3
> also enable quic using embedded ngtcp2
> original patch from renaud allard
> ok abieber@
> 

Doesn't package:

$ make package
`/pobj/py-libknot-3.3.3-python3/fake-amd64-python3/.fake_done' is up to date.
===>  Building package for py3-libknot-3.3.3
Create /usr/ports/packages/amd64/all/py3-libknot-3.3.3.tgz
Error: 
/pobj/py-libknot-3.3.3-python3/fake-amd64-python3/usr/local/lib/python3.10/site-packages/libknot.egg-info/PKG-INFO
 does not exist
Error: 
/pobj/py-libknot-3.3.3-python3/fake-amd64-python3/usr/local/lib/python3.10/site-packages/libknot.egg-info/SOURCES.txt
 does not exist
Error: 
/pobj/py-libknot-3.3.3-python3/fake-amd64-python3/usr/local/lib/python3.10/site-packages/libknot.egg-info/dependency_links.txt
 does not exist
Error: 
/pobj/py-libknot-3.3.3-python3/fake-amd64-python3/usr/local/lib/python3.10/site-packages/libknot.egg-info/top_level.txt
 does not exist
pkg_create: can't continue
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2241 
'/usr/ports/packages/amd64/all/py3-libknot-3.3.3.tgz': @trap "cd /usr/ports/...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2723 
'_internal-package': @case X${_DEPENDS_CACHE} in  X) _DEPENDS_CACHE=$(sudo -...)
*** Error 2 in /usr/ports/net/py-libknot 
(/usr/ports/infrastructure/mk/bsd.port.mk:2702 'package': 
@lock=py3-libknot-3.3.3;  export _LOCKS_H...)


Index: pkg/PLIST
===
RCS file: /cvs/ports/net/py-libknot/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   27 Dec 2023 18:14:34 -  1.5
+++ pkg/PLIST   28 Dec 2023 11:50:50 -
@@ -8,11 +8,6 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/METADATA
 
lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/RECORD
 
lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/libknot.egg-info/
-lib/python${MODPY_VERSION}/site-packages/libknot.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/libknot.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/libknot.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/libknot.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/libknot/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}



Re: CVS: cvs.openbsd.org: ports

2023-12-27 Thread Rafael Sadowski
On Wed Dec 27, 2023 at 01:40:54PM +0100, Antoine Jacoutot wrote:
> On Tue, Dec 26, 2023 at 06:20:58AM -0700, Rafael Sadowski wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: rsadow...@cvs.openbsd.org   2023/12/26 06:20:58
> > 
> > Modified files:
> > meta/kde   : Makefile 
> > Added files:
> > meta/kde/pkg   : DESCR-plasma DESCR-plasma-extras PLIST-plasma 
> >  PLIST-plasma-extras README-plasma 
> > 
> > Log message:
> > Introduce kde-plasam and kde-plasma-extras meta packages.
> > 
> > This makes it super easy to install KDE Plasma:
> > pkg_add kde-plasma (and kde-plasma-extras especially if you use it on a
> > notebook).
> > 
> > Feedback and ok kn@, kevlo@
> 
> Does not package.
> 
> Error: 
> /exopi-obj/pobj/kde-23.08.4/fake-amd64/usr/local/share/doc/pkg-readmes/kde-plasma-plasma
>  does not exist
> pkg_create: can't continue
> 

Thanks Antoine, fix committed. Merci!



Re: CVS: cvs.openbsd.org: ports

2023-12-27 Thread Antoine Jacoutot
On Tue, Dec 26, 2023 at 06:20:58AM -0700, Rafael Sadowski wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   rsadow...@cvs.openbsd.org   2023/12/26 06:20:58
> 
> Modified files:
>   meta/kde   : Makefile 
> Added files:
>   meta/kde/pkg   : DESCR-plasma DESCR-plasma-extras PLIST-plasma 
>PLIST-plasma-extras README-plasma 
> 
> Log message:
> Introduce kde-plasam and kde-plasma-extras meta packages.
> 
> This makes it super easy to install KDE Plasma:
> pkg_add kde-plasma (and kde-plasma-extras especially if you use it on a
> notebook).
> 
> Feedback and ok kn@, kevlo@

Does not package.

Error: 
/exopi-obj/pobj/kde-23.08.4/fake-amd64/usr/local/share/doc/pkg-readmes/kde-plasma-plasma
 does not exist
pkg_create: can't continue


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2023-12-21 Thread Rémi Pointel



Le 21/12/2023 à 12:01, Stuart Henderson a écrit :

+ SUBDIR += py-analyzemft.python3



Hi,

is there a typo in this file(coma instead of a point) ?

Best regards,

Remi.


Re: CVS: cvs.openbsd.org: ports

2023-12-21 Thread Stuart Henderson
On 2023/12/21 11:01, Stuart Henderson wrote:
> On 2023/12/20 17:59, Daniel Dickman wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: dan...@cvs.openbsd.org  2023/12/20 17:59:11
> > 
> > Modified files:
> > sysutils/py-analyzemft: Makefile distinfo 
> > sysutils/py-analyzemft/pkg: PLIST 
> > 
> > Log message:
> > update analyzeMFT to v3.0.1
> > 
> > While there hasn't been a proper release in some time, the latest github
> > commits did the work to update the codebase to support Python 3.
> > 
> > ok rpointel@ (MAINTAINER)
> > 
> 
> needs conflicts, etc for py-analyzemft -> py3-analyzemft.  ok?
> 
> Index: sysutils/Makefile
> ===
> RCS file: /cvs/ports/sysutils/Makefile,v
> retrieving revision 1.712
> diff -u -p -r1.712 Makefile
> --- sysutils/Makefile 2 Dec 2023 09:12:37 -   1.712
> +++ sysutils/Makefile 21 Dec 2023 10:59:59 -
> @@ -293,7 +293,7 @@
>   SUBDIR += pstree
>   SUBDIR += puppetserver
>   SUBDIR += pv
> - SUBDIR += py-analyzemft
> + SUBDIR += py-analyzemft.python3

fixed locally, should be , - landry's eyes are working better than mine :)

>   SUBDIR += py-ansible-compat,python3
>   SUBDIR += py-apscheduler,python3
>   SUBDIR += py-augeas,python3
> Index: devel/quirks/Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1586
> diff -u -p -r1.1586 Makefile
> --- devel/quirks/Makefile 17 Dec 2023 04:04:31 -  1.1586
> +++ devel/quirks/Makefile 21 Dec 2023 10:59:59 -
> @@ -3,7 +3,7 @@ CATEGORIES =  devel databases
>  DISTFILES =
>  
>  # API.rev
> -PKGNAME =quirks-6.202
> +PKGNAME =quirks-6.203
>  PKG_ARCH =   *
>  MAINTAINER = Marc Espie 
>  
> Index: devel/quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1597
> diff -u -p -r1.1597 Quirks.pm
> --- devel/quirks/files/Quirks.pm  17 Dec 2023 04:04:31 -  1.1597
> +++ devel/quirks/files/Quirks.pm  21 Dec 2023 10:59:59 -
> @@ -806,6 +806,7 @@ my $stem_extensions = {
>   'py-six' => 'py3-six',
>   'py-binaryornot' => 'py3-binaryornot',
>   'py-cython' => 'py3-cython',
> + 'py-analyzemft' => 'py3-analyzemft',
>  };
>  
>  my $obsolete_reason = {};
> Index: sysutils/py-analyzemft/Makefile
> ===
> RCS file: /cvs/ports/sysutils/py-analyzemft/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- sysutils/py-analyzemft/Makefile   21 Dec 2023 00:59:11 -  1.5
> +++ sysutils/py-analyzemft/Makefile   21 Dec 2023 10:59:59 -
> @@ -20,4 +20,7 @@ MODULES =   lang/python
>  
>  NO_TEST =Yes
>  
> +FLAVOR = python3
> +FLAVORS =python3
> +
>  .include 
> Index: sysutils/py-analyzemft/pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/py-analyzemft/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- sysutils/py-analyzemft/pkg/PLIST  21 Dec 2023 00:59:11 -  1.3
> +++ sysutils/py-analyzemft/pkg/PLIST  21 Dec 2023 10:59:59 -
> @@ -1,3 +1,5 @@
> +@conflict py-analyzemft-*
> +@pkgpath sysutils/py-analyzemft
>  bin/analyzeMFT.py
>  
> lib/python${MODPY_VERSION}/site-packages/analyzeMFT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
>  lib/python${MODPY_VERSION}/site-packages/analyzemft/



Re: CVS: cvs.openbsd.org: ports

2023-12-21 Thread Stuart Henderson
On 2023/12/20 17:59, Daniel Dickman wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   dan...@cvs.openbsd.org  2023/12/20 17:59:11
> 
> Modified files:
>   sysutils/py-analyzemft: Makefile distinfo 
>   sysutils/py-analyzemft/pkg: PLIST 
> 
> Log message:
> update analyzeMFT to v3.0.1
> 
> While there hasn't been a proper release in some time, the latest github
> commits did the work to update the codebase to support Python 3.
> 
> ok rpointel@ (MAINTAINER)
> 

needs conflicts, etc for py-analyzemft -> py3-analyzemft.  ok?

Index: sysutils/Makefile
===
RCS file: /cvs/ports/sysutils/Makefile,v
retrieving revision 1.712
diff -u -p -r1.712 Makefile
--- sysutils/Makefile   2 Dec 2023 09:12:37 -   1.712
+++ sysutils/Makefile   21 Dec 2023 10:59:59 -
@@ -293,7 +293,7 @@
  SUBDIR += pstree
  SUBDIR += puppetserver
  SUBDIR += pv
- SUBDIR += py-analyzemft
+ SUBDIR += py-analyzemft.python3
  SUBDIR += py-ansible-compat,python3
  SUBDIR += py-apscheduler,python3
  SUBDIR += py-augeas,python3
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1586
diff -u -p -r1.1586 Makefile
--- devel/quirks/Makefile   17 Dec 2023 04:04:31 -  1.1586
+++ devel/quirks/Makefile   21 Dec 2023 10:59:59 -
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-6.202
+PKGNAME =  quirks-6.203
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1597
diff -u -p -r1.1597 Quirks.pm
--- devel/quirks/files/Quirks.pm17 Dec 2023 04:04:31 -  1.1597
+++ devel/quirks/files/Quirks.pm21 Dec 2023 10:59:59 -
@@ -806,6 +806,7 @@ my $stem_extensions = {
'py-six' => 'py3-six',
'py-binaryornot' => 'py3-binaryornot',
'py-cython' => 'py3-cython',
+   'py-analyzemft' => 'py3-analyzemft',
 };
 
 my $obsolete_reason = {};
Index: sysutils/py-analyzemft/Makefile
===
RCS file: /cvs/ports/sysutils/py-analyzemft/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- sysutils/py-analyzemft/Makefile 21 Dec 2023 00:59:11 -  1.5
+++ sysutils/py-analyzemft/Makefile 21 Dec 2023 10:59:59 -
@@ -20,4 +20,7 @@ MODULES = lang/python
 
 NO_TEST =  Yes
 
+FLAVOR =   python3
+FLAVORS =  python3
+
 .include 
Index: sysutils/py-analyzemft/pkg/PLIST
===
RCS file: /cvs/ports/sysutils/py-analyzemft/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- sysutils/py-analyzemft/pkg/PLIST21 Dec 2023 00:59:11 -  1.3
+++ sysutils/py-analyzemft/pkg/PLIST21 Dec 2023 10:59:59 -
@@ -1,3 +1,5 @@
+@conflict py-analyzemft-*
+@pkgpath sysutils/py-analyzemft
 bin/analyzeMFT.py
 
lib/python${MODPY_VERSION}/site-packages/analyzeMFT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/analyzemft/



Re: CVS: cvs.openbsd.org: ports

2023-12-13 Thread Stefan Hagen
Stefan Hagen wrote (2023-12-13 21:12 CET):
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   s...@cvs.openbsd.org2023/12/13 13:12:39
> 
> Log message:
> Import audio/gonic - music streaming server / subsonic server API 
> implementation
> 
> pkg/DESCR:
> FLOSS alternative to subsonic, supporting its many clients.
> 
> Port from Russ Sharek, who also takes MAINTAINER, thank you!
> 
> OK aaron@

That should have been abieber@



Re: CVS: cvs.openbsd.org: ports

2023-12-09 Thread Stuart Henderson
I don't understand why I don't see this, but tb has a fix for it.

On 2023/12/09 08:28, Antoine Jacoutot wrote:
> On Thu, Dec 07, 2023 at 04:08:29AM -0700, Stuart Henderson wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: st...@cvs.openbsd.org   2023/12/07 04:08:29
> > 
> > Modified files:
> > security/step-cli: Makefile distinfo modules.inc 
> > 
> > Log message:
> > update to step-cli-0.25.1
> 
> Failed in my bulkd:
> 
> 
> ===>  Faking installation for step-cli-0.25.1
> /exopi-obj/pobj/step-cli-0.25.1/bin/install -d -m 755 
> /exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/bin &&  
> /exopi-obj/pobj/step-cli-0.25.1/bin/install -c  -m 755 
> /exopi-obj/pobj/step-cli-0.25.1/go/bin/*  
> /exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/bin;
> /exopi-obj/pobj/step-cli-0.25.1/bin/install -d -m 755  
> /exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/share/bash-completion/completions
>   
> /exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/share/zsh/site-functions 
>  
> /exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/share/fish/vendor_completions.d
> /exopi-obj/pobj/step-cli-0.25.1/go/bin/step completion bash >  
> /exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/share/bash-completion/completions/step
> open /root/.step/contexts.json failed: permission denied
> *** Error 1 in security/step-cli (Makefile:31 'post-install')
> *** Error 2 in security/step-cli 
> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:3148 
> '/exopi-obj/pobj/step-cli-0.25.1/fake-amd64/.fake_done')
> *** Error 2 in security/step-cli 
> (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2702 'fake': 
> @lock=step-cli-0.25.1;  export _LOCKS_HELD=" s...)
> ===> Exiting security/step-cli with an error
> 
> 
> -- 
> Antoine



Re: CVS: cvs.openbsd.org: ports

2023-12-08 Thread Antoine Jacoutot
On Thu, Dec 07, 2023 at 04:08:29AM -0700, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2023/12/07 04:08:29
> 
> Modified files:
>   security/step-cli: Makefile distinfo modules.inc 
> 
> Log message:
> update to step-cli-0.25.1

Failed in my bulkd:


===>  Faking installation for step-cli-0.25.1
/exopi-obj/pobj/step-cli-0.25.1/bin/install -d -m 755 
/exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/bin &&  
/exopi-obj/pobj/step-cli-0.25.1/bin/install -c  -m 755 
/exopi-obj/pobj/step-cli-0.25.1/go/bin/*  
/exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/bin;
/exopi-obj/pobj/step-cli-0.25.1/bin/install -d -m 755  
/exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/share/bash-completion/completions
  /exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/share/zsh/site-functions 
 
/exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/share/fish/vendor_completions.d
/exopi-obj/pobj/step-cli-0.25.1/go/bin/step completion bash >  
/exopi-obj/pobj/step-cli-0.25.1/fake-amd64/usr/local/share/bash-completion/completions/step
open /root/.step/contexts.json failed: permission denied
*** Error 1 in security/step-cli (Makefile:31 'post-install')
*** Error 2 in security/step-cli 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:3148 
'/exopi-obj/pobj/step-cli-0.25.1/fake-amd64/.fake_done')
*** Error 2 in security/step-cli 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2702 'fake': 
@lock=step-cli-0.25.1;  export _LOCKS_HELD=" s...)
===> Exiting security/step-cli with an error


-- 
Antoine



Re: CVS: cvs.openbsd.org: ports

2023-12-07 Thread Omar Polo
On 2023/12/07 14:11:59 +, Brian Callahan  wrote:
> On 12/6/2023 2:53 AM, Antoine Jacoutot wrote:
> > On Sun, Dec 03, 2023 at 12:07:28PM -0700, Brian Callahan wrote:
> >> CVSROOT:   /cvs
> >> Module name:   ports
> >> Changes by:bcal...@cvs.openbsd.org 2023/12/03 12:07:28
> >>
> >> Log message:
> >> Import lang/hare, a simple, stable, and robust systems programming 
> >> language
> >> ok op@ tobhe@
> >> 
> >> Hare is a systems programming language designed to be simple, stable,
> >> and robust. Hare uses a static type system, manual memory management,
> >> and a minimal runtime. It is well-suited to writing operating systems,
> >> system tools, compilers, networking software, and other low-level, high
> >> performance tasks.
> > 
> > Doesn't build, there's a conflict in the dependencies
> > (xtensa-elf-binutils-2.27p1 and binutils-2.41)
> > 
> > 
> 
> This should de-conflict things. I don't think we need to have the GNU as
> info page for xtensa-elf-binutils installed, as we @comment out all the
> others.
> 
> OK?

looks fine to me.  Just wanted to note that binutils hasa conflict with
gas too.  does it matter for bulks?



Re: CVS: cvs.openbsd.org: ports

2023-12-07 Thread Brian Callahan
On 12/6/2023 2:53 AM, Antoine Jacoutot wrote:
> On Sun, Dec 03, 2023 at 12:07:28PM -0700, Brian Callahan wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by:  bcal...@cvs.openbsd.org 2023/12/03 12:07:28
>>
>> Log message:
>> Import lang/hare, a simple, stable, and robust systems programming 
>> language
>> ok op@ tobhe@
>> 
>> Hare is a systems programming language designed to be simple, stable,
>> and robust. Hare uses a static type system, manual memory management,
>> and a minimal runtime. It is well-suited to writing operating systems,
>> system tools, compilers, networking software, and other low-level, high
>> performance tasks.
> 
> Doesn't build, there's a conflict in the dependencies
> (xtensa-elf-binutils-2.27p1 and binutils-2.41)
> 
> 

This should de-conflict things. I don't think we need to have the GNU as
info page for xtensa-elf-binutils installed, as we @comment out all the
others.

OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/devel/xtensa-elf/binutils/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile21 Sep 2023 09:50:08 -  1.5
+++ Makefile7 Dec 2023 14:09:24 -
@@ -2,7 +2,7 @@ COMMENT=binutils for xtensa-elf cross-d
 
 V= 2.27
 DISTNAME=  binutils-$V
-REVISION=  1
+REVISION=  2
 
 HOMEPAGE=  https://www.gnu.org/software/binutils/
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/xtensa-elf/binutils/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   11 Mar 2022 18:53:36 -  1.2
+++ pkg/PLIST   7 Dec 2023 14:09:24 -
@@ -14,7 +14,7 @@
 @bin bin/xtensa-elf-size
 @bin bin/xtensa-elf-strings
 @bin bin/xtensa-elf-strip
-@info info/as.info
+@comment @info info/as.info
 @comment @info info/bfd.info
 @comment @info info/binutils.info
 @comment @info info/gprof.info


Re: CVS: cvs.openbsd.org: ports

2023-12-05 Thread Antoine Jacoutot
On Sun, Dec 03, 2023 at 12:07:28PM -0700, Brian Callahan wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   bcal...@cvs.openbsd.org 2023/12/03 12:07:28
> 
> Log message:
> Import lang/hare, a simple, stable, and robust systems programming 
> language
> ok op@ tobhe@
> 
> Hare is a systems programming language designed to be simple, stable,
> and robust. Hare uses a static type system, manual memory management,
> and a minimal runtime. It is well-suited to writing operating systems,
> system tools, compilers, networking software, and other low-level, high
> performance tasks.

Doesn't build, there's a conflict in the dependencies
(xtensa-elf-binutils-2.27p1 and binutils-2.41)


>>> Building on exopi-6 under lang/hare/hare
BDEPENDS = [lang/hare/harec;textproc/scdoc;devel/dwz]
DIST = [lang/hare/hare:hare-0.0.0pl20231202.tar.gz]
FULLPKGNAME = hare-0.0.0pl20231202
RDEPENDS = [lang/hare/harec]
(Junk lock obtained for exopi-6 at 1701832270.20)
>>> Running depends in lang/hare/hare at 1701832270.28
   last junk was in net/pidgin-skypeweb
/usr/sbin/pkg_add -aI -Drepair dwz-0.15 harec-0.0.0pl20231202 scdoc-1.11.2
was: /usr/sbin/pkg_add -aI -Drepair dwz-0.15 harec-0.0.0pl20231202 scdoc-1.11.2
/usr/sbin/pkg_add -aI -Drepair dwz-0.15 harec-0.0.0pl20231202 scdoc-1.11.2
Collision in binutils-2.41: the following files already exist
/usr/local/info/as.info (xtensa-elf-binutils-2.27p1 and binutils-2.41)
Can't install harec-0.0.0pl20231202: can't resolve binutils-2.41
Couldn't install binutils-2.41 harec-0.0.0pl20231202
>>> Running show-prepare-results in lang/hare/hare at 1701832286.36
===> lang/hare/hare
===> Building from scratch hare-0.0.0pl20231202
===> hare-0.0.0pl20231202 depends on: harec-* - not found
Dependency check failed
*** Error 1 in lang/hare/hare 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2384 
'/exopi-obj/pobj/hare-0.0.0pl20231202/.dep-lang-hare-harec')
*** Error 2 in lang/hare/hare 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2702 'prepare': 
@lock=hare-0.0.0pl20231202;  export _LOCKS_HEL...)
===> Exiting lang/hare/hare with an error
*** Error 1 in /exopi-cvs/ports (infrastructure/mk/bsd.port.subdir.mk:144 
'show-prepare-results': @: ${echo_msg:=echo};  : ${target:=show-pr...)
(Junk lock released for exopi-6 at 1701832286.78)
Woken up games/mnemosyne
>>> Ended at 1701832286.78
max_stuck=2.43/depends=16.13/show-prepare-results=0.45
Error: job failed with 512 on exopi-6 at 1701832286




Re: CVS: cvs.openbsd.org: ports

2023-12-04 Thread Pavel Korovin
Typo, s/opensearch-dashboards/opensearch/

On 12/04, Pavel Korovin wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   p...@cvs.openbsd.org2023/12/04 04:28:50
> 
> Modified files:
>   textproc/opensearch: Makefile distinfo 
>   textproc/opensearch/pkg: PLIST 
> 
> Log message:
> Update opensearch-dashboards 2.11.0 -> 2.11.1
> Release notes: 
> https://github.com/opensearch-project/opensearch-build/blob/main/release-notes/opensearch-release-notes-2.11.1.md
> ok op@
> 

-- 
With best regards,
Pavel Korovin



Re: CVS: cvs.openbsd.org: ports

2023-12-03 Thread Stuart Henderson
On 2023/12/03 13:30, Theo Buehler wrote:
> On Sat, Dec 02, 2023 at 02:53:33AM -0700, Benoit Lecocq wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: ben...@cvs.openbsd.org  2023/12/02 02:53:33
> > 
> > Modified files:
> > devel/p5-Data-Munge: Makefile distinfo 
> > 
> > Log message:
> > Update to p5-Data-Munge-0.10.
> > 
> 
> Creating package p5-Data-Munge-0.10
> ...
> Found newer package p5-Data-Munge-0.097p1 in /data/plist/amd64
> 

fix applied.



Re: CVS: cvs.openbsd.org: ports

2023-12-03 Thread Theo Buehler
On Sat, Dec 02, 2023 at 02:53:33AM -0700, Benoit Lecocq wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ben...@cvs.openbsd.org  2023/12/02 02:53:33
> 
> Modified files:
>   devel/p5-Data-Munge: Makefile distinfo 
> 
> Log message:
> Update to p5-Data-Munge-0.10.
> 

Creating package p5-Data-Munge-0.10
...
Found newer package p5-Data-Munge-0.097p1 in /data/plist/amd64



  1   2   3   4   5   6   7   8   9   10   >