Re: [editor/micro] stopped working

2024-04-26 Thread Rob Schmersel 
On Wed, 17 Apr 2024 07:46:19 +0200
Rob Schmersel  wrote:

> On Mon, 8 Apr 2024 07:26:04 +0200
> Rob Schmersel  wrote:
> 
> > On Sun, 7 Apr 2024 12:21:14 -0400
> > George Koehler  wrote:
> >   
> > > On Sun, 7 Apr 2024 15:57:26 +0200
> > > Rob Schmersel  wrote:
> > >   
> > > > I tracked it down to the use of syscall in the tcell package
> > > > file tscreen_bsd.go (line 46)
> > > > 
> > > >   
> > > >  >   fd = uintptr(t.out.(*os.File).Fd())
> > > >  >   if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd,
> > > >  > ioc, tios, 0, 0, 0); e1 != 0 { e = e1
> > > >  >   goto failed
> > > >  >   }  
> > > 
> > > Joel Sing patched our lang/go to allow SYS_IOCTL in Syscall, but
> > > not in Syscall6.  I tried changing Syscall6 to Syscall in
> > > tscreen_bsd.go. The "function not implemented" error stopped
> > > appearing, but
> > >   
> > I think there is a reason why Syscall6 was used instead of Syscall
> > (i.e. number of arguments). Just removing the last 3 arguments now
> > makes the last argument (tios) be a pointer (at least according to
> > the syscall package description) which I'm not sure is the
> > intention and probably the reason for the black screen :)
> > 
> > So I guess I need to look at the syscall package to figure what
> > changes where made for Syscall. Will give it go later today.
> >   
> > >  - micro got stuck on a black screen; I needed to close the
> > > terminal.  
> > Got the same after patching
> >   
> > >  - I can't add my patch to the port, because "make update-patches"
> > >doesn't see it.  The file is outside WRKSRC, in
> > >WRKDIR/go/pkg/mod/github.com/zyedidia/tcell/v2@v2.0.10
> > >   
> > 
> > Yeah, the tcell package is a dependency that gets pulled in during
> > compilation. We need to request upstream to patch or get tcell as an
> > own package once it is figured out what is the cause (it definitely
> > used to work before :))
> >   
> > > --- tscreen_bsd.go.orig.port  Sun Apr  7 11:53:03 2024
> > > +++ tscreen_bsd.goSun Apr  7 11:57:57 2024
> > > @@ -43,7 +43,7 @@
> > >   tios = uintptr(unsafe.Pointer(t.tiosp))
> > >   ioc = uintptr(syscall.TIOCGETA)
> > >   fd = uintptr(t.out.(*os.File).Fd())
> > > - if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd,
> > > ioc, tios, 0, 0, 0); e1 != 0 {
> > > + if _, _, e1 := syscall.Syscall(syscall.SYS_IOCTL, fd,
> > > ioc, tios); e1 != 0 { e = e1
> > >   goto failed
> > >   }
> > > @@ -61,7 +61,7 @@
> > >   tios = uintptr(unsafe.Pointer())
> > >  
> > >   ioc = uintptr(syscall.TIOCSETA)
> > > - if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd,
> > > ioc, tios, 0, 0, 0); e1 != 0 {
> > > + if _, _, e1 := syscall.Syscall(syscall.SYS_IOCTL, fd,
> > > ioc, tios); e1 != 0 { e = e1
> > >   goto failed
> > >   }
> > > @@ -94,7 +94,7 @@
> > >   fd := uintptr(t.out.(*os.File).Fd())
> > >   ioc := uintptr(syscall.TIOCSETAF)
> > >   tios := uintptr(unsafe.Pointer(t.tiosp))
> > > - syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc,
> > > tios, 0, 0, 0)
> > > + syscall.Syscall(syscall.SYS_IOCTL, fd, ioc, tios)
> > >   t.out.(*os.File).Close()
> > >   }
> > >   if t.in != nil {
> > > @@ -108,8 +108,8 @@
> > >   dim := [4]uint16{}
> > >   dimp := uintptr(unsafe.Pointer())
> > >   ioc := uintptr(syscall.TIOCGWINSZ)
> > > - if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL,
> > > - fd, ioc, dimp, 0, 0, 0); err != 0 {
> > > + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL,
> > > + fd, ioc, dimp); err != 0 {
> > >   return -1, -1, err
> > >   }
> > >   return int(dim[1]), int(dim[0]), nil
> > >   
> >   
> 
> after banging my head against this over the weekend I have to admit
> defeat as I have no clue whatsover :)
> Is there anybody else here on the list who can help

I think this need to be marked BROKEN

Re: [editor/micro] stopped working

2024-04-16 Thread Rob Schmersel 
On Mon, 8 Apr 2024 07:26:04 +0200
Rob Schmersel  wrote:

> On Sun, 7 Apr 2024 12:21:14 -0400
> George Koehler  wrote:
> 
> > On Sun, 7 Apr 2024 15:57:26 +0200
> > Rob Schmersel  wrote:
> > 
> > > I tracked it down to the use of syscall in the tcell package file
> > > tscreen_bsd.go (line 46)
> > > 
> > > 
> > >  >   fd = uintptr(t.out.(*os.File).Fd())
> > >  >   if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd,
> > >  > ioc, tios, 0, 0, 0); e1 != 0 { e = e1
> > >  >   goto failed
> > >  >   }
> > 
> > Joel Sing patched our lang/go to allow SYS_IOCTL in Syscall, but not
> > in Syscall6.  I tried changing Syscall6 to Syscall in
> > tscreen_bsd.go. The "function not implemented" error stopped
> > appearing, but
> > 
> I think there is a reason why Syscall6 was used instead of Syscall
> (i.e. number of arguments). Just removing the last 3 arguments now
> makes the last argument (tios) be a pointer (at least according to the
> syscall package description) which I'm not sure is the intention and
> probably the reason for the black screen :)
> 
> So I guess I need to look at the syscall package to figure what
> changes where made for Syscall. Will give it go later today.
> 
> >  - micro got stuck on a black screen; I needed to close the
> > terminal.
> Got the same after patching
> 
> >  - I can't add my patch to the port, because "make update-patches"
> >doesn't see it.  The file is outside WRKSRC, in
> >WRKDIR/go/pkg/mod/github.com/zyedidia/tcell/v2@v2.0.10
> > 
> 
> Yeah, the tcell package is a dependency that gets pulled in during
> compilation. We need to request upstream to patch or get tcell as an
> own package once it is figured out what is the cause (it definitely
> used to work before :))
> 
> > --- tscreen_bsd.go.orig.portSun Apr  7 11:53:03 2024
> > +++ tscreen_bsd.go  Sun Apr  7 11:57:57 2024
> > @@ -43,7 +43,7 @@
> > tios = uintptr(unsafe.Pointer(t.tiosp))
> > ioc = uintptr(syscall.TIOCGETA)
> > fd = uintptr(t.out.(*os.File).Fd())
> > -   if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc,
> > tios, 0, 0, 0); e1 != 0 {
> > +   if _, _, e1 := syscall.Syscall(syscall.SYS_IOCTL, fd, ioc,
> > tios); e1 != 0 { e = e1
> > goto failed
> > }
> > @@ -61,7 +61,7 @@
> > tios = uintptr(unsafe.Pointer())
> >  
> > ioc = uintptr(syscall.TIOCSETA)
> > -   if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc,
> > tios, 0, 0, 0); e1 != 0 {
> > +   if _, _, e1 := syscall.Syscall(syscall.SYS_IOCTL, fd, ioc,
> > tios); e1 != 0 { e = e1
> > goto failed
> > }
> > @@ -94,7 +94,7 @@
> > fd := uintptr(t.out.(*os.File).Fd())
> > ioc := uintptr(syscall.TIOCSETAF)
> > tios := uintptr(unsafe.Pointer(t.tiosp))
> > -   syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc, tios,
> > 0, 0, 0)
> > +   syscall.Syscall(syscall.SYS_IOCTL, fd, ioc, tios)
> > t.out.(*os.File).Close()
> > }
> > if t.in != nil {
> > @@ -108,8 +108,8 @@
> > dim := [4]uint16{}
> > dimp := uintptr(unsafe.Pointer())
> > ioc := uintptr(syscall.TIOCGWINSZ)
> > -   if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL,
> > -   fd, ioc, dimp, 0, 0, 0); err != 0 {
> > +   if _, _, err := syscall.Syscall(syscall.SYS_IOCTL,
> > +   fd, ioc, dimp); err != 0 {
> > return -1, -1, err
> > }
> > return int(dim[1]), int(dim[0]), nil
> > 
> 

after banging my head against this over the weekend I have to admit
defeat as I have no clue whatsover :)
Is there anybody else here on the list who can help

Re: cad/xtrcad: fix hidden dep on mxml

2024-04-16 Thread Rob Schmersel 
On Tue, 16 Apr 2024 20:29:55 +0100
Theo Buehler  wrote:

> xtrcad has a hidden dep on mxml. Below is a possible fix.
> 
> -- Found MiniXML: /usr/local/lib/libmxml.so.0.2
> [...]
> /tmp/pobj/xtrkcad-5.2.2/xtrkcad-source-5.2.2GA/app/bin/svgformat.c:34:10:
> fatal error: 'mxml.h' file not found
> #include "mxml.h"
>  ^~~~
>1 error generated.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/cad/xtrkcad/Makefile,v
> diff -u -p -r1.29 Makefile
> --- Makefile  7 Nov 2023 14:19:21 -   1.29
> +++ Makefile  16 Apr 2024 19:28:15 -
> @@ -4,7 +4,7 @@ VERSION=  5.2.2
>  DISTNAME=xtrkcad-source-${VERSION}GA
>  PKGNAME= xtrkcad-${VERSION}
>  CATEGORIES=  cad
> -REVISION=2
> +REVISION=3
>  
>  HOMEPAGE=https://xtrkcad-fork.sourceforge.net/Wikka/HomePage
>  
> @@ -21,10 +21,13 @@ COMPILER= base-clang ports-gcc
>  COMPILER_LANGS=  c
>  
>  WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> -WANTLIB += Xrandr Xrender c fontconfig freetype m pthread z
> -WANTLIB += cairo gio-2.0 glib-2.0 gobject-2.0 iconv intl zip
> -WANTLIB += harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0
> -WANTLIB += gdk_pixbuf-2.0 atk-1.0 gdk-x11-2.0 gtk-x11-2.0
> +WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
> +WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
> +WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
> +WANTLIB += pangoft2-1.0 pthread z zip
> +
> +# force update if the statically linked mxml is updated.
> +WANTLIB += mxml
>  
>  BUILD_DEPENDS =  devel/gettext,-tools
>  
> @@ -32,6 +35,7 @@ LIB_DEPENDS=archivers/libzip \
>   devel/pango \
>   graphics/cairo \
>   graphics/gdk-pixbuf2 \
> + textproc/mxml \
>   x11/gnome/at-spi2-core \
>   x11/gtk+2
>  
> 

HOMEPAGE is out of sync and results in a 404. Not sure which one of the
2 below to suggest:
https://sourceforge.net/projects/xtrkcad-fork/
https://sourceforge.net/p/xtrkcad-fork/wiki/Home/

BR/Rob

Re: Micro could not initialize a Screen

2024-04-08 Thread Rob Schmersel 
On Mon, 08 Apr 2024 08:50:25 +0200
Mizsei Zoltán  wrote:

> Hi,
> 
> micro stopped working after the 7.5 update:
> 
> vps$ uname -a
> OpenBSD vps 7.5 GENERIC#79 amd64
> 
> vps$ which micro
> /usr/local/bin/micro
> 
> vps$ micro --version
> Version: 2.0.13
> Commit hash: 68d88b5
> Compiled on Unknown
> 
> vps$ micro test.txt
> function not implemented
> Fatal: Micro could not initialize a Screen.
> 
> vps$ echo $TERM
> xterm-256color
> 
> Regards,
> --ext
> 
> 

See also discussion here:
https://marc.info/?l=openbsd-ports=171255845906993=2

Re: [editor/micro] stopped working

2024-04-08 Thread Rob Schmersel 
On Sun, 7 Apr 2024 12:21:14 -0400
George Koehler  wrote:

> On Sun, 7 Apr 2024 15:57:26 +0200
> Rob Schmersel  wrote:
> 
> > I tracked it down to the use of syscall in the tcell package file
> > tscreen_bsd.go (line 46)
> > 
> > 
> >  >   fd = uintptr(t.out.(*os.File).Fd())
> >  >   if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc,
> >  >   tios, 0, 0, 0); e1 != 0 { e = e1
> >  >   goto failed
> >  >   }
> 
> Joel Sing patched our lang/go to allow SYS_IOCTL in Syscall, but not
> in Syscall6.  I tried changing Syscall6 to Syscall in tscreen_bsd.go.
> The "function not implemented" error stopped appearing, but
> 
I think there is a reason why Syscall6 was used instead of Syscall
(i.e. number of arguments). Just removing the last 3 arguments now
makes the last argument (tios) be a pointer (at least according to the
syscall package description) which I'm not sure is the intention and
probably the reason for the black screen :)

So I guess I need to look at the syscall package to figure what changes
where made for Syscall. Will give it go later today.

>  - micro got stuck on a black screen; I needed to close the terminal.
Got the same after patching

>  - I can't add my patch to the port, because "make update-patches"
>doesn't see it.  The file is outside WRKSRC, in
>WRKDIR/go/pkg/mod/github.com/zyedidia/tcell/v2@v2.0.10
> 

Yeah, the tcell package is a dependency that gets pulled in during
compilation. We need to request upstream to patch or get tcell as an
own package once it is figured out what is the cause (it definitely
used to work before :))

> --- tscreen_bsd.go.orig.port  Sun Apr  7 11:53:03 2024
> +++ tscreen_bsd.goSun Apr  7 11:57:57 2024
> @@ -43,7 +43,7 @@
>   tios = uintptr(unsafe.Pointer(t.tiosp))
>   ioc = uintptr(syscall.TIOCGETA)
>   fd = uintptr(t.out.(*os.File).Fd())
> - if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc,
> tios, 0, 0, 0); e1 != 0 {
> + if _, _, e1 := syscall.Syscall(syscall.SYS_IOCTL, fd, ioc,
> tios); e1 != 0 { e = e1
>   goto failed
>   }
> @@ -61,7 +61,7 @@
>   tios = uintptr(unsafe.Pointer())
>  
>   ioc = uintptr(syscall.TIOCSETA)
> - if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc,
> tios, 0, 0, 0); e1 != 0 {
> + if _, _, e1 := syscall.Syscall(syscall.SYS_IOCTL, fd, ioc,
> tios); e1 != 0 { e = e1
>   goto failed
>   }
> @@ -94,7 +94,7 @@
>   fd := uintptr(t.out.(*os.File).Fd())
>   ioc := uintptr(syscall.TIOCSETAF)
>   tios := uintptr(unsafe.Pointer(t.tiosp))
> - syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc, tios,
> 0, 0, 0)
> + syscall.Syscall(syscall.SYS_IOCTL, fd, ioc, tios)
>   t.out.(*os.File).Close()
>   }
>   if t.in != nil {
> @@ -108,8 +108,8 @@
>   dim := [4]uint16{}
>   dimp := uintptr(unsafe.Pointer())
>   ioc := uintptr(syscall.TIOCGWINSZ)
> - if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL,
> - fd, ioc, dimp, 0, 0, 0); err != 0 {
> + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL,
> + fd, ioc, dimp); err != 0 {
>   return -1, -1, err
>   }
>   return int(dim[1]), int(dim[0]), nil
>

[editor/micro] stopped working

2024-04-07 Thread Rob Schmersel 
Hi,

Since awhile ago the micro editor (editor/micro) stopped working on
OpenBSD with the following error:

> fatboy$ micro
> function not implemented
> Fatal: Micro could not initialize a Screen.

I tracked it down to the use of syscall in the tcell package file
tscreen_bsd.go (line 46)


 >   fd = uintptr(t.out.(*os.File).Fd())
 >   if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc,
 >   tios, 0, 0, 0); e1 != 0 { e = e1
 >   goto failed
 >   }

Not surprisingly since the syscall interface went the way of the dodo:
https://github.com/golang/go/issues/63900

I've got no clue on how to handle this though, anybody here has??

BR/Rob

Re: [Fwd: Register me]

2024-01-21 Thread Rob Schmersel 
On Sun, 21 Jan 2024 13:12:55 -
beecdadd...@danwin1210.de wrote:

>  Original Message
>  Subject: Register me
> From:beecdadd...@danwin1210.de
> Date:Fri, January 19, 2024 1:24 pm
> To:  ports@openbsd.org
> --
> 
> register me please
> 
> 

See here how to subscriber to openbsd mailing lists:
https://www.openbsd.org/mail.html

BR/Rob

Re: [UPDATE]devel/geany to 1.38

2023-10-12 Thread Rob Schmersel 
On Wed, 11 Oct 2023 19:55:09 +0200
Rob Schmersel  wrote:

> On Sun, 24 Sep 2023 14:36:03 +0200
> Rob Schmersel  wrote:
> 
> ping 
> 
> > Hi,
> > 
> > Simple update of geany to version 1.38 (updated PLIST and checked
> > dependencies). Left in the patch as it was still applying cleanly
> > but am not sure it is still needed. Builds and runs fine on AMD64
> > 
> > BR/Rob
> > 

There is an OK from the maintainer:
> From: Victor Kukshiev 
> To: Rob Schmersel 
> Subject: Re: [UPDATE]devel/geany to 1.38
> Date: Wed, 11 Oct 2023 21:46:44 +0300
> 
> ok, apply
> 
> ср, 11 окт. 2023 г. в 20:55, Rob Schmersel :



> On Sun, 24 Sep 2023 14:36:03 +0200
> Rob Schmersel  wrote:
>
> ping
>  
> > Hi,


> > diff --git a/devel/geany/Makefile b/devel/geany/Makefile
> > index 5d8b10aa0a1..5db5eaecff7 100644
> > --- a/devel/geany/Makefile
> > +++ b/devel/geany/Makefile
> > @@ -1,7 +1,6 @@
> >  COMMENT=   small and lightweight IDE
> >  
> > -DISTNAME = geany-1.36
> > -REVISION = 4
> > +DISTNAME = geany-1.38
> >  SHARED_LIBS +=  geany 0.0 # 0.0
> >  
> >  CATEGORIES=devel
> > @@ -30,6 +29,7 @@ WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3
> > harfbuzz iconv intl m WANTLIB += pango-1.0 pangocairo-1.0
> > pangoft2-1.0 pcre2-8 pixman-1 WANTLIB += png pthread
> > ${COMPILER_LIBCXX} xcb xcb-render xcb-shm WANTLIB += z fribidi Xau
> > Xdmcp execinfo jpeg +WANTLIB += atspi dbus-1
> >  
> >  LIB_DEPENDS=   x11/gtk+3
> >  RUN_DEPENDS=   devel/desktop-file-utils \
> > diff --git a/devel/geany/distinfo b/devel/geany/distinfo
> > index ab0bb601563..fd948f37358 100644
> > --- a/devel/geany/distinfo
> > +++ b/devel/geany/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (geany-1.36.tar.bz2) =
> > kYTdPdQLe4T8pwCDKEu52/LugCK/K+BmvcNlktkJ1T4= -SIZE
> > (geany-1.36.tar.bz2) = 4644521 +SHA256 (geany-1.38.tar.bz2) =
> > q/8Xbk1IvqNe5TA3xJyC+QttTCPmmu1uSlyozNOq1UY= +SIZE
> > (geany-1.38.tar.bz2) = 4860717 diff --git a/devel/geany/pkg/PLIST
> > b/devel/geany/pkg/PLIST index 15bec297f9c..d5eb8aaa7c1 100644
> > --- a/devel/geany/pkg/PLIST
> > +++ b/devel/geany/pkg/PLIST
> > @@ -22,6 +22,7 @@ include/geany/pluginutils.h
> >  include/geany/prefs.h
> >  include/geany/project.h
> >  include/geany/scintilla/
> > +include/geany/scintilla/Compat.h
> >  include/geany/scintilla/SciLexer.h
> >  include/geany/scintilla/Sci_Position.h
> >  include/geany/scintilla/Scintilla.h
> > @@ -43,12 +44,12 @@ include/geany/toolbar.h
> >  include/geany/ui_utils.h
> >  include/geany/utils.h
> >  lib/geany/
> > -lib/geany/classbuilder.so
> > -lib/geany/export.so
> > -lib/geany/filebrowser.so
> > -lib/geany/htmlchars.so
> > -lib/geany/saveactions.so
> > -lib/geany/splitwindow.so
> > +@so lib/geany/classbuilder.so
> > +@so lib/geany/export.so
> > +@so lib/geany/filebrowser.so
> > +@so lib/geany/htmlchars.so
> > +@so lib/geany/saveactions.so
> > +@so lib/geany/splitwindow.so
> >  lib/libgeany.la
> >  @lib lib/libgeany.so.${LIBgeany_VERSION}
> >  lib/pkgconfig/geany.pc
> > @@ -96,6 +97,7 @@ share/geany/filedefs/filetypes.Graphviz.conf
> >  share/geany/filedefs/filetypes.Groovy.conf
> >  share/geany/filedefs/filetypes.JSON.conf
> >  share/geany/filedefs/filetypes.Kotlin.conf
> > +share/geany/filedefs/filetypes.Meson.conf
> >  share/geany/filedefs/filetypes.Nim.conf
> >  share/geany/filedefs/filetypes.Scala.conf
> >  share/geany/filedefs/filetypes.Swift.conf
> > @@ -107,6 +109,7 @@ share/geany/filedefs/filetypes.ada
> >  share/geany/filedefs/filetypes.asciidoc
> >  share/geany/filedefs/filetypes.asm
> >  share/geany/filedefs/filetypes.batch
> > +share/geany/filedefs/filetypes.bibtex
> >  share/geany/filedefs/filetypes.c
> >  share/geany/filedefs/filetypes.caml
> >  share/geany/filedefs/filetypes.cmake
> > @@ -133,6 +136,7 @@ share/geany/filedefs/filetypes.haxe
> >  share/geany/filedefs/filetypes.html
> >  share/geany/filedefs/filetypes.java
> >  share/geany/filedefs/filetypes.javascript
> > +share/geany/filedefs/filetypes.julia
> >  share/geany/filedefs/filetypes.latex
> >  share/geany/filedefs/filetypes.lisp
> >  share/geany/filedefs/filetypes.lua
> > @@ -152,6 +156,7 @@ share/geany/filedefs/filetypes.restructuredtext
> >  share/geany/filedefs/filetypes.ruby
> >  share/geany/filedefs/filetypes.rust
> >  share/geany/filedefs/filetypes.sh
> > +share/geany/filedefs/filetypes.smalltalk
> >  share/geany/filedefs/filetypes.sql
> >  share/geany/filedefs/filetypes.tcl
> >  share/geany/filedefs/filetypes.txt2tags
> > @@ -258,6 +263,7 @@ share/locale/he/LC_MESSAGES/geany.mo
> >  share/locale/hi/LC_MESSAGES/geany.mo
> >  share/locale/hu/LC_MESSAGES/geany.mo
> >  share/locale/id/LC_MESSAGES/geany.mo
> > +share/locale/ie/LC_MESSAGES/geany.mo
> >  share/locale/it/LC_MESSAGES/geany.mo
> >  share/locale/ja/LC_MESSAGES/geany.mo
> >  share/locale/kk/LC_MESSAGES/geany.mo
> >   
>

Re: [UPDATE]devel/geany to 1.38

2023-10-11 Thread Rob Schmersel 
On Sun, 24 Sep 2023 14:36:03 +0200
Rob Schmersel  wrote:

ping 

> Hi,
> 
> Simple update of geany to version 1.38 (updated PLIST and checked
> dependencies). Left in the patch as it was still applying cleanly but
> am not sure it is still needed. Builds and runs fine on AMD64
> 
> BR/Rob
> 
> diff --git a/devel/geany/Makefile b/devel/geany/Makefile
> index 5d8b10aa0a1..5db5eaecff7 100644
> --- a/devel/geany/Makefile
> +++ b/devel/geany/Makefile
> @@ -1,7 +1,6 @@
>  COMMENT= small and lightweight IDE
>  
> -DISTNAME =   geany-1.36
> -REVISION =   4
> +DISTNAME =   geany-1.38
>  SHARED_LIBS +=  geany 0.0 # 0.0
>  
>  CATEGORIES=  devel
> @@ -30,6 +29,7 @@ WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3
> harfbuzz iconv intl m WANTLIB += pango-1.0 pangocairo-1.0
> pangoft2-1.0 pcre2-8 pixman-1 WANTLIB += png pthread
> ${COMPILER_LIBCXX} xcb xcb-render xcb-shm WANTLIB += z fribidi Xau
> Xdmcp execinfo jpeg +WANTLIB += atspi dbus-1
>  
>  LIB_DEPENDS= x11/gtk+3
>  RUN_DEPENDS= devel/desktop-file-utils \
> diff --git a/devel/geany/distinfo b/devel/geany/distinfo
> index ab0bb601563..fd948f37358 100644
> --- a/devel/geany/distinfo
> +++ b/devel/geany/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (geany-1.36.tar.bz2) =
> kYTdPdQLe4T8pwCDKEu52/LugCK/K+BmvcNlktkJ1T4= -SIZE
> (geany-1.36.tar.bz2) = 4644521 +SHA256 (geany-1.38.tar.bz2) =
> q/8Xbk1IvqNe5TA3xJyC+QttTCPmmu1uSlyozNOq1UY= +SIZE
> (geany-1.38.tar.bz2) = 4860717 diff --git a/devel/geany/pkg/PLIST
> b/devel/geany/pkg/PLIST index 15bec297f9c..d5eb8aaa7c1 100644
> --- a/devel/geany/pkg/PLIST
> +++ b/devel/geany/pkg/PLIST
> @@ -22,6 +22,7 @@ include/geany/pluginutils.h
>  include/geany/prefs.h
>  include/geany/project.h
>  include/geany/scintilla/
> +include/geany/scintilla/Compat.h
>  include/geany/scintilla/SciLexer.h
>  include/geany/scintilla/Sci_Position.h
>  include/geany/scintilla/Scintilla.h
> @@ -43,12 +44,12 @@ include/geany/toolbar.h
>  include/geany/ui_utils.h
>  include/geany/utils.h
>  lib/geany/
> -lib/geany/classbuilder.so
> -lib/geany/export.so
> -lib/geany/filebrowser.so
> -lib/geany/htmlchars.so
> -lib/geany/saveactions.so
> -lib/geany/splitwindow.so
> +@so lib/geany/classbuilder.so
> +@so lib/geany/export.so
> +@so lib/geany/filebrowser.so
> +@so lib/geany/htmlchars.so
> +@so lib/geany/saveactions.so
> +@so lib/geany/splitwindow.so
>  lib/libgeany.la
>  @lib lib/libgeany.so.${LIBgeany_VERSION}
>  lib/pkgconfig/geany.pc
> @@ -96,6 +97,7 @@ share/geany/filedefs/filetypes.Graphviz.conf
>  share/geany/filedefs/filetypes.Groovy.conf
>  share/geany/filedefs/filetypes.JSON.conf
>  share/geany/filedefs/filetypes.Kotlin.conf
> +share/geany/filedefs/filetypes.Meson.conf
>  share/geany/filedefs/filetypes.Nim.conf
>  share/geany/filedefs/filetypes.Scala.conf
>  share/geany/filedefs/filetypes.Swift.conf
> @@ -107,6 +109,7 @@ share/geany/filedefs/filetypes.ada
>  share/geany/filedefs/filetypes.asciidoc
>  share/geany/filedefs/filetypes.asm
>  share/geany/filedefs/filetypes.batch
> +share/geany/filedefs/filetypes.bibtex
>  share/geany/filedefs/filetypes.c
>  share/geany/filedefs/filetypes.caml
>  share/geany/filedefs/filetypes.cmake
> @@ -133,6 +136,7 @@ share/geany/filedefs/filetypes.haxe
>  share/geany/filedefs/filetypes.html
>  share/geany/filedefs/filetypes.java
>  share/geany/filedefs/filetypes.javascript
> +share/geany/filedefs/filetypes.julia
>  share/geany/filedefs/filetypes.latex
>  share/geany/filedefs/filetypes.lisp
>  share/geany/filedefs/filetypes.lua
> @@ -152,6 +156,7 @@ share/geany/filedefs/filetypes.restructuredtext
>  share/geany/filedefs/filetypes.ruby
>  share/geany/filedefs/filetypes.rust
>  share/geany/filedefs/filetypes.sh
> +share/geany/filedefs/filetypes.smalltalk
>  share/geany/filedefs/filetypes.sql
>  share/geany/filedefs/filetypes.tcl
>  share/geany/filedefs/filetypes.txt2tags
> @@ -258,6 +263,7 @@ share/locale/he/LC_MESSAGES/geany.mo
>  share/locale/hi/LC_MESSAGES/geany.mo
>  share/locale/hu/LC_MESSAGES/geany.mo
>  share/locale/id/LC_MESSAGES/geany.mo
> +share/locale/ie/LC_MESSAGES/geany.mo
>  share/locale/it/LC_MESSAGES/geany.mo
>  share/locale/ja/LC_MESSAGES/geany.mo
>  share/locale/kk/LC_MESSAGES/geany.mo
>

[UPDATE]devel/geany to 1.38

2023-09-24 Thread Rob Schmersel 
Hi,

Simple update of geany to version 1.38 (updated PLIST and checked
dependencies). Left in the patch as it was still applying cleanly but
am not sure it is still needed. Builds and runs fine on AMD64

BR/Rob

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 5d8b10aa0a1..5db5eaecff7 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,7 +1,6 @@
 COMMENT=   small and lightweight IDE
 
-DISTNAME = geany-1.36
-REVISION = 4
+DISTNAME = geany-1.38
 SHARED_LIBS +=  geany 0.0 # 0.0
 
 CATEGORIES=devel
@@ -30,6 +29,7 @@ WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz 
iconv intl m
 WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB += png pthread ${COMPILER_LIBCXX} xcb xcb-render xcb-shm
 WANTLIB += z fribidi Xau Xdmcp execinfo jpeg
+WANTLIB += atspi dbus-1
 
 LIB_DEPENDS=   x11/gtk+3
 RUN_DEPENDS=   devel/desktop-file-utils \
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index ab0bb601563..fd948f37358 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geany-1.36.tar.bz2) = kYTdPdQLe4T8pwCDKEu52/LugCK/K+BmvcNlktkJ1T4=
-SIZE (geany-1.36.tar.bz2) = 4644521
+SHA256 (geany-1.38.tar.bz2) = q/8Xbk1IvqNe5TA3xJyC+QttTCPmmu1uSlyozNOq1UY=
+SIZE (geany-1.38.tar.bz2) = 4860717
diff --git a/devel/geany/pkg/PLIST b/devel/geany/pkg/PLIST
index 15bec297f9c..d5eb8aaa7c1 100644
--- a/devel/geany/pkg/PLIST
+++ b/devel/geany/pkg/PLIST
@@ -22,6 +22,7 @@ include/geany/pluginutils.h
 include/geany/prefs.h
 include/geany/project.h
 include/geany/scintilla/
+include/geany/scintilla/Compat.h
 include/geany/scintilla/SciLexer.h
 include/geany/scintilla/Sci_Position.h
 include/geany/scintilla/Scintilla.h
@@ -43,12 +44,12 @@ include/geany/toolbar.h
 include/geany/ui_utils.h
 include/geany/utils.h
 lib/geany/
-lib/geany/classbuilder.so
-lib/geany/export.so
-lib/geany/filebrowser.so
-lib/geany/htmlchars.so
-lib/geany/saveactions.so
-lib/geany/splitwindow.so
+@so lib/geany/classbuilder.so
+@so lib/geany/export.so
+@so lib/geany/filebrowser.so
+@so lib/geany/htmlchars.so
+@so lib/geany/saveactions.so
+@so lib/geany/splitwindow.so
 lib/libgeany.la
 @lib lib/libgeany.so.${LIBgeany_VERSION}
 lib/pkgconfig/geany.pc
@@ -96,6 +97,7 @@ share/geany/filedefs/filetypes.Graphviz.conf
 share/geany/filedefs/filetypes.Groovy.conf
 share/geany/filedefs/filetypes.JSON.conf
 share/geany/filedefs/filetypes.Kotlin.conf
+share/geany/filedefs/filetypes.Meson.conf
 share/geany/filedefs/filetypes.Nim.conf
 share/geany/filedefs/filetypes.Scala.conf
 share/geany/filedefs/filetypes.Swift.conf
@@ -107,6 +109,7 @@ share/geany/filedefs/filetypes.ada
 share/geany/filedefs/filetypes.asciidoc
 share/geany/filedefs/filetypes.asm
 share/geany/filedefs/filetypes.batch
+share/geany/filedefs/filetypes.bibtex
 share/geany/filedefs/filetypes.c
 share/geany/filedefs/filetypes.caml
 share/geany/filedefs/filetypes.cmake
@@ -133,6 +136,7 @@ share/geany/filedefs/filetypes.haxe
 share/geany/filedefs/filetypes.html
 share/geany/filedefs/filetypes.java
 share/geany/filedefs/filetypes.javascript
+share/geany/filedefs/filetypes.julia
 share/geany/filedefs/filetypes.latex
 share/geany/filedefs/filetypes.lisp
 share/geany/filedefs/filetypes.lua
@@ -152,6 +156,7 @@ share/geany/filedefs/filetypes.restructuredtext
 share/geany/filedefs/filetypes.ruby
 share/geany/filedefs/filetypes.rust
 share/geany/filedefs/filetypes.sh
+share/geany/filedefs/filetypes.smalltalk
 share/geany/filedefs/filetypes.sql
 share/geany/filedefs/filetypes.tcl
 share/geany/filedefs/filetypes.txt2tags
@@ -258,6 +263,7 @@ share/locale/he/LC_MESSAGES/geany.mo
 share/locale/hi/LC_MESSAGES/geany.mo
 share/locale/hu/LC_MESSAGES/geany.mo
 share/locale/id/LC_MESSAGES/geany.mo
+share/locale/ie/LC_MESSAGES/geany.mo
 share/locale/it/LC_MESSAGES/geany.mo
 share/locale/ja/LC_MESSAGES/geany.mo
 share/locale/kk/LC_MESSAGES/geany.mo

Re: [NEW] sysutils/wdfs-fuse

2022-06-18 Thread Rob Schmersel 
On Sat, 18 Jun 2022 13:27:06 +0200
Rubén Llorente  wrote:

> On Wed, Jun 15, 2022 at 01:33:55AM +, Yifei Zhan wrote:
> > On 22/06/14 08:20PM, Rub?n Llorente wrote:  
> > > Does anybody think this port is ripe for import? Performance is
> > > not good but so far I have no experienced any errors with this
> > > one.  
> > 
> > - glib-2.0 is missing from WANTLIB, this is discovered 
> >   using `make port-lib-depends-check`, tweaked version attached.
> > 
> > - build ok on both amd64 and arm64, but I don't have a WebDAV
> > server nearby so can't test further. also seems like the only way
> > of setting up a WebDAV server on OpenBSD with ports is by using 
> >   Next/OwnCloud? I wonder if there is a simpler way... ^^;
> >   
> 
> If all you want to do is test, you can get an account from any free
> Nextcloud provider.
> 
> This one comes to mind: https://woelkli.com/en
> 

or  install rclone which allows to run a simple webdav server:
rclone serve webdav /srv/http

Re: [UPDATE] deluge - python 3.8 compatibility

2021-10-26 Thread Rob Schmersel 
On Sat, 16 Oct 2021 11:41:55 +0200
Rafael Sadowski  wrote:

> On Mon Oct 11, 2021 at 01:57:27PM +0200, Rob Schmersel wrote:
> > Hi,
> > 
> > My first attempt to update a port (thanks @sthen for the guidance).
> > Updated deluge to include the following fixes to get it starting up
> > without errors in python >= 3.8
> > 
> > [Logging] Fix Python 3.8 compatibility: 
> > https://git.deluge-torrent.org/deluge/commit/?h=develop=351664ec071daa04161577c6a1c949ed0f2c3206
> > 
> > [Logging] Fix findCaller with unknown source: 
> > https://git.deluge-torrent.org/deluge/commit/?h=develop=5e06aee5c8846f94bd5fcc209132dacf06de781f
> > 
> > Fix warning related to gettext: 
> > https://git.deluge-torrent.org/deluge/commit/?h=develop=d6c96d629183e8bab2167ef56457f994017e7c85
> > 
> > 
> > BR/Rob  
> 
> This fix my issue, thanks
> 
> $ deluge
> Unable to initialize gettext/locale!
> 'ngettext'
> Traceback (most recent call last):
>   File "/usr/local/lib/python3.8/site-packages/deluge/i18n/util.py",
>   line 11
>   builtins.__dict__['_n'] = builtins.__dict__['ngettext']
> 
> OK rsadowski@

Gentle reminder. There is 1 OK.

BR/Rob

> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/deluge/Makefile,v
> > retrieving revision 1.12
> > diff -u -p -u -p -r1.12 Makefile
> > --- Makefile23 Feb 2021 19:39:31 -  1.12
> > +++ Makefile11 Oct 2021 10:17:18 -
> > @@ -4,7 +4,7 @@ COMMENT =   bittorrent client
> >  
> >  DISTNAME = deluge-${MODPY_EGG_VERSION}
> >  MODPY_EGG_VERSION =2.0.3
> > -REVISION = 2
> > +REVISION = 3
> >  
> >  CATEGORIES =   net
> >  
> > cvs server: Diffing pkg
> > Index: patches/patch-deluge_i18n_util_py
> > ===
> > RCS file: patches/patch-deluge_i18n_util_py
> > diff -N patches/patch-deluge_i18n_util_py
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-deluge_i18n_util_py   11 Oct 2021 10:17:18
> > - @@ -0,0 +1,14 @@
> > +$OpenBSD$
> > +
> > +Index: deluge/i18n/util.py
> > +--- deluge/i18n/util.py.orig
> >  deluge/i18n/util.py
> > +@@ -114,7 +114,7 @@ def setup_translation():
> > + # Workaround for Python 2 unicode gettext (keyword
> > removed in Py3).
> > + kwargs = {} if not deluge.common.PY2 else {'unicode':
> > True}
> > + 
> > +-gettext.install(I18N_DOMAIN, translations_path,
> > names='ngettext', **kwargs) ++gettext.install(I18N_DOMAIN,
> > translations_path, names=['ngettext'], **kwargs)
> > + builtins.__dict__['_n'] = builtins.__dict__['ngettext']
> > + 
> > + libintl = None
> > Index: patches/patch-deluge_log_py
> > ===
> > RCS file: patches/patch-deluge_log_py
> > diff -N patches/patch-deluge_log_py
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-deluge_log_py 11 Oct 2021 10:17:18 -
> > @@ -0,0 +1,35 @@
> > +$OpenBSD$
> > +
> > +Index: deluge/log.py
> > +--- deluge/log.py.orig
> >  deluge/log.py
> > +@@ -86,9 +86,9 @@ class Logging(LoggingLoggerClass):
> > + def exception(self, msg, *args, **kwargs):
> > + yield LoggingLoggerClass.exception(self, msg, *args,
> > **kwargs)
> > + 
> > +-def findCaller(self, stack_info=False):  # NOQA: N802
> > ++def findCaller(self, *args, **kwargs):  # NOQA: N802
> > + f = logging.currentframe().f_back
> > +-rv = '(unknown file)', 0, '(unknown function)'
> > ++rv = ('(unknown file)', 0, '(unknown function)', None)
> > + while hasattr(f, 'f_code'):
> > + co = f.f_code
> > + filename = os.path.normcase(co.co_filename)
> > +@@ -98,12 +98,12 @@ class Logging(LoggingLoggerClass):
> > + ):
> > + f = f.f_back
> > + continue
> > +-if common.PY2:
> > +-rv = (filename, f.f_lineno, co.co_name)
> > +-else:
> > +-rv = (filename, f.f_lineno, co.co_name, None)
> > ++rv = (filename, f.f_lineno, co.co_name, None)
> > + break
> > +-return rv
> > ++if common.PY2:
> > ++return rv[:-1]
> > ++else:
> > ++return rv
> > + 
> > + 
> > + levels = {  
> 
>

[UPDATE] deluge - python 3.8 compatibility

2021-10-11 Thread Rob Schmersel 
Hi,

My first attempt to update a port (thanks @sthen for the guidance).
Updated deluge to include the following fixes to get it starting up without 
errors in python >= 3.8

[Logging] Fix Python 3.8 compatibility: 
https://git.deluge-torrent.org/deluge/commit/?h=develop=351664ec071daa04161577c6a1c949ed0f2c3206

[Logging] Fix findCaller with unknown source: 
https://git.deluge-torrent.org/deluge/commit/?h=develop=5e06aee5c8846f94bd5fcc209132dacf06de781f

Fix warning related to gettext: 
https://git.deluge-torrent.org/deluge/commit/?h=develop=d6c96d629183e8bab2167ef56457f994017e7c85


BR/Rob


Index: Makefile
===
RCS file: /cvs/ports/net/deluge/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile23 Feb 2021 19:39:31 -  1.12
+++ Makefile11 Oct 2021 10:17:18 -
@@ -4,7 +4,7 @@ COMMENT =   bittorrent client
 
 DISTNAME = deluge-${MODPY_EGG_VERSION}
 MODPY_EGG_VERSION =2.0.3
-REVISION = 2
+REVISION = 3
 
 CATEGORIES =   net
 
cvs server: Diffing pkg
Index: patches/patch-deluge_i18n_util_py
===
RCS file: patches/patch-deluge_i18n_util_py
diff -N patches/patch-deluge_i18n_util_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-deluge_i18n_util_py   11 Oct 2021 10:17:18 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: deluge/i18n/util.py
+--- deluge/i18n/util.py.orig
 deluge/i18n/util.py
+@@ -114,7 +114,7 @@ def setup_translation():
+ # Workaround for Python 2 unicode gettext (keyword removed in Py3).
+ kwargs = {} if not deluge.common.PY2 else {'unicode': True}
+ 
+-gettext.install(I18N_DOMAIN, translations_path, names='ngettext', 
**kwargs)
++gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], 
**kwargs)
+ builtins.__dict__['_n'] = builtins.__dict__['ngettext']
+ 
+ libintl = None
Index: patches/patch-deluge_log_py
===
RCS file: patches/patch-deluge_log_py
diff -N patches/patch-deluge_log_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-deluge_log_py 11 Oct 2021 10:17:18 -
@@ -0,0 +1,35 @@
+$OpenBSD$
+
+Index: deluge/log.py
+--- deluge/log.py.orig
 deluge/log.py
+@@ -86,9 +86,9 @@ class Logging(LoggingLoggerClass):
+ def exception(self, msg, *args, **kwargs):
+ yield LoggingLoggerClass.exception(self, msg, *args, **kwargs)
+ 
+-def findCaller(self, stack_info=False):  # NOQA: N802
++def findCaller(self, *args, **kwargs):  # NOQA: N802
+ f = logging.currentframe().f_back
+-rv = '(unknown file)', 0, '(unknown function)'
++rv = ('(unknown file)', 0, '(unknown function)', None)
+ while hasattr(f, 'f_code'):
+ co = f.f_code
+ filename = os.path.normcase(co.co_filename)
+@@ -98,12 +98,12 @@ class Logging(LoggingLoggerClass):
+ ):
+ f = f.f_back
+ continue
+-if common.PY2:
+-rv = (filename, f.f_lineno, co.co_name)
+-else:
+-rv = (filename, f.f_lineno, co.co_name, None)
++rv = (filename, f.f_lineno, co.co_name, None)
+ break
+-return rv
++if common.PY2:
++return rv[:-1]
++else:
++return rv
+ 
+ 
+ levels = {
Index: Makefile
===
RCS file: /cvs/ports/net/deluge/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile	23 Feb 2021 19:39:31 -	1.12
+++ Makefile	11 Oct 2021 10:17:18 -
@@ -4,7 +4,7 @@ COMMENT =	bittorrent client
 
 DISTNAME =		deluge-${MODPY_EGG_VERSION}
 MODPY_EGG_VERSION =	2.0.3
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =	net
 
Index: patches/patch-deluge_i18n_util_py
===
RCS file: patches/patch-deluge_i18n_util_py
diff -N patches/patch-deluge_i18n_util_py
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-deluge_i18n_util_py	11 Oct 2021 10:17:18 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: deluge/i18n/util.py
+--- deluge/i18n/util.py.orig
 deluge/i18n/util.py
+@@ -114,7 +114,7 @@ def setup_translation():
+ # Workaround for Python 2 unicode gettext (keyword removed in Py3).
+ kwargs = {} if not deluge.common.PY2 else {'unicode': True}
+ 
+-gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
++gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
+ builtins.__dict__['_n'] = builtins.__dict__['ngettext']
+ 
+ libintl = None
Index: patches/patch-deluge_log_py
===
RCS file: patches/patch-deluge_log_py
diff -N patches/patch-deluge_log_py
--- /dev/null	1 Jan 1970 00

Re: Errors in deluge port with python > 3.8

2021-09-23 Thread Rob Schmersel 
On Thu, 23 Sep 2021 20:21:38 +0100
Stuart Henderson  wrote:

> On 2021/09/23 12:58, rob.schmer...@bahnhof.se wrote:
> > Hi,
> > 
> > Deluge as packages is version 2.0.3 from about 2 years ago. Since
> > switching to python 3.8 there are a number of errors popping up when
> > running deluge-web:
> > 
> > fatboy$ deluge-web
> > 
> > 
> > Unable to initialize gettext/locale!
> > 'ngettext'
> > Traceback (most recent call last):
> >   File "/usr/local/lib/python3.8/site-packages/deluge/i18n/util.py",
> > line 118, in setup_translation
> > builtins.__dict__['_n'] = builtins.__dict__['ngettext']
> > KeyError: 'ngettext'
> > 
> > And one related to findCaller usage in log.py. Both of these have
> > been solved for some time now in the develop branch
> > (https://git.deluge-torrent.org/deluge/log/?h=develop). How would
> > one go about updating the port in order to include this in the
> > package (at the moment I'm manually updating after every pkg_add
> > -u). Would one need to cherry pick the commits and add them as
> > patches to the port?
> > Or would it be easier/possible to pick a time in the
> > develop branch to create a tarball to be stored somewhere and used
> > in an updated port?
> > 
> > BR/Rob
> >   
> 
> Simplest overall for OpenBSD and other OS packagers would be if
> upstream would make a new release, then we can all just update to
> that.
> 
> Otherwise, it Looks like they're fairly simple fixes? (At least the
> ngettext patch that Debian are using just adds [ ] in one line).
> In which case it's probably best to just backport the particular
> fixes. Here's roughly what you need to do:
> 
> - Checkout the ports tree if you haven't already
> 
> cd /usr/ports/net/deluge:
> make patch
> cd `make show=WRKSRC`
> cp $file $file.orig (etc; i.e. backup all edited files)
> vi deluge/i18n/util.py (etc; edit files as needed)
> cd -
> make update-patches
> cvs add patches/patch-deluge_i18n_util_py (etc)
> vi Makefile (increment REVISION; if you do this for another
> port and there is no existing REVISION then add one, starting at 0)
> cvs diff -uNp | tee /tmp/deluge.diff
> 
> Then mail that diff
> 

Will give it a shot :)

Errors in deluge port with python > 3.8

2021-09-23 Thread rob . schmersel 
Hi,

Deluge as packages is version 2.0.3 from about 2 years ago. Since
switching to python 3.8 there are a number of errors popping up when
running deluge-web:

fatboy$ deluge-web


Unable to initialize gettext/locale!
'ngettext'
Traceback (most recent call last):
  File "/usr/local/lib/python3.8/site-packages/deluge/i18n/util.py",
line 118, in setup_translation
builtins.__dict__['_n'] = builtins.__dict__['ngettext']
KeyError: 'ngettext'

And one related to findCaller usage in log.py. Both of these have been
solved for some time now in the develop branch
(https://git.deluge-torrent.org/deluge/log/?h=develop). How would one go
about updating the port in order to include this in the package (at the
moment I'm manually updating after every pkg_add -u). 
Would one need to cherry pick the commits and add them as patches to
the port?
Or would it be easier/possible to pick a time in the
develop branch to create a tarball to be stored somewhere and used in an
updated port?

BR/Rob

Re: grafana 7.4.5

2021-03-21 Thread Rob Schmersel 
On Fri, 19 Mar 2021 20:18:21 +
Stuart Henderson  wrote:

> seems to work, but I only have a simple setup and don't entirely
> know what I'm doing with this, if someone is using it more rigorously
> than this please do test.
> 
> as usual with go, this involved swearing at go.port.mk and several
> abandoned attempts over some months. the problem with this one is that
> grafana now uses go modules but doesn't work with proxy.golang.org so
> I rolled my own tar.
> 
[... snip patch ...]
> 

All my dashboards remain working after update. Tried some new plugins 
(that only work with grafana > 7) and they are working aswell with my
setup.

BR/Rob

Re: UPDATE ports/plan9/plan9port MAP_STACK patch

2018-03-10 Thread rob 
> This patch updates libthread in plan9port to be MAP_STACK compliant,
> replacing calls to malloc/free with mmap and munmap when allocating
> thread stacks.

Thanks for this, Aaron! It got those programs from plan9port working
again for me here.

Best,
Rob

Re: DPB incorrectly building all multi-packages

2016-06-19 Thread Rob 
Great, thanks for that.

This makes building devel/subversion quite painful as it means there is a 
dependency on gnome-keyring which brings in loads of cruft.  I suppose the 
answer to issues like this is submit a patch to add a pseudo flavour to disable 
specific multi-packages.

Thanks for your help, it has saved much hair pulling.

Rob

> On 19 Jun 2016, at 21:22, Stuart Henderson <s...@spacehopper.org> wrote:
> 
> On 2016/06/19 18:57, Rob wrote:
>> Hi,
>> 
>> I’ve been pulling my hair out for the past week trying to find out why I 
>> can’t build multi-packages using dpb(1) on 5.9, or rather why dpb(1) is 
>> choosing to build all of a ports sub-packages.
>> 
>> I have been trying to build databases/postgresql,-server, among other.  
>> Unfortunately, this builds all of the PostgreSQL sub packages (e.g. 
>> -plpython, -docs).  The command line I’m using is:
>> 
>> # /usr/ports/infrastructure/bin/dpb databases/postgresql,-server
>> 
>> I’ve tried searching, but I’ve been unable to find any other people 
>> reporting this problem.  Digging through the source I can see that 
>> SUBDIR=databases/postgresql gets set within DPB::Vars::run_command() when 
>> ‘make dump-vars’ is run and this shows all of the sub/multi-packages, these 
>> then get enabled and added to the build queue.  I think if 
>> SUBDIR=databases/postgresql,-server was set this would eliminate the problem.
>> 
>> Am I correct in assuming dpb(1) supports this type of pkgpath (e.g. 
>> databases/postgresql,-server)?  If so, does this functionality work as 
>> expected under a vanilla 5.9, from the release ISO or built from the 
>> OPENBSD_5_9 CVS tag?
>> 
>> thanks
>> 
>> Rob
> 
> Unless there is a "no_xx" PSEUDO_FLAVOR (not the case for postgresql),
> you can't control which parts of a multi-package port are built, whether
> using dpb or not.
> 
>

DPB incorrectly building all multi-packages

2016-06-19 Thread Rob 
Hi,

I’ve been pulling my hair out for the past week trying to find out why I can’t 
build multi-packages using dpb(1) on 5.9, or rather why dpb(1) is choosing to 
build all of a ports sub-packages.

I have been trying to build databases/postgresql,-server, among other.  
Unfortunately, this builds all of the PostgreSQL sub packages (e.g. -plpython, 
-docs).  The command line I’m using is:

# /usr/ports/infrastructure/bin/dpb databases/postgresql,-server

I’ve tried searching, but I’ve been unable to find any other people reporting 
this problem.  Digging through the source I can see that 
SUBDIR=databases/postgresql gets set within DPB::Vars::run_command() when ‘make 
dump-vars’ is run and this shows all of the sub/multi-packages, these then get 
enabled and added to the build queue.  I think if 
SUBDIR=databases/postgresql,-server was set this would eliminate the problem.

Am I correct in assuming dpb(1) supports this type of pkgpath (e.g. 
databases/postgresql,-server)?  If so, does this functionality work as expected 
under a vanilla 5.9, from the release ISO or built from the OPENBSD_5_9 CVS tag?

thanks

Rob