Re: NEW: www/tuba

[Omar Polo]

On 2024/07/05 02:48:39 +, Brian Callahan  wrote:
> Hi ports --
> 
> Attached is a new port, www/tuba. Tuba is a desktop app for browsing the 
> Fediverse.
> 
> This works OK for me on amd64. There is a small piece of runtime setup 
> which is documented here: 
> https://github.com/GeopJr/Tuba/wiki/keyring-issues -- Tuba will give you 
> this link when you launch it for the first time. This is why there are 
> RDEPS and gnome-keyring and seahorse. I can put an explanatory comment 
> in the port Makefile about this if people think it makes sense.
> 
> OK?

quickly tested, but works for me.  OK op@ with `make update-plist' since
it wants to remove the share/locale/{nb_NO,zh_Hans}/{,LC_MESSAGES/} dirs.

I'd also suggest/ask to add a symlink for the binary for folks like me
that don't use a .desktop-capable application launcher.  Diff below does
both.

(the manpage is so useless I haven't even considered to make it work as
`man tuba' too.)


Thanks,

Omar Polo

--- Makefile.orig   Tue Jul 23 16:05:38 2024
+++ MakefileTue Jul 23 16:06:10 2024
@@ -36,4 +36,7 @@
x11/gnome/seahorse \
x11/gtk+4,-guic
 
+post-install:
+   cd ${PREFIX}/bin && ln -s dev.geopjr.Tuba tuba
+
 .include 
--- pkg/PLIST.orig  Fri Jul  5 04:19:32 2024
+++ pkg/PLIST   Tue Jul 23 16:11:18 2024
@@ -1,4 +1,5 @@
 @bin bin/dev.geopjr.Tuba
+bin/tuba
 @man man/man1/dev.geopjr.Tuba.1
 share/applications/dev.geopjr.Tuba.desktop
 share/glib-2.0/schemas/dev.geopjr.Tuba.gschema.xml
@@ -30,8 +31,6 @@
 share/locale/ja/LC_MESSAGES/dev.geopjr.Tuba.mo
 share/locale/kab/LC_MESSAGES/dev.geopjr.Tuba.mo
 share/locale/ko/LC_MESSAGES/dev.geopjr.Tuba.mo
-share/locale/nb_NO/
-share/locale/nb_NO/LC_MESSAGES/
 share/locale/nb_NO/LC_MESSAGES/dev.geopjr.Tuba.mo
 share/locale/nl/LC_MESSAGES/dev.geopjr.Tuba.mo
 share/locale/oc/LC_MESSAGES/dev.geopjr.Tuba.mo
@@ -44,8 +43,6 @@
 share/locale/th/LC_MESSAGES/dev.geopjr.Tuba.mo
 share/locale/tr/LC_MESSAGES/dev.geopjr.Tuba.mo
 share/locale/uk/LC_MESSAGES/dev.geopjr.Tuba.mo
-share/locale/zh_Hans/
-share/locale/zh_Hans/LC_MESSAGES/
 share/locale/zh_Hans/LC_MESSAGES/dev.geopjr.Tuba.mo
 share/metainfo/dev.geopjr.Tuba.metainfo.xml
 @tag glib-compile-schemas

Re: NEW: cad/horizon-eda

[Omar Polo]

On 2024/07/22 11:36:32 +0100, Stuart Henderson  wrote:
> On 2024/07/20 14:34, Thomas L. wrote:
> > On Sat, 20 Jul 2024 11:50:42 +0100
> > Stuart Henderson  wrote:
> > 
> > > On 2024/07/19 22:05, Thomas L. wrote:
> > > > *second ping*
> > >
> > > Please resend the tar when pinging.
> > 
> > sure, here it is.
> 
> Thanks; sorry for the delay. I'd get rid of the DISTFILES setting which
> is a bit unusual and not necessary. Otherwise OK sthen@ if someone would
> like to import it.

haven't managed to test it yet, but had the same diff locally.  looks
fine to me, ok op@

> diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile
> index 80703fa..6ae215a 100644
> --- a/cad/horizon-eda/Makefile
> +++ b/cad/horizon-eda/Makefile
> @@ -1,11 +1,9 @@
>  COMMENT =electronic design automation package
>  
> -V =  2.6.0
>  GH_ACCOUNT = horizon-eda
>  GH_PROJECT = horizon
> -GH_TAGNAME = v${V}
> -DISTFILES =  horizon-{}${V}${EXTRACT_SUFX}
> -PKGNAME =horizon-eda-${V}
> +GH_TAGNAME = v2.6.0
> +PKGNAME =${DISTNAME:S/horizon/horizon-eda/}
>  
>  CATEGORIES = cad
>  

Re: [Maintainer Update] archivers/zpaqfranz-60.5

[Omar Polo]

On 2024/07/20 19:11:15 +0200, tux0r  wrote:
> Small update -> patch attached

committed, thanks!

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/07/21 12:06:27

Modified files:
archivers/zpaqfranz: Makefile distinfo 

Log message:
update archivers/zpaqfranz to 60.5; from MAINTAINER tux0r, thanks!

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/07/19 14:30:57

Modified files:
devel/lua-lpty : Makefile 

Log message:
improve devel/lua-lpty COMMENT; ok asou@

Re: [new] multimedia/mat2

[Omar Polo]

On 2024/07/18 15:39:13 +0100, Stuart Henderson  wrote:
> OK for op@'s tar.
>
> 
> On 2024/07/18 10:38, Jag Talon wrote:
> > Yes that's ok with me too! I think for my usage my main entry point is
> > standalone, but I know some users interact with it through GUI
> > frontends like https://apps.gnome.org/MetadataCleaner/ and
> > https://0xacab.org/jfriedli/mat2-quasar-frontend
> > 
> > But perhaps for consistency with other systems
> > https://0xacab.org/jvoisin/mat2/-/blob/master/INSTALL.md, renaming it
> > to mat2 would be best. 
> > 
> > Only FreeBSD has py-mat2, I believe.

imported, thank you!

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/07/18 08:44:02

Modified files:
multimedia : Makefile 

Log message:
+mat2

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/07/18 08:42:56

Log message:
import mat2-0.13.4

mat2 is a metadata removal tool, supporting a wide range of commonly
used file formats. It provides a Python library and a command-line
interface.

Supported formats include: avi, bmp, css, epub/ncx, flac, gif, jpeg,
m4a/mp2/mp3, mp4, odc/odf/odg/odi/odp/ods/odt, off/opus/oga/spx, pdf,
png, ppm, pptx/xlsx/docx, svg/svgz, tar/tar.gz/tar.bz2/tar.xz, tiff,
torrent, wav, wmv, zip, ...

port from Jag Talon, who is also taking MAINTAINER, thank you!
tweaks from me and sthen
ok sthen@

Status:

Vendor Tag: op
Release Tags:   op_20240718

N ports/multimedia/mat2/Makefile
N ports/multimedia/mat2/distinfo
N ports/multimedia/mat2/pkg/DESCR
N ports/multimedia/mat2/pkg/PLIST

No conflicts created by this import

Re: [new] multimedia/mat2

[Omar Polo]

On 2024/07/18 13:04:40 +0100, Stuart Henderson  wrote:
> On 2024/07/18 13:00, Omar Polo wrote:
> > On 2024/07/17 09:51:49 -0400, Jag Talon  wrote:
> > > Ping! Does this look ok to everyone?
> > 
> > with RUN_DEPENDS sorted and a tiny formatting change to DESCR it's OK
> > op@ to import.
> > 
> > Just a curiosity, why don't call it mat2 instead of py3-mat2?  I
> > understand that it also provides a library, but I guess the main
> > entrypoint is the binary bin/mat2 and so the package could be called
> > like that?
> 
> If the main use is standalone, then that probably makes sense.
> 
> >  DISTNAME = mat2-${MODPY_EGG_VERSION}
> > -PKGNAME =  py-${DISTNAME}
> >  
> >  CATEGORIES =   multimedia
> >  
> > @@ -20,14 +19,14 @@
> >  FLAVORS =  python3
> >  FLAVOR =   python3
> 
> If it doesn't have a py- prefix then please don't use FLAVOR=python3

of course, sorry for missing it.  Here's a new tarball with the packaged
called "mat2" and without FLAVORS.  If it's really used as a library too
(honsetly I haven't checked) then I'm also fine with readding the prefix
and FLAVORS.

(it's obviously ok op@ to import with or without the FLAVOR/py-prefix)



mat2.tar.gz
Description: GNU Zip compressed data

Re: [new] multimedia/mat2

[Omar Polo]

On 2024/07/17 09:51:49 -0400, Jag Talon  wrote:
> Ping! Does this look ok to everyone?

with RUN_DEPENDS sorted and a tiny formatting change to DESCR it's OK
op@ to import.

Just a curiosity, why don't call it mat2 instead of py3-mat2?  I
understand that it also provides a library, but I guess the main
entrypoint is the binary bin/mat2 and so the package could be called
like that?

I'm attaching a diff on top of your tarball just to show what I mean.
Only the first hunk is for my proposal to call it "mat2".


--- Makefile.orig   Thu Jul 18 12:54:07 2024
+++ MakefileThu Jul 18 12:55:39 2024
@@ -2,7 +2,6 @@
 
 MODPY_EGG_VERSION =0.13.4
 DISTNAME = mat2-${MODPY_EGG_VERSION}
-PKGNAME =  py-${DISTNAME}
 
 CATEGORIES =   multimedia
 
@@ -20,14 +19,14 @@
 FLAVORS =  python3
 FLAVOR =   python3
 
-RUN_DEPENDS =  graphics/libimagequant \
-   x11/gnome/librsvg \
-   graphics/gdk-pixbuf2 \
-   print/poppler \
-   audio/py-mutagen${MODPY_FLAVOR} \
+RUN_DEPENDS =  audio/py-mutagen${MODPY_FLAVOR} \
devel/py-gobject3${MODPY_FLAVOR} \
+   graphics/ffmpeg \
+   graphics/gdk-pixbuf2 \
+   graphics/libimagequant \
graphics/p5-Image-ExifTool \
-   graphics/ffmpeg
+   print/poppler \
+   x11/gnome/librsvg
 
 # Test files aren't available in PyPI
 NO_TEST =  Yes
--- pkg/DESCR.orig  Thu Jul 18 12:53:44 2024
+++ pkg/DESCR   Thu Jul 18 12:53:49 2024
@@ -1,5 +1,6 @@
 mat2 is a metadata removal tool, supporting a wide range of commonly
-used file formats. It provides a Python library and a command-line interface.
+used file formats. It provides a Python library and a command-line
+interface.
 
 Supported formats include: avi, bmp, css, epub/ncx, flac, gif, jpeg,
 m4a/mp2/mp3, mp4, odc/odf/odg/odi/odp/ods/odt, off/opus/oga/spx, pdf,

Re: UPDATE: fonts/victor-mono-1.5.6

[Omar Polo]

On 2024/07/16 17:03:59 -0600, Ashlen  wrote:
> Looks good to me, I had the same diff lying around but never did send it
> in. Thanks. :)

Thank you

> If you could drop me as MAINTAINER, though, that would help me out. I'm
> not using OpenBSD as my daily operating system and testing with
> snapshots like I used to, so I haven't been following ports@ or doing
> any ports work in general. I would've completely missed this if you
> hadn't CC'ed me.

Done in the same commit

> This should be the only port I have MAINTAINER status on.

Yes, looking at portroach it was only victor-mono


Thank you,

Omar Polo

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/07/17 05:40:35

Modified files:
fonts/victor-mono: Makefile distinfo 

Log message:
update fonts/victor-mono to 1.5.6

diff from Renato Aguiar, ok MAINTAINER Ashlen

While here remove the MAINTAINER as per their request.

Re: UPDATE: fonts/victor-mono-1.5.6

[Omar Polo]

Renato Aguiar  wrote:
> Trivial diff updating fonts/victor-mono to 1.5.6:

diff reads fine to me, but we should wait for the maintainer response
(+cc Ashlen); maybe they don't read ports@, so CC'ing is always a good
idea.

(reattaching Renato' diff for visibility.)

Index: Makefile
===
RCS file: /home/cvs/ports/fonts/victor-mono/Makefile,v
diff -u -p -r1.4 Makefile
--- Makefile15 Apr 2024 16:08:18 -  1.4
+++ Makefile16 Jul 2024 08:36:25 -
@@ -3,7 +3,7 @@ HOMEPAGE=   https://rubjo.github.io/victor
 MAINTAINER=Ashlen 
 
 MODFONT_FAMILY=victor-mono
-MODFONT_VERSION=   1.5.5
+MODFONT_VERSION=   1.5.6
 
 SITES= 
https://github.com/rubjo/victor-mono/raw/v${MODFONT_VERSION}/public/
 DISTFILES= victor-mono-${MODFONT_VERSION}{VictorMonoAll}${EXTRACT_SUFX}
Index: distinfo
===
RCS file: /home/cvs/ports/fonts/victor-mono/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- distinfo19 May 2023 10:41:39 -  1.1.1.1
+++ distinfo16 Jul 2024 08:36:25 -
@@ -1,2 +1,2 @@
-SHA256 (victor-mono-1.5.5.zip) = NCiOFspINO/HIarwxvTvPYaoWlp5F2l4e1CFPsIa/Ts=
-SIZE (victor-mono-1.5.5.zip) = 9165795
+SHA256 (victor-mono-1.5.6.zip) = 6rN3rTvMeiAml8Ak67jIco+ZeJxPCT01jz0gIFLMlJY=
+SIZE (victor-mono-1.5.6.zip) = 9190154

Re: [Maintainer Update] archivers/zpaqfranz-60.4

[Omar Polo]

tux0r  wrote:
> New (small) update. Patch attached.

Committed, thanks!

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/07/15 11:04:12

Modified files:
archivers/zpaqfranz: Makefile distinfo 

Log message:
update archivers/zpaqfranz to 60.4; from MAINTAINER tux0r, thanks!

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/07/14 22:31:21

Modified files:
graphics/imlib2: Makefile distinfo 
Removed files:
graphics/imlib2/patches: patch-src_bin_imlib2_view_c 
 patch-src_lib_amd64_blend_S 
 patch-src_lib_amd64_blend_cmod_S 

Log message:
update graphics/imlib2 to 1.12.3

bugfixes in the XPM loader and Y4M loader; add CET bits in the asm
code.

tested by jca@, tweak from brad, ok jca@

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/07/14 01:20:42

Modified files:
devel  : Makefile 

Log message:
+lua-lpty,lua{51,52,53,54}

Re: NEW: x11/qtadvanceddocking

[Omar Polo]

Rafael Sadowski  wrote:
> New dependency qtadvanceddocking-4.3.1a to update math/labplot to 2.11.
> Tested with the upcoming labplot update.
> 
> OK to import?

generally ok op@, please consider to cherry-pick nits from diff below
(makefile spacing issues and one directory removed by make update-plist.)

--- Makefile.orig   Sat Jul 13 15:56:27 2024
+++ MakefileSat Jul 13 15:57:33 2024
@@ -1,12 +1,11 @@
-
 COMMENT =  advanced docking system for Qt
 
-V = 4.3.1
+V =4.3.1
 DISTNAME = qtadvanceddocking-${V}
 
-DIST_TUPLE = github githubuser0x Qt-Advanced-Docking-System ${V} .
+DIST_TUPLE =   github githubuser0x Qt-Advanced-Docking-System ${V} .
 
-SHARED_LIBS +=  qt6advanceddocking0.0 # 0.0
+SHARED_LIBS += qt6advanceddocking0.0 # 0.0
 
 CATEGORIES =   x11 devel
 
@@ -22,10 +21,9 @@
 MODULES =  devel/cmake \
x11/qt6
 
-WRKSRC =${WRKDIR}/Qt-Advanced-Docking-System-4.3.1
+WRKSRC =   ${WRKDIR}/Qt-Advanced-Docking-System-4.3.1
 
 CONFIGURE_ARGS +=  -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-
 CONFIGURE_ARGS +=  -DADS_VERSION="${V}"
 
 MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
--- pkg/PLIST.orig  Fri Jul 12 10:27:32 2024
+++ pkg/PLIST   Sat Jul 13 16:59:31 2024
@@ -23,7 +23,6 @@
 include/qt6advanceddocking/PushButton.h
 include/qt6advanceddocking/ResizeHandle.h
 include/qt6advanceddocking/ads_globals.h
-lib/cmake/
 lib/cmake/qt6advanceddocking/
 lib/cmake/qt6advanceddocking/adsTargets${MODCMAKE_BUILD_SUFFIX}
 lib/cmake/qt6advanceddocking/adsTargets.cmake

Re: NEW: devel/lua-lpty

[Omar Polo]

ASOU Masato  wrote:
> Hi ports@,
> 
> I want to import devel/lua-lpty into the tree.
> 
> DESCR:
> lpty is a module that allows a program written in lua to open the master side 
> of
> a PTY and start a program with the slave side of the PTY as its controlling
> terminal.  The PTY may then be read from and written to, thus controlling the
> remote program.
> 
> lpty is released under the terms of the MIT license.
> 
> If you have anything to say about this, comments, bug reports,
> whatever, feel free
> to email them to g...@tset.de
> 
> ok, comments?

A few nits:

 - for new ports, please send a tarball
 - the patch is mangled and doesn't apply.
 - REVISION starts empty (i.e. no REVISION at all)
 - why only for lua 5.1?  using flavors we can provide this for all lua
   versions.
 - the distname has a name that's too generic ("version_${V}").  This
   can be a problem because it may clash with another port' distname.
   I'd use DISTFILES with the {} syntax to rename the file (see
   bsd.port.mk and grep for `minetest')
 - no need to patch the Makefile, we can use MAKE_FLAGS to override the
   variables.
 - I'd reflow the DESCR and drop the mention of the license and the
   upstream email address.
 - `make update-plist' adds the @so marker

I'm attaching a tarball with above fixed that's OK op@ to import if it
works for you, I haven't tested it at runtime.


Thanks,

Omar Polo



lua-lpty.tar.gz
Description: GNU Zip compressed data

Re: NEW: devel/intel-gmmlib

[Omar Polo]

Rafael Sadowski  wrote:
> On Sat Jul 13, 2024 at 11:25:16AM GMT, Klemens Nanni wrote:
> > Source/GmmLib/CMakeLists.txt has upstream's .so version, so I'd put 12.3
> > into the SHARED_LIBS comment.
> 
> I don#t care about the comment version. I don't see the use-case.

Sometimes it is useful at update time.  You can see the previous
upstream version and compare to the one after the update as a hint to
see whether it needs a major bump or not.  Of course it's only a hint,
but can be useful.

Unfortunately more and more projects are using as the so version the
project version which is completely useless.

Re: NEW: sysutils/libva-utils

[Omar Polo]

Rafael Sadowski  wrote:
> OK to import libva-utils-2.22.0? Yes you need libva from xenocara ;)
> 
> Comment:
> collection of tests for VA-API
> 
> Description:
> libva-utils is a collection of utilities and examples
> to exercise VA-API in accordance with the libva project.
> 
> VA-API is an open-source library and API specification,
> which provides access to graphics hardware acceleration
> capabilities for video processing. It consists of a main
> library and driver-specific acceleration backends for
> each supported hardware vendor.
> 
> Maintainer: The OpenBSD ports mailing-list 
> 
> WWW: https://github.com/intel/libva-utils

% vainfo
libva info: VA-API version 1.22.0
libva info: Trying to open /usr/X11R6/lib/modules/drivers//radeonsi_drv_video.so
libva info: Found init function __vaDriverInit_1_22
libva info: va_openDriver() returns 0
Trying display: x11
vainfo: VA-API version: 1.22 (libva 2.22.0)
vainfo: Driver version: Mesa Gallium driver 23.3.6 for AMD Radeon Graphics 
(radeonsi, renoir, LLVM 16.0.6, DRM 3.54, 7.5)
vainfo: Supported profile and entrypoints
  VAProfileMPEG2Simple: VAEntrypointVLD
  VAProfileMPEG2Main  : VAEntrypointVLD
  VAProfileVC1Simple  : VAEntrypointVLD
  VAProfileVC1Main: VAEntrypointVLD
  VAProfileVC1Advanced: VAEntrypointVLD
  VAProfileH264ConstrainedBaseline: VAEntrypointVLD
  VAProfileH264ConstrainedBaseline: VAEntrypointEncSlice
  VAProfileH264Main   : VAEntrypointVLD
  VAProfileH264Main   : VAEntrypointEncSlice
  VAProfileH264High   : VAEntrypointVLD
  VAProfileH264High   : VAEntrypointEncSlice
  VAProfileHEVCMain   : VAEntrypointVLD
  VAProfileHEVCMain   : VAEntrypointEncSlice
  VAProfileHEVCMain10 : VAEntrypointVLD
  VAProfileHEVCMain10 : VAEntrypointEncSlice
  VAProfileJPEGBaseline   : VAEntrypointVLD
  VAProfileVP9Profile0: VAEntrypointVLD
  VAProfileVP9Profile2: VAEntrypointVLD
  VAProfileNone   : VAEntrypointVideoProc

works for me :)

I've also run test_va_api, it prints a lots of OK but after a while it
hanged Xorg.

The port looks fine and it's useful, ok op@

(the alignment of some vars is a bit inconsistent, but it's not a big
deal.)

update graphics/imlib2 to 1.12.3

[Omar Polo]

small bugfix release, the changelog is:

Some loader fixes and improvements, CET support:
- XPM loader: Fix potential segv on malformed file
- XPM loader: Fix some color table parsing errors
- XPM loader: Major overhaul
- Y4M loader: add support for full range color
- Y4M loader: add support for 10-bit 4:2:0
- Add missing CET (Control-flow Enforcement Technology) bits in asm code

as I don't have any CET/IBT hardware, I'd appreciate some runtime
testing.  just testing with graphics/feh or graphics/nsxiv should be
enough.

Thanks,

Omar Polo


Index: Makefile
===
RCS file: /home/cvs/ports/graphics/imlib2/Makefile,v
diff -u -p -r1.56 Makefile
--- Makefile26 Feb 2024 10:09:13 -  1.56
+++ Makefile13 Jul 2024 11:21:44 -
@@ -1,7 +1,6 @@
 COMMENT=   image manipulation library
 
-DISTNAME=  imlib2-1.12.2
-REVISION=  1
+DISTNAME=  imlib2-1.12.3
 SHARED_LIBS=   Imlib2  9.0 # 13.2
 CATEGORIES=graphics
 
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/imlib2/distinfo,v
diff -u -p -r1.16 distinfo
--- distinfo3 Feb 2024 18:14:34 -   1.16
+++ distinfo13 Jul 2024 11:23:23 -
@@ -1,2 +1,2 @@
-SHA256 (imlib2-1.12.2.tar.gz) = 6WtDAUrJ1hoHdeKKRs97771JZUcF34RQAehJ5Eg5SBs=
-SIZE (imlib2-1.12.2.tar.gz) = 1144617
+SHA256 (imlib2-1.12.3.tar.gz) = VE94nH3++8gbXoLNdNzSvjhHroziU9QChS8ZqC8lGGs=
+SIZE (imlib2-1.12.3.tar.gz) = 1145967
Index: patches/patch-src_bin_imlib2_view_c
===
RCS file: /home/cvs/ports/graphics/imlib2/patches/patch-src_bin_imlib2_view_c,v
diff -u -p -r1.1 patch-src_bin_imlib2_view_c
--- patches/patch-src_bin_imlib2_view_c 28 Feb 2023 10:10:28 -  1.1
+++ patches/patch-src_bin_imlib2_view_c 13 Jul 2024 11:54:35 -
@@ -11,4 +11,4 @@ Index: src/bin/imlib2_view.c
 +#include 
  #include 
  #include 
- #include 
+ #include 
Index: patches/patch-src_lib_amd64_blend_S
===
RCS file: patches/patch-src_lib_amd64_blend_S
diff -N patches/patch-src_lib_amd64_blend_S
--- patches/patch-src_lib_amd64_blend_S 23 Feb 2024 11:25:04 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-Index: src/lib/amd64_blend.S
 src/lib/amd64_blend.S.orig
-+++ src/lib/amd64_blend.S
-@@ -102,6 +102,7 @@ FN_(imlib_amd64_reshade_copy_rgb_to_rgba)
- 
- 
- #define ENTER \
-+  endbr64 ; \
-   pushq %rbp  ; \
-   movq %rsp, %rbp ; \
-   pushq %rbx  ; \
Index: patches/patch-src_lib_amd64_blend_cmod_S
===
RCS file: patches/patch-src_lib_amd64_blend_cmod_S
diff -N patches/patch-src_lib_amd64_blend_cmod_S
--- patches/patch-src_lib_amd64_blend_cmod_S23 Feb 2024 11:25:04 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-Index: src/lib/amd64_blend_cmod.S
 src/lib/amd64_blend_cmod.S.orig
-+++ src/lib/amd64_blend_cmod.S
-@@ -114,6 +114,7 @@ FN_(imlib_amd64_reshade_copy_rgb_to_rgba_cmod)
- 
- 
- #define ENTER \
-+  endbr64 ; \
-   pushq %rbp  ; \
-   movq %rsp, %rbp ; \
-   pushq %rbx  ; \

Re: NEW: devel/intel-gmmlib

[Omar Polo]

Rafael Sadowski  wrote:
> OK to import intel-gmmlib-22.3.19?

can't test at runtime (amdgpu here) but looks fine.  OK op@ with chmod -x 
Makefile

> Comment:
> Intel Graphics Memory Management Library
> 
> Required by:
> intel-media-driver-24.1.5
> 
> Description:
> The Intel Graphics Memory Management Library provides device specific
> and buffer management for the Intel Graphics Compute Runtime for
> OpenCL and the Intel Media Driver for VAAPI.
> 
> Maintainer: The OpenBSD ports mailing-list 
> 
> WWW: https://01.org/intel-media-for-linux

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/07/12 12:42:06

Modified files:
devel/got  : Makefile 
Added files:
devel/got/patches: patch-tog_tog_c 

Log message:
backout tog change, makes the regress spinning indefinitely

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/07/11 04:38:39

Modified files:
devel/got  : Makefile distinfo 
devel/got/pkg  : PLIST-server 

Log message:
update got to 0.101

- improve gotwebd.8 one-line description
- adjust some SIZE_MAX bounds checks
- fix histedit -e bug where reverting all the changes caused histedit -c cycles
- show a more useful error when a reference name collides with another
- improve error message shown by 'got send' when ancestry has diverged
- fix wrong gotwebd default repository path in the manpage
- tog: fix jumping to the next commit from the diff view with the J key
- tog: fix horizontal scroll bug that draws a trailing '.'
- gotwebd: plug file descriptor leak in error path
- fix bug that prevented gotwebd from working without a config file

Re: update graphics/yacrader

[Omar Polo]

On 2024/06/19 23:58:44 +0200, Solene Rapenne  wrote:
> this was not fun to update, switch from qt5 to qt6
> and there was an issue due to variables having the
> same name as macros in sys/types.h
> 
> ok?

Please aplogize for the very late response.  It works for me and the
diff looks good.  Thank you!

ok op@

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/06/29 12:32:18

Modified files:
net/telescope  : Makefile distinfo 

Log message:
update net/telescope to 0.10.1

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/06/22 06:50:13

Modified files:
security/plass : Makefile distinfo 

Log message:
update security/plass to 1.0

Re: How to push a port?

[Omar Polo]

On 2024/06/13 20:34:24 +0200, danterobin...@tuta.io wrote:
> New to mailing lists not sure how this works, am I doing it correctly?
> I have updated a port on my local machine and would like to commit the
> port. I have committed a package update before on Gentoo but unsure of
> how to do it on OpenBSD.
> https://www.openbsd.org/faq/ports/guide.html#CommitUpdates says here I
> need a CVS account, how do I get one of those? Or someone else here can
> update the port and then I just paste the updated code or what?

Just send a diff to this mailing list with a sensible subject line (like
"update net/foo to X.Y.Z") and Cc the maintainer if there is one.

Mind the list netiquette and make sure the diff does not get mangled by
your mail client (try first to send the diff to yourself and check that
you can apply it.)

https://www.openbsd.org/mail.html

A committer will then review the diff and provide further guidance.


Here you can find some information on how to do work with CVS (making
sure the tree is updated and how to generate a diff).  The page is more
about base than ports, but the working is the same.

https://www.openbsd.org/anoncvs.html

(or you can use the git mirror on codeberg or github)


Thanks,

Omar Polo

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/06/11 02:28:58

Modified files:
net/gmid   : Tag: OPENBSD_7_5 Makefile distinfo 
net/gmid/files : Tag: OPENBSD_7_5 gmid.conf 

Log message:
update net/gmid to 2.0.5

This update fixs a logic error that can cause a DoS.

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/06/11 02:25:43

Modified files:
net/gmid   : Makefile distinfo 

Log message:
update net/gmid to 2.0.5

This update fixes a logic error that can cause a DoS.

Re: Control battery charging support in x11/kde-plasma/powerdevil

[Omar Polo]

On 2024/06/07 11:20:29 +0200, Rafael Sadowski  wrote:
> Please find below a simple patch to add control battery charging support
> in powerdevil aka KDE Plamsa - systemsettings via sysctl(2).
> 
> I would be happy if someone would take a look at the code.

never used plasma so haven't tested, but fwiw the sysctl(2) bits looks
fine to me.

> [...]
> ++#if defined(__OpenBSD__)
> ++static bool isThresholdSupported()
> ++{
> ++int mode;
> ++size_t len = sizeof(mode);
> ++int mib[] = {CTL_HW, HW_BATTERY, HW_BATTERY_CHARGEMODE};
> ++return (sysctl(mib, 3, , , NULL, 0) != -1);

I was a bit surprised by this initially.  However, you're just testing
whether the hw.battery node is available, so this seems fine to me.
Maybe add a comment just in case?  Just to save a few seconds to the
next one glancing at this.

> ++}
> ++
> ++static int getBatteryCharge(const int type)
> ++{
> ++int percentage = -1;
> ++size_t len = sizeof(percentage);
> ++int mib[] = {CTL_HW, HW_BATTERY, type};
> ++sysctl(mib, 3, , , NULL, 0);

maybe consider checking whether sysctl returns successfully here or not.
If we call this, it means that thet hw.battery node exists, so this
shouldn't be failing, but still it doesn't cost much to add an if.

> ++return percentage;
> ++}



Thanks,

Omar Polo

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/06/06 08:17:47

Modified files:
net/gmid   : Makefile distinfo 

Log message:
update net/gmid to 2.0.4

Re: update smplayer to 24.5.0 and add missing RDEP

[Omar Polo]

On 2024/05/29 11:00:24 +0200, Florian Viehweger  
wrote:
> > > While running 'make fake' i saw the following line, but it seems
> > > harmless:
> > > ./get_svn_revision.sh[8]: git: not found
> > 
> > Do the package contents change if git is installed? 
> > 
> > make package
> > make clean=fake
> > doas pkg_add git
> > make repackage
> 
> No, PLIST is not changed.
> 
> After looking at the code, I understand that get_svn_revision.sh checks
> the revision and writes that information into 2 files. This is done to
> avoid spurious rebuilds.
> 
> Since we are not checking out via git and using releases, this is not
> needed. Git rightfully fails itself as this is not a git repository.
> 
> Adding git is therefore not needed.

Yet, it could be useful to neuter it anyway.  It happened in the past
that a developer had /usr/ports has a git checkout and this was causing
some headaches building stuff since the default build directory is under
/usr/ports.

In graphics/nsxiv for example we have this to avoid patching the port.

# don't invoke git at all.
pre-build:
ln -sf /usr/bin/true ${WRKDIR}/bin/git


Just my two cents.  not saying this has to be done for smplayer too, i
honestly haven't reasoned about what can happen in this case if
/usr/ports is under git nor what happens if git is symlinked to true (or
false.)

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/06/04 05:41:27

Modified files:
net/gmid   : Makefile distinfo 
net/gmid/files : gmid.conf 

Log message:
update net/gmid to 2.0.3

while here update the default configuration, was missing a `listen
on' since the 2.x update.

update net/toxic to 0.15.1 and net/toxcore to 0.2.19

[Omar Polo]

sending both together since toxic 0.15.1 needs the latest toxcore as far
as i can see.  briefly tried, toxic seems to work but hangs on /quit
(still have to debug it), utox (the other toxcore dep) doesn't seem to
even connect.

could anyone test these more throughfully than me?  my only contact
moved to a different IM several months ago... ^^"

Index: toxcore/Makefile
===
RCS file: /home/cvs/ports/net/toxcore/Makefile,v
diff -u -p -r1.12 Makefile
--- toxcore/Makefile27 Sep 2023 14:18:37 -  1.12
+++ toxcore/Makefile30 May 2024 16:57:55 -
@@ -1,10 +1,10 @@
 COMMENT =  Tox client library
 
-V =0.2.18
+V =0.2.19
 DISTNAME = c-toxcore-$V
 PKGNAME =  ${DISTNAME:S/c-//}
 
-SHARED_LIBS += toxcore 3.0
+SHARED_LIBS += toxcore 4.0
 
 CATEGORIES =   net telephony
 
Index: toxcore/distinfo
===
RCS file: /home/cvs/ports/net/toxcore/distinfo,v
diff -u -p -r1.6 distinfo
--- toxcore/distinfo29 Apr 2022 11:37:06 -  1.6
+++ toxcore/distinfo30 May 2024 16:54:31 -
@@ -1,2 +1,2 @@
-SHA256 (c-toxcore-0.2.18.tar.gz) = 8pQFN5mIY1k+KLxqa19W8JZ19s2KKDJre8MbSDbAiUI=
-SIZE (c-toxcore-0.2.18.tar.gz) = 653247
+SHA256 (c-toxcore-0.2.19.tar.gz) = i0GPZHDbCFz1mpkVaFYTVWVW3yv0JxSPGBS3sRhihZQ=
+SIZE (c-toxcore-0.2.19.tar.gz) = 860531
Index: toxic/Makefile
===
RCS file: /home/cvs/ports/net/toxic/Makefile,v
diff -u -p -r1.20 Makefile
--- toxic/Makefile  6 May 2024 12:23:55 -   1.20
+++ toxic/Makefile  30 May 2024 17:13:58 -
@@ -1,9 +1,8 @@
 COMMENT =  ncurses-based Tox client
 
-GH_ACCOUNT =   Jfreegman
+GH_ACCOUNT =   TokTok
 GH_PROJECT =   toxic
-GH_TAGNAME =   v0.11.3
-REVISION = 2
+GH_TAGNAME =   v0.15.1
 
 CATEGORIES =   net
 
@@ -11,7 +10,7 @@ CATEGORIES =  net
 PERMIT_PACKAGE =   Yes
 
 WANTLIB += alut c config curses curl m openal png pthread intl
-WANTLIB += qrencode toxcore util z ${MODPY_WANTLIB}
+WANTLIB += qrencode toxcore util ${MODPY_WANTLIB}
 
 LIB_DEPENDS =  audio/freealut \
net/toxcore \
Index: toxic/distinfo
===
RCS file: /home/cvs/ports/net/toxic/distinfo,v
diff -u -p -r1.4 distinfo
--- toxic/distinfo  28 Feb 2022 12:51:57 -  1.4
+++ toxic/distinfo  30 May 2024 17:04:03 -
@@ -1,2 +1,2 @@
-SHA256 (toxic-0.11.3.tar.gz) = Gj/UKJhSv2TuF7mKJ1l9DY9efTyayQGAvU5jqOWuU9k=
-SIZE (toxic-0.11.3.tar.gz) = 1197252
+SHA256 (toxic-0.15.1.tar.gz) = Vs7cN7IqFBHGj9izlfQPUV1qR3m+AlQMXNSVZlyqEnw=
+SIZE (toxic-0.15.1.tar.gz) = 1246436

Re: NEW: autoconf 2.72

[Omar Polo]

On 2024/05/29 11:52:49 +0100, Kirill A. Korinsky  wrote:
> On Wed, 29 May 2024 09:14:43 +0100,
> Stuart Henderson  wrote:
> > 
> > Reattached to make it easier for anyone who wants to look.
> > 
> > I'm not familiar enough with m4 to know if the changes in
> > patch-configure make sense.
> > 

same for me, it's a bit over my head

> To make it easy for review I made diff between 2.71 and 2.72.
> 
> It seems trivial and srigthforward with expection of two hunks, both of them
> seems to related to remove check for GNU M4, and the code which is removed
> as updated to with code base which requires at least M4 1.4.8.

...but since they match what we do for 2.71 I guess it's fine :)

> [...]
> So, as far as I understand it (compiled output of m4 is quite difficult to
> understand BTW) everything is legitim and fine.
> 
> Thus, I had brifly tested in ot -current/amd64 and confirm that it works. 

Same here, I tested with a few projects I had around (make distclean;
export AUTOCONF_VERSION=2.72; ./autogen.sh && ./configure) and works
just as fine as 2.71.


Thanks!

Omar Polo

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/26 11:04:29

Modified files:
audio/amused   : Makefile distinfo 

Log message:
update audio/amused to 0.15

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/26 01:47:20

Modified files:
net/telescope  : Makefile distinfo 

Log message:
update telescope to 0.9.1

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/22 02:54:41

Modified files:
games/love/11  : Makefile 

Log message:
bump games/love/11

at least on aarch64 now it uses luajit after Makefile.inc r1.5;
with help from tb.

Re: 0ad: double datasize to avoid crashes

[Omar Polo]

On 2024/05/19 17:13:05 -0400, Thomas Frohwein  wrote:
> Can we do the same check for -lt like with chromium? The reason is that
> I don't think the datasize should be reduced if the user has set it
> higher than the 2G.

fwiw I prefer it too.

> As in this counter diff:

chiming in only for a small nitpick:

> [...]
> + if [ -x "$pyrogenesis" ] ; then
> ++  DATASIZE=$((2 * 1024 * 1024))
> ++  if [ $(ulimit -Sd) -lt ${DATASIZE} ]; then
> ++ulimit -Sd ${DATASIZE} || \
> ++  ${X11BASE}/bin/xmessage -file - -center -buttons yes:0,no:1 -default 
> no <<- _EOF
> ++Cannot increase datasize-cur to at least ${DATASIZE}
> ++Do you want to run 0.A.D. anyway?

this should really be "0 A.D." :P

> ++(If so, it may run out of memory and crash.)
> ++_EOF
> ++[ $? -eq 0 ] || exit
> ++  fi
> +   "$pyrogenesis" "$@"
> + else
> +   echo "Error: pyrogenesis not found in ($PATH)"

Re: update games/godot4

[Omar Polo]

On 2024/05/13 19:35:27 +0200, Solene Rapenne  wrote:
> I updated godot4 to see if I could run a game, it did not but here
> is the diff, not much tested
> 
> https://godotengine.org/article/maintenance-release-godot-4-2-2-and-4-1-4/

briefly tested too but works for me :p

ok op@


Thanks!

Re: [Maintainer Update] archivers/zpaqfranz-59.5

[Omar Polo]

On 2024/05/14 20:06:57 +0200, tux0r  wrote:
> Today's update replaces my patches for 59.3 and 59.4... obviously. New
> patch attached.

committed, thanks!

(and sorry for missing the previous two :p)

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/15 03:56:46

Modified files:
archivers/zpaqfranz: Makefile distinfo 

Log message:
update archivers/zpaqfranz to 59.5; from maintainer tux0r, thanks!

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/08 07:51:54

Modified files:
databases/pspg : Makefile distinfo 
databases/pspg/patches: patch-src_args_c 

Log message:
update databases/pspg to 5.8.5; regen patches

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/08 03:10:48

Modified files:
lang/clojure   : Makefile distinfo 
lang/clojure/patches: patch-clojure 
lang/clojure/pkg: DESCR 

Log message:
update lang/clojure to 1.11.3.1463

while here regen patches and tweak DESCR a bit.

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/08 02:59:39

Modified files:
devel  : Makefile 

Log message:
+luaposix,lua54

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/08 02:59:13

Modified files:
devel/luaposix : Makefile distinfo 
devel/luaposix/pkg: PLIST 
Added files:
devel/luaposix/patches: patch-ext_include__helpers_c 

Log message:
update devel/luaposix to 36.2.1; take maintainer

while here also add a lua54 flavor.

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/07 03:19:07

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
remove opensmtpd-extras*; ok sthen

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/07 03:18:08

Removed files:
mail/opensmtpd-extras: Makefile distinfo 
mail/opensmtpd-extras/patches: patch-api_mproc_c 
   patch-api_queue_api_c 
mail/opensmtpd-extras/pkg: DESCR-main DESCR-mysql DESCR-pgsql 
   DESCR-python DESCR-redis PLIST-main 
   PLIST-mysql PLIST-pgsql PLIST-python 
   PLIST-redis 

Log message:
remove opensmtpd-extras; replaced with opensmtpd-tables

ok jung and giovanni (previous maintainers)

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/07 03:17:12

Modified files:
mail   : Makefile 

Log message:
-opensmtpd-extras +opensmtpd-tables

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/05/07 03:16:41

Log message:
import opensmtpd-tables

These new packages replace the previous opensmtpd-extras.  All the
tables, except table-python which is no longer available, were
converted to the new smtpd-tables(7) protocol and won't need any
configuration change.

with gilles (upstream), improvements from sthen@
General approach ok jung@

Status:

Vendor Tag: op
Release Tags:   op_20240507

N ports/mail/opensmtpd-tables/Makefile
N ports/mail/opensmtpd-tables/Makefile.inc
N ports/mail/opensmtpd-tables/ldap/Makefile
N ports/mail/opensmtpd-tables/ldap/distinfo
N ports/mail/opensmtpd-tables/ldap/pkg/DESCR
N ports/mail/opensmtpd-tables/ldap/pkg/PLIST
N ports/mail/opensmtpd-tables/mysql/Makefile
N ports/mail/opensmtpd-tables/mysql/distinfo
N ports/mail/opensmtpd-tables/mysql/pkg/DESCR
N ports/mail/opensmtpd-tables/mysql/pkg/PLIST
N ports/mail/opensmtpd-tables/passwd/Makefile
N ports/mail/opensmtpd-tables/passwd/distinfo
N ports/mail/opensmtpd-tables/passwd/pkg/DESCR
N ports/mail/opensmtpd-tables/passwd/pkg/PLIST
N ports/mail/opensmtpd-tables/postgres/Makefile
N ports/mail/opensmtpd-tables/postgres/distinfo
N ports/mail/opensmtpd-tables/postgres/pkg/DESCR
N ports/mail/opensmtpd-tables/postgres/pkg/PLIST
N ports/mail/opensmtpd-tables/redis/Makefile
N ports/mail/opensmtpd-tables/redis/distinfo
N ports/mail/opensmtpd-tables/redis/pkg/DESCR
N ports/mail/opensmtpd-tables/redis/pkg/PLIST
N ports/mail/opensmtpd-tables/socketmap/Makefile
N ports/mail/opensmtpd-tables/socketmap/distinfo
N ports/mail/opensmtpd-tables/socketmap/pkg/DESCR
N ports/mail/opensmtpd-tables/socketmap/pkg/PLIST
N ports/mail/opensmtpd-tables/sqlite/Makefile
N ports/mail/opensmtpd-tables/sqlite/distinfo
N ports/mail/opensmtpd-tables/sqlite/pkg/DESCR
N ports/mail/opensmtpd-tables/sqlite/pkg/PLIST

No conflicts created by this import

Re: new/replace: opensmtpd-extras-* with opensmtpd-tables-*

[Omar Polo]

sorry for the delay,

On 2024/05/02 12:30:20 +0100, Stuart Henderson  wrote:
> Personally I would have done this as a plain removal of the old packages
> and ask people (via current.html and quirks obsolete_reason) to remove
> the old ones themselves, then EPOCH stuff can be avoided in the new
> ports, and we don't end up with a not-really-useful meta package lying
> around (i.e. a small amount of extra work for upgraders, but less cruft
> lying around, and the resulting ports are simpler).

Thinking more about it, let's just remove the old packages and require
some manual intenvention for the update.

I removed the EPOCH in Makefile.inc and fixed the typo in the DESCR
(thanks!).  I'll completely remove opensmtpd-extras/*.

Here's the diff only for quirks and current.  Is it ok to reserve an
obsolete_reason for this?

P.S.: I tried to use qr{opensmtpd-extra} but then it'd complains that
  the obsolete reason 66 is unused.


Thanks!

Omar Polo

Index: Makefile
===
RCS file: /home/cvs/ports/devel/quirks/Makefile,v
diff -u -p -r1.1613 Makefile
--- Makefile	1 May 2024 10:24:18 -	1.1613
+++ Makefile	2 May 2024 09:17:50 -
@@ -3,7 +3,7 @@ CATEGORIES =	devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =	quirks-7.21
+PKGNAME =	quirks-7.22
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie 
 
Index: files/Quirks.pm
===
RCS file: /home/cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -p -r1.1624 Quirks.pm
--- files/Quirks.pm	1 May 2024 10:24:18 -	1.1624
+++ files/Quirks.pm	6 May 2024 17:56:47 -
@@ -813,12 +813,12 @@ my $stem_extensions = {
 	'sendxmpp' => 'go-sendxmpp',
 	'libreddit' => 'redlib',
 	'rebar3' => 'erl25-rebar3',
+# 7.6
 	'stalwart-cli' => 'stalwart-mail',
 	'stalwart-jmap' => 'stalwart-mail',
 	'stalwart-imap' => 'stalwart-mail',
 	'stalwart-smtp' => 'stalwart-mail',
 	'BlockZone' => 'blockzone',
-# 7.6
 	'tepl' => 'libgedit-tepl',
 };
 
@@ -1924,6 +1924,7 @@ setup_obsolete_reason(
 	31 => 'mkplaylist',
 	1 => 'proteus',
 	1 => qr{^tryton},
+# 7.6
 	5 => 'py3-pyls-black',
 	5 => 'py3-python-language-server',
 	5 => 'py3-python-jsonrpc-server',
@@ -1932,6 +1933,11 @@ setup_obsolete_reason(
 	3 => 'transcode',
 	3 => 'phonon-backend-gstreamer',
 	0 => 'gone',
+	66 => 'opensmtpd-extras',
+	66 => 'opensmtpd-extras-mysql',
+	66 => 'opensmtpd-extras-pgsql',
+	66 => 'opensmtpd-extras-redis',
+	31 => 'opensmtpd-extras-python',
 );
 
 # though it's not yet used, these should be pkgnames, so that eventually
@@ -2014,6 +2020,7 @@ my $obsolete_message = {
 	63 => "outdated, unmaintained, crashes on startup",
 	64 => "dead upstream, crashes when showing the Syncthing web interface, use a browser",
 	65 => "superseded by goldendict-ng",
+	66 => "superseded by opensmtpd-table-*"
 };
 
 # ->is_base_system($handle, $state):
Index: current.html
===
RCS file: /home/cvs/www/faq/current.html,v
diff -u -p -r1.1119 current.html
--- current.html	24 Apr 2024 12:07:11 -	1.1119
+++ current.html	6 May 2024 17:38:28 -
@@ -70,6 +70,20 @@ announce policy no
 
 
 
+2024/05/02 - smtpd table protocol change
+
+The https://man.openbsd.org/smtpd.8;>smtpd(8) table protocol
+was changed to
+https://man.openbsd.org/smtpd-tables.7;>smtpd-tables(7).
+The old packages opensmtpd-extras should be removed and the
+appropriate table installed from the opensmtpd-table-*
+packages.
+For example, the passwd table is in the opensmtpd-table-passwd
+package.
+Once the new tables are installed, no changes to the configuration
+are needed.
+
+
 

Re: new/replace: opensmtpd-extras-* with opensmtpd-tables-*

[Omar Polo]

On 2024/04/30 16:10:28 +0200, Omar Polo  wrote:
> With the upcoming change in the transport layer for the tables, we've
> also taken the chance to split them into separate repositories.
> 
> The idea is to remove the current opensmtpd-extra-* packages and import
> the new set of opensmtpd-table-* packages (in the tarball attached.)
> 
> The queue, schedulers and table-python will be removed, the other
> remains the same for the end-user point of view.
> 
> (queue-{null,ram,stub} and schedule-{ram,stub} I don't think are useful
> nor really used.  If anyone is using table-python I can help adapting it,
> but they should really update to python3 and implement the stdio
> protocol.  It's amazing how easy it is to write tables now.)
> 
> The -mysql, -pgqsl and -redis package gets replaced with their
> corresponding opensmtpd-table-* package.  -main instead can't be
> migrated since it contains several tables that are now in different
> repos.
> 
> To make the migration smooth, I decided to keep opensmtpd-extras-main as
> an empty "meta" package that depends on opensmtpd-table-{ldap,passwd,
> socketmap,sqlite}.
> 
> I verified by running pkg_add -u in /usr/ports/packages/... that the
> migration is painless, but please pay attention to the quirks diff and
> @conflict and @pkgpath lines in the PLISTs.
> 
> ok to import?

Updated diff after a quirks change.

Index: devel/quirks/Makefile
===
RCS file: /home/cvs/ports/devel/quirks/Makefile,v
diff -u -p -r1.1613 Makefile
--- devel/quirks/Makefile   1 May 2024 10:24:18 -   1.1613
+++ devel/quirks/Makefile   2 May 2024 09:17:50 -
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-7.21
+PKGNAME =  quirks-7.22
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /home/cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -p -r1.1624 Quirks.pm
--- devel/quirks/files/Quirks.pm1 May 2024 10:24:18 -   1.1624
+++ devel/quirks/files/Quirks.pm2 May 2024 09:13:17 -
@@ -813,13 +813,16 @@ my $stem_extensions = {
'sendxmpp' => 'go-sendxmpp',
'libreddit' => 'redlib',
'rebar3' => 'erl25-rebar3',
+# 7.6
'stalwart-cli' => 'stalwart-mail',
'stalwart-jmap' => 'stalwart-mail',
'stalwart-imap' => 'stalwart-mail',
'stalwart-smtp' => 'stalwart-mail',
'BlockZone' => 'blockzone',
-# 7.6
'tepl' => 'libgedit-tepl',
+   'opensmtpd-extras-mysql' => 'opensmtpd-table-mysql',
+   'opensmtpd-extras-pgsql' => 'opensmtpd-table-postgres',
+   'opensmtpd-extras-redis' => 'opensmtpd-table-redis',
 };
 
 my $obsolete_reason = {};
@@ -1924,6 +1927,7 @@ setup_obsolete_reason(
31 => 'mkplaylist',
1 => 'proteus',
1 => qr{^tryton},
+# 7.6
5 => 'py3-pyls-black',
5 => 'py3-python-language-server',
5 => 'py3-python-jsonrpc-server',
@@ -1932,6 +1936,7 @@ setup_obsolete_reason(
3 => 'transcode',
3 => 'phonon-backend-gstreamer',
0 => 'gone',
+   6 => 'opensmtpd-extras-python'
 );
 
 # though it's not yet used, these should be pkgnames, so that eventually
Index: mail/opensmtpd-extras/Makefile
===
RCS file: /home/cvs/ports/mail/opensmtpd-extras/Makefile,v
diff -u -p -r1.38 Makefile
--- mail/opensmtpd-extras/Makefile  31 Jan 2024 18:00:10 -  1.38
+++ mail/opensmtpd-extras/Makefile  30 Apr 2024 13:41:28 -
@@ -1,21 +1,8 @@
-COMMENT-main=  extras for smtpd
-COMMENT-mysql= mysql based smtpd table support
-COMMENT-pgsql= postgresql based smtpd table support
-COMMENT-python=extras with python bindings for smtpd
-COMMENT-redis= redis based smtpd table support
-
-V= 6.7.1
-DISTNAME=  opensmtpd-extras-${V}
-PKGNAME-main=  ${DISTNAME}
-PKGNAME-mysql= opensmtpd-extras-mysql-${V}
-PKGNAME-pgsql= opensmtpd-extras-pgsql-${V}
-PKGNAME-python=opensmtpd-extras-python-${V}
-PKGNAME-redis= opensmtpd-extras-redis-${V}
-REVISION-main= 0
-REVISION-mysql=1
-REVISION-pgsql=1
-REVISION-python=   0
-REVISION-redis=0
+COMMENT-main=  meta package with common OpenSMTPD tables
+
+PKGNAME=   opensmtpd-extras-6.7.1
+PKGNAME-main=  ${PKGNAME}
+REVISION-main= 1
 EPOCH= 0
 
 CATEGORIES=mail
@@ -25,58 +12,21 @@ HOMEPAGE=   https://www.opensmtpd.org/
 MAINTAINER=Giovanni Bechis , \
Joerg Jung 
 
-MULTI_PA

new/replace: opensmtpd-extras-* with opensmtpd-tables-*

[Omar Polo]

With the upcoming change in the transport layer for the tables, we've
also taken the chance to split them into separate repositories.

The idea is to remove the current opensmtpd-extra-* packages and import
the new set of opensmtpd-table-* packages (in the tarball attached.)

The queue, schedulers and table-python will be removed, the other
remains the same for the end-user point of view.

(queue-{null,ram,stub} and schedule-{ram,stub} I don't think are useful
nor really used.  If anyone is using table-python I can help adapting it,
but they should really update to python3 and implement the stdio
protocol.  It's amazing how easy it is to write tables now.)

The -mysql, -pgqsl and -redis package gets replaced with their
corresponding opensmtpd-table-* package.  -main instead can't be
migrated since it contains several tables that are now in different
repos.

To make the migration smooth, I decided to keep opensmtpd-extras-main as
an empty "meta" package that depends on opensmtpd-table-{ldap,passwd,
socketmap,sqlite}.

I verified by running pkg_add -u in /usr/ports/packages/... that the
migration is painless, but please pay attention to the quirks diff and
@conflict and @pkgpath lines in the PLISTs.

ok to import?


Index: devel/quirks/Makefile
===
RCS file: /home/cvs/ports/devel/quirks/Makefile,v
diff -u -p -r1.1612 Makefile
--- devel/quirks/Makefile   25 Apr 2024 14:47:21 -  1.1612
+++ devel/quirks/Makefile   30 Apr 2024 13:35:48 -
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-7.20
+PKGNAME =  quirks-7.21
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /home/cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -p -r1.1623 Quirks.pm
--- devel/quirks/files/Quirks.pm25 Apr 2024 14:47:21 -  1.1623
+++ devel/quirks/files/Quirks.pm30 Apr 2024 13:35:15 -
@@ -813,11 +813,15 @@ my $stem_extensions = {
'sendxmpp' => 'go-sendxmpp',
'libreddit' => 'redlib',
'rebar3' => 'erl25-rebar3',
+# 7.6
'stalwart-cli' => 'stalwart-mail',
'stalwart-jmap' => 'stalwart-mail',
'stalwart-imap' => 'stalwart-mail',
'stalwart-smtp' => 'stalwart-mail',
'BlockZone' => 'blockzone',
+   'opensmtpd-extras-mysql' => 'opensmtpd-table-mysql',
+   'opensmtpd-extras-pgsql' => 'opensmtpd-table-postgres',
+   'opensmtpd-extras-redis' => 'opensmtpd-table-redis',
 };
 
 my $obsolete_reason = {};
@@ -1922,6 +1926,7 @@ setup_obsolete_reason(
31 => 'mkplaylist',
1 => 'proteus',
1 => qr{^tryton},
+# 7.6
5 => 'py3-pyls-black',
5 => 'py3-python-language-server',
5 => 'py3-python-jsonrpc-server',
@@ -1930,6 +1935,7 @@ setup_obsolete_reason(
3 => 'transcode',
3 => 'phonon-backend-gstreamer',
0 => 'gone',
+   6 => 'opensmtpd-extras-python'
 );
 
 # though it's not yet used, these should be pkgnames, so that eventually
Index: mail/opensmtpd-extras/Makefile
===
RCS file: /home/cvs/ports/mail/opensmtpd-extras/Makefile,v
diff -u -p -r1.38 Makefile
--- mail/opensmtpd-extras/Makefile  31 Jan 2024 18:00:10 -  1.38
+++ mail/opensmtpd-extras/Makefile  30 Apr 2024 13:41:28 -
@@ -1,21 +1,8 @@
-COMMENT-main=  extras for smtpd
-COMMENT-mysql= mysql based smtpd table support
-COMMENT-pgsql= postgresql based smtpd table support
-COMMENT-python=extras with python bindings for smtpd
-COMMENT-redis= redis based smtpd table support
-
-V= 6.7.1
-DISTNAME=  opensmtpd-extras-${V}
-PKGNAME-main=  ${DISTNAME}
-PKGNAME-mysql= opensmtpd-extras-mysql-${V}
-PKGNAME-pgsql= opensmtpd-extras-pgsql-${V}
-PKGNAME-python=opensmtpd-extras-python-${V}
-PKGNAME-redis= opensmtpd-extras-redis-${V}
-REVISION-main= 0
-REVISION-mysql=1
-REVISION-pgsql=1
-REVISION-python=   0
-REVISION-redis=0
+COMMENT-main=  meta package with common OpenSMTPD tables
+
+PKGNAME=   opensmtpd-extras-6.7.1
+PKGNAME-main=  ${PKGNAME}
+REVISION-main= 1
 EPOCH= 0
 
 CATEGORIES=mail
@@ -25,58 +12,21 @@ HOMEPAGE=   https://www.opensmtpd.org/
 MAINTAINER=Giovanni Bechis , \
Joerg Jung 
 
-MULTI_PACKAGES=-main -mysql -pgsql -python -redis
+MULTI_PACKAGES=-main
 
 # BSD
 PERMIT_PACKAGE=Yes
 
-WANTLIB-main=  c crypto event m pthread ssl sqlite3 z
-WANTLIB-mysql= c crypto event ssl m pthread mariadb z
-WANTLIB-pgsql= c crypto event ssl m pq
-WANTLIB-python=c 

Re: [NEW] net/crawley-v1.7.5

[Omar Polo]

On 2024/04/27 23:40:35 -0400, Russ Sharek  wrote:
> Anything else need tidying on this?

The port looks fine to me, and it's a little useful utility.

ok op@ to import

thanks!

update devel/luaposix to 36.2.1

[Omar Polo]

Noticed that we're lagging a bit behind upstream.  There have been a
few breaking changes, but skimming in the changelog nothing extreme.
The build switched to luke.

The only consumer is sysutils/lsyncd.  I've run the regression suite and
seems to be working, but I never used it before.

One patch is just to silence the massive amount of warnings clang would
issue otherwise and is a no-op in practice, the second one to work
around the lack of msglen_t in sys/msg.h.

while here i've also added the lua54 flavor.  ok?

Index: Makefile
===
RCS file: /home/cvs/ports/devel/luaposix/Makefile,v
diff -u -p -r1.26 Makefile
--- Makefile11 Mar 2022 18:50:46 -  1.26
+++ Makefile28 Apr 2024 14:35:29 -
@@ -1,20 +1,19 @@
 COMMENT=   posix library for the lua language
-V= 33.4.0
+V= 36.2.1
 DISTNAME=  luaposix-${V}
 EPOCH= 0
-REVISION=  1
 CATEGORIES=devel
 
 GH_ACCOUNT=luaposix
 GH_PROJECT=luaposix
-GH_TAGNAME=release-v${V}
+GH_TAGNAME=v${V}
 
 # MIT
 PERMIT_PACKAGE=Yes
 
 MODULES=   lang/lua
 
-FLAVORS=   lua52 lua53
+FLAVORS=   lua52 lua53 lua54
 FLAVOR?=
 
 # lua51 needs the bit32 library
@@ -22,9 +21,26 @@ FLAVOR?=
 RUN_DEPENDS=   devel/lua-bit32
 .endif
 
-CONFIGURE_STYLE=   gnu
-
-CONFIGURE_ENV+=LUA=${MODLUA_BIN}
+CONFIGURE_ARGS =   package="${GH_ACCOUNT}" \
+   version="${GH_TAGNAME}" \
+   PREFIX="${TRUEPREFIX}" \
+   LUA="${MODLUA_BIN}" \
+   LUA_INCDIR="${MODLUA_INCL_DIR}" \
+   CC="${CC}" \
+   LD="${CC}" \
+   CFLAGS="${CFLAGS}" \
+   INST_LIBDIR="${DESTDIR}${MODLUA_LIBDIR}" \
+   INST_LUADIR="${DESTDIR}${MODLUA_DATADIR}"
+
+FAKE_FLAGS +=  INST_LIBDIR="${MODLUA_LIBDIR}" \
+   INST_LUADIR="${MODLUA_DATADIR}"
+
+do-build:
+   cd "${WRKSRC}" && ${MODLUA_BIN} build-aux/luke ${CONFIGURE_ARGS}
+
+do-install:
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/luaposix
+   cd "${WRKSRC}" && ${MODLUA_BIN} build-aux/luke ${ALL_FAKE_FLAGS} install
 
 post-install:
mv ${PREFIX}/share/doc/luaposix ${MODLUA_DOCDIR}
Index: distinfo
===
RCS file: /home/cvs/ports/devel/luaposix/distinfo,v
diff -u -p -r1.8 distinfo
--- distinfo31 Aug 2016 10:11:52 -  1.8
+++ distinfo28 Apr 2024 07:51:55 -
@@ -1,2 +1,2 @@
-SHA256 (luaposix-33.4.0.tar.gz) = 5mJi9bf+HDLGXxel71/7McTRh3AZtIcKXTc+KrZSaiE=
-SIZE (luaposix-33.4.0.tar.gz) = 643523
+SHA256 (luaposix-36.2.1.tar.gz) = ROUIfNPEcFj5k0uQwAF+TPhwtxYZ+ZcH3UMwdGIt67E=
+SIZE (luaposix-36.2.1.tar.gz) = 188010
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/luaposix/pkg/PLIST,v
diff -u -p -r1.6 PLIST
--- pkg/PLIST   11 Mar 2022 18:50:46 -  1.6
+++ pkg/PLIST   28 Apr 2024 08:11:39 -
@@ -1,58 +1,41 @@
-lib/lua/${MODLUA_VERSION}/posix.a
-lib/lua/${MODLUA_VERSION}/posix.so
+lib/lua/${MODLUA_VERSION}/posix/
+@so lib/lua/${MODLUA_VERSION}/posix/ctype.so
+@so lib/lua/${MODLUA_VERSION}/posix/dirent.so
+@so lib/lua/${MODLUA_VERSION}/posix/errno.so
+@so lib/lua/${MODLUA_VERSION}/posix/fcntl.so
+@so lib/lua/${MODLUA_VERSION}/posix/fnmatch.so
+@so lib/lua/${MODLUA_VERSION}/posix/glob.so
+@so lib/lua/${MODLUA_VERSION}/posix/grp.so
+@so lib/lua/${MODLUA_VERSION}/posix/libgen.so
+@so lib/lua/${MODLUA_VERSION}/posix/poll.so
+@so lib/lua/${MODLUA_VERSION}/posix/pwd.so
+@so lib/lua/${MODLUA_VERSION}/posix/sched.so
+@so lib/lua/${MODLUA_VERSION}/posix/signal.so
+@so lib/lua/${MODLUA_VERSION}/posix/stdio.so
+@so lib/lua/${MODLUA_VERSION}/posix/stdlib.so
+lib/lua/${MODLUA_VERSION}/posix/sys/
+@so lib/lua/${MODLUA_VERSION}/posix/sys/msg.so
+@so lib/lua/${MODLUA_VERSION}/posix/sys/resource.so
+@so lib/lua/${MODLUA_VERSION}/posix/sys/socket.so
+@so lib/lua/${MODLUA_VERSION}/posix/sys/stat.so
+@so lib/lua/${MODLUA_VERSION}/posix/sys/statvfs.so
+@so lib/lua/${MODLUA_VERSION}/posix/sys/time.so
+@so lib/lua/${MODLUA_VERSION}/posix/sys/times.so
+@so lib/lua/${MODLUA_VERSION}/posix/sys/utsname.so
+@so lib/lua/${MODLUA_VERSION}/posix/sys/wait.so
+@so lib/lua/${MODLUA_VERSION}/posix/syslog.so
+@so lib/lua/${MODLUA_VERSION}/posix/termio.so
+@so lib/lua/${MODLUA_VERSION}/posix/time.so
+@so lib/lua/${MODLUA_VERSION}/posix/unistd.so
+@so lib/lua/${MODLUA_VERSION}/posix/utime.so
 share/doc/${FULLPKGNAME}/
-share/doc/${FULLPKGNAME}/examples/
-share/doc/${FULLPKGNAME}/examples/dir.lua.html
-share/doc/${FULLPKGNAME}/examples/fork.lua.html
-share/doc/${FULLPKGNAME}/examples/fork2.lua.html
-share/doc/${FULLPKGNAME}/examples/getopt.lua.html
-share/doc/${FULLPKGNAME}/examples/glob.lua.html
-share/doc/${FULLPKGNAME}/examples/limit.lua.html

Re: update net/kristall

[Omar Polo]

On 2024/04/18 23:29:20 +0200, Solene Rapenne  wrote:
> this updates kristall to latest commit
> 
> not sure if we want to keep it, we have
> many good gemini browsers nowadays and with
> much less dependencies than this one

I wouldn't remove this only due to the number of dependencies, otherwise
we could clean up a good chunk of the port tree.  It is true however
that it wasn't updated for more than two years...

It still fills a niche for folks using a lot of qt applications maybe.

In case you want to update it, here's an improved diff that:

 - fixes the shebang in doc/gem-to-man.sh
 - fixes the installation path for the manpage
 - makes sure that the CFLAGS are propagated

that is ofc ok op@ to commit if you want to go ahead with it.

It works more or less for me.  I personally hate the way it renders the
text, inter-word spacing is abnormal and makes it illegible for me, and
it doesn't render the icons inside the buttons for forward and backward
navigation and to refresh the page.


Index: Makefile
===
RCS file: /home/cvs/ports/net/kristall/Makefile,v
diff -u -p -r1.5 Makefile
--- Makefile24 Apr 2023 11:41:24 -  1.5
+++ Makefile25 Apr 2024 08:14:29 -
@@ -1,11 +1,10 @@
 COMMENT =  graphical multi-protocol navigator
 
-DISTNAME = kristall-202500
+DISTNAME = kristall-2024010500
 
 GH_ACCOUNT =   MasterQ32
 GH_PROJECT =   kristall
-GH_COMMIT =9744a24ffbf4d5ea6ad8b418d740c90336ee33b8
-REVISION = 1
+GH_COMMIT =b4c677cdb5a9d7337758bcad45db5b21e2b85280
 
 CATEGORIES =   net x11
 
@@ -30,6 +29,12 @@ LIB_DEPENDS =audio/pulseaudio \
 USE_GMAKE =Yes
 
 NO_TEST =  Yes
+
+MAKE_ENV +=KRISTALL_VERSION=${DISTNAME} \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}"
+
+FAKE_FLAGS =   mandir="${DESTDIR}${PREFIX}/man/man1"
 
 ALL_TARGET =   kristall
 
Index: distinfo
===
RCS file: /home/cvs/ports/net/kristall/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo20 Nov 2021 10:33:41 -  1.2
+++ distinfo25 Apr 2024 07:49:43 -
@@ -1,2 +1,2 @@
-SHA256 (kristall-202500-9744a24f.tar.gz) = 
LmKSQEGWbMpV5G7+Bljhbxg8IKi4mH/a6uh9IuL1qfo=
-SIZE (kristall-202500-9744a24f.tar.gz) = 22016994
+SHA256 (kristall-2024010500-b4c677cd.tar.gz) = 
NqtkRCpYcE/lXYdiWbtyNDhIrVLn84P0cV2M8ngoQDk=
+SIZE (kristall-2024010500-b4c677cd.tar.gz) = 22026147
Index: patches/patch-doc_gem-to-man_awk
===
RCS file: patches/patch-doc_gem-to-man_awk
diff -N patches/patch-doc_gem-to-man_awk
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-doc_gem-to-man_awk25 Apr 2024 07:54:09 -
@@ -0,0 +1,9 @@
+Index: doc/gem-to-man.awk
+--- doc/gem-to-man.awk.orig
 doc/gem-to-man.awk
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env -S awk -f
++#!/usr/bin/awk -f
+ 
+ BEGIN {
+ preformatted=0
Index: patches/patch-src_kristall_pro
===
RCS file: /home/cvs/ports/net/kristall/patches/patch-src_kristall_pro,v
diff -u -p -r1.2 patch-src_kristall_pro
--- patches/patch-src_kristall_pro  11 Mar 2022 19:46:12 -  1.2
+++ patches/patch-src_kristall_pro  25 Apr 2024 07:49:43 -
@@ -1,14 +0,0 @@
-Prevent git run at every ${CC} call
-
-Index: src/kristall.pro
 src/kristall.pro.orig
-+++ src/kristall.pro
-@@ -9,7 +9,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets networ
- # deprecated API in order to know how to port your code away from it.
- DEFINES += QT_DEPRECATED_WARNINGS
- 
--DEFINES += KRISTALL_VERSION="\"$(shell cd $$PWD; git describe --tags)\""
-+DEFINES += KRISTALL_VERSION="OpenBSD"
- 
- # You can also make your code fail to compile if it uses deprecated APIs.
- # In order to do so, uncomment the following line.
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/net/kristall/pkg/PLIST,v
diff -u -p -r1.3 PLIST
--- pkg/PLIST   11 Mar 2022 19:46:12 -  1.3
+++ pkg/PLIST   25 Apr 2024 08:16:19 -
@@ -1,4 +1,5 @@
 @bin bin/kristall
+@man man/man1/kristall.1
 share/applications/Kristall.desktop
 share/icons/hicolor/128x128/apps/net.random-projects.kristall.png
 share/icons/hicolor/16x16/apps/net.random-projects.kristall.png
@@ -7,5 +8,7 @@ share/icons/hicolor/64x64/apps/net.rando
 share/icons/hicolor/scalable/apps/net.random-projects.kristall.svg
 @tag update-desktop-database
 @tag gtk-update-icon-cache %D/share/icons/hicolor
+share/metainfo/
+share/metainfo/Kristall.metainfo.xml
 share/mime/packages/kristall.xml
 @tag update-mime-database

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/04/11 09:13:23

Modified files:
games/taisei   : Makefile 

Log message:
bump after math/cglm update (as only the headers are used)

also, remove BROKEN-i386 as it may build there with a newer cglm.

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/04/11 09:12:17

Modified files:
games/gnubg: Makefile 

Log message:
bump after math/cglm update (as only the headers are used)

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/04/11 09:11:34

Modified files:
math/cglm  : Makefile distinfo 
math/cglm/patches: patch-CMakeLists_txt 

Log message:
update math/cglm to 0.9.4: bugfix release

>From the upstream changelog: "Also now SSE can work without SSE2
which may not available on 32bit devices e.g. i686", so this could
fix the build failure of games/taisei on i386.

changelog: https://github.com/recp/cglm/releases/tag/v0.9.4

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/04/11 03:40:41

Modified files:
net/gmid   : Tag: OPENBSD_7_5 Makefile distinfo 

Log message:
update net/gmid to 2.0.2: bugfix release

- fixed `log access path' under chroot
- fixed config dumping (-nn)
- reworked grammar to allow semicolons after top-level statements
- don't make the log style reserved keywords (unbreaks the $common ex.)

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/04/04 13:36:04

Modified files:
net/gmid   : Makefile distinfo 

Log message:
update net/gmid to 2.0.2: bugfix release

Re: [NEW] audio/nncmpp

[Omar Polo]

On 2024/03/26 13:00:16 +, Stuart Henderson  wrote:
> On 2024/03/26 13:25, Omar Polo wrote:
> > On 2024/03/01 01:34:01 +0100, Kirill A. Korinsky  wrote:
> > > Greetings,
> > > 
> > > Here an updated versio to 2.2.1 of this new port.
> > 
> > just briefly tested since I don't use mpd anymore, but it's a nice
> > client!
> > 
> > a few tweaks, but then it's OK op@ to import
> 
> please replace
> 
> WRKSRC=   ${WRKDIR}/nncmpp
> WRKDIST=  ${WRKSRC}
> 
> with just
> 
> WRKDIST=  ${WRKDIR}/nncmpp
> 
> then it's ok

oh yeah, thanks.  I've also added -DWITH_PULSE=OFF since otherwise it
could opt-in linking to it if found.

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/26 07:14:48

Modified files:
audio  : Makefile 

Log message:
+nncmpp

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/26 07:14:12

Log message:
import nncmpp-2.1.1

nncmpp is yet another MPD client. Its specialty is running equally well
in the terminal, or as an X11 clien it will provide the same keyboard
and mouse-friendly interface.

port by Kirill A. Korinsky (kirill at korins [dot] ky)
ok/tweaks sthen@

-DWITH_PULSE=off added after the ok

Status:

Vendor Tag: op
Release Tags:   op_20240326

N ports/audio/nncmpp/Makefile
N ports/audio/nncmpp/distinfo
N ports/audio/nncmpp/patches/patch-termo_CMakeLists_txt
N ports/audio/nncmpp/pkg/DESCR
N ports/audio/nncmpp/pkg/PLIST

No conflicts created by this import

Re: [NEW] audio/nncmpp

[Omar Polo]

On 2024/03/01 01:34:01 +0100, Kirill A. Korinsky  wrote:
> Greetings,
> 
> Here an updated versio to 2.2.1 of this new port.

just briefly tested since I don't use mpd anymore, but it's a nice
client!

a few tweaks, but then it's OK op@ to import

 - COMMENT should start with a lowercase unless it's an acronym or a
   proper noun (so MPD and X11 are fine capitalized, terminal not)
 - 2.1.1.tar.gz is a filename too generic, hence the DISTNAME/DISTFILES dance
 - regen wantlib
 - the termo sublibrary does interesting stuff in its cmake file.
   TL;DR nuke gio/glib checking, add CFLAGS
   Longer: it looks for gio and glib which are optionally used for some
   demos which are not installed.  if not found however the build fails
   since it can't find iconv.
 - sort LIB_DEPENDS and remove glib2 from there as it is unused
 - regen wantlib
 - fold DESCR: the lines were too close to the 80 column for my taste

attaching a diff against your makefile and an updated tarball.

Thanks!

--- Makefile.orig   Tue Mar 26 12:00:53 2024
+++ MakefileTue Mar 26 12:25:47 2024
@@ -1,11 +1,11 @@
-COMMENT=   Terminal/X11 MPD client
+COMMENT=   terminal/X11 MPD client
 
 V= 2.1.1
 V.liberty= 969a4cfc3ea1c4d7c0327907385fc64906ed5d4c
 V.termo=   2518b53e5ae4579bf84ed58fa7a62806f64e861c
 
-PKGNAME=   nncmpp-${V}
-DISTNAME=  v${V}
+DISTNAME=  nncmpp-${V}
+DISTFILES= nncmpp-{v}${V}${EXTRACT_SUFX}
 
 CATEGORIES=audio
 
@@ -21,18 +21,20 @@
 # ISC
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   X11 Xft Xrender unistring ncursesw gio-2.0 glib-2.0
-WANTLIB+=  curl freetype fontconfig png m iconv
+WANTLIB += X11 Xft Xrender c curl curses fontconfig freetype iconv
+WANTLIB += m png pthread unistring
 
 MODULES=   devel/cmake
 
+# for iconv
+CFLAGS+=   -I${LOCALBASE}/include
+
 BUILD_DEPENDS= textproc/asciidoctor \
x11/gnome/librsvg
 
 LIB_DEPENDS =  converters/libunistring \
-   devel/glib2 \
-   net/curl \
-   graphics/png
+   graphics/png \
+   net/curl
 
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+4,-guic



nncmpp.tar.gz
Description: GNU Zip compressed data

Re: [new] devel/sbt 1.9.8

[Omar Polo]

On 2024/03/26 10:16:16 +, Stuart Henderson  wrote:
> On 2024/03/26 10:54, Kirill A. Korinsky wrote:
> > Folks,
> > 
> > this is reminder about this new port.
> 
> Here are a few small tweaks (commented diff below, new tar attached).
> With these it's ok sthen@ (need a second ok or another developer to
> import on mine).

looks fine to me, ok op@ to import.  Thanks!

maybe I'd add java to the CATEGORIES and also import it under java, your
call.

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/25 07:24:32

Modified files:
devel/meson/patches: patch-mesonbuild_dependencies_boost_py 

Log message:
fix the diff for boos.py; this matches otto@' PR upstream.  ok otto@

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/25 06:27:24

Modified files:
graphics/shaderc: Makefile distinfo 
graphics/shaderc/patches: patch-CMakeLists_txt 
  patch-glslc_test_CMakeLists_txt 

Log message:
update graphics/shaderc to 2024.0

Re: meson vs boost

[Omar Polo]

On 2024/03/22 20:12:41 +0100, Otto Moerbeek  wrote:
> How about this? If you think it's ok, I'll try to see what upstream thinks

the boost.py diff fails to apply for me, maybe it was generated against
the previous version (1.3.x)?


Index: patches/patch-mesonbuild_dependencies_boost_py
===
RCS file: 
/home/cvs/ports/devel/meson/patches/patch-mesonbuild_dependencies_boost_py,v
diff -u -p -r1.1 patch-mesonbuild_dependencies_boost_py
--- patches/patch-mesonbuild_dependencies_boost_py  25 Mar 2024 07:12:30 
-  1.1
+++ patches/patch-mesonbuild_dependencies_boost_py  25 Mar 2024 11:49:49 
-
@@ -1,13 +1,13 @@
 Index: mesonbuild/dependencies/boost.py
 --- mesonbuild/dependencies/boost.py.orig
 +++ mesonbuild/dependencies/boost.py
-@@ -609,7 +609,8 @@ class BoostDependency(SystemDependency):
- mlog.debug(f'Static {len(libs)}')
+@@ -594,7 +594,8 @@ class BoostDependency(SystemDependency):
+ # mlog.debug('- vscrt: {}'.format(vscrt))
+ libs = [x for x in libs if x.static == self.static or not 
self.explicit_static]
  libs = [x for x in libs if x.mt == self.multithreading]
- mlog.debug(f'MT {len(libs)}')
 -libs = [x for x in libs if x.version_matches(lib_vers)]
 +if not mesonlib.is_openbsd():
 +libs = [x for x in libs if x.version_matches(lib_vers)]
- mlog.debug(f'Vers {len(libs)} {lib_vers}')
  libs = [x for x in libs if x.arch_matches(self.arch)]
- mlog.debug(f'Arch {len(libs)}')
+ libs = [x for x in libs if x.vscrt_matches(vscrt)]
+ libs = [x for x in libs if x.nvsuffix != 'dll']  # Only link to 
import libraries

Re: flask 2.3.3

[Omar Polo]

On 2024/03/21 20:37:38 -0400, Daniel Dickman  wrote:
> Following on the werkzeug update, here's an update of flask. It needs the 
> updated werkzeug.
> 
> ok?

works for me; ok op@, thanks!

same nit as for werkzeug:

> -RUN_DEPENDS =devel/py-blinker${MODPY_FLAVOR} \
> - www/py-itsdangerous${MODPY_FLAVOR} \
> - www/py-jinja2${MODPY_FLAVOR} \
> - www/py-werkzeug${MODPY_FLAVOR} \
> - devel/py-click${MODPY_FLAVOR}>=8.0.0
> +MODPY_PI =   Yes
> +MODPY_PYBUILD =  flit_core
> +
> +RUN_DEPENDS =devel/py-blinker${MODPY_FLAVOR}>=1.6.2 \
> + www/py-itsdangerous${MODPY_FLAVOR}>=2.1.2 \
> + www/py-jinja2${MODPY_FLAVOR}>=3.1.2 \
> + www/py-werkzeug${MODPY_FLAVOR}>=2.3.7 \
> + devel/py-click${MODPY_FLAVOR}>=8.1.3

although they weren't sorted previously either, since you're touching
these lines anyway why don't sort them too? :)

Re: werkzeug 2.3.8

[Omar Polo]

On 2024/03/21 20:36:20 -0400, Daniel Dickman  wrote:
> Here's an update of werkzeug to 2.3.8 needed to update flask.
> 
> ok?

ok op@ with one nit below

I guess you're not jumping to 3.0.1 due to the removal of deprecated
functions?

> -TEST_DEPENDS =   devel/py-test-xprocess${MODPY_FLAVOR} \
> +RUN_DEPENDS =textproc/py-MarkupSafe${MODPY_FLAVOR}
> +
> +TEST_DEPENDS =   devel/py-greenlet${MODPY_FLAVOR} \
> + devel/py-test-xprocess${MODPY_FLAVOR} \
>   devel/py-test-timeout${MODPY_FLAVOR} \

I'd keep the entries sorted, so -xprocess after -timeout.

>   net/py-ephemeral_port_reserve${MODPY_FLAVOR} \
> + security/py-cryptography${MODPY_FLAVOR} \
> + sysutils/py-watchdog${MODPY_FLAVOR} \
>   www/py-requests${MODPY_FLAVOR}

Thanks!

Re: fix "PLIST.orig already exists"

[Omar Polo]

On 2024/03/23 16:11:04 +0100, Peter Hessler  wrote:
> this error is worthless and a waste of time, stop generating it:
>   /usr/ports/www/yt-dlp/pkg/PLIST changed but 
> /usr/ports/www/yt-dlp/pkg/PLIST.orig exists
> 
> OK?

oh yes please, it's annoying for no reason IMHO.

one small nit:

> --- infrastructure/bin/update-plist   14 May 2023 09:18:05 -  1.214
> +++ infrastructure/bin/update-plist   23 Mar 2024 15:07:59 -
> @@ -1392,7 +1392,6 @@ $self->write_new_files;
>  
>  # and now, we figure out where to move the new files
>  my @towrite = ();
> -my $cantmove = 0;
>  
>  my $exitcode = 0;
>  
> @@ -1412,22 +1411,13 @@ for my $p (@{$self->{lists}}) {
>   } else {
>   print "$k changed";

could add the \n here (or use `say')

>   push(@towrite, $k);
> - if (-f "$k$orig") {
> - print " but $k$orig exists\n";
> - $cantmove = 1;
> - } else {
> - print "\n";
> - }
> + print "\n";

instead of printing \n here now.

>   }
>   } else {
>   print "$k is new\n";
>   push(@towrite, $k);
>   }
>   }
> -}
> -
> -if ($cantmove) {
> - exit(2);
>  }
>  
>  if ($self->{state}->not) {

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/21 08:35:25

Modified files:
games/taisei   : Makefile distinfo 
Removed files:
games/taisei/patches: patch-external_koishi_src_stack_alloc_c 

Log message:
update games/taisei to 1.4.1

disable LTO to fix a crash during the bossfight of the third stage
(this issue was already present in 1.4 but not on 1.3.x)

[new] databases/postgresql-pgvector

[Omar Polo]

% pkg_info postgresql-pgvector
Information for inst:postgresql-pgvector-0.6.2

Comment:
vector similarity search for PostgreSQL

Description:
pgvector is a PostgreSQL extension which provides exact and approximate
nearest neighbor search on vectors, as well as L2 distance, inner
product, and cosine distance.

Maintainer: Omar Polo 

WWW: https://github.com/pgvector/pgvector


ok to import?



postgresql-pgvector.tar.gz
Description: GNU Zip compressed data

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/19 02:28:40

Modified files:
databases/pspg : Makefile distinfo 

Log message:
update databases/pspg to 5.8.2

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/18 03:36:49

Modified files:
devel/luarocks : Makefile distinfo 
devel/luarocks/pkg: PLIST 

Log message:
update devel/luarocks to 3.11.0

changelog: https://github.com/luarocks/luarocks/blob/master/CHANGELOG.md
This "skips" over 3.10.0.

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/18 03:08:54

Modified files:
lang/clojure   : Makefile distinfo 

Log message:
update lang/clojure to 1.11.2.1446

Re: [new] www/pipe-viewer

[Omar Polo]

On 2024/03/08 14:51:45 +, Klemens Nanni  wrote:
> Omar, with that I'm OK to import, seems safe before release.

Oops, forgot to reply here.  I have imported it a couple of days ago.
Thanks!

Re: powerpc bulk build report

[Omar Polo]

On 2024/03/10 18:42:06 +0100, Tobias Heider  wrote:
> On Sun, Mar 10, 2024 at 06:26:04PM +0100, Omar Polo wrote:
> > On 2024/03/03 20:37:45 -0700, gkoeh...@openbsd.org wrote:
> > > http://build-failures.rhaalovely.net/powerpc/2024-02-07/games/nanosaur2.log
> > 
> > : 
> > /usr/obj/ports/nanosaur2-2.1.0/Nanosaur2-2.1.0/Source/Headers/ogl_support.h:122:2:
> > : error: unknown type name 'vector'
> > : vector float v[4];
> > : ^
> > : 1 error generated.
> > 
> > I missed this failure, thanks izzy for prodding me.  I don't have a
> > powerpc to test this, but it appears if I'm grepping correctly that this
> > field is never used.
> > 
> > (no bump needed since it only fixes -hopefully- the build on powerpc
> > where it wasn't built before.)
> > 
> > The alternative, if I'm reading this[0] correctly, is to sprinkle some
> > #include  and -maltivec, but since it's not used I think it's
> > easier to just remove it.  If it works I'll upstream this as well.
> > 
> > [0]: 
> > https://gcc.gnu.org/onlinedocs/gcc/PowerPC-AltiVec_002fVSX-Built-in-Functions.html
> 
> I actually built and tested this a few weeks back. I just removed all the
> #ifdef __ppc__ blocks. Game loads but runs with ~5 fps and crashes after
> a few seconds on my powerbook G4
> 
> Do we actually support ppcs without altivec? I guess it might work better
> with altivec enabled instead.

If there are chances that it is playable with altivec enabled IMHO it
would make sense to do so since the choice is between a broken game
everywhere and something that can be played on some machines.

However, this vector doesn't seem to be used at all in the code, so I
don't see how enabling altivec here will actually change something at
runtime, although I might have missed something.

Re: powerpc bulk build report

[Omar Polo]

On 2024/03/03 20:37:45 -0700, gkoeh...@openbsd.org wrote:
> http://build-failures.rhaalovely.net/powerpc/2024-02-07/games/nanosaur2.log

: 
/usr/obj/ports/nanosaur2-2.1.0/Nanosaur2-2.1.0/Source/Headers/ogl_support.h:122:2:
: error: unknown type name 'vector'
: vector float v[4];
: ^
: 1 error generated.

I missed this failure, thanks izzy for prodding me.  I don't have a
powerpc to test this, but it appears if I'm grepping correctly that this
field is never used.

(no bump needed since it only fixes -hopefully- the build on powerpc
where it wasn't built before.)

The alternative, if I'm reading this[0] correctly, is to sprinkle some
#include  and -maltivec, but since it's not used I think it's
easier to just remove it.  If it works I'll upstream this as well.

[0]: 
https://gcc.gnu.org/onlinedocs/gcc/PowerPC-AltiVec_002fVSX-Built-in-Functions.html


Thanks!

Omar Polo


Index: patches/patch-Source_Headers_ogl_support_h
===
RCS file: patches/patch-Source_Headers_ogl_support_h
diff -N patches/patch-Source_Headers_ogl_support_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Source_Headers_ogl_support_h  10 Mar 2024 17:12:47 -
@@ -0,0 +1,16 @@
+fixes "error: unknown type name 'vector'" on powerpc; the v field is
+never used.
+
+Index: Source/Headers/ogl_support.h
+--- Source/Headers/ogl_support.h.orig
 Source/Headers/ogl_support.h
+@@ -118,9 +118,6 @@ typedef struct
+ typedef union
+ {
+   GLfloat value[16];
+-  #if defined(__ppc__)
+-  vector float v[4];
+-  #endif
+ }OGLMatrix4x4;
+ 
+ typedef struct

Re: sysutils/docker-cli: update to 25.0.3

[Omar Polo]

On 2024/03/09 10:15:55 +0100, Omar Polo  wrote:
> On 2024/02/25 14:06:27 +, Lucas Gabriel Vuotto  wrote:
> > Bump.
> 
> pinging again

i've imported it with ok rsadowski, thanks :-)

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/09 10:29:43

Modified files:
sysutils/docker-cli: Makefile distinfo 
Added files:
sysutils/docker-cli/patches: 
 
patch-cli-plugins_socket_socket_nodarwin_go 
 patch-cli-plugins_socket_socket_openbsd_go 
Removed files:
sysutils/docker-cli/patches: 
 
patch-vendor_github_com_containerd_containerd_content_local_store_unix_go 
 
patch-vendor_github_com_containerd_continuity_fs_stat_openbsd_go 
 
patch-vendor_github_com_moby_sys_mount_mounter_bsd_go 
 
patch-vendor_github_com_moby_sys_mount_mounter_openbsd_go 
 
patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go 
 
patch-vendor_github_com_tonistiigi_fsutil_fs_go 
 
patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go 
 
patch-vendor_github_com_tonistiigi_fsutil_send_go 
 
patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go 

Log message:
update docker-cli to 25.0.3

diff from from Lucas Gabriel Vuotto and Kirill A. Korinsky, thanks!
ok rsadowski

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/09 10:27:05

Log message:
import docker-compose-2.24.5

Docker Compose is a tool for running multi-container applications on
Docker defined using the Compose file format. A Compose file is used to
define how one or more containers that make up your application are
configured. Once you have a Compose file, you can create and start your
application with a single command: docker compose up.

port from Lucas Gabriel Vuotto and Kirill A. Korinsky, thank you!
ok rsadowski

Status:

Vendor Tag: op
Release Tags:   op_20240309

N ports/sysutils/docker-compose/Makefile
N ports/sysutils/docker-compose/distinfo
N 
ports/sysutils/docker-compose/patches/patch-internal_locker_runtime_unix_go
N ports/sysutils/docker-compose/patches/patch-pkg_remote_cache_unix_go
N 
ports/sysutils/docker-compose/patches/patch-vendor_github_com_moby_buildkit_cmd_buildkitd_config_gcpolicy_unix_go
N 
ports/sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go
N 
ports/sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
N 
ports/sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go
N 
ports/sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
N 
ports/sysutils/docker-compose/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
N ports/sysutils/docker-compose/pkg/DESCR
N ports/sysutils/docker-compose/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/09 10:27:41

Modified files:
sysutils   : Makefile 

Log message:
+ docker-buildx docker-compose

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/09 10:25:37

Log message:
import docker-buildx-0.12.1

buildx is a Docker CLI plugin for extended build capabilities
with BuildKit.

port from Lucas Gabriel Vuotto and Kirill A. Korinsky, thank you!
ok rsadowski

Status:

Vendor Tag: op
Release Tags:   op_20240309

N ports/sysutils/docker-buildx/Makefile
N ports/sysutils/docker-buildx/distinfo
N 
ports/sysutils/docker-buildx/patches/patch-vendor_github_com_moby_buildkit_cmd_buildkitd_config_gcpolicy_unix_go
N 
ports/sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_diskwriter_go
N 
ports/sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_fs_go
N 
ports/sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_hardlinks_go
N 
ports/sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_send_go
N 
ports/sysutils/docker-buildx/patches/patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go
N ports/sysutils/docker-buildx/pkg/DESCR
N ports/sysutils/docker-buildx/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/09 02:33:07

Modified files:
www: Makefile 

Log message:
+pipe-viewer

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/09 02:30:57

Log message:
import pipe-viewer-0.5.0

gtk-pipe-viewer is a lightweight application with a GTK interface (fork
of straw-viewer) for searching and playing videos from YouTube. This
fork parses the YouTube website directly and relies on the invidious
instances only as a fallback method.

from Stefan Moran, who is also taking MAINTAINER, thank you!
with some tweaks from me and kn, ok kn

Status:

Vendor Tag: op
Release Tags:   op_20240309

N ports/www/pipe-viewer/Makefile
N ports/www/pipe-viewer/distinfo
N ports/www/pipe-viewer/pkg/PLIST-gtk
N ports/www/pipe-viewer/pkg/DESCR-main
N ports/www/pipe-viewer/pkg/DESCR-gtk
N ports/www/pipe-viewer/pkg/PLIST-main

No conflicts created by this import

Re: sysutils/docker-cli: update to 25.0.3

[Omar Polo]

On 2024/02/25 14:06:27 +, Lucas Gabriel Vuotto  wrote:
> Bump.

pinging again

I'm reattaching the tarballs.  I made a small edit in docker-compose and
buildx to switch back to GH_*: go.port.mk has some special casing for it
and none for DIST_TUPLE and until someone brave enough will take a look,
it makes more sense to continue using GH_* with go ports for the time
being, less chances of surprises ;)

Ah, also, in docker-compose a `make update-plist' was needed to make
bin/docker-compose lose the @bin marker (it's a symlink now.)


Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/docker-cli/Makefile,v
diff -u -p -r1.9 Makefile
--- Makefile20 Nov 2022 16:14:43 -  1.9
+++ Makefile3 Mar 2024 17:41:51 -
@@ -1,10 +1,8 @@
 COMMENT =  command-line tool for controlling Docker
 
-V =20.10.21
+V =25.0.3
 
-GH_ACCOUNT =   docker
-GH_PROJECT =   cli
-GH_TAGNAME =   v${V}
+DIST_TUPLE =   github docker cli v${V} .
 PKGNAME =  docker-${DISTNAME}
 
 CATEGORIES =   sysutils
@@ -17,10 +15,12 @@ PERMIT_PACKAGE =Yes
 WANTLIB += c pthread
 
 MODULES =  lang/go
-MODGO_LDFLAGS =-X 
github.com/docker/cli/cli/version.Version=${V}
-
 GO_PKGNAME =   github.com/docker/cli
+MODGO_LDFLAGS =-X ${GO_PKGNAME}/cli/version.Version=${V}
+
+RUN_DEPENDS =  sysutils/docker-buildx
+
 WRKSRC =   ${MODGO_WORKSPACE}/src/${GO_PKGNAME}
-ALL_TARGET =   github.com/docker/cli/cmd/docker
+ALL_TARGET =   ${GO_PKGNAME}/cmd/docker
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/sysutils/docker-cli/distinfo,v
diff -u -p -r1.5 distinfo
--- distinfo20 Nov 2022 16:14:43 -  1.5
+++ distinfo3 Mar 2024 17:41:51 -
@@ -1,2 +1,2 @@
-SHA256 (cli-20.10.21.tar.gz) = 8PYsocgOj9W54UDKZO8+ddx896KAQLPRCyYDBxKJRug=
-SIZE (cli-20.10.21.tar.gz) = 7633967
+SHA256 (docker-cli-v25.0.3.tar.gz) = 
BK0M6pkqZdsgyxsNv20c4yxwXOh53lGyIJX+jSgDCBU=
+SIZE (docker-cli-v25.0.3.tar.gz) = 6864551
Index: patches/patch-cli-plugins_socket_socket_nodarwin_go
===
RCS file: patches/patch-cli-plugins_socket_socket_nodarwin_go
diff -N patches/patch-cli-plugins_socket_socket_nodarwin_go
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cli-plugins_socket_socket_nodarwin_go 3 Mar 2024 17:41:51 
-
@@ -0,0 +1,20 @@
+Avoid keeping @docker_cli_[UUID] files
+https://github.com/docker/cli/pull/4862
+
+Index: cli-plugins/socket/socket_nodarwin.go
+--- cli-plugins/socket/socket_nodarwin.go.orig
 cli-plugins/socket/socket_nodarwin.go
+@@ -1,4 +1,4 @@
+-//go:build !darwin
++//go:build !darwin && !openbsd
+ 
+ package socket
+ 
+@@ -15,5 +15,6 @@ func listen(socketname string) (*net.UnixListener, err
+ 
+ func onAccept(conn *net.UnixConn, listener *net.UnixListener) {
+   // do nothing
+-  // while on darwin we would unlink here; on non-darwin the socket is 
abstract and not present on the filesystem
++  // while on darwin and OpenBSD we would unlink here;
++  // on non-darwin the socket is abstract and not present on the 
filesystem
+ }
Index: patches/patch-cli-plugins_socket_socket_openbsd_go
===
RCS file: patches/patch-cli-plugins_socket_socket_openbsd_go
diff -N patches/patch-cli-plugins_socket_socket_openbsd_go
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cli-plugins_socket_socket_openbsd_go  3 Mar 2024 17:41:51 
-
@@ -0,0 +1,26 @@
+Avoid keeping @docker_cli_[UUID] files
+https://github.com/docker/cli/pull/4862
+
+Index: cli-plugins/socket/socket_openbsd.go
+--- cli-plugins/socket/socket_openbsd.go.orig
 cli-plugins/socket/socket_openbsd.go
+@@ -0,0 +1,19 @@
++package socket
++
++import (
++  "net"
++  "os"
++  "path/filepath"
++  "syscall"
++)
++
++func listen(socketname string) (*net.UnixListener, error) {
++  return net.ListenUnix("unix", {
++  Name: filepath.Join(os.TempDir(), socketname),
++  Net:  "unix",
++  })
++}
++
++func onAccept(conn *net.UnixConn, listener *net.UnixListener) {
++  syscall.Unlink(listener.Addr().String())
++}
Index: 
patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
===
RCS file: 
patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
diff -N 
patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
--- 
patches/patch-vendor_github_com_containerd_containerd_content_local_store_unix_go
   11 Mar 2022 19:57:21 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-Index: 

Re: [maintainer update] devel/gopls 0.15.1

[Omar Polo]

On 2024/03/08 16:49:11 +0100, Laurent Cheylus  wrote:
> Hi,
> 
> a simple update for devel/gopls port.
> Changelog: https://github.com/golang/tools/releases/tag/gopls/v0.15.1
> 
> Build and tests OK on current/amd64.

Works fine!  Committed, thanks!

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/08 12:56:29

Modified files:
devel/gopls: Makefile distinfo modules.inc 

Log message:
update devel/gopls to 0.15.1; from maintainer Laurent Cheylus, thanks!

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/06 09:19:39

Modified files:
graphics/decker/patches: patch-c_dom_h 

Log message:
add commentary to the patch

Re: [maintainer update] Bump graphics/decker 1.39 -> 1.40

[Omar Polo]

Hello,

On 2024/03/06 10:19:39 -0500, "Jag Talon"  wrote:
> Notes:
> ==
> 
> * Aside from bumping the version number, I also added a dependency to 
> xdg-utils
> to the Makefile. Apparently it's used within the app to open external links. I
> misunderstood it as only applicable to the web version of Decker which we 
> don't
> build. Now Decker is able to open external links.
> 
> * I also added a new patch called patch-c_dom_h which includes sys/wait.h in 
> the
> c/dom.h file. This allows the build to continue.

I've committed the update with devel/xdg-utils moved as RUN_DEPENDS.

As sthen explained, LIB_DEPENDS is only for ports that provides shared
libraries that this port links to.  Instead, devel/xdg-utils only
provides a command that decker needs at runtime, so it has to be a
RUN_DEPENDS.

/usr/ports/infrastructure/bin/portcheck will caught these mistakes, it's
handy to run it after building the port to catch small issues like this
one.  (tip: it's handy to add /usr/ports/infrastructe/bin to $PATH)

Also, while with CVS you can't (easily) add a directory unless you have
write access, you can still `cvs add' new files.  This is better than
attaching new files because it's easier to apply them.

`cvs -q -n up -d' will tell you the state of the directory, with ?
entries being files unknown to CVS, R files marked as removed with
`cvs rm', A files added, M files modified, etc.

I'm attaching the diff that I've actually committed.

Thanks!

Index: Makefile
===
RCS file: /home/cvs/ports/graphics/decker/Makefile,v
diff -u -p -r1.2 Makefile
--- Makefile18 Feb 2024 21:55:41 -  1.2
+++ Makefile6 Mar 2024 16:02:43 -
@@ -1,6 +1,6 @@
 COMMENT =  multimedia platform inspired by HyperCard
 
-DIST_TUPLE =   github JohnEarnest Decker v1.39 .
+DIST_TUPLE =   github JohnEarnest Decker v1.40 .
 PKGNAME =  ${DISTNAME:L}
 
 CATEGORIES =   graphics
@@ -21,6 +21,8 @@ BUILD_DEPENDS =   editors/vim \
 
 LIB_DEPENDS =  devel/sdl2 \
devel/sdl2-image
+
+RUN_DEPENDS =  devel/xdg-utils
 
 ALL_TARGET =   decker lilt docs
 
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/decker/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo18 Feb 2024 21:55:41 -  1.2
+++ distinfo6 Mar 2024 15:58:27 -
@@ -1,2 +1,2 @@
-SHA256 (JohnEarnest-Decker-v1.39.tar.gz) = 
PTLwp775tqWUAw5/DhAtTcKtOwOvRvcAEmXSDuk4384=
-SIZE (JohnEarnest-Decker-v1.39.tar.gz) = 1343234
+SHA256 (JohnEarnest-Decker-v1.40.tar.gz) = 
VnVUKMFYJ6fK+7faWc+DII+p9bpiH4itHCs4aD1kzug=
+SIZE (JohnEarnest-Decker-v1.40.tar.gz) = 1348788
Index: patches/patch-Makefile
===
RCS file: /home/cvs/ports/graphics/decker/patches/patch-Makefile,v
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile  18 Feb 2024 11:03:40 -  1.1.1.1
+++ patches/patch-Makefile  6 Mar 2024 15:58:27 -
@@ -13,8 +13,8 @@ Index: Makefile
# -Wno-misleading-indentation silences warnings which are entirely 
spurious.
FLAGS:=$(FLAGS) -Wno-misleading-indentation -Wno-unknown-warning-option
FLAGS:=$(FLAGS) -lm
-@@ -43,16 +43,16 @@ ifneq ("$(EXTRA_FLAGS)","")
- endif
+@@ -46,16 +46,16 @@ endif
+ # FLAGS:=$(FLAGS) -DDANGER_ZONE
  
  resources:
 -  @chmod +x ./scripts/resources.sh
@@ -36,7 +36,7 @@ Index: Makefile
  
  clean:
@rm -rf ./c/build/
-@@ -60,19 +60,19 @@ clean:
+@@ -63,19 +63,19 @@ clean:
@rm -f docs/*.html
  
  install:
Index: patches/patch-c_dom_h
===
RCS file: patches/patch-c_dom_h
diff -N patches/patch-c_dom_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-c_dom_h   6 Mar 2024 15:59:16 -
@@ -0,0 +1,9 @@
+Index: c/dom.h
+--- c/dom.h.orig
 c/dom.h
+@@ -1,4 +1,4 @@
+-
++#include 
+ #include "resources.h"
+ 
+ // Decker document object model

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/06 09:07:14

Modified files:
graphics/decker: Makefile distinfo 
graphics/decker/patches: patch-Makefile 
Added files:
graphics/decker/patches: patch-c_dom_h 

Log message:
update graphics/decker to 1.40; from MAINTAINER Jag Talon, thanks!

changelog: 

Re: [new] www/pipe-viewer

[Omar Polo]

Hello,

On 2024/03/04 22:38:23 +, Klemens Nanni  wrote:
> On Mon, Mar 04, 2024 at 05:21:52PM -0500, Stefan Moran wrote:
> > Attached is a port for www/pipe-viewer 0.5.0, a lightweight perl youtube
> > client, designed to be used without a Google API key. The port is a
> > multipackage with -gtk, a GTK3 frontend using x11/p5-Gtk3, and -main,
> > the standard cli interface. The port depends on either youtube-dl or
> > yt-dlp to fetch videos, and I chose to include www/yt-dlp as a rundep as
> > that seems to be the more heavily-maintained and functional ( and also
> > less legally-targeted ;) ) project at this point in time. I also chose
> > to include most of the optional dependencies, excluding
> > LWP::UserAgent::Cached (not currently ported).
> > 
> > https://github.com/trizen/pipe-viewer
> 
> Port-wise looks fine, although I'd capitalise youtube in COMMENT
> accordingly and distinguish DESCR-gtk from DESCR-main.
> Perhaps add multimedia, net and/or x11 to CATEGORIES?

+1

I'd also try to have a slightly different COMMENT for the -gtk
subpackage and change its name to gkt-pipe-viewer to mirror the name of
the binary it installs.

When it makes sense, I think it's easier for discovery purposes to have
the name of the package to be the same of the program it installs.

> Starts, searches and plays fine in brief testing, seems like a handy
> alternative to the (heavy) Qt alternatives minitube and plasmatube.

some here, briefly tried but I'm liking it, it could become my preferred
way to navigate youtube :)

I'm attaching a diff against your makefile and an updated tarball that's
ok op@ to import.

while here i've changed to port to use DIST_TUPLE rather than GH_* and
re-run make makesum due to it.  I've also tried to change the two DESCR
a bit, to reiterate which one has a GTK interface and which don't.


--- Makefile.orig   Wed Mar  6 15:02:57 2024
+++ MakefileWed Mar  6 16:33:07 2024
@@ -1,17 +1,14 @@
-COMMENT-main = lightweight perl youtube client
-COMMENT-gtk =  lightweight perl youtube client
+COMMENT-main = lightweight YouTube client
+COMMENT-gtk =  lightweight YouTube client with a GTK interface
 
 VERSION =  0.5.0
+DIST_TUPLE =   github trizen pipe-viewer ${VERSION} .
 PKGNAME-main = pipe-viewer-${VERSION}
-PKGNAME-gtk =  pipe-viewer-gtk-${VERSION}
+PKGNAME-gtk =  gtk-pipe-viewer-${VERSION}
 
 MULTI_PACKAGES =   -main -gtk
 
-GH_ACCOUNT =   trizen
-GH_PROJECT =   pipe-viewer
-GH_TAGNAME =   ${VERSION}
-
-CATEGORIES =   www
+CATEGORIES =   www multimedia
 
 MAINTAINER =   Stefan Moran 
 



pipe-viewer.tar.gz
Description: GNU Zip compressed data

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2024/03/04 04:04:30

Modified files:
devel/leiningen: Makefile distinfo 

Log message:
update devel/leiningen to 2.11.2

portwise: use DIST_TUPLE and move to codeberg.

Re: [update] www/mycorrhiza: add cert symlink instructions

[Omar Polo]

Hello,

On 2024/02/27 09:14:59 -0500, "Jag Talon"  wrote:
> On Mon Feb 26, 2024 at 11:14 PM EST, la-ninpre wrote:
> > On 26 February 2024 22:45:18 UTC, Jag Talon  
> > wrote:
> > > Bumping REVISION as well.
> > >  
> >
> > Hello,
> > thank you for suggesting this change, I haven't noticed this before, 
> > because in testing environment i wasn't using ssl and in 'production'  I 
> > already had this symlink. The patch is fine by me, but i'm thinking that 
> > maybe it would be better to unify the two patches. What do you think?
> 
> Thank you I'm glad you like the changes. I have the unified diff attached!
> 
> ok?

[...]

> --- pkg/README8 Sep 2022 13:35:47 -   1.1.1.1
> +++ pkg/README27 Feb 2024 14:04:07 -
> @@ -58,6 +58,11 @@ acme-client(1)) and start httpd(8) and r
>   # rcctl enable httpd relayd
>   # rcctl start httpd relayd
>  
> +If you already have a certificate following the acme-client.conf
> +default template, make sure to create the following symlink to prevent
> +SEC_ERROR_UNKNOWN_ISSUER issues on some browsers:
> + 
> +# ln -s /etc/ssl/example.com.fullchain.pem /etc/ssl/example.com.crt

I'm not a relayd user, but this seems to me the wrong place to put this
information.

If I understand correctly relayd is not loading the fullchain cert, due
to the (IMHO silly) rules of how it loads the certificates in /etc/.  If
this is the case, then I'd consider this "common relayd knowledge" and
putting a workaround in a random port' README seems wrong.

Re: pkg_info: fold Comment newline

[Omar Polo]

On 2024/03/02 17:39:10 +, Klemens Nanni  wrote:
> As per Makefile.template and portcheck(1) COMMENT is <=60 chars, so it'd
> fit on the same Comment: line in pkg_info(1) output -- less scrolling!
> 
> It just stands out, imho, compared to Maintainer: and WWW: where there's
> no such seemingly superfluous line break.
> 
> Thoughts?

I like it!  it seems better to me to keep "Comment" and the comment text
in the same line; especially since we strive to have "short" comments.

However, it seems to me that this has the chance of breaking other
tools.  Reading this diff I've discovered the -l flag for pkg_info that
is meant to aid parsing the output of pkg_info.  I have no clue if this
option is used anywhere, but I'd prefer not to discover it when we're
this close to the release :)

In particular, pkg_info -lxxx quirks will change:

@@ -1,7 +1,6 @@
 xxxInformation for inst:quirks-7.10
 
-xxxComment:
-exceptions to pkg_add rules
+Comment: exceptions to pkg_add rules

Re: [UPDATE] x11/picom - new version 11.2

[Omar Polo]

On 2024/02/26 10:51:54 -0400, Jose Maldonado  wrote:
> I am also using amdgpu and so far nothing new. Thanks for the feedback!

I've committed it, thanks!