Re: Problems updating math/maxima

2023-05-26 Thread George Koehler
On Fri, 26 May 2023 06:21:35 -0600
Jonathan Drews  wrote:

> Dima was right. Also one of the replies I got from the maxima discuss
> list:
> "My experience is that sbcl is way faster than ecl in practical use.
> "The Testsuite (at least +the share one) loads many packages and does
> try not to do any lengthy work with them. Loading +packages is not
> extremely fast in sbcl. The only drawback of sbcl is that sbcl runs
> out of +memory in places ECL doesn't."

lang/sbcl is "ONLY_FOR_ARCHS = amd64 i386 powerpc".  I need ecl for
powerpc64, where I can't run sbcl, but I can run ecl and maxima.

sbcl has "USE_WXNEEDED = Yes", ecl doesn't.  Some users might prefer
sbcl for speed; others might prefer ecl for W^X.

--George



CVS: cvs.openbsd.org: ports

2023-05-26 Thread George Koehler
CVSROOT:/cvs
Module name:ports
Changes by: gkoeh...@cvs.openbsd.org2023/05/26 19:10:48

Modified files:
editors/poke   : Makefile 

Log message:
Don't detect emacs or xemacs in configure

The build broke if I had installed editors/xemacs (and not
editors/emacs), when it tried to run xemacs to compile some Lisp.

ok fcambus@ (maintainer)



Re: Problems updating math/maxima

2023-05-26 Thread Jonathan Drews
On Fri, May 26, 2023 at 12:23:18PM +0100, Stuart Henderson wrote:
> On 2023/05/25 18:57, Jonathan Drews wrote:
> > On Thu, May 25, 2023 at 03:23:23PM +0200, Dima Pasechnik wrote:
> > > 
> > > As well, less urgently,  
> > > shouldn't there be a way to get Maxima compiled with sbcl, only only ecl.
> > > (sbcl typically gives considerably better performance, and it's available 
> > > in ports,
> 
> > I wrote the maxima discuss list and they affirm the performance boost
> > that Dima mentions by using sbcl. However I get this make build error:
> > 
> > Missing library for sbcl>=0.0
> > Fatal error
> > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2385 
> 
> sbcl is a standalone compiler binary + runtime files, there is no
> library so you can't use LIB_DEPENDS+WANTLIB for it. would be
> BUILD_DEPENDS and maybe also RUN_DEPENDS if needed.
> 
Stuart and others:

 I got maxima running with sbcl. Here is the result of make test:

# make test > MakeTestResults.txt 2>&1

Regression tests for maxima-5.46.0
Making check in admin
gmake[1]: Entering directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/admin'
gmake[1]: Nothing to be done for 'check'.
gmake[1]: Leaving directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/admin'
Making check in crosscompile-windows
gmake[1]: Entering directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/crosscompile-windows'
gmake[1]: Nothing to be done for 'check'.
gmake[1]: Leaving directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/crosscompile-windows'
Making check in src
gmake[1]: Entering directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/src'
if test share-subdirs_autogenerated.lisp -nt share-subdirs.lisp; then
cp share-subdirs_autogenerated.lisp share-subdirs.lisp; fi
gmake[1]: Leaving directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/src'
Making check in lisp-utils
gmake[1]: Entering directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/lisp-utils'
gmake[1]: Nothing to be done for 'check'.
gmake[1]: Leaving directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/lisp-utils'
Making check in tests
gmake[1]: Entering directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/tests'
gmake  check-TESTS
gmake[2]: Entering directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/tests'
gmake[3]: Entering directory
'/usr/ports/pobj/maxima-5.46.0/maxima-5.46.0/tests'
*** Signal SIGINT in . (/usr/ports/pobj/maxima-5.46.0/.test_done)
*** Error 1 in /usr/ports/math/maxima
(/usr/ports/infrastructure/mk/bsd.port.mk:2600 'test':
@lock=maxima-5.46.0;  export _LOCKS_HELD=" maxi...)

I got two errors:

Here is my diff:

$ diff -eu  Makefile.org Makefile > Makefile.diff

--- Makefile.orgFri May 26 18:02:01 2023
+++ MakefileFri May 26 18:04:37 2023
@@ -1,6 +1,6 @@
 COMMENT=   GPL computer algebra system based on DOE
Macsyma
 
-VERSION=   5.44.0
+VERSION=   5.46.0
 DISTNAME=  maxima-${VERSION}
 CATEGORIES=math
 
@@ -10,31 +10,33 @@
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-WANTLIB += c ecl ffi gc gmp m pthread
+WANTLIB += c ffi gc gmp m pthread
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=maxima/}
 
 USE_GMAKE= yes
 
-# Python is not needed for building but configure fails without it.
-# Instead of patching just add the lang/python dependency.
-# http://sourceforge.net/p/maxima/mailman/message/34462954/
-MODULES =  lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
-MODPY_RUNDEP = No
+MODTCL_VERSION=8.6
+#MODPY_RUNDEP =No
 
-BUILD_DEPENDS =print/texinfo
-LIB_DEPENDS=   lang/ecl
+BUILD_DEPENDS =print/texinfo \
+   lang/sbcl
+# LIB_DEPENDS =lang/sbcl
 RUN_DEPENDS =  devel/desktop-file-utils \
misc/rlwrap \
-   misc/shared-mime-info
+   misc/shared-mime-info \
+   lang/sbcl
 
+
+pre-build:
+   ${MODTCL_WISH_ADJ} ${WRKSRC}/interfaces/xmaxima/xmaxima
+
 SUBST_VARS=VERSION
 
 MAKE_FLAGS =   MAKEINFO="${LOCALBASE}/bin/gtexi2any" \
TEXI2DVI="${LOCALBASE}/bin/gtexi2dvi"
 
-CONFIGURE_ARGS+=   --enable-ecl
+CONFIGURE_ARGS+=   --enable-sbcl
 CONFIGURE_STYLE=   gnu
 
 FLAVORS=   no_x11
@@ -42,11 +44,12 @@




CVS: cvs.openbsd.org: ports

2023-05-26 Thread Pavel Korovin
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2023/05/26 15:07:46

Modified files:
sysutils/py-vmomi: Makefile distinfo 

Log message:
Update py-vmomi 8.0.1.0 -> 8.0.1.0.1
Release notes: https://github.com/vmware/pyvmomi/releases/tag/v8.0.1.0.1



Re: CVS: cvs.openbsd.org: ports

2023-05-26 Thread Pavel Korovin
ok by sthen@, thanks!

On 05/26, Pavel Korovin wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   p...@cvs.openbsd.org2023/05/26 14:33:15
> 
> Log message:
> Import bbolt, embedded key/value database for Go
> 
> Status:
> 
> Vendor Tag:   pvk
> Release Tags: pvk_20230526
> 
> N ports/databases/bbolt/Makefile
> N ports/databases/bbolt/distinfo
> N ports/databases/bbolt/pkg/DESCR
> N ports/databases/bbolt/pkg/PLIST
> 
> No conflicts created by this import



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Pavel Korovin
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2023/05/26 14:33:52

Modified files:
databases  : Makefile 

Log message:
+bbolt



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Pavel Korovin
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2023/05/26 14:33:15

Log message:
Import bbolt, embedded key/value database for Go

Status:

Vendor Tag: pvk
Release Tags:   pvk_20230526

N ports/databases/bbolt/Makefile
N ports/databases/bbolt/distinfo
N ports/databases/bbolt/pkg/DESCR
N ports/databases/bbolt/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2023/05/26 13:57:12

Modified files:
audio/navidrome: Makefile distinfo modules.inc 

Log message:
audio/navidrome: simple update to version 0.49.3.



Re: [NEW] databases/bbolt

2023-05-26 Thread Pavel Korovin
On 05/26, Stuart Henderson wrote:
> The port generally looks good.
> 
> I found DESCR a bit confusing (bbolt vs Bolt) as I wasn't aware of the
> history, I've rewritten it a bit which I think is a bit easier for me
> to understand.
> 
> "make test" fails for me, log below. I don't know if that's important.

My tests fail in different places, I don't think it's important in case
of using the port for checking/compacting/browsing bbolt database files.
Do you think including NO_TEST = Yes makes sense?

Thank you for correcting description, with updated DESCR is it OK to import?

-- 
With best regards,
Pavel Korovin



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2023/05/26 11:50:29

Modified files:
security/rust-openssl-tests: Makefile crates.inc distinfo 
security/rust-openssl-tests/pkg: PLIST 

Log message:
Update to rust-openssl-tests 20230526



Re: Problems updating math/maxima

2023-05-26 Thread Dima Pasechnik
On Fri, May 26, 2023 at 03:32:57PM +0100, Stuart Henderson wrote:
> On 2023/05/26 14:23, Dima Pasechnik wrote:
> > Is there any particular reason there is no modern makeinfo in OpenBSD?
> > (the one that has texi2any executable, that's version 6.8 or newer)
> 
> That is available in the texinfo package ('g' prefix in the binary
> names). It's a little old (6.5), no particular reason it's outdated afaik,
> just nobody has done the work to update and test.

it's too old to build Maxima's docs - that's what I get if I try using it, and 
not version 6.8:

make[3]: Entering directory 
'/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info'
./build_html.sh
./build_html.sh: 
abs_srcdir=/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info, 
pwd=/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info, language=en, 
languagedir=/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info, 
texiinitfile=/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info/texi2html.init
./build_html.sh: execute category program: "sbcl" --script make-categories.lisp
maxima.texi:5: warning: @chapter should only appear at the beginning of a line
maxima.texi:5: warning: @chapter should not appear in @node
./Category-Help.texi:33: @ref reference to nonexistent node `Item: 
Introduction/deffn/quad_control'
./include-maxima.texi:226: @menu reference to nonexistent node `Documentation 
Categories'
Can't use an undefined value as an ARRAY reference at 
/usr/local/share/texinfo/Texinfo/Structuring.pm line 932.
maxima.texi:5: warning: @chapter should only appear at the beginning of a line
maxima.texi:5: warning: @chapter should not appear in @node
./Category-Help.texi:33: @ref reference to nonexistent node `Item: 
Introduction/deffn/quad_control'
./include-maxima.texi:226: @menu reference to nonexistent node `Documentation 
Categories'
Can't use an undefined value as an ARRAY reference at 
/usr/local/share/texinfo/Texinfo/Structuring.pm line 932.
./build_html.sh
./build_html.sh: 
abs_srcdir=/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info, 
pwd=/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info, language=en, 
languagedir=/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info, 
texiinitfile=/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info/texi2html.init
./build_html.sh: execute category program: "sbcl" --script make-categories.lisp
maxima.texi:5: warning: @chapter should only appear at the beginning of a line
maxima.texi:5: warning: @chapter should not appear in @node
./Category-Help.texi:33: @ref reference to nonexistent node `Item: 
Introduction/deffn/quad_control'
./include-maxima.texi:226: @menu reference to nonexistent node `Documentation 
Categories'
Can't use an undefined value as an ARRAY reference at 
/usr/local/share/texinfo/Texinfo/Structuring.pm line 932.
maxima.texi:5: warning: @chapter should only appear at the beginning of a line
maxima.texi:5: warning: @chapter should not appear in @node
./Category-Help.texi:33: @ref reference to nonexistent node `Item: 
Introduction/deffn/quad_control'
./include-maxima.texi:226: @menu reference to nonexistent node `Documentation 
Categories'
Can't use an undefined value as an ARRAY reference at 
/usr/local/share/texinfo/Texinfo/Structuring.pm line 932.
/usr/bin/env perl ./create_index maxima_singlepage.html
Can't open maxima_singlepage.html at ./create_index line 14.
make[3]: *** [Makefile:1649: contents.hhc] Error 2
make[3]: Leaving directory 
'/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info'
make[2]: *** [Makefile:1217: all-recursive] Error 1
make[2]: Leaving directory 
'/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc/info'
make[1]: *** [Makefile:390: all-recursive] Error 1
make[1]: Leaving directory 
'/home/dima/sagetrac-mirror/upstream/maxima-5.46.0/doc'
make: *** [Makefile:444: all-recursive] Error 1


I'd be happy to try to submit an upgrade to the texinfo port.

Cheers,
Dima



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/26 10:52:57

Modified files:
x11/gnome/maps : Makefile distinfo 

Log message:
Update to gnome-maps-44.2.



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/05/26 10:50:34

Modified files:
audio/mumble   : Makefile 

Log message:
remove myself as maintainer



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/26 10:50:03

Modified files:
x11/gnome/control-center: Makefile distinfo 
x11/gnome/control-center/patches: 
  
patch-panels_user-accounts_cc-user-panel_c 
x11/gnome/control-center/pkg: PLIST 

Log message:
Update to gnome-control-center-44.2.



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/26 10:30:53

Modified files:
mail/evolution-ews: Makefile distinfo 

Log message:
Update to evolution-ews-3.48.2.



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/26 10:30:41

Modified files:
mail/evolution : Makefile distinfo 
mail/evolution/pkg: PLIST 

Log message:
Update to evolution-3.48.2.



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/26 10:30:05

Modified files:
databases/evolution-data-server: Makefile distinfo 

Log message:
Update to evolution-data-server-3.48.2.



[PATCH] www/unit: enable njs

2023-05-26 Thread Sergey A. Osokin
Hi,

lang/njs has been added to the ports tree recently, so
here's the patch to enable nginx javascript for www/unit.

Thank you.

-- 
Sergey A. Osokin
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.inc
--- Makefile.inc	16 May 2023 08:21:08 -	1.8
+++ Makefile.inc	26 May 2023 15:43:21 -
@@ -28,6 +28,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--runstatedir=${LOCALSTATEDIR}/run/unit \
 		--statedir=${LOCALSTATEDIR}/db/unit \
 		--tmpdir=${LOCALSTATEDIR}/tmp/unit \
+		--njs \
 		--openssl \
 		--user=_unit \
 		--group=_unit
Index: unit/Makefile
===
RCS file: /cvs/ports/www/unit/unit/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- unit/Makefile	26 Apr 2023 15:57:28 -	1.5
+++ unit/Makefile	26 May 2023 15:43:21 -
@@ -2,7 +2,8 @@ COMMENT=	dynamic web application server
 
 WANTLIB=	c crypto m pcre2-8 pthread ssl
 
-LIB_DEPENDS=	devel/pcre2
+LIB_DEPENDS=	devel/pcre2 \
+		lang/njs
 
 MODULES=	lang/python
 MODPY_BUILDDEP=	No


CVS: cvs.openbsd.org: ports

2023-05-26 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2023/05/26 09:28:47

Modified files:
infrastructure/lib/DPB: Config.pm 

Log message:
fix error message



Re: Problems updating math/maxima

2023-05-26 Thread Stuart Henderson
On 2023/05/26 14:23, Dima Pasechnik wrote:
> Is there any particular reason there is no modern makeinfo in OpenBSD?
> (the one that has texi2any executable, that's version 6.8 or newer)

That is available in the texinfo package ('g' prefix in the binary
names). It's a little old (6.5), no particular reason it's outdated afaik,
just nobody has done the work to update and test.

The version in base is a much older one from before the license changed
to GPLv3.



Re: Problems updating math/maxima

2023-05-26 Thread Dima Pasechnik
On Fri, May 26, 2023 at 12:23:18PM +0100, Stuart Henderson wrote:
> On 2023/05/25 18:57, Jonathan Drews wrote:
> > On Thu, May 25, 2023 at 03:23:23PM +0200, Dima Pasechnik wrote:
> > > 
> > > As well, less urgently,  
> > > shouldn't there be a way to get Maxima compiled with sbcl, only only ecl.
> > > (sbcl typically gives considerably better performance, and it's available 
> > > in ports,
> 
> > I wrote the maxima discuss list and they affirm the performance boost
> > that Dima mentions by using sbcl. However I get this make build error:
> > 
> > Missing library for sbcl>=0.0
> > Fatal error
> > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2385 
> 
> sbcl is a standalone compiler binary + runtime files, there is no
> library so you can't use LIB_DEPENDS+WANTLIB for it. would be
> BUILD_DEPENDS and maybe also RUN_DEPENDS if needed.

For what it is worth, I am able to build Maxima 5.46.0 with OpenBSD 7.3's sbcl 
the usual Maxima's way:

./configure --enable-sbcl && make

- but only if I have modern makeinfo, version 6.8 or better.
(same happens, actually, with ecl instead of sbcl, as well).

With the standard ancient OpenBSD's makeinfo (part of texinfo), it fails at 
building docs
(yes, one can of course use info and html docs shipped with Maxima instead)

Is there any particular reason there is no modern makeinfo in OpenBSD?
(the one that has texi2any executable, that's version 6.8 or newer)

If it was the case it'd allow to drop several text2 ports, as they'd
be all provided by texinfo.

Dima



Re: Problems updating math/maxima

2023-05-26 Thread Jonathan Drews
On Fri, May 26, 2023 at 12:23:18PM +0100, Stuart Henderson wrote:
> On 2023/05/25 18:57, Jonathan Drews wrote:
> > On Thu, May 25, 2023 at 03:23:23PM +0200, Dima Pasechnik wrote:
> > > 
> > > As well, less urgently,  
> > > shouldn't there be a way to get Maxima compiled with sbcl, only only ecl.
> > > (sbcl typically gives considerably better performance, and it's available 
> > > in ports,
> 
> > I wrote the maxima discuss list and they affirm the performance boost
> > that Dima mentions by using sbcl. However I get this make build error:
> > 
> > Missing library for sbcl>=0.0
> > Fatal error
> > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2385 
> 
> sbcl is a standalone compiler binary + runtime files, there is no
> library so you can't use LIB_DEPENDS+WANTLIB for it. would be
> BUILD_DEPENDS and maybe also RUN_DEPENDS if needed.
> 


Thanks so much Stuart: 

 I made the additions to  BUILD_DEPENDS and RUN_DEPENDS and
maxima-5.46.0 successfully built. There is a significant improvement
in performance:

Compute a Taylor series to 825 terms using ecl:
taylor(exp(-x/5)*sin(x), x,0,825)$
takes 20 seconds

Compute a Taylor series to 825 terms using sbcl:
taylor(exp(-x/5)*sin(x), x,0,825)$
takes 13 seconds

Dima was right. Also one of the replies I got from the maxima discuss
list:
"My experience is that sbcl is way faster than ecl in practical use.
"The Testsuite (at least +the share one) loads many packages and does
try not to do any lengthy work with them. Loading +packages is not
extremely fast in sbcl. The only drawback of sbcl is that sbcl runs
out of +memory in places ECL doesn't."

I am getting a lot of warnings when I do make build. I am going to
capture thise in a file. They flew by to fast to read.


> ecl is an embeddable lisp implementation that can run as a library
> linked to by other programs.
> 
> 
> > My Makefile:
> 
> generally a cvs (or git) diff would be preferred instead of sending the
> Makefile (please write it to a file and read it into your editor or send
> it as an attachment so that tabs/wrapping are maintained).
> 
I will figure out how to do this and do it from now on.

--
Kind regards,
Jonathan



Re: vlc no telnet interface

2023-05-26 Thread Luca Di Gregorio
Ok, clear, thanks a lot for the effort and for the clarification.

Il giorno ven 26 mag 2023 alle ore 10:58 Stuart Henderson <
s...@spacehopper.org> ha scritto:

> You are running 7.3. That has been added for -current only (the first
> release it will make it into is 7.4).
>
> --
>   Sent from a phone, apologies for poor formatting.
>
>
> On 26 May 2023 07:42:18 Luca Di Gregorio  wrote:
>
> Hello, I've just done a 'pkg_add -Uu -v':
>>
>> Update candidates: vlc-3.0.18 -> vlc-3.0.18
>>
>> and tried to run 'vlc -vvv -I telnet', but I see again:
>>
>> main interface debug: looking for interface module matching "telnet": 13
>> candidates
>> main interface debug: no interface modules matched
>> main interface error: no suitable interface module
>>
>> Am I doing something wrong?
>>
>> With a 'vlc --version' I see:
>> VLC media player 3.0.18 Vetinari (revision 3.0.13-8-g41878ff4f2)
>> VLC version 3.0.18 Vetinari (3.0.13-8-g41878ff4f2)
>> Compiled by _pbuild on amd64-3.ports.openbsd.org (Mar 25 2023 12:30:05)
>>
>> Regards
>> Luca
>>
>> Il giorno ven 12 mag 2023 alle ore 23:48 Brad Smith 
>> ha
>> scritto:
>>
>> On 2023-05-10 4:29 a.m., Stuart Henderson wrote:
>>>
 On 2023/04/30 11:53, Antoine Jacoutot wrote:

> + if test "${enable_lua}" != "no"
>> + then
>> +-  PKG_CHECK_MODULES(LUA, lua5.2,
>> ++  PKG_CHECK_MODULES(LUA, lua51,
>>
> Can we use SUBST_CMD to prevent hardcoding?
>
 I don't see anything wrong with hardcoding here? I think MODLUA_VERSION
 should reflect what the port wants, it's not like SHARED_LIBS.

 On 2023/05/09 02:29, Brad Smith wrote:

> On 2023-05-01 5:36 a.m., Stuart Henderson wrote:
>
>> Any particular reason to use 5.1 instead of 5.2? (They're all EoL
>>
> except
>>>
 5.4, but 5.1 is much longer since EoL).
>>
> Just that is what the default is, MODLUA_DEFAULT_VERSION.
>
 I don't think this is meant to be prescriptive any more than
 say AUTOCONF_VERSION, just that it's what most things used when the
 module was added. We haven't run into problems with ports pulling
 in multiple lua versions via lib deps.

 (I have a diff to add lua5.X pkg-config files to the lua ports to
 test sometime but the i386 builders are unhappy atm, also the include
 directories are non-standard too and also need patches in various ports,
 so it would be good to clean up that whole lot at once).

 How about this diff for vlc? Compared to your previous:

 - uses the lua version which upstream prefers
 - brings back UPDATE_PLIST_ARGS from my earlier one to avoid the
 a52/a${MODLUA_VERSION} that is subst'ed in PLIST-main with 5.2

>>> I saw this part and did not understand what it was for.
>>>
 - uses the minimum necessary configure.ac patch to handle lua52.pc.

>>>
>>> Sure.
>>>
>>>
>>>
>


Re: Problems updating math/maxima

2023-05-26 Thread Stuart Henderson
On 2023/05/25 18:57, Jonathan Drews wrote:
> On Thu, May 25, 2023 at 03:23:23PM +0200, Dima Pasechnik wrote:
> > 
> > As well, less urgently,  
> > shouldn't there be a way to get Maxima compiled with sbcl, only only ecl.
> > (sbcl typically gives considerably better performance, and it's available 
> > in ports,

> I wrote the maxima discuss list and they affirm the performance boost
> that Dima mentions by using sbcl. However I get this make build error:
> 
> Missing library for sbcl>=0.0
> Fatal error
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2385 

sbcl is a standalone compiler binary + runtime files, there is no
library so you can't use LIB_DEPENDS+WANTLIB for it. would be
BUILD_DEPENDS and maybe also RUN_DEPENDS if needed.

ecl is an embeddable lisp implementation that can run as a library
linked to by other programs.


> My Makefile:

generally a cvs (or git) diff would be preferred instead of sending the
Makefile (please write it to a file and read it into your editor or send
it as an attachment so that tabs/wrapping are maintained).



[test] nginx-1.25.0 with up to date naxsi

2023-05-26 Thread Renaud Allard

Hello,

Here is a diff which updates nginx to 1.25.0 like tb@ did and also 
changes the repository for naxsi to an up to date maintained version 
(https://github.com/wargio/naxsi) which is compatible with nginx 1.25.0.


Works for me on amd64 with the newer default naxsi rules.

Best Regards? patch
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.165
diff -u -p -r1.165 Makefile
--- Makefile	17 Apr 2023 17:36:58 -	1.165
+++ Makefile	26 May 2023 11:17:30 -
@@ -15,7 +15,7 @@ COMMENT-passenger=	nginx passenger (ruby
 COMMENT-rtmp=		nginx module for RTMP streaming
 COMMENT-securelink=	nginx HMAC secure link module
 
-VERSION=	1.24.0
+VERSION=	1.25.0
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
 
@@ -38,17 +38,19 @@ PKGNAME-securelink=	nginx-securelink-${V
 
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
+NAXSI_VERSION=	1.4
+
 MASTER_SITES=	https://nginx.org/download/
 MASTER_SITES0=	https://github.com/
 MASTER_SITES1=	https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master/ \
 		https://raw.githubusercontent.com/sthen/nginx_chroot_patch/add_1.20.1/
+MASTER_SITES2=	https://github.com/wargio/naxsi/releases/download/${NAXSI_VERSION}/
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=	\
 	openresty	headers-more-nginx-module	v0.34 \
 	openresty	lua-nginx-module		v0.10.11 \
-	nbs-system	naxsid714f1636ea49a9a9f4f06dba14aee003e970834 \
 	kvspb		nginx-auth-ldap			83c059b73566c2ee9cbda920d91b66657cf120b7 \
 	arut		nginx-rtmp-module		v${VERSION-rtmp} \
 	simpl		ngx_devel_kit			v0.3.0 \
@@ -58,6 +60,7 @@ _GH_MODS=	\
 .for _a _p _c in ${_GH_MODS}
 DISTFILES+=	${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
 .endfor
+DISTFILES+=	naxsi-${NAXSI_VERSION}-src-with-deps.tar.gz:2
 
 HOMEPAGE=	https://nginx.org/
 
@@ -175,6 +178,7 @@ CONFIGURE_ARGS+=	--prefix=${NGINX_DIR} \
 			--with-http_ssl_module \
 			--with-http_stub_status_module \
 			--with-http_v2_module \
+			--with-http_v3_module \
 			--with-http_xslt_module=dynamic \
 			--with-mail=dynamic \
 			--with-stream=dynamic \
@@ -193,11 +197,12 @@ NO_TEST=		Yes
 ALL_TARGET=
 
 pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi \
+.for i in headers-more-nginx-module lua-nginx-module \
 	nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
 	ngx_http_hmac_secure_link_module
 	cd ${WRKSRC} && mv ../$i-* $i
 .endfor
+	cd ${WRKSRC} && mkdir naxsi && mv ../naxsi_* naxsi/
 
 pre-configure:
 	@cd ${WRKSRC} && ${SUBST_CMD} ${SUBSTFILES}
@@ -210,7 +215,7 @@ do-install:
 	fastcgi_params scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${PREFIX}/share/nginx/
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/naxsi/naxsi_config/naxsi_core.rules \
+	${INSTALL_DATA} ${WRKSRC}/naxsi/naxsi_rules/naxsi_core.rules \
 		${PREFIX}/share/nginx/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/nginx/html/
 	${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/nginx/html/
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.80
diff -u -p -r1.80 distinfo
--- distinfo	17 Apr 2023 17:36:58 -	1.80
+++ distinfo	26 May 2023 11:17:30 -
@@ -1,8 +1,8 @@
 SHA256 (headers-more-nginx-module-v0.34.tar.gz) = DA0s7SzolbP0XrKyMM2QUIqyp3MpnxU94UpD5EwSCbM=
 SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
-SHA256 (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 2+IXdBFFfxy6mO5Gc84xh2mUrQa9zl7MDuZjhO8OQg4=
+SHA256 (naxsi-1.4-src-with-deps.tar.gz) = xLnXUvu3D6QPzBeqrvbg8ZBxoOd/90ysSz2lemeGhoQ=
 SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.24.0.tar.gz) = d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=
+SHA256 (nginx-1.25.0.tar.gz) = XtRNRZQycqTopbz0Q0I3IQ8t4xuQP8peOBwbvX7uHow=
 SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
 SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
 SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
@@ -10,9 +10,9 @@ SHA256 (ngx_http_geoip2_module-3.3.tar.g
 SHA256 (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
 SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
 SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
-SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
+SIZE (naxsi-1.4-src-with-deps.tar.gz) = 2274095
 SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.24.0.tar.gz) = 1112471
+SIZE (nginx-1.25.0.tar.gz) = 1217579
 SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542
 SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
 SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455


smime.p7s
Description: S/MIME Cryptographic Signature


Re: [NEW] databases/bbolt

2023-05-26 Thread Stuart Henderson
On 2023/05/25 11:31, Pavel Korovin wrote:
> Hello,
> 
> Please find databases/bbolt port attached.
> https://pkg.go.dev/go.etcd.io/bbolt
> 
> It was nice to have it on hand while recovering corrupted Consul/Vault
> databases after power outage.
> 
> OK to import?
> 
> From pkg/DESCR:
> Package Bbolt implements a low-level key/value store in pure Go. It supports
> fully serializable transactions, ACID semantics, and lock-free MVCC with
> multiple readers and a single writer. Bolt can be used for projects that want 
> a
> simple data store without the need to add large dependencies such as Postgres 
> or
> MySQL.
> 
> Bolt is a single-level, zero-copy, B+tree data store. This means that Bolt is
> optimized for fast read access and does not require recovery in the event of a
> system crash. Transactions which have not finished committing will simply be
> rolled back in the event of a crash.
> 
> The design of Bolt is based on Howard Chu's LMDB database project.

The port generally looks good.

I found DESCR a bit confusing (bbolt vs Bolt) as I wasn't aware of the
history, I've rewritten it a bit which I think is a bit easier for me
to understand.

"make test" fails for me, log below. I don't know if that's important.


bbolt implements a low-level key/value store in pure Go. It supports
fully serializable transactions, ACID semantics, and lock-free MVCC with
multiple readers and a single writer.

It is a fork of Ben Johnson's "Bolt" key/value store aimed at providing
the Go community with an active maintenance and development target for
Bolt.

Bolt can be used for projects that want a simple data store without the
need to add large dependencies such as Postgres or MySQL.

Bolt is a single-level, zero-copy, B+tree data store. This means that
Bolt is optimized for fast read access and does not require recovery
in the event of a system crash. Transactions which have not finished
committing will simply be rolled back in the event of a crash.

The design of Bolt is based on Howard Chu's LMDB database project.


go: downloading github.com/stretchr/testify v1.8.1
go: downloading gopkg.in/yaml.v3 v3.0.1
go: downloading github.com/davecgh/go-spew v1.1.1
go: downloading github.com/pmezard/go-difflib v1.0.0
seed: 97315
quick settings: count=5, items=1000, ksize=1024, vsize=1024
0001
panic: test timed out after 10m0s
running tests:
TestSimulateNoFreeListSync_1op_10p (11s)

goroutine 115960 [running]:
testing.(*M).startAlarm.func1()
/usr/local/go/src/testing/testing.go:2241 +0x3c5
created by time.goFunc
/usr/local/go/src/time/sleep.go:176 +0x32

goroutine 1 [chan receive]:
testing.(*T).Run(0xc0001384e0, {0x6529c0?, 0xc00015ba50?}, 0x6738b8)
/usr/local/go/src/testing/testing.go:1630 +0x405
testing.runTests.func1(0x816240?)
/usr/local/go/src/testing/testing.go:2036 +0x45
testing.tRunner(0xc0001384e0, 0xc00015bb88)
/usr/local/go/src/testing/testing.go:1576 +0x10b
testing.runTests(0xc000119040?, {0x80fec0, 0xbb, 0xbb}, {0x46768b?, 
0xc00015bc00?, 0x815a60?})
/usr/local/go/src/testing/testing.go:2034 +0x489
testing.(*M).Run(0xc000119040)
/usr/local/go/src/testing/testing.go:1906 +0x63a
go.etcd.io/bbolt_test.TestMain(0x?)
/usr/obj/ports/bbolt-1.3.7/go.etcd.io/bbolt@v1.3.7/quick_test.go:37 
+0x359
main.main()
_testmain.go:457 +0x1d3

goroutine 99127 [chan send]:
go.etcd.io/bbolt_test.testSimulate(0xc000503a00, 0x467ae7?, 0x8, 0x2710, 
0xc038d55f60?)

/usr/obj/ports/bbolt-1.3.7/go.etcd.io/bbolt@v1.3.7/simulation_test.go:69 +0x35b
go.etcd.io/bbolt_test.TestSimulateNoFreeListSync_1op_10p(0x0?)

/usr/obj/ports/bbolt-1.3.7/go.etcd.io/bbolt@v1.3.7/simulation_no_freelist_sync_test.go:34
 +0x45
testing.tRunner(0xc000503a00, 0x6738b8)
/usr/local/go/src/testing/testing.go:1576 +0x10b
created by testing.(*T).Run
/usr/local/go/src/testing/testing.go:1629 +0x3ea

goroutine 115946 [runnable]:
go.etcd.io/bbolt_test.testSimulate.func2()
/usr/obj/ports/bbolt-1.3.7/go.etcd.io/bbolt@v1.3.7/simulation_test.go:85
runtime.goexit()
/usr/local/go/src/runtime/asm_amd64.s:1598 +0x1
created by go.etcd.io/bbolt_test.testSimulate

/usr/obj/ports/bbolt-1.3.7/go.etcd.io/bbolt@v1.3.7/simulation_test.go:85 +0x579

goroutine 115805 [runnable]:
go.etcd.io/bbolt.(*DB).page(...)
/usr/obj/ports/bbolt-1.3.7/go.etcd.io/bbolt@v1.3.7/db.go:1054
go.etcd.io/bbolt.(*Tx).page(0x4166f0, 0xc59998)
/usr/obj/ports/bbolt-1.3.7/go.etcd.io/bbolt@v1.3.7/tx.go:533 +0x61
go.etcd.io/bbolt.(*Bucket).pageNode(0xc59d50?, 0xc00d497800?)
/usr/obj/ports/bbolt-1.3.7/go.etcd.io/bbolt@v1.3.7/bucket.go:740 +0x8d
go.etcd.io/bbolt.(*Cursor).search(0xc59d50, {0xc028d700d0, 0xcd, 0xd0}, 
0xc00030?)
/usr/obj/ports/bbolt-1.3.7/go.etcd.io/bbolt@v1.3.7/cursor.go:272 +0x54
go.etcd.io/bbolt.(*Cursor).searchPage(0xc59d50, {0xc028d700d0, 0xcd, 0xd0}, 
0x621de0?)

Re: Problems updating math/maxima

2023-05-26 Thread Jonathan Drews
On Fri, May 26, 2023 at 11:38:00AM +0100, Stuart Henderson wrote:
> Let's stick to one change at a time, and give the maintainer some
> time to respond to the update diff.

Good advice. I will do that.

--
Kind regards,
Jonathan
:w



Re: maintainer update net/gajim 1.5.2 --> 1.7.3

2023-05-26 Thread Stuart Henderson
On 2023/05/20 19:30, Paco Esteban wrote:
> Hi ports@,
> 
> This is an update for net/gajim to its latest version 1.7.3
> Tons of changes since last version.  I did not update sooner because of
> setuptools version dependency.  Find the full changelog here:
> 
> https://dev.gajim.org/gajim/python-nbxmpp/-/blob/4.2.2/ChangeLog
> 
> Upstream seems to have changed the way they package gajim, and now the
> man pages and the freedesktop file thingy are not copied during the fake
> stage.
> I see there is a script to copy this on pep517build/install_metadata.py
> 
> According to python-module(5):
> Most modern Python software can be packaged using a PEP 517
> build frontend (in the devel/py-build port).  To use this, set
> MODPY_PYBUILD to the name of the build backend.  If the port
> provides a pyproject.toml file, check the "build-backend" line in
> the [build-system] section.
> 
> And the build-system section says:
> [build-system]
> requires = [
> "setuptools >= 65.0.0",
> ]
> build-backend = "backend"
> backend-path = ["pep517build"]
> 
> 
> Not sure which backend is "backend" ...
> 
> python-module(5) also says:
> In rare cases, the build backend is distributed with the software
> itself and MODPY_PYBUILD can be set to Yes to use this mechanism
> without adding a dependency for another backend.
> 
> So I tried both "setuptools" and "Yes" for MODPY_PYBUILD, with the same
> result.
> 
> Any help here appreciated.

If MODPY_PYBUILD is set to anything other than "No" then it does a
build using PEP517 infrastructure which uses whatever is setup in the
pyproject.toml file as the backend (which has a fallback to using
pyproject.toml setuptools if doesn't exist).

The various values setuptools, setuptools_scm, flit_core, etc, are
to setup dependencies.

There's no difference in the actual build command run whether it's
set to "Yes" or "setuptools" or "flit_core" or whatever. Match what's
actually used so the deps are added correctly. So here setuptools
makes sense because it is needed in the build even if it's running
it via its own internal backend (which itself uses setuptools).




On 2023/05/20 19:35, Paco Esteban wrote:
> By the way, I've found this on their repo:
> https://dev.gajim.org/gajim/gajim/-/blob/1.7.3/README.md#building-the-metadata-files-unix-only
> 
> Not sure at which stage to add those commands.
> Any ideas ?

--- Makefile-   Fri May 26 11:17:45 2023
+++ MakefileFri May 26 11:44:10 2023
@@ -39,4 +39,12 @@ RUN_DEPENDS= audio/gsound \
x11/gtk+4,-guic \
x11/gtksourceview4
 
+post-install:
+   cd ${WRKSRC}; \
+   ${MODPY_BIN} pep517build/build_metadata.py -o dist/metadata; \
+   ${MODPY_BIN} pep517build/install_metadata.py dist/metadata 
--prefix=${PREFIX}
+   mv ${PREFIX}/share/man/man1/* ${PREFIX}/man/man1/
+   rmdir ${PREFIX}/share/man{,/man1}
+   gunzip ${PREFIX}/man/man1/*.gz
+
 .include 



Re: Problems updating math/maxima

2023-05-26 Thread Stuart Henderson
Let's stick to one change at a time, and give the maintainer some
time to respond to the update diff.

On 2023/05/25 15:23, Dima Pasechnik wrote:
> On Thu, May 25, 2023 at 05:30:43AM -0600, Jonathan Drews wrote:
> > On Thu, May 25, 2023 at 12:02:16PM +0100, Stuart Henderson wrote:
> > > Here's an updated diff. The MODTCL_WISH_ADJ from the previous diff
> > > is not actually needed, and Python is no longer needed.
> > > 
> > > I don't use this software but the update looks good to me now.
> 
> Can you also add building maxima.fas and installing it into
> /usr/local/lib/ecl/ ?
> Then one can use Maxima from any application which can load libecl.so
> (e.g. from an application written in C).
> If we ever port SageMath (sagemath.org) to OpenBSD (there is a port to 
> FreeBSD)
> then maxima.fas will be necessary. 
> 
> As well, less urgently,  
> shouldn't there be a way to get Maxima compiled with sbcl, only only ecl.
> (sbcl typically gives considerably better performance, and it's available in 
> ports,
> but embedding into applications is a different story, harder than with ecl).
> 
> Best,
> Dima
> 
> > > 
> > 
> > Stuart:
> > 
> >  Thank you so much for all your help on this port. I will make the
> > changes you have given here and test the port. 
> > 
> > 
> > ---
> > Kind regards,
> > Jonathan
> > 
> 



Re: maintainer update py-nbxmpp 3.4.2 --> 4.2.2

2023-05-26 Thread Stuart Henderson
OK.

It can be simplified a bit with this on top:

--- Makefile-   Fri May 26 11:14:17 2023
+++ MakefileFri May 26 11:16:03 2023
@@ -12,12 +12,9 @@ MAINTAINER = Paco Esteban 
 # GPLv3
 PERMIT_PACKAGE =   Yes
 
-MASTER_SITES = ${MASTER_SITE_PYPI:=n/nbxmpp/}
-
 MODULES =  lang/python
+MODPY_PI = Yes
 MODPY_PYBUILD =setuptools
-MODPY_PYTEST = Yes
-MODPY_PYTEST_ARGS =test
 
 RUN_DEPENDS =  devel/glib2>=2.60.0 \
devel/libsoup3 \


On 2023/05/20 19:19, Paco Esteban wrote:
> Hi ports@,
> 
> This is an update of net/py-nbxmpp to its latest version 4.2.2
> It's needed for an upcoming update of net/gajim
> 
> Main changes are now python 3.10 is needed and they moved from libsoup
> 2 to 3.  Full changelog here:
> 
> https://dev.gajim.org/gajim/python-nbxmpp/-/blob/4.2.2/ChangeLog
> 
> Nothing really special on the port itself.
> 
> Ok to commit ?
> 
> diff /usr/ports
> commit - 630d98e3b12a74e52362425cf2d761365414e347
> path + /usr/ports
> blob - 337888249008cd57a876734605f787d6812516df
> file + net/py-nbxmpp/Makefile
> --- net/py-nbxmpp/Makefile
> +++ net/py-nbxmpp/Makefile
> @@ -1,10 +1,9 @@
>  COMMENT =Python XMPP and Jabber implementation
>  
> -MODPY_EGG_VERSION =  3.2.4
> +MODPY_EGG_VERSION =  4.2.2
>  DISTNAME =   nbxmpp-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
>  CATEGORIES = net devel
> -REVISION =   0
>  
>  HOMEPAGE =   https://python-nbxmpp.gajim.org/
>  
> @@ -20,8 +19,8 @@ RUN_DEPENDS =   devel/glib2>=2.6.0 \
>  MODPY_PYTEST =   Yes
>  MODPY_PYTEST_ARGS =  test
>  
> -RUN_DEPENDS =devel/glib2>=2.6.0 \
> - devel/libsoup \
> +RUN_DEPENDS =devel/glib2>=2.60.0 \
> + devel/libsoup3 \
>   devel/py-gobject3${MODPY_FLAVOR} \
>   net/py-idna${MODPY_FLAVOR} \
>   sysutils/py-packaging${MODPY_FLAVOR} \
> blob - d7ad69572af4ab366b3c8905877c70805d0972a3
> file + net/py-nbxmpp/distinfo
> --- net/py-nbxmpp/distinfo
> +++ net/py-nbxmpp/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (nbxmpp-3.2.4.tar.gz) = dN7/T8IGAyVVcffgtM1oFX5E4edpNB5j0y3YRqKRphU=
> -SIZE (nbxmpp-3.2.4.tar.gz) = 161470
> +SHA256 (nbxmpp-4.2.2.tar.gz) = hvSIVtrwV3l/+WPtdUKvxsZEoN5m9hdxho1GuY33tiQ=
> +SIZE (nbxmpp-4.2.2.tar.gz) = 166998
> blob - a8138138b501a3f2181360deb7dfd4bdeb46afe1
> file + net/py-nbxmpp/pkg/PLIST
> --- net/py-nbxmpp/pkg/PLIST
> +++ net/py-nbxmpp/pkg/PLIST
> @@ -26,6 +26,8 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODP
>  
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>  
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}idlequeue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>  
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}idlequeue.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -65,15 +67,8 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/exampl
>  lib/python${MODPY_VERSION}/site-packages/nbxmpp/const.py
>  lib/python${MODPY_VERSION}/site-packages/nbxmpp/dispatcher.py
>  lib/python${MODPY_VERSION}/site-packages/nbxmpp/errors.py
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/__init__.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}/
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/client.py
>  lib/python${MODPY_VERSION}/site-packages/nbxmpp/exceptions.py
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/http.py
>  lib/python${MODPY_VERSION}/site-packages/nbxmpp/idlequeue.py
>  lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/
>  lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/__init__.py
> @@ -158,8 +153,12 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/module

Re: nginx 1.25 and naxsi

2023-05-26 Thread Stuart Henderson
On 2023/05/26 12:04, Renaud Allard wrote:
> Hello,
> 
> It seems that the version of naxsi we ship with nginx
> (https://github.com/nbs-system/naxsi) is largely outdated and has problems
> with future nginx 1.25.
> The idea was to replace it with https://github.com/wargio/naxsi
> 
> The issue is that if I simply replace naxsi in _GH_MODS with something like
> this:
> wargio  naxsi   1.4
> 
> It downloads the tar.gz, but it's missing libinjection include files because
> they are linked to another repository in github (see
> https://github.com/wargio/naxsi/tree/main/naxsi_src).
> 
> There is a release including the dependencies here:
> https://github.com/wargio/naxsi/releases/download/1.4/naxsi-1.4-src-with-deps.tar.gz
> But I don't see how I can fetch that version instead of the "normal" one.
> 
> Any clue?

something like

NAXSI_V=1.4
MASTER_SITES2=  https://github.com/wargio/naxsi/releases/download/${NAXSI_V}
DISTFILES+= naxsi-${NAXSI_V}-src-with-deps.tar.gz:2



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2023/05/26 04:06:19

Modified files:
sysutils/fzf   : Makefile distinfo modules.inc 
Removed files:
sysutils/fzf/patches: patch-shell_completion_bash 

Log message:
sysutils/fzf: update to version 0.40.0.

Diff from Laurent Cheylus, thanks!



nginx 1.25 and naxsi

2023-05-26 Thread Renaud Allard

Hello,

It seems that the version of naxsi we ship with nginx 
(https://github.com/nbs-system/naxsi) is largely outdated and has 
problems with future nginx 1.25.

The idea was to replace it with https://github.com/wargio/naxsi

The issue is that if I simply replace naxsi in _GH_MODS with something 
like this:

wargio  naxsi   1.4

It downloads the tar.gz, but it's missing libinjection include files 
because they are linked to another repository in github (see 
https://github.com/wargio/naxsi/tree/main/naxsi_src).


There is a release including the dependencies here:
https://github.com/wargio/naxsi/releases/download/1.4/naxsi-1.4-src-with-deps.tar.gz
But I don't see how I can fetch that version instead of the "normal" one.

Any clue?

Thank you


smime.p7s
Description: S/MIME Cryptographic Signature


Re: [update] sysutils/grafana to 9.5.1

2023-05-26 Thread Florian Obser
On 2023-05-18 02:45 UTC, Lucas Raab  wrote:
> On Thu, Apr 27, 2023 at 09:20:11AM +, Lucas Raab wrote:
>> Hello,
>> 
>> Here's an update for grafana to 9.5.1. I've run a couple 9.4.* releases
>> between the last update and this one. 9.4.* and 9.5.1 have been running fine.
>> 
>> Other tests with this one?
>> 
>> Thanks,
>> Lucas
>
> update attached for 9.5.2
>
>

This seems to have broken rcctl ls failed.

Adding

pexp="grafana server ${daemon_flags}"

to /etc/rc.d/grafana seems to fix things. It really wants
${daemon_flags} in there, "grafana server" alone does not work.

-- 
In my defence, I have been left unsupervised.



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/26 03:12:59

Modified files:
www/epiphany   : Makefile distinfo 

Log message:
Update to epiphany-44.3.



Re: vlc no telnet interface

2023-05-26 Thread Stuart Henderson
You are running 7.3. That has been added for -current only (the first 
release it will make it into is 7.4).


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

On 26 May 2023 07:42:18 Luca Di Gregorio  wrote:


Hello, I've just done a 'pkg_add -Uu -v':

Update candidates: vlc-3.0.18 -> vlc-3.0.18

and tried to run 'vlc -vvv -I telnet', but I see again:

main interface debug: looking for interface module matching "telnet": 13
candidates
main interface debug: no interface modules matched
main interface error: no suitable interface module

Am I doing something wrong?

With a 'vlc --version' I see:
VLC media player 3.0.18 Vetinari (revision 3.0.13-8-g41878ff4f2)
VLC version 3.0.18 Vetinari (3.0.13-8-g41878ff4f2)
Compiled by _pbuild on amd64-3.ports.openbsd.org (Mar 25 2023 12:30:05)

Regards
Luca

Il giorno ven 12 mag 2023 alle ore 23:48 Brad Smith  ha
scritto:


On 2023-05-10 4:29 a.m., Stuart Henderson wrote:
> On 2023/04/30 11:53, Antoine Jacoutot wrote:
>>> + if test "${enable_lua}" != "no"
>>> + then
>>> +-  PKG_CHECK_MODULES(LUA, lua5.2,
>>> ++  PKG_CHECK_MODULES(LUA, lua51,
>> Can we use SUBST_CMD to prevent hardcoding?
> I don't see anything wrong with hardcoding here? I think MODLUA_VERSION
> should reflect what the port wants, it's not like SHARED_LIBS.
>
> On 2023/05/09 02:29, Brad Smith wrote:
>> On 2023-05-01 5:36 a.m., Stuart Henderson wrote:
>>> Any particular reason to use 5.1 instead of 5.2? (They're all EoL
except
>>> 5.4, but 5.1 is much longer since EoL).
>> Just that is what the default is, MODLUA_DEFAULT_VERSION.
> I don't think this is meant to be prescriptive any more than
> say AUTOCONF_VERSION, just that it's what most things used when the
> module was added. We haven't run into problems with ports pulling
> in multiple lua versions via lib deps.
>
> (I have a diff to add lua5.X pkg-config files to the lua ports to
> test sometime but the i386 builders are unhappy atm, also the include
> directories are non-standard too and also need patches in various ports,
> so it would be good to clean up that whole lot at once).
>
> How about this diff for vlc? Compared to your previous:
>
> - uses the lua version which upstream prefers
> - brings back UPDATE_PLIST_ARGS from my earlier one to avoid the
> a52/a${MODLUA_VERSION} that is subst'ed in PLIST-main with 5.2
I saw this part and did not understand what it was for.
> - uses the minimum necessary configure.ac patch to handle lua52.pc.

Sure.






Re: New [cad/solvespace] - 3.1

2023-05-26 Thread Johannes Thyssen Tishman
Hi Stefan,

> Looks good now.
>
> OK for import sdk@

Awesome, thanks for that. Please find attached the port with the
following last minute tweaks:

- Formated DESCR based on your suggestions
- Updated DESCR to match description on solvespace's website
- Dropped Jerome KASPER from MAINTAINER as per his request

Thanks again :)

Kind regards,

--
Johannes Thyssen Tishman
https://thyssentishman.com



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


CVS: cvs.openbsd.org: ports

2023-05-26 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/26 01:03:03

Modified files:
lang/vala  : Makefile distinfo 

Log message:
Update to vala-0.56.8.



Re: vlc no telnet interface

2023-05-26 Thread Luca Di Gregorio
Hello, I've just done a 'pkg_add -Uu -v':

Update candidates: vlc-3.0.18 -> vlc-3.0.18

and tried to run 'vlc -vvv -I telnet', but I see again:

main interface debug: looking for interface module matching "telnet": 13
candidates
main interface debug: no interface modules matched
main interface error: no suitable interface module

Am I doing something wrong?

With a 'vlc --version' I see:
VLC media player 3.0.18 Vetinari (revision 3.0.13-8-g41878ff4f2)
VLC version 3.0.18 Vetinari (3.0.13-8-g41878ff4f2)
Compiled by _pbuild on amd64-3.ports.openbsd.org (Mar 25 2023 12:30:05)

Regards
Luca

Il giorno ven 12 mag 2023 alle ore 23:48 Brad Smith  ha
scritto:

> On 2023-05-10 4:29 a.m., Stuart Henderson wrote:
> > On 2023/04/30 11:53, Antoine Jacoutot wrote:
> >>> + if test "${enable_lua}" != "no"
> >>> + then
> >>> +-  PKG_CHECK_MODULES(LUA, lua5.2,
> >>> ++  PKG_CHECK_MODULES(LUA, lua51,
> >> Can we use SUBST_CMD to prevent hardcoding?
> > I don't see anything wrong with hardcoding here? I think MODLUA_VERSION
> > should reflect what the port wants, it's not like SHARED_LIBS.
> >
> > On 2023/05/09 02:29, Brad Smith wrote:
> >> On 2023-05-01 5:36 a.m., Stuart Henderson wrote:
> >>> Any particular reason to use 5.1 instead of 5.2? (They're all EoL
> except
> >>> 5.4, but 5.1 is much longer since EoL).
> >> Just that is what the default is, MODLUA_DEFAULT_VERSION.
> > I don't think this is meant to be prescriptive any more than
> > say AUTOCONF_VERSION, just that it's what most things used when the
> > module was added. We haven't run into problems with ports pulling
> > in multiple lua versions via lib deps.
> >
> > (I have a diff to add lua5.X pkg-config files to the lua ports to
> > test sometime but the i386 builders are unhappy atm, also the include
> > directories are non-standard too and also need patches in various ports,
> > so it would be good to clean up that whole lot at once).
> >
> > How about this diff for vlc? Compared to your previous:
> >
> > - uses the lua version which upstream prefers
> > - brings back UPDATE_PLIST_ARGS from my earlier one to avoid the
> > a52/a${MODLUA_VERSION} that is subst'ed in PLIST-main with 5.2
> I saw this part and did not understand what it was for.
> > - uses the minimum necessary configure.ac patch to handle lua52.pc.
>
> Sure.
>
>


CVS: cvs.openbsd.org: ports

2023-05-26 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/26 00:23:30

Modified files:
x11/gnome/orca : Makefile distinfo 
x11/gnome/orca/pkg: DESCR PLIST 

Log message:
Update to orca-44.1.
Loosen up dependencies (most are optional).



CVS: cvs.openbsd.org: ports

2023-05-26 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/26 00:19:03

Modified files:
devel/meson: Makefile distinfo meson.port.mk 
devel/meson/patches: patch-mesonbuild_build_py 

Log message:
Update to meson-1.1.1.