CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/24 00:06:41 Modified files: games/gzdoom : Makefile distinfo games/gzdoom/patches: patch-CMakeLists_txt games/gzdoom/pkg: README Added files: games/gzdoom/patches: patch-libraries_ZVulkan_CMakeLists_txt Removed files: games/gzdoom/patches: patch-libraries_discordrpc_CMakeLists_txt patch-src_d_main_cpp Log message: Update gzdoom to 4.11.3 Original update from thfr@ README rewritten by me to explain the backend situation. OK thfr, lgtm Timo (maintainer)
Re: mumble doesn't start on current
callison caffrey wrote (2023-11-23 15:20 CET): > I always do pkg_add -uDsnap when sysupgrade -sn. > > Anyway, did -uDsnap; tried again, then -u; tried again. Same output. > > This is the mirror I use: https://ftp.hostserver.de/pub/OpenBSD/ I'm seeing it too. "mumble:mumble: undefined symbol '_ZN6google8protobuf8internal14ArenaStringPtr3SetENSt3__117basic_string_viewIcNS3_11char_traitsI" It looks like protobuf and mumble on the mirror don't match. Rebuilding and installing devel/protobuf from ports fixed it for me. Best Regards, Stefan
Re: www/minitube: google API key no longer required
Klemens Nanni wrote (2023-11-23 05:02 CET): > https://flavio.tordini.org/minitube-3-5-and-musictube-1-13 from aug. 2020 > says >= 3.5 uses the Invidious API, thus key is no longer required; > I can indeed watch videos just fine without providing anything. > > Whether there is any particular feature still requiring a personal > google account/API key and/or using YouTube's v3 instead. > > 3.9.3 sources having src/yt3.cpp dealing with the environment variable > is all I can see/test. > > Until today I thought minitube was unusable without a google account due > to this, then I saw it working on some Linux distro out of the box and > went looking. > > Here's a cheap attempt at lifting the "requirement" bits without removing > instructions I don't know enough about. > > Thoughts? Minitube has just removed the note about the youtube key. That it is still supported is nowhere to be found, except in the issues and the code of course. https://github.com/flaviotordini/minitube/commit/7b4ef7f8aa76f316e1396a0b7b7dcde4874e0ede#diff-04c6e90faac2675aa89e2176d2eec7d8 The YT app instructions are... mostly correct. This is a moving target. Some parts have moved. There is no dropdown anymore where a dropdown is mentioned. The settigs for the v3 API are nowhere to be found, I guess it's default or removed. But I could create an app with it and got a secret key. But... running minitube with the GOOGLE_API_KEY exported still contacted Invidious according to ktrace. Given the fact the minitube works fine without key, I'd be ok with removing the README. OK sdk@ for the subtle change, but also ok if you want to go further. > Index: Makefile > === > RCS file: /cvs/ports/www/minitube/Makefile,v > diff -u -p -r1.74 Makefile > --- Makefile 27 Sep 2023 19:13:03 - 1.74 > +++ Makefile 23 Nov 2023 03:36:09 - > @@ -2,7 +2,7 @@ COMMENT = standalone YouTube.com video b > > V = 3.9.3 > DISTNAME = minitube-$V > -REVISION = 1 > +REVISION = 2 > EXTRACT_SUFX = .tar.bz2 > > CATEGORIES = www multimedia > Index: pkg/README > === > RCS file: /cvs/ports/www/minitube/pkg/README,v > diff -u -p -r1.7 README > --- pkg/README11 Mar 2022 20:10:06 - 1.7 > +++ pkg/README23 Nov 2023 03:53:19 - > @@ -4,7 +4,7 @@ > > Google API key > == > -An API key is required in order to access the YouTube Data web services. > +A personal API key can be used to access the YouTube Data web services. > > Go to https://console.developers.google.com/ > >
Re: GZDoom update, next attempt
Stefan Hagen wrote (2023-11-22 07:36 CET):
> Thomas Frohwein wrote (2023-11-22 03:47 CET):
> > On Tue, Nov 21, 2023 at 08:20:16AM +0100, Stefan Hagen wrote:
> >
> > [...]
> >
> > > - added more details about supported games (the ones I know that work)
> > > - added ~/.config/gzdoom as wad installation dir
> > > - updated sha256 for doom-1.8 wad (what the heck happened there?)
> > > - added reference to games/freedoom
> > > - added information about GL backends and how to change them in case of
> > > a crash/freeze.
> >
> > see below for comments.
> >
> > > +Supported are data files from:
> > > +- Doom 1 (doom1.wad) and 2 (doom2.wad)
> > > +- Freedoom (freedoom1.wad, freedoom2.wad)
> > > +- Heretic (heretic.wad)
> > > +- Hexen (hexen.wad)
> > > +- Vomitoreum (vomitoreum.ipk3)
> > > +- Apocalyptic Vibes (AVBuild.ipk3)
> >
> > There are way more and I don't think the README is the right place to
> > try to enumerate them all, especially as those are actively being
> > released, including probably dozens in 2023 alone. I'm okay with a
> > limited selection of something like Doom 1&2, Freedoom, Heretic, and
> > Hexen - that is pretty much the original content plus Freedoom which
> > is useful for testing given its license/availability.
>
> Fair point. I thought it's useful to add some that are not ending in .wad.
> But there's official documentation for that. I removed the last two and
> added a link to the official documentation.
>
> > > +If you do not possess any of those, you can install the freedoom
> > > +package or use the shareware IWAD which is available at:
> > >
> > >
> > > ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/doom/doom-1.8.wad.gz
> > > -SHA256 (doom-1.8.wad.gz) = WM9qVjtjGkdWFjCvpidthTwnB5NC95aewwBpZdqFV6E=
> > > +SHA256 (doom-1.8.wad.gz) =
> > > 58cf6a563b631a47561630afa6276d853c27079342f7969ec3006965da8557a1
> > > +
> > > +Rename the file as "doom.wad" to one of the mentioned locations.
> >
> > "Rename" is strange here, what about:
> > Rename the file to "doom.wad" and move it to one of the above-mentioned
> > locations.
>
> Yes, that's better.
>
> > > +[GlobalSettings]
> > > +vid_preferbackend=1
> > > +
> > > +Supported values are: 0 (OpenGL), 1 (Vulkan) or 2 (OpenGL ES)
> >
> > I'm not sure that's correct. Looking at the documentation at [1], it
> > seems to me that 3 is GL ES, and 2 seems to be for a Direct3D Windows-
> > related backend.
> >
> > [1] https://zdoom.org/wiki/CVARs:Display
>
> I'm seeing the documentation - but the mentioned values are correct on
> my system. Value 3 lets the game start, but the backend option in game
> shows "Unknown".
>
> On OpenBSD (Posix System) only the left column is relevant. I think we
> don't build with GLES2, and the documentation mentiones 0 and 2 as
> "OpenGL". The latter one is probably OpenGL ES.
>
> So I think the values in the README are correct for OpenBSD. But if
> you're uneasy with this, we can also write something like:
>
> "Valid backenend values are 0-3, play around with them until you find one
> that works."
>
> Diff with updated README below.
I just found your earlier comment:
> I'm on an Intel Tigerlake system and OpenGL (vid_preferbackend=0) and
> GLES2 (vid_preferbackend=3) work, but vulkan segfaults.
So appearently, GLES2 is available on intel based machines. I added the
value to the list.
Index: games/gzdoom/Makefile
===
RCS file: /cvs/ports/games/gzdoom/Makefile,v
diff -u -p -u -p -r1.17 Makefile
--- games/gzdoom/Makefile 18 Jul 2022 08:27:45 - 1.17
+++ games/gzdoom/Makefile 22 Nov 2023 06:49:27 -
@@ -6,11 +6,10 @@ ONLY_FOR_ARCHS = i386 amd64
COMMENT = OpenGL engine for idTech 1 games like
doom,hexen,heretic...
-V =4.8.2
-GH_ACCOUNT = coelckers
-GH_PROJECT = gzdoom
-GH_TAGNAME = g${V}
-DISTNAME = gzdoom-${V}
+V =4.11.3
+
+DIST_TUPLE = github ZDoom gzdoom g${V} .
+PKGNAME = gzdoom-${V}
CATEGORIES=games
@@ -21,8 +20,8 @@ MAINTAINER = Timo Myyra https://github.com/coelckers/gzdoom/pull/1665
-
-Index: src/d_main.cpp
src/d_main.cpp.orig
-+++ src/d_main.cpp
-@@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void)
-
- std::set_new_handler(NewFailure);
- const char *batchout = Args->CheckValue("-error
Re: GZDoom update, next attempt
Thomas Frohwein wrote (2023-11-22 03:47 CET):
> On Tue, Nov 21, 2023 at 08:20:16AM +0100, Stefan Hagen wrote:
>
> [...]
>
> > - added more details about supported games (the ones I know that work)
> > - added ~/.config/gzdoom as wad installation dir
> > - updated sha256 for doom-1.8 wad (what the heck happened there?)
> > - added reference to games/freedoom
> > - added information about GL backends and how to change them in case of
> > a crash/freeze.
>
> see below for comments.
>
> > +Supported are data files from:
> > +- Doom 1 (doom1.wad) and 2 (doom2.wad)
> > +- Freedoom (freedoom1.wad, freedoom2.wad)
> > +- Heretic (heretic.wad)
> > +- Hexen (hexen.wad)
> > +- Vomitoreum (vomitoreum.ipk3)
> > +- Apocalyptic Vibes (AVBuild.ipk3)
>
> There are way more and I don't think the README is the right place to
> try to enumerate them all, especially as those are actively being
> released, including probably dozens in 2023 alone. I'm okay with a
> limited selection of something like Doom 1&2, Freedoom, Heretic, and
> Hexen - that is pretty much the original content plus Freedoom which
> is useful for testing given its license/availability.
Fair point. I thought it's useful to add some that are not ending in .wad.
But there's official documentation for that. I removed the last two and
added a link to the official documentation.
> > +If you do not possess any of those, you can install the freedoom
> > +package or use the shareware IWAD which is available at:
> >
> > ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/doom/doom-1.8.wad.gz
> > -SHA256 (doom-1.8.wad.gz) = WM9qVjtjGkdWFjCvpidthTwnB5NC95aewwBpZdqFV6E=
> > +SHA256 (doom-1.8.wad.gz) =
> > 58cf6a563b631a47561630afa6276d853c27079342f7969ec3006965da8557a1
> > +
> > +Rename the file as "doom.wad" to one of the mentioned locations.
>
> "Rename" is strange here, what about:
> Rename the file to "doom.wad" and move it to one of the above-mentioned
> locations.
Yes, that's better.
> > +[GlobalSettings]
> > +vid_preferbackend=1
> > +
> > +Supported values are: 0 (OpenGL), 1 (Vulkan) or 2 (OpenGL ES)
>
> I'm not sure that's correct. Looking at the documentation at [1], it
> seems to me that 3 is GL ES, and 2 seems to be for a Direct3D Windows-
> related backend.
>
> [1] https://zdoom.org/wiki/CVARs:Display
I'm seeing the documentation - but the mentioned values are correct on
my system. Value 3 lets the game start, but the backend option in game
shows "Unknown".
On OpenBSD (Posix System) only the left column is relevant. I think we
don't build with GLES2, and the documentation mentiones 0 and 2 as
"OpenGL". The latter one is probably OpenGL ES.
So I think the values in the README are correct for OpenBSD. But if
you're uneasy with this, we can also write something like:
"Valid backenend values are 0-3, play around with them until you find one
that works."
Diff with updated README below.
Index: games/gzdoom/Makefile
===
RCS file: /cvs/ports/games/gzdoom/Makefile,v
diff -u -p -u -p -r1.17 Makefile
--- games/gzdoom/Makefile 18 Jul 2022 08:27:45 - 1.17
+++ games/gzdoom/Makefile 22 Nov 2023 06:32:27 -
@@ -6,11 +6,10 @@ ONLY_FOR_ARCHS = i386 amd64
COMMENT = OpenGL engine for idTech 1 games like
doom,hexen,heretic...
-V =4.8.2
-GH_ACCOUNT = coelckers
-GH_PROJECT = gzdoom
-GH_TAGNAME = g${V}
-DISTNAME = gzdoom-${V}
+V =4.11.3
+
+DIST_TUPLE = github ZDoom gzdoom g${V} .
+PKGNAME = gzdoom-${V}
CATEGORIES=games
@@ -21,8 +20,8 @@ MAINTAINER = Timo Myyra https://github.com/coelckers/gzdoom/pull/1665
-
-Index: src/d_main.cpp
src/d_main.cpp.orig
-+++ src/d_main.cpp
-@@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void)
-
- std::set_new_handler(NewFailure);
- const char *batchout = Args->CheckValue("-errorlog");
-+
-+ D_DoomInit();
-
- // [RH] Make sure zdoom.pk3 is always loaded,
- // as it contains magic stuff we need.
-@@ -3567,8 +3569,6 @@ static int D_DoomMain_Internal (void)
- }
-
- if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME,
GetVersionString());
--
-- D_DoomInit();
-
- extern void D_ConfirmSendStats();
- D_ConfirmSendStats();
Index: games/gzdoom/pkg/README
===
RCS file: /cvs/ports/games/gzdoom/pkg/README,v
diff -u -p -u -p -r1.2 README
--- games/gzdoom/pkg/README 11 Mar 2022 19:04:32 - 1.2
+++ games/gzdoom/pkg/README
Re: GZDoom update, next attempt
Thomas Frohwein wrote (2023-11-17 02:43 CET):
> On Wed, Nov 15, 2023 at 08:32:39AM +0100, Stefan Hagen wrote:
> > Timo Myyrä wrote (2023-11-14 17:50 CET):
> > > On Fri, Nov 10 2023, Stefan Hagen wrote:
> > >
> > > > Thomas Frohwein wrote (2023-11-09 21:16 CET):
> > > >> Here is an update to GZDoom 4.11.3. It works to run mods like the
> > > >> recently released Beyond Sunset.
> > > >>
> > > >> Of note, you may need to switch the video backend to opengl as I
> > > >> outlined after previous concerns:
> > > >>
> > > >> https://marc.info/?l=openbsd-ports=169132550927983=2
> > > >>
> > > >> Of note, we are several versions behind upstream - the current version
> > > >> in ports is 4.8.2.
> > > >
> > > > What's the deal with:
> > > >> +- set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
> > > >> ++ #set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
> > > >
> > > > It builds and works fine with
> > > > set(ZVULKAN_LIBS ${CMAKE_DL_LIBS})
> > > >
> > > > There doesn't seem to be a difference at runtime. At least on my
> > > > machine (amd), vulkan runs fine with and without this line.
> > > >
> > > > (I haven't diffed the build logs to figure out if it has picked up
> > > > something differently)
> > > >
> > > > Regarding:
> > > >> https://marc.info/?l=openbsd-ports=169132550927983=2
> > > >> After changing that back to default opengl (0),
> > > >
> > > > It seems to be untrue that opengl is the default backend. If I remove
> > > > gzdoom.ini and start the game, the vulkan backend is automatically
> > > > selected.
> > > >
> > > > If we have issues with the vulkan backend on more than a few machines,
> > > > should we change the default? And/Or described the issue in the README?
> > > >
> > >
> > > How about this diff? Bumps minor version a bit and sets the vulkan bits.
> > > Works for me with ryzen thinkpad.
> >
> > Hmm. Vulkan and OpenGL ES works. When I select OpenGL it gets stuck on
> > the loading screen and gzdoom keeps consuming 60% CPU and X ~15/20%.
> >
> > Does this happen for you too?
>
> I'm on an Intel Tigerlake system and OpenGL (vid_preferbackend=0) and
> GLES2 (vid_preferbackend=3) work, but vulkan segfaults.
>
> I tested with Freedoom, as well as the commercial gzdoom games Supplice
> and Beyond Sunset.
>
> To me, this looks like it might not be straightforward to figure out
> all the video backend issues, but as multiple are available and it seems
> to work with some for everyone, I'm ok thfr@ with the update.
Sure, not problem. But then we should document it.
Attached the same diff, but I rewrote the README.
- add usual readme header
- added more details about supported games (the ones I know that work)
- added ~/.config/gzdoom as wad installation dir
- updated sha256 for doom-1.8 wad (what the heck happened there?)
- added reference to games/freedoom
- added information about GL backends and how to change them in case of
a crash/freeze.
Portwise OK sdk@
Index: games/gzdoom/Makefile
===
RCS file: /cvs/ports/games/gzdoom/Makefile,v
diff -u -p -u -p -r1.17 Makefile
--- games/gzdoom/Makefile 18 Jul 2022 08:27:45 - 1.17
+++ games/gzdoom/Makefile 21 Nov 2023 07:15:51 -
@@ -6,11 +6,10 @@ ONLY_FOR_ARCHS = i386 amd64
COMMENT = OpenGL engine for idTech 1 games like
doom,hexen,heretic...
-V =4.8.2
-GH_ACCOUNT = coelckers
-GH_PROJECT = gzdoom
-GH_TAGNAME = g${V}
-DISTNAME = gzdoom-${V}
+V =4.11.3
+
+DIST_TUPLE = github ZDoom gzdoom g${V} .
+PKGNAME = gzdoom-${V}
CATEGORIES=games
@@ -21,8 +20,8 @@ MAINTAINER = Timo Myyra ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/doom/doom-1.8.wad.gz
-SHA256 (doom-1.8.wad.gz) = WM9qVjtjGkdWFjCvpidthTwnB5NC95aewwBpZdqFV6E=
+SHA256 (doom-1.8.wad.gz) =
58cf6a563b631a47561630afa6276d853c27079342f7969ec3006965da8557a1
+
+Rename the file as "doom.wad" to one of the mentioned locations.
-Install it to ${PREFIX}/share/doom as "doom.wad".
+Optional Dependencies
+=
In case fluidsynth backend is needed the user needs to setup soundfont for it.
+
+Known Problems
+==
+
+Gzdoom supports three GL backends (OpenGL, OpenGL ES, Vulkan). Some work
+better than others depending on the graphic hardware in the system.
+
+In case gzdoom freezes or crashes before you can reach the in-game menu
+to select a different backend, you can modify ~/.config/gzdoom/gzdoom.ini
+manually and change the vid_preferbackend value:
+
+[GlobalSettings]
+vid_preferbackend=1
+
+Supported values are: 0 (OpenGL), 1 (Vulkan) or 2 (OpenGL ES)
+
+
+
+
Re: [bugfix] x11/notion enable SA_RESTART signal
*ping* Stefan Hagen wrote (2022-04-18 08:36 CEST): > I finally managed to track down why notion sporadically crashes and why > lua statusbars that invoke commands and read their stdout are (quite > frequently) erroring out with "Interrupted by system call" once there is > load on the system. > > The culprint is the missing SA_RESTART signal, which is needed when > doing file i/o in lua with popen(3). > > I'm removing the _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED restrictions > to free up access to the signal, which is behind __XPG_VISIBLE >= 500. > > While the issue is more sporadic in notion itself, I can reliably > reproduce it by putting load on my system and let my statusbar popen a > shell script and read its stdout. > > OK? I completely forgot about this because I have it in my local version. I would still like this to go in tree. I assume not many people are using this port, because you'd trip over this issue as soon as you try to show the output of a program or shell script in the status bar. While there: GH_* -> DIST_TUPLE. OK? Index: x11/notion/Makefile === RCS file: /cvs/ports/x11/notion/Makefile,v diff -u -p -u -p -r1.2 Makefile --- x11/notion/Makefile 11 Mar 2022 20:16:49 - 1.2 +++ x11/notion/Makefile 21 Nov 2023 06:25:18 - @@ -1,8 +1,7 @@ COMMENT= light, keyboard friendly static tiling window manager -GH_ACCOUNT=raboof -GH_PROJECT=notion -GH_TAGNAME=4.0.2 +DIST_TUPLE=github raboof notion 4.0.2 . +REVISION= 0 CATEGORIES=x11 Index: x11/notion/distinfo === RCS file: /cvs/ports/x11/notion/distinfo,v diff -u -p -u -p -r1.1.1.1 distinfo --- x11/notion/distinfo 22 Aug 2021 01:57:26 - 1.1.1.1 +++ x11/notion/distinfo 21 Nov 2023 06:25:18 - @@ -1,2 +1,2 @@ -SHA256 (notion-4.0.2.tar.gz) = 3O/WINAo9lQcFYecPbIY3ggd986NLpy0/H3dm5JTtpg= -SIZE (notion-4.0.2.tar.gz) = 790842 +SHA256 (raboof-notion-4.0.2.tar.gz) = 3O/WINAo9lQcFYecPbIY3ggd986NLpy0/H3dm5JTtpg= +SIZE (raboof-notion-4.0.2.tar.gz) = 790842 Index: x11/notion/patches/patch-system-autodetect_mk === RCS file: /cvs/ports/x11/notion/patches/patch-system-autodetect_mk,v diff -u -p -u -p -r1.2 patch-system-autodetect_mk --- x11/notion/patches/patch-system-autodetect_mk 11 Mar 2022 20:16:49 - 1.2 +++ x11/notion/patches/patch-system-autodetect_mk 21 Nov 2023 06:25:18 - @@ -30,3 +30,12 @@ Index: system-autodetect.mk # Cygwin needs this. Also when you disable _BSD_SOURCE you may need it. #DEFINES += -DCF_NO_GETLOADAVG +@@ -205,7 +205,7 @@ POSIX_SOURCE?=-D_POSIX_C_SOURCE=200112L + BSD_SOURCE?=-D_BSD_SOURCE + + # Most systems +-XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED ++#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED + # SunOS, (Irix) + #XOPEN_SOURCE=-D__EXTENSIONS__ +
[update] wmctrl 1.0.7 to 1.0.7pl20180910 (new upstream)
Hi,
x11/wmctrl homepage is dead and the distfile is not fetchable anymore.
I was looking around if there's a better source.
I found: https://github.com/kfogel/wmctrl
This seems to be a sensible upstream provider. The author writes that he
doesn't intend to actively bring the software forward, but he's accepting
and reviewing patches. This version already contains a set of fixes and
enhancements.
From the readme:
The version here contains various enhancements that people around the
Net had added in their own divergent versions. The two main sources
of these enhancements were https://github.com/dancor/wmctrl and
https://github.com/geekless/wmctrl. The additions include these
new command-line options/actions:
-Y: iconify (Vadim Ushakov)
-S: sort window list in stacking order (Vadim Ushakov)
-j: list current desktop (Kevin Der)
-r -y: like -e but reactivate after the move (Chris Piro )
-E: get-title (Dan Corson)
-z: lower window (Dan Corson)
Other improvements are a typo fix for the --help output, and some fixes
for build-time compiler warnings.
A 64 bit fix is also included, so I dropped the patch.
Comments / OK to switch to this repo?
Best Regards,
Stefan
PS: I could not get DIST_TUPLE to work with the commit hash.
Index: x11/wmctrl/Makefile
===
RCS file: /cvs/ports/x11/wmctrl/Makefile,v
diff -u -p -u -p -r1.24 Makefile
--- x11/wmctrl/Makefile 27 Sep 2023 20:37:27 - 1.24
+++ x11/wmctrl/Makefile 20 Nov 2023 21:25:34 -
@@ -1,11 +1,11 @@
COMMENT= interact with an EWMH/NetWM window manager
-DISTNAME= wmctrl-1.07
-REVISION= 9
+DISTNAME= wmctrl-1.07pl20180910
-CATEGORIES=x11
-SITES= ${HOMEPAGE}
+GH_ACCOUNT=kfogel
+GH_PROJECT=wmctrl
+GH_COMMIT= c408c9e1c00092fc9aea2bd1ba4bec8e9ef3c40c
-HOMEPAGE= https://sites.google.com/site/tstyblo/wmctrl/
+CATEGORIES=x11
# GPLv2
PERMIT_PACKAGE=Yes
Index: x11/wmctrl/distinfo
===
RCS file: /cvs/ports/x11/wmctrl/distinfo,v
diff -u -p -u -p -r1.5 distinfo
--- x11/wmctrl/distinfo 18 Jan 2015 03:16:03 - 1.5
+++ x11/wmctrl/distinfo 20 Nov 2023 21:25:34 -
@@ -1,2 +1,2 @@
-SHA256 (wmctrl-1.07.tar.gz) = 14oe/bYvGGdCmK0DnFy9se226OFJuzqOOgGkdQqjzKk=
-SIZE (wmctrl-1.07.tar.gz) = 87820
+SHA256 (wmctrl-1.07pl20180910-c408c9e1.tar.gz) =
z1mIqT9ylgrM9rlhBF+WTvvtZi2XNNBYtUiv63RqvIU=
+SIZE (wmctrl-1.07pl20180910-c408c9e1.tar.gz) = 90815
Index: x11/wmctrl/patches/patch-main_c
===
RCS file: x11/wmctrl/patches/patch-main_c
diff -N x11/wmctrl/patches/patch-main_c
--- x11/wmctrl/patches/patch-main_c 11 Mar 2022 20:17:35 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-Index: main.c
main.c.orig
-+++ main.c
-@@ -1439,8 +1439,12 @@ static gchar *get_property (Display *disp, Window win,
- return NULL;
- }
-
-+/* Data returned in 32-bit format is stored as long */
-+if (ret_format == 32)
-+tmp_size = sizeof(long) * ret_nitems;
-+else
-+tmp_size = (ret_format / 8) * ret_nitems;
- /* null terminate the result to make string handling easier */
--tmp_size = (ret_format / 8) * ret_nitems;
- ret = g_malloc(tmp_size + 1);
- memcpy(ret, ret_prop, tmp_size);
- ret[tmp_size] = '\0';
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/19 08:20:30 Modified files: sysutils/hcloud: Makefile distinfo modules.inc Log message: Update hcloud to 1.40.0 Features - add warning messages to context commands - allow JSON output on resource creation - context: ask to use HCLOUD_TOKEN when creating new context - pretty-print JSON output - print out IPs after they were created Bug Fixes - "create" actions were not awaited in some cases - image: backup is suggested as type in update command - inconsistent formatting in "describe" commands - network: create prints success to stderr instead of stdout - primary-ip: list does now allow to output IP column - primary-ip: updating the name resets auto-delete - static resource list commands only return first 50 entries
Re: [new] multimedia/ytfzf
Laurent Cheylus wrote (2023-11-19 11:37 CET):
> Hi Stefan,
>
> > I just found this on ports@ after I started to create a port on my
> > own.
> > Attached is an updated version (2.6.1) which also uses DIST_TUPLE. I
> > also broke RUN_DEPENDS into one dependency per line. It's just easier
> > to read.
> >
> > Without thumbnails, ytfzf works fine. I tried the imv, mpv and chafa
> > thumbnail
> > generation. They don't work because fzf is being killed by pledge:
> >
> > $ ytfzf -t -T {chafa,mpv,imv}
> > fzf[85237]: pledge "wpath", syscall 5
> >
> > This happens, because fzf is trying to open the prefiew image in /tmp
> >
> > 46440 fzf NAMI "/tmp/fzf-preview-1776267355"
> > 46440 fzf PLDG open, "wpath", errno 1 Operation not permitted
> >
> > As you're also maintaining fzf, maybe you want to look at this?
>
> I just sent on ports@ an update for sysutils/fzf v0.44.1 and I added tmppath
> pledge permission to allow temporary files in /tmp.
>
> With this fix, your update for multimedia/ytfzf v2.6.1 works as expected.
> Build and tests OK on current/amd64.
>
> Thanks for your update and tests with fzf.
Excellent. I've committed the fzf update.
For ytfzf, OK for import.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/19 03:59:12 Modified files: sysutils/fzf : Makefile distinfo modules.inc sysutils/fzf/patches: patch-src_protector_protector_openbsd_go sysutils/fzf/pkg: PLIST Log message: Update fzf to 0.44.1 from MAINTAINER Laurent Cheylus, thanks! - update Makefile, distinfo and modules.inc - update PLIST to add bin/fzf-preview.sh (new in 0.44.0 version) - modify patch for src/protector/protector_openbsd_go: * remove inet for pledge (merged upstream with PR 3483) * add tmppath for pledge => needed by tools that uses /tmp directory with temporary files (upstream PR pending)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/18 04:01:31 Modified files: devel/quirks : Tag: OPENBSD_7_4 Makefile devel/quirks/files: Tag: OPENBSD_7_4 Quirks.pm www/yt-dlp : Tag: OPENBSD_7_4 Makefile distinfo www/yt-dlp/patches: Tag: OPENBSD_7_4 patch-setup_py www/yt-dlp/pkg : Tag: OPENBSD_7_4 PLIST Log message: Backport to 7.4: Update yt-dlp to 2023.11.16 Fixes CVE-2023-46121 OK mestre@
[fix] www/wwwoffle - allow users to view the example file
Hi,
currently you can't view the example file for wwwoffle as user.
Here is a patch that does two things:
- allows everyone to read the example wwwoffle.conf
- grants root rw access for consistency with other configuration files/examples.
Before the patch:
-r--r- 1 root bin ... /usr/local/share/examples/wwwoffle/wwwoffle.conf
-r--r- 1 root wheel ... /etc/wwwoffle/wwwoffle.conf
After the patch:
-rw-r--r-- 1 root bin ... /usr/local/share/examples/wwwoffle/wwwoffle.conf
-rw-r- 1 root wheel ... /etc/wwwoffle/wwwoffle.conf
OK?
Index: www/wwwoffle/Makefile
===
RCS file: /cvs/ports/www/wwwoffle/Makefile,v
diff -u -p -u -p -r1.27 Makefile
--- www/wwwoffle/Makefile 27 Sep 2023 19:13:07 - 1.27
+++ www/wwwoffle/Makefile 18 Nov 2023 07:58:04 -
@@ -2,7 +2,7 @@ COMMENT=WWW OFFLine Explorer
DISTNAME= wwwoffle-2.9j
CATEGORIES=www
-REVISION= 0
+REVISION= 1
HOMEPAGE= http://www.gedanken.org.uk/software/wwwoffle/
Index: www/wwwoffle/pkg/PLIST
===
RCS file: /cvs/ports/www/wwwoffle/pkg/PLIST,v
diff -u -p -u -p -r1.11 PLIST
--- www/wwwoffle/pkg/PLIST 8 Nov 2022 11:17:22 - 1.11
+++ www/wwwoffle/pkg/PLIST 18 Nov 2023 07:58:04 -
@@ -72,9 +72,9 @@ share/doc/wwwoffle/pl/README.lang
share/doc/wwwoffle/ru/
share/examples/wwwoffle/
@sample ${SYSCONFDIR}/wwwoffle/
-@mode 440
-@owner root
share/examples/wwwoffle/wwwoffle.conf
+@mode 640
+@owner root
@sample ${SYSCONFDIR}/wwwoffle/wwwoffle.conf
@mode
@owner
[security/stable] www/yt-dlp to 2023.11.16 reg. CVE-2023-46121
Hi,
on behalf of mestre@ there's a backport to stable for www/yt-dlp,
which contains a fix for CVE-2023-46121.
Below diff applies to 7.4 and updates the cve entry in quirks.
OK?
Best Regards,
Stefan
Index: www/yt-dlp/Makefile
===
RCS file: /cvs/ports/www/yt-dlp/Makefile,v
diff -u -p -r1.30 Makefile
--- www/yt-dlp/Makefile 27 Sep 2023 19:13:07 - 1.30
+++ www/yt-dlp/Makefile 17 Nov 2023 21:17:50 -
@@ -1,6 +1,6 @@
COMMENT = CLI program to download videos from YouTube and other sites
-VERSION = 2023.09.24
+VERSION = 2023.11.16
MODPY_EGG_VERSION =${VERSION:S/.0/./g}
DISTNAME = yt-dlp-${VERSION}
Index: www/yt-dlp/distinfo
===
RCS file: /cvs/ports/www/yt-dlp/distinfo,v
diff -u -p -r1.26 distinfo
--- www/yt-dlp/distinfo 25 Sep 2023 15:43:31 - 1.26
+++ www/yt-dlp/distinfo 17 Nov 2023 21:17:50 -
@@ -1,2 +1,2 @@
-SHA256 (yt-dlp-2023.09.24.tar.gz) =
aJqqtEh2Op77M55gg0bUKqPU93Yoj8H08iMUKsI6Wr8=
-SIZE (yt-dlp-2023.09.24.tar.gz) = 5494731
+SHA256 (yt-dlp-2023.11.16.tar.gz) =
qn+35JtXsbWsQ5pyVoV15N+QT/wwQX4Z5kSZDnI5rFM=
+SIZE (yt-dlp-2023.11.16.tar.gz) = 5568397
Index: www/yt-dlp/patches/patch-setup_py
===
RCS file: /cvs/ports/www/yt-dlp/patches/patch-setup_py,v
diff -u -p -r1.9 patch-setup_py
--- www/yt-dlp/patches/patch-setup_py 7 Jan 2023 13:18:45 - 1.9
+++ www/yt-dlp/patches/patch-setup_py 17 Nov 2023 21:17:50 -
@@ -1,7 +1,7 @@
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -77,7 +77,7 @@ def build_params():
+@@ -85,7 +85,7 @@ def build_params():
('share/zsh/site-functions', ['completions/zsh/_yt-dlp']),
('share/fish/vendor_completions.d', ['completions/fish/yt-dlp.fish']),
('share/doc/yt_dlp', ['README.txt']),
Index: www/yt-dlp/pkg/PLIST
===
RCS file: /cvs/ports/www/yt-dlp/pkg/PLIST,v
diff -u -p -r1.25 PLIST
--- www/yt-dlp/pkg/PLIST25 Sep 2023 15:43:31 - 1.25
+++ www/yt-dlp/pkg/PLIST17 Nov 2023 21:17:51 -
@@ -637,6 +637,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}elonet.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}elpais.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}elpais.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}eltrecetv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}eltrecetv.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}embedly.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}embedly.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}engadget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -649,6 +651,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}epoch.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}eporner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}eporner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}erocast.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}erocast.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}eroprofile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}eroprofile.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}ertgr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -945,6 +949,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}japandiet.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jeuxvideo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jeuxvideo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jiosaavn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jiosaavn.${MODPY_PYC_MAGIC_TAG}pyc
Re: CVS: cvs.openbsd.org: ports
Stefan Hagen wrote (2023-11-17 21:40 CET): > CVSROOT: /cvs > Module name: ports > Changes by: s...@cvs.openbsd.org2023/11/17 13:40:25 > > Modified files: > devel/quirks : Makefile > devel/quirks/files: Quirks.pm > > Log message: > Update quirk for yt-dlp 2023.11.16 This is the cve list entry for CVE-2023-46121
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/17 13:40:25 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Update quirk for yt-dlp 2023.11.16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/17 13:33:02 Modified files: www/yt-dlp : Makefile distinfo www/yt-dlp/patches: patch-setup_py www/yt-dlp/pkg : PLIST Log message: Update yt-dlp to 2023.11.16 from Justin Berthault Committing in behalf of maintainer mestre@
Re: [update] www/yt-dlp to 2023.11.16
Ricardo Mestre wrote (2023-11-17 09:56 CET):
> Hi,
>
> Stuart I'm subscribed to ports@, unfortunately due to $DAYJOB I won't be able
> to
> look at this for at least a week or 2 so could you please take care of this or
> maybe sdk@?
Sure, I'll commit this diff and create one for stable.
> Please note that the previous release from Tuesday had a fix for
> CVE-2023-46121
> so quirks also needs to be updated and maybe also updating the pkg in -stable.
>
> On 08:23 Fri 17 Nov , Stuart Henderson wrote:
> > When a port has a maintainer, you should CC them, don't rely on
> > them reading ports@.
> >
> >
> > On 2023/11/17 08:36, Justin Berthault wrote:
> > > > A "make update-patches" is missing.
> > >
> > > Thanks. Everything is ok now.
> > >
> > >
> > > diff /usr/ports
> > > commit - 8c63e64d8e995c22e5c74c405d9e013926952908
> > > path + /usr/ports
> > > blob - 4e530ab2529a5b43a1cee66f51b20be2767c36d6
> > > file + www/yt-dlp/Makefile
> > > --- www/yt-dlp/Makefile
> > > +++ www/yt-dlp/Makefile
> > > @@ -1,6 +1,6 @@
> > > COMMENT =CLI program to download videos from YouTube and other
> > > sites
> > >
> > > -VERSION =2023.10.13
> > > +VERSION =2023.11.16
> > > MODPY_EGG_VERSION = ${VERSION:S/.0/./g}
> > >
> > > DISTNAME = yt-dlp-${VERSION}
> > > blob - 05552f398fdee8bd509c7b381237af119563355c
> > > file + www/yt-dlp/distinfo
> > > --- www/yt-dlp/distinfo
> > > +++ www/yt-dlp/distinfo
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (yt-dlp-2023.10.13.tar.gz) =
> > > ZJRPRFKnZXtfsxrlXYI9lBGhop+cEHHTP6PmKG4gUio=
> > > -SIZE (yt-dlp-2023.10.13.tar.gz) = 5525233
> > > +SHA256 (yt-dlp-2023.11.16.tar.gz) =
> > > qn+35JtXsbWsQ5pyVoV15N+QT/wwQX4Z5kSZDnI5rFM=
> > > +SIZE (yt-dlp-2023.11.16.tar.gz) = 5568397
> > > blob - 6203b6485d2fcc6686439a12874817eb6b82f43e
> > > file + www/yt-dlp/patches/patch-setup_py
> > > --- www/yt-dlp/patches/patch-setup_py
> > > +++ www/yt-dlp/patches/patch-setup_py
> > > @@ -1,7 +1,7 @@
> > > Index: setup.py
> > > --- setup.py.orig
> > > +++ setup.py
> > > -@@ -78,7 +78,7 @@ def build_params():
> > > +@@ -85,7 +85,7 @@ def build_params():
> > > ('share/zsh/site-functions', ['completions/zsh/_yt-dlp']),
> > > ('share/fish/vendor_completions.d',
> > > ['completions/fish/yt-dlp.fish']),
> > > ('share/doc/yt_dlp', ['README.txt']),
> > > blob - 55297a8c5445638f12ee78eacd3afa799a0be1d7
> > > file + www/yt-dlp/pkg/PLIST
> > > --- www/yt-dlp/pkg/PLIST
> > > +++ www/yt-dlp/pkg/PLIST
> > > @@ -637,6 +637,8 @@ lib/python${MODPY_VERSION}/site-packages/yt_dlp/extrac
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}elonet.${MODPY_PYC_MAGIC_TAG}pyc
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}elpais.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}elpais.${MODPY_PYC_MAGIC_TAG}pyc
> > > +lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}eltrecetv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> > > +lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}eltrecetv.${MODPY_PYC_MAGIC_TAG}pyc
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}embedly.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}embedly.${MODPY_PYC_MAGIC_TAG}pyc
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}engadget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> > > @@ -947,6 +949,8 @@ lib/python${MODPY_VERSION}/site-packages/yt_dlp/extrac
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}japandiet.${MODPY_PYC_MAGIC_TAG}pyc
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jeuxvideo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jeuxvideo.${MODPY_PYC_MAGIC_TAG}pyc
> > > +lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jiosaavn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> > > +lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jiosaavn.${MODPY_PYC_MAGIC_TAG}pyc
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jixie.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jixie.${MODPY_PYC_MAGIC_TAG}pyc
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}joj.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> > > @@ -1011,6 +1015,8 @@
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extrac
> > >
> > > lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}laola1tv.${MODPY_PYC_MAGIC_TAG}pyc
> > >
> > >
Re: [update] www/yt-dlp to 2023.11.16
Justin Berthault wrote (2023-11-16 22:42 CET):
> Update yt-dlp to 2023.11.16
>
> build and tested on arm64
A "make update-patches" is missing.
Otherwise OK sdk@
> diff /usr/ports
> commit - 8c63e64d8e995c22e5c74c405d9e013926952908
> path + /usr/ports
> blob - 4e530ab2529a5b43a1cee66f51b20be2767c36d6
> file + www/yt-dlp/Makefile
> --- www/yt-dlp/Makefile
> +++ www/yt-dlp/Makefile
> @@ -1,6 +1,6 @@
> COMMENT =CLI program to download videos from YouTube and other sites
>
> -VERSION =2023.10.13
> +VERSION =2023.11.16
> MODPY_EGG_VERSION = ${VERSION:S/.0/./g}
>
> DISTNAME = yt-dlp-${VERSION}
> blob - 05552f398fdee8bd509c7b381237af119563355c
> file + www/yt-dlp/distinfo
> --- www/yt-dlp/distinfo
> +++ www/yt-dlp/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (yt-dlp-2023.10.13.tar.gz) =
> ZJRPRFKnZXtfsxrlXYI9lBGhop+cEHHTP6PmKG4gUio=
> -SIZE (yt-dlp-2023.10.13.tar.gz) = 5525233
> +SHA256 (yt-dlp-2023.11.16.tar.gz) =
> qn+35JtXsbWsQ5pyVoV15N+QT/wwQX4Z5kSZDnI5rFM=
> +SIZE (yt-dlp-2023.11.16.tar.gz) = 5568397
> blob - 55297a8c5445638f12ee78eacd3afa799a0be1d7
> file + www/yt-dlp/pkg/PLIST
> --- www/yt-dlp/pkg/PLIST
> +++ www/yt-dlp/pkg/PLIST
> @@ -637,6 +637,8 @@ lib/python${MODPY_VERSION}/site-packages/yt_dlp/extrac
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}elonet.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}elpais.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}elpais.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}eltrecetv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}eltrecetv.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}embedly.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}embedly.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}engadget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -947,6 +949,8 @@ lib/python${MODPY_VERSION}/site-packages/yt_dlp/extrac
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}japandiet.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jeuxvideo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jeuxvideo.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jiosaavn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jiosaavn.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jixie.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jixie.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}joj.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -1011,6 +1015,8 @@ lib/python${MODPY_VERSION}/site-packages/yt_dlp/extrac
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}laola1tv.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}lastfm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}lastfm.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}laxarxames.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}laxarxames.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}lazy_extractors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}lazy_extractors.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}lbry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -1299,8 +1305,6 @@ lib/python${MODPY_VERSION}/site-packages/yt_dlp/extrac
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}nintendo.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}nitter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}nitter.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}njpwworld.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
Re: amd64: llvm 16 fallout (2023-11-14)
Christian Weisgerber wrote (2023-11-16 16:54 CET): > My build is still catching up with the many fixes that have already > been committed, but here is some basic triage of remaining problems: > > cad/prusaslicer C++ ambiguous function call > comms/gnuradio internal compiler error > devel/atlas C++17 does not allow dynamic exception > devel/avr32/newlib C integer to pointer conversion > devel/iaito C++ undeclared identifier > devel/lutok C++ auto_ptr For this: > games/0ad/base Rust? Error: warning: c++: error: unknown argument: '-fexperimental-new-pass-manager' The fix seems to be here: https://code.wildfiregames.com/D5011 I don't have time now if someone wants to patch it. It's not straight forward, because the file to patch seems not to exist after extract. > games/amoebax C++ auto_ptr > games/bastetC++ undeclared identifier > games/boswars C++ auto_ptr > games/eliot C++ no member in namespace 'std' > games/goldberg_emulator C++ no member in namespace 'std' > games/lwjgl3JRE segv > games/mars C++ no member in namespace 'std' > japanese/onew,canna C integer to pointer conversion > lang/fpc? > multimedia/synfig C++ auto_ptr > net/gnugk C++ no member in namespace 'std' > net/kea,postgresql checking for log4cplus/logger.h... no > net/minbif C++17 does not allow dynamic exception > net/nheko C va_list > net/xprobe C++ undeclared identifier > security/pivy configure: cannot compute sizeof (int) > security/web-eid-appC++ integer value outside enum range > www/firefox-esr clang-13 internal compiler error > www/mozilla-firefox clang-13 internal compiler error > www/tor-browser/browser clang-13 internal compiler error > x11/gnome/mutter'wayland-server.h' not found > x11/kde-applications/kleopatra C++ integer value outside enum range > x11/ogreC++ auto_ptr > x11/qt6/qtwebengine C integer to pointer conversion > > -- > Christian "naddy" Weisgerber na...@mips.inka.de >
Re: [new] multimedia/ytfzf
Laurent Cheylus wrote (2023-07-05 07:50 CEST):
> cc solene@ and luffy20...@protonmail.com (initial request to create this
> port)
>
> Proposal to import a new port multimedia/ytfzf for ytfzf tool
> https://github.com/pystardust/ytfzf
>
> ytfzf is a shell script that helps you find Youtube videos (without API) and
> opens/downloads them using mpv/youtube-dl.
>
> Initial port for version 2.6.0:
> - no build, only an install stage to copy script, manpages, example for
> config and copy addons
> - patch script for addons directory => substitute VAR for ${TRUEPREFIX}
> - RUN_DEPENDS for jq, curl, fzf, multimedia/mpv and www/yt-dlp
> - no dependency for ueberzugpp (no port for OpenBSD)
>
> Basic tests searching Youtube videos and displaying the list of results with
> fzf.
>
> Please test, comments welcome and commit if OK.
I just found this on ports@ after I started to create a port on my own.
Attached is an updated version (2.6.1) which also uses DIST_TUPLE. I
also broke RUN_DEPENDS into one dependency per line. It's just easier to
read.
Without thumbnails, ytfzf works fine. I tried the imv, mpv and chafa thumbnail
generation. They don't work because fzf is being killed by pledge:
$ ytfzf -t -T {chafa,mpv,imv}
fzf[85237]: pledge "wpath", syscall 5
This happens, because fzf is trying to open the prefiew image in /tmp
46440 fzf NAMI "/tmp/fzf-preview-1776267355"
46440 fzf PLDG open, "wpath", errno 1 Operation not permitted
As you're also maintaining fzf, maybe you want to look at this?
Best regards,
Stefan
ytfzf.tgz
Description: application/tar-gz
Re: GZDoom update, next attempt
Timo Myyrä wrote (2023-11-14 17:50 CET):
> On Fri, Nov 10 2023, Stefan Hagen wrote:
>
> > Thomas Frohwein wrote (2023-11-09 21:16 CET):
> >> Here is an update to GZDoom 4.11.3. It works to run mods like the
> >> recently released Beyond Sunset.
> >>
> >> Of note, you may need to switch the video backend to opengl as I
> >> outlined after previous concerns:
> >>
> >> https://marc.info/?l=openbsd-ports=169132550927983=2
> >>
> >> Of note, we are several versions behind upstream - the current version
> >> in ports is 4.8.2.
> >
> > What's the deal with:
> >> +- set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
> >> ++ #set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
> >
> > It builds and works fine with
> > set(ZVULKAN_LIBS ${CMAKE_DL_LIBS})
> >
> > There doesn't seem to be a difference at runtime. At least on my
> > machine (amd), vulkan runs fine with and without this line.
> >
> > (I haven't diffed the build logs to figure out if it has picked up
> > something differently)
> >
> > Regarding:
> >> https://marc.info/?l=openbsd-ports=169132550927983=2
> >> After changing that back to default opengl (0),
> >
> > It seems to be untrue that opengl is the default backend. If I remove
> > gzdoom.ini and start the game, the vulkan backend is automatically
> > selected.
> >
> > If we have issues with the vulkan backend on more than a few machines,
> > should we change the default? And/Or described the issue in the README?
> >
>
> How about this diff? Bumps minor version a bit and sets the vulkan bits.
> Works for me with ryzen thinkpad.
Hmm. Vulkan and OpenGL ES works. When I select OpenGL it gets stuck on
the loading screen and gzdoom keeps consuming 60% CPU and X ~15/20%.
Does this happen for you too?
> diff /usr/ports
> commit - 9213cea3ba80fcc2debf29c883db9b8e42c07622
> path + /usr/ports
> blob - e08c43f0bf6074d7afac5b1c384ceb55e065c6fc
> file + games/gzdoom/Makefile
> --- games/gzdoom/Makefile
> +++ games/gzdoom/Makefile
> @@ -6,12 +6,11 @@ ONLY_FOR_ARCHS =i386 amd64
>
> COMMENT =OpenGL engine for idTech 1 games like
> doom,hexen,heretic...
>
> -V = 4.8.2
> -GH_ACCOUNT = coelckers
> -GH_PROJECT = gzdoom
> -GH_TAGNAME = g${V}
> -DISTNAME = gzdoom-${V}
> +V = 4.11.3
>
> +DIST_TUPLE = github ZDoom gzdoom g${V} .
> +PKGNAME =gzdoom-${V}
> +
> CATEGORIES= games
>
> HOMEPAGE = https://zdoom.org
> @@ -21,8 +20,8 @@ MAINTAINER =Timo Myyra
>
> # GPLv3
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
> -WANTLIB += openal vpx z zmusic
> +WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo m
> +WANTLIB += openal vpx webp webpdemux webpmux zmusic
>
> # C++17
> COMPILER = base-clang ports-gcc
> @@ -34,13 +33,14 @@ CONFIGURE_ARGS += -DDYN_OPENAL=NO
> CONFIGURE_ARGS +=-DHAVE_STDINT_H=1
> CONFIGURE_ARGS +=-DNO_OPENMP=ON
>
> -CXXFLAGS += -I. -I${LOCALBASE}/include
> +CFLAGS +=-I${X11BASE}/include
> +CXXFLAGS += -I. -I${LOCALBASE}/include
>
> LIB_DEPENDS =archivers/bzip2 \
> audio/openal \
> audio/zmusic \
> devel/sdl2 \
> - graphics/jpeg \
> + graphics/libwebp \
> multimedia/libvpx
>
> NO_TEST =Yes
> blob - fffa78bdc838438fde2a24aea4f98f67711f36aa
> file + games/gzdoom/distinfo
> --- games/gzdoom/distinfo
> +++ games/gzdoom/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (gzdoom-4.8.2.tar.gz) = Tt1g+AlMncPft0AL28DrsKXldLCmdH7uTI2fH2r3cSc=
> -SIZE (gzdoom-4.8.2.tar.gz) = 24247668
> +SHA256 (ZDoom-gzdoom-g4.11.3.tar.gz) =
> WUPbpQ2iD/lPH8xBUTJnLUKhWRfFcbHCt87v4Uk19dU=
> +SIZE (ZDoom-gzdoom-g4.11.3.tar.gz) = 24354699
> blob - 0f5f1a7bc01e286e168f93809d4a8c6c8357cc3e
> file + games/gzdoom/patches/patch-CMakeLists_txt
> --- games/gzdoom/patches/patch-CMakeLists_txt
> +++ games/gzdoom/patches/patch-CMakeLists_txt
> @@ -1,7 +1,7 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -272,7 +272,7 @@ else()
> +@@ -301,7 +301,7 @@ else()
>
> if ( UNIX )
> include(CheckSymbolExists)
> blob - /dev/null
> file + games/gzdoom/patches/patch-libraries_ZVulkan_CMakeLists_txt (mode 644)
> --- /dev/null
> +++ games/gzdoom/patches/patch-libraries_ZVulkan_CMakeLists_txt
> @@ -0,0 +1,12 @
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/14 02:22:09 Modified files: infrastructure/templates: Makefile.template Log message: Replace GH_* with DIST_TUPLE in Makefile.template with input from op, sthen. OK sthen
Re: Add DIST_TUPLE to Makefile.template
Stuart Henderson wrote (2023-11-14 09:43 CET): > On 2023/11/14 08:42, Stefan Hagen wrote: > > Stuart Henderson wrote (2023-11-13 21:01 CET): > > > On 2023/11/13 20:10, Stefan Hagen wrote: > > > > Omar Polo wrote (2023-11-13 18:07 CET): > > > > > On 2023/11/13 14:57:39 +0100, Stefan Hagen > > > > > wrote: > > > > > > Omar Polo wrote (2023-11-13 14:08 CET): > > > > > > > > > > Here's what I had in mind. it needs better wording but haven't come > > > > > up > > > > > with something better yet. Neither "forgename" nor "name" (nor > > > > > "forge") > > > > > convey the meaning of "just put github/codeberg/gitlab/... here". > > > > > > > > > +# For web forges (github, codeberg, ...) if there's a static tarball > > > > > +# available (preferred) just use SITES and DISTNAME, otherwise > > > > > +# DIST_TUPLE, in which case DISTNAME is not generally needed. > > > > > > > > Are these sites called "forge"? It's the first time I hear "forgename". > > > > It's clear from the context and I'm not against it. Intuitively I'd call > > > > it sitename. > > > > > > > > I like your wording. I'd either still reference dist-tupple.pattern > > > > somewhere or include the full list. > > > > > > > > > -# github: > > > > > -# /releases/ -> preferred. ignore GH_*, just use SITES and DISTNAME. > > > > > -# /archive/ -> GH_ACCOUNT and GH_PROJECT, plus either GH_TAGNAME or > > > > > GH_COMMIT. > > > > > > > > > > I think it's useful to show the /releases/ and /archive/ directories > > > here, I think I would say something along these lines > > > > The example works for github, gitlab and codeberg. > > It does not apply to kde, gnome and sourcehut. > > > > > > +# For web forges (codeberg, github, gitlab, kde, srht, gnome) if > > > > there's > > > > +# a static tarball available (preferred) just use SITES and DISTNAME. > > > > +# For autogenerated ones use DIST_TUPLE, in which case DISTNAME is not > > > > +# generally needed. > > > > > > I don't like the word "forge" here, I don't think it's all that well > > > known and there's potential for confusion with sourceforge. Is it enough > > > to just list the names? > > > > What about calling them platforms? > > > > > > +#DIST_TUPLE = forgename account project tagname/commitid extractdir > > > > +#DIST_TUPLE = github vim vim v9.0.1677 . > > > > > > perhaps showing an example here that uses a second DIST_TUPLE entry > > > pointed at a subdir would be helpful. > > > > I think I found a way to describe it in a way that reads good and is > > understandable and contains all the information and is accurate. > > > > Sorry to come up with a completely different version, but I think it's > > better. And assuming that dist_tuple will be used a lot, it's probably > > fine to give it a bit more space in the file. > > > > Is it good? > > # > > -# github: > > -# /releases/ -> preferred. ignore GH_*, just use SITES and DISTNAME. > > -# /archive/ -> GH_ACCOUNT and GH_PROJECT, plus either GH_TAGNAME or > > GH_COMMIT. > > +# On source code hosting platforms use static tarballs over generated ones. > > +# It's easy to distinguish between them on github, gitlab and codeberg by > > +# looking at the file URL: > > +# /releases/ -> preferred. Use SITES and DISTNAME. > > +# /archive/ -> use DIST_TUPLE (use only if there is no release version). > > # > > -# set DISTNAME if using GH_COMMIT, or if using GH_TAGNAME and the tag is > > not in > > -# the format "v1.00" or "1.00". > > -# > > -#GH_ACCOUNT = username > > -#GH_PROJECT = project > > -#GH_TAGNAME = 1.0 > > -#GH_COMMIT = abab123456789abacafeabab123123b1e4ble4bl > > +# platform: codeberg, github, gitlab, kde, srht, gnome > > +# account: usually the account or organisation name > > +# project: the project or repository name > > All good up to here. > > > +# tagname: source code tag like 1.0.1 or v1.0 (more creative tags require > > DISTNAME) > > +# commitid: at least 10 charactes of the commit hash (requires DISTNAME) > > +# subdir: usually ".", can be a subdir if the archive
Re: Add DIST_TUPLE to Makefile.template
Stuart Henderson wrote (2023-11-13 21:01 CET): > On 2023/11/13 20:10, Stefan Hagen wrote: > > Omar Polo wrote (2023-11-13 18:07 CET): > > > On 2023/11/13 14:57:39 +0100, Stefan Hagen > > > wrote: > > > > Omar Polo wrote (2023-11-13 14:08 CET): > > > > > > Here's what I had in mind. it needs better wording but haven't come up > > > with something better yet. Neither "forgename" nor "name" (nor "forge") > > > convey the meaning of "just put github/codeberg/gitlab/... here". > > > > > +# For web forges (github, codeberg, ...) if there's a static tarball > > > +# available (preferred) just use SITES and DISTNAME, otherwise > > > +# DIST_TUPLE, in which case DISTNAME is not generally needed. > > > > Are these sites called "forge"? It's the first time I hear "forgename". > > It's clear from the context and I'm not against it. Intuitively I'd call > > it sitename. > > > > I like your wording. I'd either still reference dist-tupple.pattern > > somewhere or include the full list. > > > > > -# github: > > > -# /releases/ -> preferred. ignore GH_*, just use SITES and DISTNAME. > > > -# /archive/ -> GH_ACCOUNT and GH_PROJECT, plus either GH_TAGNAME or > > > GH_COMMIT. > > > > I think it's useful to show the /releases/ and /archive/ directories > here, I think I would say something along these lines The example works for github, gitlab and codeberg. It does not apply to kde, gnome and sourcehut. > > +# For web forges (codeberg, github, gitlab, kde, srht, gnome) if there's > > +# a static tarball available (preferred) just use SITES and DISTNAME. > > +# For autogenerated ones use DIST_TUPLE, in which case DISTNAME is not > > +# generally needed. > > I don't like the word "forge" here, I don't think it's all that well > known and there's potential for confusion with sourceforge. Is it enough > to just list the names? What about calling them platforms? > > +#DIST_TUPLE = forgename account project tagname/commitid extractdir > > +#DIST_TUPLE = github vim vim v9.0.1677 . > > perhaps showing an example here that uses a second DIST_TUPLE entry > pointed at a subdir would be helpful. I think I found a way to describe it in a way that reads good and is understandable and contains all the information and is accurate. Sorry to come up with a completely different version, but I think it's better. And assuming that dist_tuple will be used a lot, it's probably fine to give it a bit more space in the file. Is it good? Index: infrastructure/templates/Makefile.template === RCS file: /cvs/ports/infrastructure/templates/Makefile.template,v diff -u -p -u -p -r1.99 Makefile.template --- infrastructure/templates/Makefile.template 15 Oct 2023 11:22:01 - 1.99 +++ infrastructure/templates/Makefile.template 14 Nov 2023 07:29:51 - @@ -36,17 +36,19 @@ DISTNAME = ??? #PKGNAME-foo = ??? for multi packages # -# github: -# /releases/ -> preferred. ignore GH_*, just use SITES and DISTNAME. -# /archive/ -> GH_ACCOUNT and GH_PROJECT, plus either GH_TAGNAME or GH_COMMIT. +# On source code hosting platforms use static tarballs over generated ones. +# It's easy to distinguish between them on github, gitlab and codeberg by +# looking at the file URL: +# /releases/ -> preferred. Use SITES and DISTNAME. +# /archive/ -> use DIST_TUPLE (use only if there is no release version). # -# set DISTNAME if using GH_COMMIT, or if using GH_TAGNAME and the tag is not in -# the format "v1.00" or "1.00". -# -#GH_ACCOUNT = username -#GH_PROJECT = project -#GH_TAGNAME = 1.0 -#GH_COMMIT = abab123456789abacafeabab123123b1e4ble4bl +# platform: codeberg, github, gitlab, kde, srht, gnome +# account: usually the account or organisation name +# project: the project or repository name +# tagname: source code tag like 1.0.1 or v1.0 (more creative tags require DISTNAME) +# commitid: at least 10 charactes of the commit hash (requires DISTNAME) +# subdir: usually ".", can be a subdir if the archive extracts to the root +#DIST_TUPLE = platform account project tagname/commitid subdir # for any port that creates shared libraries. # both libtool and cmake automatically set filenames based on this variable.
Re: Add DIST_TUPLE to Makefile.template
Omar Polo wrote (2023-11-13 18:07 CET): > On 2023/11/13 14:57:39 +0100, Stefan Hagen > wrote: > > Omar Polo wrote (2023-11-13 14:08 CET): > > > On 2023/11/13 13:49:03 +0100, Stefan Hagen > > > wrote: > > > > DIST_TUPLE did not yet make it into the Makefile.template. > > > > > > > > OK to add it under the GH_ parts? > > > > > > why not replacing GH_* completely with this in the template? There is > > > still stuff that explicitly depends on GH_*? (except go.port.mk) > > > > If there's no case left for GH_, I'm not against removing it. > > to be clear: I wasn't suggesting to nuke GH_*, just that the Makefile > template could mention only one method, and DIST_TUPLE is IMHO the one > to suggest now. Neither was I. I was speaking in the context of the Makefile.template > here it still references GH_* directly, not that's bad, but I'd take the > chance to generalize a bit this paragraph and providing a note that can > be used to quickly fetch stuff from various forges. > Here's what I had in mind. it needs better wording but haven't come up > with something better yet. Neither "forgename" nor "name" (nor "forge") > convey the meaning of "just put github/codeberg/gitlab/... here". > +# For web forges (github, codeberg, ...) if there's a static tarball > +# available (preferred) just use SITES and DISTNAME, otherwise > +# DIST_TUPLE, in which case DISTNAME is not generally needed. Are these sites called "forge"? It's the first time I hear "forgename". It's clear from the context and I'm not against it. Intuitively I'd call it sitename. I like your wording. I'd either still reference dist-tupple.pattern somewhere or include the full list. > -# github: > -# /releases/ -> preferred. ignore GH_*, just use SITES and DISTNAME. > -# /archive/ -> GH_ACCOUNT and GH_PROJECT, plus either GH_TAGNAME or > GH_COMMIT. > +#DIST_TUPLE =forgename account project tagname/commitid . No explanation about the last parameter? I'd leave the concrete example in, I think it helps. I also added the "autogenerated" word, which I find useful, because it's not really clear what's meant with a non-static tarball if one doesn't know about the checksum problem already. Index: infrastructure/templates/Makefile.template === RCS file: /cvs/ports/infrastructure/templates/Makefile.template,v diff -u -p -u -p -r1.99 Makefile.template --- infrastructure/templates/Makefile.template 15 Oct 2023 11:22:01 - 1.99 +++ infrastructure/templates/Makefile.template 13 Nov 2023 18:53:15 - @@ -36,17 +36,12 @@ DISTNAME = ??? #PKGNAME-foo = ??? for multi packages # -# github: -# /releases/ -> preferred. ignore GH_*, just use SITES and DISTNAME. -# /archive/ -> GH_ACCOUNT and GH_PROJECT, plus either GH_TAGNAME or GH_COMMIT. -# -# set DISTNAME if using GH_COMMIT, or if using GH_TAGNAME and the tag is not in -# the format "v1.00" or "1.00". -# -#GH_ACCOUNT = username -#GH_PROJECT = project -#GH_TAGNAME = 1.0 -#GH_COMMIT = abab123456789abacafeabab123123b1e4ble4bl +# For web forges (codeberg, github, gitlab, kde, srht, gnome) if there's +# a static tarball available (preferred) just use SITES and DISTNAME. +# For autogenerated ones use DIST_TUPLE, in which case DISTNAME is not +# generally needed. +#DIST_TUPLE = forgename account project tagname/commitid extractdir +#DIST_TUPLE = github vim vim v9.0.1677 . # for any port that creates shared libraries. # both libtool and cmake automatically set filenames based on this variable.
Re: UPDATE: Suricata-7.0.1
gonzalo wrote (2023-11-01 14:44 CET):
> Hi Stefan,
>
> Sorry the delay, I made it for 7.0.2, this looks better for you?
>
-MASTER_SITES = https://www.openinfosecfoundation.org/download/
+SITES =https://www.openinfosecfoundation.org/download/
Are you working on -release? MASTER_SITES is gone for a while now...
I manually applied the failing Makefile and it works now.
There were still a lot of WANTLIB and some LIB_DEPENDS entries that
aren't needed. I removed these.
Please double check that I didn't remove too much. If the port needs
some of these installed at runtime, they should better be added as
RUN_DEPENDS.
portcheck, port-lib-depends-check and test target are happy with this. A
short runtime test by enabling + starting the daemon on my trunk device
worked.
Regenerated patch with my tweaks below.
ok sdk@
Index: security/suricata/Makefile
===
RCS file: /cvs/ports/security/suricata/Makefile,v
diff -u -p -u -p -r1.60 Makefile
--- security/suricata/Makefile 27 Sep 2023 16:34:37 - 1.60
+++ security/suricata/Makefile 13 Nov 2023 14:42:34 -
@@ -3,7 +3,7 @@ NOT_FOR_ARCHS = powerpc64 riscv64
COMMENT = high performance network IDS, IPS and security monitoring
-SURICATA_V = 6.0.12
+SURICATA_V = 7.0.2
SUPDATE_V =1.2.7
DISTNAME = suricata-${SURICATA_V}
@@ -20,9 +20,8 @@ PERMIT_PACKAGE= Yes
SITES =https://www.openinfosecfoundation.org/download/
# uses pledge()
-WANTLIB += ${COMPILER_LIBCXX} c iconv jansson lz4 lzma m magic
-WANTLIB += maxminddb net nspr4 nss3 nssutil3 pcap pcre plc4 plds4
-WANTLIB += smime3 ssl3 yaml-0 z
+WANTLIB += ${COMPILER_LIBCXX} c elf iconv jansson lz4 m magic maxminddb
+WANTLIB += net pcap pcre2-8 yaml-0 z
MODULES = lang/python
@@ -34,22 +33,19 @@ BUILD_DEPENDS = devel/py-setuptools${MOD
RUN_DEPENDS = textproc/py-yaml${MODPY_FLAVOR}
LIB_DEPENDS = archivers/lz4 \
- archivers/xz \
converters/libiconv \
devel/jansson \
- devel/nspr \
devel/libyaml \
devel/libmagic \
- devel/pcre \
+ devel/pcre2 \
net/libnet/1.1 \
- net/libmaxminddb \
- security/nss
+ net/libmaxminddb
COMPILER = base-clang ports-gcc
DEBUG_PACKAGES = ${BUILD_PACKAGES}
CONFIGURE_STYLE = autoconf
-AUTOCONF_VERSION = 2.69
+AUTOCONF_VERSION = 2.71
AUTOMAKE_VERSION = 1.15
CONFIGURE_ENV =ac_cv_path_HAVE_PDFLATEX= \
Index: security/suricata/distinfo
===
RCS file: /cvs/ports/security/suricata/distinfo,v
diff -u -p -u -p -r1.20 distinfo
--- security/suricata/distinfo 3 Jul 2023 08:22:31 - 1.20
+++ security/suricata/distinfo 13 Nov 2023 14:42:34 -
@@ -1,2 +1,2 @@
-SHA256 (suricata-6.0.12.tar.gz) = BLIxYJNbAxl7CFwszJ2Ah1oz8RVYMFTRRgqw+2bYNLM=
-SIZE (suricata-6.0.12.tar.gz) = 27388535
+SHA256 (suricata-7.0.2.tar.gz) = tOtgSDjvmag5a8i3u1TK0R8kQsvXy7MA5/WqsZCXvE0=
+SIZE (suricata-7.0.2.tar.gz) = 23445403
Index: security/suricata/patches/patch-configure_ac
===
RCS file: /cvs/ports/security/suricata/patches/patch-configure_ac,v
diff -u -p -u -p -r1.11 patch-configure_ac
--- security/suricata/patches/patch-configure_ac3 Jul 2023 08:22:31
- 1.11
+++ security/suricata/patches/patch-configure_ac13 Nov 2023 14:42:34
-
@@ -3,7 +3,7 @@ To remove the pid file, its directory mu
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -2764,7 +2764,7 @@ if test "$WINDOWS_PATH" = "yes"; then
+@@ -2560,7 +2560,7 @@ if test "$WINDOWS_PATH" = "yes"; then
fi
else
EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
Index: security/suricata/patches/patch-doc_userguide_Makefile_in
===
RCS file: /cvs/ports/security/suricata/patches/patch-doc_userguide_Makefile_in,v
diff -u -p -u -p -r1.6 patch-doc_userguide_Makefile_in
--- security/suricata/patches/patch-doc_userguide_Makefile_in 3 Jul 2023
08:22:31 - 1.6
+++ security/suricata/patches/patch-doc_userguide_Makefile_in 13 Nov 2023
14:42:34 -
@@ -3,32 +3,6 @@ Index: doc/userguide/Makefile.in
+++ doc/userguide/Makefile.in
@@ -1,3 +1,4 @@
+
- # Makefile.in generated by automake 1.16.1 from Makefile.am.
+ # Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-
-@@ -623,14 +624,14 @@ uninstall-man: uninstall-man1
- @HAVE_SPHINXBUILD_TRUE@ sysconfdir=$(sysconfdir) \
- @HAVE_SPHINXBUILD_TRUE@ localstatedir=$(localstatedir) \
- @HAVE_SPHINXBUILD_TRUE@ version=$(PACKAGE_VERSION) \
--@HAVE_SPHINXBUILD_TRUE@ $(SPHINX_BUILD) -W -b html -d
_build/doctrees \
-+@HAVE_SPHINXBUILD_TRUE@
Re: Add DIST_TUPLE to Makefile.template
Omar Polo wrote (2023-11-13 14:08 CET): > On 2023/11/13 13:49:03 +0100, Stefan Hagen > wrote: > > Hi, > > > > DIST_TUPLE did not yet make it into the Makefile.template. > > > > OK to add it under the GH_ parts? > > why not replacing GH_* completely with this in the template? There is > still stuff that explicitly depends on GH_*? (except go.port.mk) If there's no case left for GH_, I'm not against removing it. Index: infrastructure/templates/Makefile.template === RCS file: /cvs/ports/infrastructure/templates/Makefile.template,v diff -u -p -u -p -r1.99 Makefile.template --- infrastructure/templates/Makefile.template 15 Oct 2023 11:22:01 - 1.99 +++ infrastructure/templates/Makefile.template 13 Nov 2023 13:56:55 - @@ -38,15 +38,15 @@ DISTNAME = ??? # # github: # /releases/ -> preferred. ignore GH_*, just use SITES and DISTNAME. -# /archive/ -> GH_ACCOUNT and GH_PROJECT, plus either GH_TAGNAME or GH_COMMIT. +# /archive/ -> use DIST_TUPLE as described below. # -# set DISTNAME if using GH_COMMIT, or if using GH_TAGNAME and the tag is not in +# set DISTNAME if using , or if using and the tag is not in # the format "v1.00" or "1.00". # -#GH_ACCOUNT = username -#GH_PROJECT = project -#GH_TAGNAME = 1.0 -#GH_COMMIT = abab123456789abacafeabab123123b1e4ble4bl +# use the dist tuple mechanism for github and other sites that are +# supported. See infrastructure/db/dist-tuple.pattern for details. +# DIST_TUPLE += # +# DIST_TUPLE +=gitlab vim vim v9.0.1677 . # VIM License / donation-ware # for any port that creates shared libraries. # both libtool and cmake automatically set filenames based on this variable.
Re: [NEW] sysutils/fclones
Frederic Cambus wrote (2023-11-13 12:58 CET): > On Sat, Nov 11, 2023 at 07:02:58PM +0100, Stefan Hagen wrote: > > > > fclones is a command line utility that identifies groups of identical > > > files > > > and gets rid of the file copies you no longer need. It comes with plenty > > > of > > > configuration options for controlling the search scope and offers many > > > ways > > > of removing duplicates. For maximum flexibility, it integrates well with > > > other Unix utilities like find and it speaks JSON, so you have a lot of > > > control over the search and cleanup process. > > > > finally something that's a bit more clever than fdupes. I wish it had a > > manpage instead of making me jump through all commands with the -h flag. > > But that's the world we live in... > > > > The port looks good. You could replace the GH_* lines with the new > > DIST_TUPLE (and recreate distinfo): > > > > DIST_TUPLE =github pkolaczk fclones v0.34.0 . > > Good point, thanks, I moved DIST_TUPLE a bit upper in the Makefile in > the position of the previous GH_ variables. > > (We should probably add a DIST_TUPLE entry in Makefile.template to > standardize positioning). You're probably right. I sent a diff to add it to the Makefile. > > Regarding the patch... is this the rust way to find `basename $0`? > > > > If this is the case, why don't you just patch it to: > > > > program_name: "fclones".to_string(), > > I used the same mechanism as in the lang/deno patches but I agree that > it's easier to simply hardcode the string. > > I regenerated the patch to remove the "use std::path::PathBuf;" part > which isn't required anymore. > > > 1 (of 165) test fails: > > test dedupe::test::test_partition_respects_creation_time_priority ... FAILED > > Also fails here, I'm not sure what to do about this. > > New tarball attached. Looks good. OK for import sdk@
Add DIST_TUPLE to Makefile.template
Hi, DIST_TUPLE did not yet make it into the Makefile.template. OK to add it under the GH_ parts? Index: infrastructure/templates/Makefile.template === RCS file: /cvs/ports/infrastructure/templates/Makefile.template,v diff -u -p -u -p -r1.99 Makefile.template --- infrastructure/templates/Makefile.template 15 Oct 2023 11:22:01 - 1.99 +++ infrastructure/templates/Makefile.template 13 Nov 2023 12:47:58 - @@ -48,6 +48,11 @@ DISTNAME = ??? #GH_TAGNAME = 1.0 #GH_COMMIT = abab123456789abacafeabab123123b1e4ble4bl +# it is preferred to us the shorter dist tuple mechanism for sites that +# are supported. See infrastructure/db/dist-tuple.pattern for details. +# DIST_TUPLE += # +# DIST_TUPLE +=gitlab vim vim v9.0.1677 . # VIM License / donation-ware + # for any port that creates shared libraries. # both libtool and cmake automatically set filenames based on this variable. # for libtool- or cmake-based ports, have a look at WRKBUILD/shared_libs.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/12 04:20:33 Modified files: www: Makefile Log message: Add dir for gallery-dl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/12 04:19:39 Log message: Import gallery-dl 1.26.2 from grodzio1 $ cat pkg/DESCR gallery-dl is a command-line program for downloading image galleries and collections from several image hosting sites. It is a cross-platform tool with many configuration options and powerful filenaming capabilities. MAINTAINER: grodzio1 With help from sdk, sthen OK sdk@ bentley@ Status: Vendor Tag: sdk Release Tags: sdk_20231112 N ports/www/gallery-dl/Makefile N ports/www/gallery-dl/distinfo N ports/www/gallery-dl/pkg/DESCR N ports/www/gallery-dl/pkg/PLIST N ports/www/gallery-dl/pkg/README N ports/www/gallery-dl/patches/patch-setup_py No conflicts created by this import
Re: [NEW] sysutils/fclones
Frederic Cambus wrote (2023-11-11 14:58 CET): > Hi ports@, > > Here is a new port: sysutils/fclones > > From DESCR: > > fclones is a command line utility that identifies groups of identical files > and gets rid of the file copies you no longer need. It comes with plenty of > configuration options for controlling the search scope and offers many ways > of removing duplicates. For maximum flexibility, it integrates well with > other Unix utilities like find and it speaks JSON, so you have a lot of > control over the search and cleanup process. > > Comments? OK? Hi, finally something that's a bit more clever than fdupes. I wish it had a manpage instead of making me jump through all commands with the -h flag. But that's the world we live in... The port looks good. You could replace the GH_* lines with the new DIST_TUPLE (and recreate distinfo): DIST_TUPLE =github pkolaczk fclones v0.34.0 . Regarding the patch... is this the rust way to find `basename $0`? If this is the case, why don't you just patch it to: program_name: "fclones".to_string(), Then the pre-configure part can go away. 1 (of 165) test fails: test dedupe::test::test_partition_respects_creation_time_priority ... FAILED My version attached. Best regards, Stefan fclones.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/10 04:17:58 Modified files: net/lagrange : Makefile distinfo Log message: Update net/lagrange to 1.17.3; from MAINTAINER Florian Viehweger, thanks! Changes: https://github.com/skyjake/lagrange/releases/tag/v1.17.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/10 02:59:14 Modified files: mail/mu: Makefile distinfo mail/mu/pkg: PLIST Log message: Update mu to version 1.10.8 Port changes: - switched to dist_tuple - homepage goes to https directly - plist had info instead of @info Software changes: - guile: fix module installation path - infodir: allow passing absolute path - mu4e-view: assign gnus-article-buffer (helps with some external programs) - mu4e: fix completion with non-quick keys (when using completion frameworks) With hints from op@ OK op
Re: [update] mail/mu to version 1.10.8 + dist_tuple + minor tweaks
Stefan Hagen wrote (2023-11-10 09:46 CET):
> Hi,
>
> no update, just a few port tweaks:
>
> - switched to dist_tuple
> - homepage goes to https directly
> - plist had info instead of @info
I'll be dammed. This diff was sitting a few hours too long. There was
a new release a few hours ago. So here's a diff including the version
bump.
Changes:
- guile: fix module installation path
- infodir: allow passing absolute path
- mu4e-view: assign gnus-article-buffer (helps with some external programs)
- mu4e: fix completion with non-quick keys (when using completion frameworks)
+ tweaks from the previous mail
OK?
Best regards,
Stefan
Index: mail/mu/Makefile
===
RCS file: /cvs/ports/mail/mu/Makefile,v
diff -u -p -u -p -r1.43 Makefile
--- mail/mu/Makefile26 Sep 2023 12:28:13 - 1.43
+++ mail/mu/Makefile10 Nov 2023 08:49:57 -
@@ -1,6 +1,6 @@
COMMENT= maildir indexer and searcher with emacs frontend
-V =1.10.7
+V =1.10.8
GUILE_V = 3.0
DISTNAME = mu-$V
@@ -11,7 +11,7 @@ FLAVOR ?=
SHARED_LIBS = guile-mu0.1
CATEGORIES = mail
-HOMEPAGE = http://www.djcbsoftware.nl/code/mu/
+HOMEPAGE = https://www.djcbsoftware.nl/code/mu/
MAINTAINER = Stefan Hagen
@@ -21,7 +21,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} c gio-2.0 glib-2.0 gmime-3.0 gobject-2.0
WANTLIB += m xapian
-SITES =https://github.com/djcb/mu/releases/download/v${V}/
+DIST_TUPLE = github djcb mu v${V} .
EXTRACT_SUFX = .tar.xz
MODULES = devel/meson
@@ -50,7 +50,6 @@ pre-configure:
${WRKDIST}/guile/*/*.scm
post-install:
- gunzip ${WRKINST}/${TRUEPREFIX}/share/info/*.info.gz
mv ${WRKINST}/${TRUEPREFIX}/share/info/*.info \
${WRKINST}/${TRUEPREFIX}/info/
rm -r ${WRKINST}/${TRUEPREFIX}/share/info
Index: mail/mu/distinfo
===
RCS file: /cvs/ports/mail/mu/distinfo,v
diff -u -p -u -p -r1.27 distinfo
--- mail/mu/distinfo5 Sep 2023 11:04:50 - 1.27
+++ mail/mu/distinfo10 Nov 2023 08:49:57 -
@@ -1,2 +1,2 @@
-SHA256 (mu-1.10.7.tar.xz) = 6qrJulFdojIpWwPyeX7tE1Uv3SmjASITTdOCpk0NPCE=
-SIZE (mu-1.10.7.tar.xz) = 570740
+SHA256 (djcb-mu-v1.10.8.tar.gz) = dh4HSuS7+ZXJMVB1O+VchJDz6XwZox5CiYMpZKh5G7E=
+SIZE (djcb-mu-v1.10.8.tar.gz) = 768318
Index: mail/mu/pkg/PLIST
===
RCS file: /cvs/ports/mail/mu/pkg/PLIST,v
diff -u -p -u -p -r1.11 PLIST
--- mail/mu/pkg/PLIST 5 Sep 2023 11:04:51 - 1.11
+++ mail/mu/pkg/PLIST 10 Nov 2023 08:49:57 -
@@ -1,5 +1,5 @@
@bin bin/mu
-info/mu4e.info
+@info info/mu4e.info
@man man/man1/mu-add.1
@man man/man1/mu-cfind.1
@man man/man1/mu-extract.1
mail/mu: dist_tuple + minor tweaks
Hi,
no update, just a few port tweaks:
- switched to dist_tuple
- homepage goes to https directly
- plist had info instead of @info
OK?
Index: mail/mu/Makefile
===
RCS file: /cvs/ports/mail/mu/Makefile,v
diff -u -p -u -p -r1.43 Makefile
--- mail/mu/Makefile26 Sep 2023 12:28:13 - 1.43
+++ mail/mu/Makefile10 Nov 2023 08:41:41 -
@@ -5,13 +5,15 @@ GUILE_V = 3.0
DISTNAME = mu-$V
+REVISION = 0
+
FLAVORS = guile
FLAVOR ?=
SHARED_LIBS = guile-mu0.1
CATEGORIES = mail
-HOMEPAGE = http://www.djcbsoftware.nl/code/mu/
+HOMEPAGE = https://www.djcbsoftware.nl/code/mu/
MAINTAINER = Stefan Hagen
@@ -21,7 +23,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} c gio-2.0 glib-2.0 gmime-3.0 gobject-2.0
WANTLIB += m xapian
-SITES =https://github.com/djcb/mu/releases/download/v${V}/
+DIST_TUPLE = github djcb mu v${V} .
EXTRACT_SUFX = .tar.xz
MODULES = devel/meson
Index: mail/mu/distinfo
===
RCS file: /cvs/ports/mail/mu/distinfo,v
diff -u -p -u -p -r1.27 distinfo
--- mail/mu/distinfo5 Sep 2023 11:04:50 - 1.27
+++ mail/mu/distinfo10 Nov 2023 08:41:41 -
@@ -1,2 +1,2 @@
-SHA256 (mu-1.10.7.tar.xz) = 6qrJulFdojIpWwPyeX7tE1Uv3SmjASITTdOCpk0NPCE=
-SIZE (mu-1.10.7.tar.xz) = 570740
+SHA256 (djcb-mu-v1.10.7.tar.gz) = EbcNYydkrVttCOMGSeG2HjOYqQNNnh9OiTBCpvQNujg=
+SIZE (djcb-mu-v1.10.7.tar.gz) = 768281
Index: mail/mu/pkg/PLIST
===
RCS file: /cvs/ports/mail/mu/pkg/PLIST,v
diff -u -p -u -p -r1.11 PLIST
--- mail/mu/pkg/PLIST 5 Sep 2023 11:04:51 - 1.11
+++ mail/mu/pkg/PLIST 10 Nov 2023 08:41:41 -
@@ -1,5 +1,5 @@
@bin bin/mu
-info/mu4e.info
+@info info/mu4e.info
@man man/man1/mu-add.1
@man man/man1/mu-cfind.1
@man man/man1/mu-extract.1
Re: GZDoom update, next attempt
Thomas Frohwein wrote (2023-11-09 21:16 CET):
> Here is an update to GZDoom 4.11.3. It works to run mods like the
> recently released Beyond Sunset.
>
> Of note, you may need to switch the video backend to opengl as I
> outlined after previous concerns:
>
> https://marc.info/?l=openbsd-ports=169132550927983=2
>
> Of note, we are several versions behind upstream - the current version
> in ports is 4.8.2.
What's the deal with:
> +-set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
> ++#set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
It builds and works fine with
set(ZVULKAN_LIBS ${CMAKE_DL_LIBS})
There doesn't seem to be a difference at runtime. At least on my
machine (amd), vulkan runs fine with and without this line.
(I haven't diffed the build logs to figure out if it has picked up
something differently)
Regarding:
> https://marc.info/?l=openbsd-ports=169132550927983=2
> After changing that back to default opengl (0),
It seems to be untrue that opengl is the default backend. If I remove
gzdoom.ini and start the game, the vulkan backend is automatically
selected.
If we have issues with the vulkan backend on more than a few machines,
should we change the default? And/Or described the issue in the README?
Best regards,
Stefan
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/gzdoom/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 18 Jul 2022 08:27:45 - 1.17
> +++ Makefile 9 Nov 2023 20:12:53 -
> @@ -6,11 +6,10 @@ ONLY_FOR_ARCHS =i386 amd64
>
> COMMENT =OpenGL engine for idTech 1 games like
> doom,hexen,heretic...
>
> -V = 4.8.2
> -GH_ACCOUNT = coelckers
> -GH_PROJECT = gzdoom
> -GH_TAGNAME = g${V}
> -DISTNAME = gzdoom-${V}
> +V = 4.11.3
> +
> +DIST_TUPLE = github ZDoom gzdoom g${V} .
> +PKGNAME =gzdoom-${V}
>
> CATEGORIES= games
>
> @@ -21,8 +20,8 @@ MAINTAINER =Timo Myyra # GPLv3
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
> -WANTLIB += openal vpx z zmusic
> +WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo m
> +WANTLIB += openal vpx webp webpdemux webpmux zmusic
>
> # C++17
> COMPILER = base-clang ports-gcc
> @@ -34,13 +33,14 @@ CONFIGURE_ARGS += -DDYN_OPENAL=NO
> CONFIGURE_ARGS +=-DHAVE_STDINT_H=1
> CONFIGURE_ARGS +=-DNO_OPENMP=ON
>
> -CXXFLAGS += -I. -I${LOCALBASE}/include
> +CFLAGS +=-I${X11BASE}/include
> +CXXFLAGS += -I. -I${LOCALBASE}/include
>
> LIB_DEPENDS =archivers/bzip2 \
> audio/openal \
> audio/zmusic \
> devel/sdl2 \
> - graphics/jpeg \
> + graphics/libwebp \
> multimedia/libvpx
>
> NO_TEST =Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/gzdoom/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 18 Jul 2022 08:27:45 - 1.7
> +++ distinfo 9 Nov 2023 20:12:53 -
> @@ -1,2 +1,2 @@
> -SHA256 (gzdoom-4.8.2.tar.gz) = Tt1g+AlMncPft0AL28DrsKXldLCmdH7uTI2fH2r3cSc=
> -SIZE (gzdoom-4.8.2.tar.gz) = 24247668
> +SHA256 (ZDoom-gzdoom-g4.11.3.tar.gz) =
> WUPbpQ2iD/lPH8xBUTJnLUKhWRfFcbHCt87v4Uk19dU=
> +SIZE (ZDoom-gzdoom-g4.11.3.tar.gz) = 24354699
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/games/gzdoom/patches/patch-CMakeLists_txt,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 18 Jul 2022 08:27:46 - 1.3
> +++ patches/patch-CMakeLists_txt 9 Nov 2023 20:12:53 -
> @@ -1,7 +1,7 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -272,7 +272,7 @@ else()
> +@@ -301,7 +301,7 @@ else()
>
> if ( UNIX )
> include(CheckSymbolExists)
> Index: patches/patch-libraries_ZVulkan_CMakeLists_txt
> ===
> RCS file: patches/patch-libraries_ZVulkan_CMakeLists_txt
> diff -N patches/patch-libraries_ZVulkan_CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-libraries_ZVulkan_CMakeLists_txt9 Nov 2023 20:12:53
> -
> @@ -0,0 +1,12 @@
> +Index: libraries/ZVulkan/CMakeLists.txt
> +--- libraries/ZVulkan/CMakeLists.txt.orig
> libraries/ZVulkan/CMakeLists.txt
> +@@ -188,7 +188,7 @@ if(WIN32)
> + add_definitions(-DUNICODE -D_UNICODE)
> + else()
> + set(ZVULKAN_SOURCES ${ZVULKAN_SOURCES} ${ZVULKAN_UNIX_SOURCES})
> +-set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
> ++#set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
> + add_definitions(-DUNIX -D_UNIX)
> +
Re: patch: allow shortened commits in dist-tuple
Marc Espie wrote (2023-11-05 20:08 CET):
>
> I don't think we need to go the full 40 chars.
>
> It is highly unlikely people are going to use 10 hex chars
> as a tag (and if they do, it's likely it's just a copy of the
> commit hash)
>
> 10 seems like a good number. tb@ mentionned that 8 is too short
> (we already ran into collision with 8).
>
> So 10 ? or 12 ?
>
> Opinions ?
+1 for the shortened hash and 10 looks reasonable.
> Index: dist-tuple.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/dist-tuple.port.mk,v
> diff -u -p -r1.14 dist-tuple.port.mk
> --- dist-tuple.port.mk28 Sep 2023 06:02:43 - 1.14
> +++ dist-tuple.port.mk5 Nov 2023 19:06:56 -
> @@ -25,7 +25,7 @@ ERRORS += "Fatal: invalid choice for DIS
> .endif
>
> _subdir =
> -.if "${_id}" == "HASH" || "${_id:C/^[0-9a-f]{40}$/HASH/}" != "HASH"
> +.if "${_id}" == "HASH" || "${_id:C/^[0-9a-f]{10,40}$/HASH/}" != "HASH"
> # set DISTNAME if not done by the port and add refs/tags/ subdir
> DISTNAME ?=
> ${_project}-${_id:C/^(v|V|ver|[Rr]el|[Rr]elease)[-._]?([0-9])/\2/}
> _subdir =refs/tags/
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/05 12:05:15 Modified files: x11: Makefile Log message: Add dir srandrd
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/11/05 12:04:13 Log message: Import x11/srandrd version 0.6.3 $ cat pkg/DESCR srandrd is a tool that executes a command on xrandr output change events, i.e. if a monitor is plugged or unplugged. I'm taking MAINTAINER as well. OK op thfr (with hints from both) Status: Vendor Tag: sdk Release Tags: sdk_20231105 N ports/x11/srandrd/Makefile N ports/x11/srandrd/distinfo N ports/x11/srandrd/pkg/DESCR N ports/x11/srandrd/pkg/PLIST N ports/x11/srandrd/patches/patch-Makefile No conflicts created by this import
Re: [new] x11/srandrd 0.6.3 - the missing hotplug daemon for X outputs
Thomas Frohwein wrote (2023-11-05 18:30 CET):
> On Sun, Nov 05, 2023 at 04:37:06PM +0100, Stefan Hagen wrote:
>
> [...]
>
> > > > SUBST_VARS =${WRKSRC}/Makefile
>
> [...]
>
> > >
> > > CFLAGS += -I${X11BASE}/include
> > > LDFLAGS += -L${X11BASE}/lib
> >
> > I mixed this up. This should have been:
> >
> > post-patch:
> > ${SUBST_CMD} ${WRKSRC}/Makefile
> >
> > To replace X11BASE in the Makefile.
> >
> > But I like your solution better and took it over. New version attached.
>
> You now have the CFLAGS and LDFLAGS in both the port Makefile and the
> Makefile in WRKSRC, the latter expanded to /usr/X11R6 in 2 places.
>
> I was thinking of something like:
>
> CFLAGS := $(CFLAGS) -Wall -g -pedantic -std=c99
>
> My Makefile-fu isn't good enough to get this to work similarly for
> LDFLAGS without resorting to renaming the variable in
> ${WRKSRC}/Makefile...
>
> Either way, you should probably pass those include and link dirs only
> in one place, and not both Makefiles.
...I clearly didn't sleep enough.
I tend to go back to my previous solution. Because when I need a patch
anyway, then I can put these lines in there without redirection.
I can add $(X11BASE)/... and it's subsituted automatically (without
SUBST_CMD).
And nothing in the port Makefile is needed.
Am I still not seeing it?
> > > This makes it easier to amend in the future if the need arises.
> > >
> > > Lastly, as this is a demon, should this come with an rc file and a
> > > dedicated user, so that it can be run on system startup? With X11
> > > applications, this makes it a bit weirder to launch before .xsession.
> > > Not sure if that's worth a consideration, but I'm thinking of it
> > > because of some contortions that I've done with sensorsd(8) and
> > > something like in the sensorsd script:
> > >
> > > su -l thfr -c "env DISPLAY=:0 $command"
> >
> > srandrd needs to be started while X is running. If it can't connect to
> > X, it will just print an error and quit. So a traditional daemon won't
> > work.
> >
> > I got it to work from xenodm/Xsetup_0. But when the switch to the
> > user happens, the login session is closed and srandrd will quit.
> > So you still need to add it to .xsession as well.
> >
> > If you find a better solution, I'm all ears.
>
> This makes sense... an rc file would not be useful at all then. Thanks
> for the clarification!
>
> >
> > If you want to switch from sensorsd, you could use the "srandrd list"
> > output as check. This doesn't daemonize. But I wouldn't want to wait
> > for the next sensorsd check when I plug a screen in. The srandrd daemon
> > switches immediately.
> >
> > Thanks for the feedback!
> > - Stefan
>
>
srandrd.tgz
Description: application/tar-gz
Re: [new] x11/srandrd 0.6.3 - the missing hotplug daemon for X outputs
Thomas Frohwein wrote (2023-11-05 15:37 CET):
> On Wed, Nov 01, 2023 at 09:01:48AM +0100, Stefan Hagen wrote:
> > Omar Polo wrote (2023-10-30 19:46 CET):
> > > On 2023/10/30 14:28:35 +0100, Stefan Hagen
> > > wrote:
> > > > Stefan Hagen wrote (2023-10-30 13:56 CET):
> > > > > I was looking for a solution to invoke autorandr when a monitor
> > > > > gets attached/detached. Unfortunately this emits no event that our
> > > > > hotplugd(8) can catch.
> > > > >
> > > > > Today I stumbled over srandrd, and it's solving this issue in a nice
> > > > > and
> > > > > clean way.
> > > > >
> > > > > $ cat pkg/DESCR
> > > > > -
> > > > > srandrd is a tool that executes a command on xrandr output change
> > > > > events, i.e. if a monitor is plugged or unplugged. By default srandrd
> > > > > forks to background and exits if the xserver exits.
> > > > > -
> > > > >
> > > > > You can drop "srandrd some_script.sh" into .xsession and it will run
> > > > > this
> > > > > script when X output changes happen.
> > > > >
> > > > > Inside the script, you have variables available to filter and react to
> > > > > specific events. How that works is described in srandrd(1).
>
> This has an example script, but it's probably very interesting to
> think of using x11/autorandr in there...
That's what I do. There's not much of a script needed.
Simply a wrapper around "autorandr -c" because "srandrd autorandr -c"
wouldn't execute it with the parameter.
> > > > > Comment/OK for import?
> > > >
> > > > I noticed the CFLAGS weren't quite right. I adjusted the patch to
> > > > remove -Os and add the OpenBSD CFLAGS (-O2 -pipe).
> > > >
> > > > Update attached.
> > >
> > > Can't test it right now, but the port looks fine and seems useful.
> > > OK op@ to import
> > >
> > > nits:
> > >
> > > - please remove the stray empty lines at the bottom of DESCR
> > > - maybe I'd drop the "By default srandr forks to the background [...]"
> > >from the DESCR, doesn't seem the place to document such behaviour.
> > >Thankfully, this port ships a manual describing the tool.
> > > - to save a few lines, you could consider using the shiny new DIST_TUPLE
> > >(just a suggestion)
> >
> > Thanks. I removed the nits and added DIST_TUPLE. I haven't used it
> > before, so thanks for suggesting.
> >
> > I'll import after one more OK.
>
> The LICENSE calls itself MIT/X Consortium License in the LICENSE file:
>
> - # IT/X Consortium License
> + # MIT/X Consortium License
Uh, nice catch. Copy pasta...
> > SUBST_VARS =${WRKSRC}/Makefile
>
> This line doesn't make sense. Look at the result:
>
> $ make show=SUBST_VARS
> /usr/ports/pobj/srandrd-0.6.3/srandrd-0.6.3/Makefile ARCH BASE_PKGPATH
> FLAVOR_EXT FULLPKGNAME HOMEPAGE LOCALBASE LOCALSTATEDIR MACHINE_ARCH
> MAINTAINER PREFIX RCDIR SYSCONFDIR TRUEPREFIX X11BASE PKGSTEM
>
> SUBST_VARS is the list of variables that will be substituted. You may
> have meant to do what SUBST_CMD does, but as it isn't in your Makefile,
> you probably don't even need that. I recommend reading SUBST_* in
> bsd.port.mk(5).
>
> Regarding the patch, I would lean towards just adding CFLAGS/LDFLAGS in
> there and then adding the likes of '-I${X11BASE}/include' and
> '-L${X11BASE}/lib' to the port Makefile with e.g.
>
> CFLAGS += -I${X11BASE}/include
> LDFLAGS += -L${X11BASE}/lib
I mixed this up. This should have been:
post-patch:
${SUBST_CMD} ${WRKSRC}/Makefile
To replace X11BASE in the Makefile.
But I like your solution better and took it over. New version attached.
> This makes it easier to amend in the future if the need arises.
>
> Lastly, as this is a demon, should this come with an rc file and a
> dedicated user, so that it can be run on system startup? With X11
> applications, this makes it a bit weirder to launch before .xsession.
> Not sure if that's worth a consideration, but I'm thinking of it
> because of some contortions that I've done with sensorsd(8) and
> something like in the sensorsd script:
>
> su -l thfr -c "env DISPLAY=:0 $command"
srandrd needs to be started while X is running. If it can't connect to
X, it will just print an error and quit. So a traditional daemon won't
work.
I got it to work from xenodm/Xsetup_0. But when the switch to the
user happens, the login session is closed and srandrd will quit.
So you still need to add it to .xsession as well.
If you find a better solution, I'm all ears.
If you want to switch from sensorsd, you could use the "srandrd list"
output as check. This doesn't daemonize. But I wouldn't want to wait
for the next sensorsd check when I plug a screen in. The srandrd daemon
switches immediately.
Thanks for the feedback!
- Stefan
srandrd.tgz
Description: application/tar-gz
[update/wip] games/renpy 7.3.5 => 8.1.1 (and change to python3)
Hello,
I'm trying to update our python2 renpy 7.3.5 to the python3 renpy 8.1.1.
Why renpy 8.1.1? (8.1.3 is out):
Ideally I wanted to update to renpy 8.1.0, because the dependency
pygame_sdl2 is coming from the official repository, which only has the
version renpy 8.1.0 needs. 8.1.1 wants a newer, unreleased, pygame_sdl2.
But renpy 8.1.0 is missing libhydrogen and the build fails. Libhydrogen
got added to renpy in version 8.1.1.
Therefore I'm mixing renpy 8.1.1 with the slightly too old pygame_sdl2
8.1.0. More about that later.
Attached are two diffs:
- An update for pygame_sdl2 from 7.3.5.606 to 8.1.0.23050902 that also
enables it for python3.
- An update for renpy from 7.3.5 to 8.1.1 + change to python3.
So far, renpy 8 is working with the example games, and one I bought from
gog.com
When renpy starts up, it spams a few pages with errors like this:
Traceback (most recent call last):
File "/usr/local/share/renpy/renpy/script.py", line 699, in load_file
with open(rpycfn, "wb") as f:
PermissionError: [Errno 13] Permission denied:
'/usr/local/share/renpy/renpy/common/00action_data.rpyc'
Renpy tries to compile rpy and rpym files to rpyc and rpymc.
This doesn't work for files we install to /usr/local/.
I searched the web, and it seems that there is no commandline only
tool that can do this compilation. Only the renpy gui program and the
launcher are doing it.
This doesn't keep renpy from starting the games!
Questions I have for this port:
- Is it okay to mix pygame_sdl2 8.1.0 with renpy 8.1.1? I think we can
go for it and fix it when the official repository provides 8.1.1.
I diffed
https://www.renpy.org/dl/8.1.1/pygame_sdl2-2.1.0-for-renpy-8.1.1.tar.gz
and
https://www.renpy.org/dl/8.1.0/pygame_sdl2-2.1.0-for-renpy-8.1.0.tar.gz
The only difference is cython generated code. So I believe the 8.1.0
version can be used.
- Are the startup compile errors a block for the update? I'm not sure
about this. We'd need a compileall.py for renpy files. Are python
hackers around?
Best Regards,
Stefan
Index: games/renpy/Makefile
===
RCS file: /cvs/ports/games/renpy/Makefile,v
diff -u -p -u -p -r1.21 Makefile
--- games/renpy/Makefile26 Sep 2023 09:41:40 - 1.21
+++ games/renpy/Makefile29 Oct 2023 18:34:44 -
@@ -1,10 +1,9 @@
COMMENT = visual novel engine
-V =7.3.5
-MODPY_EGG_VERSION =${V}.606
+V =8.1.1
+MODPY_EGG_VERSION =${V}
DISTNAME = renpy-${V}-source
PKGNAME = renpy-${V}
-REVISION = 1
CATEGORIES = games
@@ -16,21 +15,26 @@ PERMIT_PACKAGE =Yes
WANTLIB += GLEW SDL2 avcodec avformat avutil freetype
WANTLIB += m png pthread swresample swscale z ${MODPY_WANTLIB}
-SITES =https://www.renpy.org/dl/${V}/
+SITES =${HOMEPAGE}/dl/${V}/
EXTRACT_SUFX = .tar.bz2
MODULES = lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
-BUILD_DEPENDS =devel/pygame \
+BUILD_DEPENDS =devel/py-future${MODPY_FLAVOR} \
+ devel/pygame \
games/pygame_sdl2 \
- lang/cython,python3
+ games/pygame_sdl2${MODPY_FLAVOR} \
+ lang/cython${MODPY_FLAVOR}
-RUN_DEPENDS = games/pygame_sdl2
+RUN_DEPENDS = games/pygame_sdl2${MODPY_FLAVOR} \
+ security/py-ecdsa${MODPY_FLAVOR} \
+ security/py-pefile${MODPY_FLAVOR}
# XXX enable fribidi support
-LIB_DEPENDS = graphics/ffmpeg \
- graphics/glew
+LIB_DEPENDS = graphics/glew \
+ graphics/ffmpeg
+
+MODPY_PYBUILD =setuptools
MAKE_ENV = RENPY_DEPS_INSTALL=/usr::${LOCALBASE}::${X11BASE}
@@ -40,16 +44,17 @@ NO_TEST = Yes
WRKSRC = ${WRKDIST}/module
-# XXX not needed in newer releases
-MODPY_ADJ_FILES = ../renpy.py
-
pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/renpy
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/renpy/
+ cd ${WRKDIST} && \
+ cp sdk-fonts/SourceHanSansLite.ttf launcher/game/fonts/
cd ${WRKDIST} && \
cp -r launcher renpy the_question tutorial LICENSE.txt \
${PREFIX}/share/renpy
${INSTALL_SCRIPT} ${WRKDIST}/renpy.py ${PREFIX}/share/renpy
${SUBST_PROGRAM} ${FILESDIR}/renpy ${PREFIX}/bin/renpy
${SUBST_PROGRAM} ${FILESDIR}/renpyify ${PREFIX}/bin/renpyify
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/share/renpy
.include
Index: games/renpy/distinfo
===
RCS file: /cvs/ports/games/renpy/distinfo,v
diff -u -p -u -p -r1.4 distinfo
--- games/renpy/distinfo12 Mar
Re: dictd: move files between PLISTs and conflicts
Klemens Nanni wrote (2023-10-27 21:25 CEST):
> On Fri, Oct 27, 2023 at 09:57:55AM +0100, Stuart Henderson wrote:
> > (not related to the diff, but noticed while reviewing - some files
> > aren't useful with the port as built anyway - dictd_popen.conf.in and
> > dictd_plugin_dbi.conf could be @comment'ed - dict1.conf is in the
> > server PLIST but it's actually a client config file).
>
> This means old dict-server conflicts with new dictd-client.
>
> # TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add dictd-client
> Collision in dictd-client-1.13.1p0->1.13.1p1: the following files
> already exist
> /usr/local/share/examples/dictd/dict1.conf
> (dictd-server-1.13.1p0 and dictd-client-1.13.1p1)
> Couldn't find updates for dictd-client-1.13.1p0
> Couldn't install dictd-client-1.13.1p1
>
> So I added conflicts between new old and old, which looks good for when
> the result would actually conflict:
>
> # TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -n dictd-server
> Can't install dictd-server-1.13.1p1 because of conflicts
> (dictd-client-1.13.1p0,dictd-server-1.13.1p0)
> --- dictd-server-1.13.1p1 ---
> Can't install dictd-server-1.13.1p1: conflicts
> Couldn't install dictd-server-1.13.1p1
>
> # TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -n dictd-client
> Can't install dictd-client-1.13.1p1 because of conflicts
> (dictd-client-1.13.1p0,dictd-server-1.13.1p0)
> --- dictd-client-1.13.1p1 ---
> Can't install dictd-client-1.13.1p1: conflicts
> Couldn't install dictd-client-1.13.1p1
>
> But that also means I can't update both to new versions:
>
> # TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add
> dictd-{client,server}
> Can't install dictd-client-1.13.1p1 because of conflicts
> (dictd-server-1.13.1p0,dictd-client-1.13.1p0)
> Can't install dictd-server-1.13.1p1 because of conflicts
> (dictd-client-1.13.1p0,dictd-server-1.13.1p0)
> --- dictd-client-1.13.1p1 ---
> Can't install dictd-client-1.13.1p1: conflicts
> --- dictd-server-1.13.1p1 ---
> Can't install dictd-server-1.13.1p1: conflicts
> Couldn't install dictd-client-1.13.1p1 dictd-server-1.13.1p1
>
> Dropping both @conflict markers also fails (less nicely), of course.
>
> How can we make an update like that?
> Remove dict1.conf from -server, wait for update, add to -client?
I think you did everything right, but tested wrong.
pkg_add will rightly complain about the conflict. I think you want to
test "pkg_add -u" here, which works and attempts to upgrade client/server first.
$ TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -un dictd-client
dictd-client-1.9.15p3+dictd-server-1.9.15p1->dictd-client+dictd-server-1.13.1p1:
ok
The following new rcscripts were installed: /etc/rc.d/dictd
See rcctl(8) for details.
$ TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -un dictd-server
dictd-client-1.9.15p3+dictd-server-1.9.15p1->dictd-client+dictd-server-1.13.1p1:
ok
The following new rcscripts were installed: /etc/rc.d/dictd
See rcctl(8) for details.
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/dictd/Makefile,v
> diff -u -p -r1.18 Makefile
> --- Makefile 27 Oct 2023 18:51:10 - 1.18
> +++ Makefile 27 Oct 2023 19:23:26 -
> @@ -6,8 +6,8 @@ DISTNAME= dictd-$V
>
> PKGNAME-main=dictd-client-$V
> PKGNAME-server= dictd-server-$V
> -REVISION-main=0
> -REVISION-server=0
> +REVISION-main= 1
> +REVISION-server=1
>
> CATEGORIES= net education
>
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/net/dictd/pkg/PLIST-main,v
> diff -u -p -r1.3 PLIST-main
> --- pkg/PLIST-main26 Oct 2023 16:49:27 - 1.3
> +++ pkg/PLIST-main27 Oct 2023 19:23:26 -
> @@ -1,3 +1,4 @@
> +@conflict dictd-server-<1.13.1p1
> @conflict p5-Net-Dict-*
> @pkgpath net/dictd
> @bin bin/dict
> @@ -6,3 +7,5 @@ bin/dictl
> @man man/man1/dict.1
> @man man/man1/dict_lookup.1
> @man man/man1/dictl.1
> +share/examples/dictd/
> +share/examples/dictd/dict1.conf
> Index: pkg/PLIST-server
> ===
> RCS file: /cvs/ports/net/dictd/pkg/PLIST-server,v
> diff -u -p -r1.4 PLIST-server
> --- pkg/PLIST-server 27 Oct 2023 18:51:10 - 1.4
> +++ pkg/PLIST-server 27 Oct 2023 19:23:26 -
> @@ -1,3 +1,4 @@
> +@conflict dictd-client-<1.13.1p0
> @newgroup _dictd:639
> @newuser _dictd:639:_dictd::dictd Account:/nonexistent:/sbin/nologin
> @rcscript ${RCDIR}/dictd
> @@ -20,14 +21,13 @@ include/dictdplugin.h
> share/examples/dictd/
> share/examples/dictd/dictd.conf
> @sample ${SYSCONFDIR}/dictd.conf
> -share/examples/dictd/dict1.conf
> share/examples/dictd/dictd1.conf
>
Re: Update from Maintainer: databases/sqlcipher 4.5.4 -> 4.5.5
Tom Murphy wrote (2023-10-27 22:45 CEST):
> Hi,
>
> The below diff updates databases/sqlcipher to v4.5.5.
> Changes include:
>
> * Updates baseline to upstream SQLite 3.42.0
> * Does not allow key to be set again on a connection after it has been
> successfully used for an encryption or decryption operation to prevent
> accidental database corruption
> * Raises an error if a rekey operation is attempted on an unencrypted
> database
> * Raises an error when a key or rekey operation is passed an empty key
> * Minor improvements to constant time functions
> * Miscellaneous code and comment cleanup
>
> I've bumped SHARED_LIBS based on running nm -g between the old and
> new libraries and 3 functions appear to have disappered between 4.5.4
> and 4.5.5:
>
> sqlcipher_codec_ctx_get_flag
> sqlcipher_codec_ctx_set_flag
> sqlcipher_codec_ctx_unset_flag
>
> Based on the documentation it says to crank the major version by one,
> so is 1.0 OK for this? The output of ${WRKBUILD}/shared_libs.log still
> says:
>
> # SHARED_LIBS+=#
> SHARED_LIBS += sqlcipher0.4 # 8.6
>
> This is what was originally in the Makefile. Not sure if this is
> correct?
I've committed this diff. This port is not a dependency within the ports
tree. So this is a free shared lib bump, because nothing needs to be
rebuilt because of it.
The orig. version can be found when building outside of the ports
infrastructure. Or when peeking into a binary package from upstream (if
available). It's often tedious to find and not that important.
In many ports, the orig-version comment is not set.
Thanks for the update.
- Stefan
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/sqlcipher/Makefile,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 Makefile
> --- Makefile 10 May 2023 08:38:21 - 1.7
> +++ Makefile 27 Oct 2023 20:37:14 -
> @@ -2,9 +2,9 @@ COMMENT = encrypted SQLite database
>
> GH_ACCOUNT = sqlcipher
> GH_PROJECT = sqlcipher
> -GH_TAGNAME = v4.5.4
> +GH_TAGNAME = v4.5.5
>
> -SHARED_LIBS += sqlcipher 0.4 # 8.6
> +SHARED_LIBS += sqlcipher 1.0 # 8.6
>
> CATEGORIES = databases
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/databases/sqlcipher/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- distinfo 10 May 2023 08:38:21 - 1.6
> +++ distinfo 27 Oct 2023 20:37:14 -
> @@ -1,2 +1,2 @@
> -SHA256 (sqlcipher-4.5.4.tar.gz) =
> 6gUv5jTXKfnda2JAFhBN55b6+H5Iep6Gigf67jWVd3E=
> -SIZE (sqlcipher-4.5.4.tar.gz) = 18755568
> +SHA256 (sqlcipher-4.5.5.tar.gz) =
> AU751PW19OevTZOtOZZnlHu1XjGGDmcfDe8biubwXeA=
> +SIZE (sqlcipher-4.5.5.tar.gz) = 18816611
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/10/29 01:56:08 Modified files: databases/sqlcipher: Makefile distinfo Log message: Update sqlcipher to 4.5.5 from MAINTAINER Tom Murphy Changes: * Updates baseline to upstream SQLite 3.42.0 * Does not allow key to be set again on a connection after it has been successfully used for an encryption or decryption operation to prevent accidental database corruption * Raises an error if a rekey operation is attempted on an unencrypted database * Raises an error when a key or rekey operation is passed an empty key * Minor improvements to constant time functions * Miscellaneous code and comment cleanup With shlib bump, but there are no upstream consumers.
Re: [update] sysutils/coreboot-utils 4.21
Klemens Nanni wrote (2023-10-28 21:36 CEST):
> On Sat, Oct 28, 2023 at 06:55:58PM +0200, Stefan Hagen wrote:
> > cat wrote (2023-10-28 12:42 CEST):
> > > Updated coreboot-utils to most recent point release, now also includes
> > > cbfstool which is one of the most useful utilities coreboot provides.
> > >
> > > One patch was necessary for cbfstool support - removing a flag in the
> > > Makefile.inc file which caused building it to fail.
> > >
> > > Tested on amd64.
> > >
> > > I do not wish to maintain this further, and regardless coreboot-utils
> > > does not change much from release to release so I don't figure this
> > > will be much of an issue.
> > >
> > > Best regards,
> > > cat
> >
> > Hi,
> >
> > thanks for the update. No need to tell us about not wanting to maintain
> > it. You didn't include yourself as MAINTAINER in the file, so no
> > worries. We're happy for any help - even if it's not on a regular basis.
> >
> > Regarding your update:
> >
> > - Drop REVISION when you update the port version
> > - Run make update-patches as last step, so the patch hunk locations are
> > updated.
> > - If you manually weed out the PLIST, @comment the lines you don't want,
> > so make update-plist doesn't put them back in.
> >
> > Also: Updates are better provided as diffs than archives.
> >
> > Other than that, this looks good to me.
>
> I don't have means to test this, but this port-wise this looks good,
> thanks to both of you.
Committed, thanks!
> > I don't know much about coreboot. Please read over the executables
> > I commented and confirm that those are not desired.
> >
> > Diff below with the changes I mentioned. I also sorted UTILS.
> >
> > Index: sysutils/coreboot-utils/Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/coreboot-utils/Makefile,v
> > diff -u -p -u -p -r1.13 Makefile
> > --- sysutils/coreboot-utils/Makefile27 Sep 2023 17:16:24 -
> > 1.13
> > +++ sysutils/coreboot-utils/Makefile28 Oct 2023 16:45:55 -
> > @@ -4,10 +4,9 @@ ONLY_FOR_ARCHS = amd64
> >
> > COMMENT = utilities to work on firmware images and hardware
> >
> > -V =4.17
> > +V =4.21
> > DISTNAME = coreboot-${V}
> > PKGNAME = coreboot-utils-${V}
> > -REVISION = 0
> >
> > CATEGORIES = sysutils devel
> >
> > @@ -21,7 +20,7 @@ WANTLIB = c
> > SITES =https://coreboot.org/releases/
> >
> > EXTRACT_SUFX = .tar.xz
> > -EXTRACT_FILES =${DISTNAME}/{src/commonlib,util}
> > +EXTRACT_FILES =
> > ${DISTNAME}/{src/commonlib,src/vendorcode,util,3rdparty}
> >
> > USE_GMAKE =Yes
> >
> > @@ -34,7 +33,8 @@ MAKE_FLAGS = CC=${CC} \
> > FAKE_FLAGS = PREFIX=${PREFIX}
> >
> > # XXX intelmetool requires unsupported pcilib access methods
> > -UTILS =cbmem \
> > +UTILS =cbfstool \
> > + cbmem \
> > ectool \
> > ifdtool \
> > nvramtool
> > Index: sysutils/coreboot-utils/distinfo
> > ===
> > RCS file: /cvs/ports/sysutils/coreboot-utils/distinfo,v
> > diff -u -p -u -p -r1.7 distinfo
> > --- sysutils/coreboot-utils/distinfo4 Jul 2022 16:36:53 -
> > 1.7
> > +++ sysutils/coreboot-utils/distinfo28 Oct 2023 16:45:55 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (coreboot-4.17.tar.xz) =
> > ldoR0cakUDhRAaaHmSWKOYzpZfTkbM5v6NXr105QwSU=
> > -SIZE (coreboot-4.17.tar.xz) = 55676844
> > +SHA256 (coreboot-4.21.tar.xz) =
> > /RtIhHnBZNgU03Ocw7bPm/WH+INywWayToaGABWAlWU=
> > +SIZE (coreboot-4.21.tar.xz) = 59528772
> > Index: sysutils/coreboot-utils/patches/patch-util_cbfstool_Makefile_inc
> > ===
> > RCS file: sysutils/coreboot-utils/patches/patch-util_cbfstool_Makefile_inc
> > diff -N sysutils/coreboot-utils/patches/patch-util_cbfstool_Makefile_inc
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ sysutils/coreboot-utils/patches/patch-util_cbfstool_Makefile_inc
> > 28 Oct 2023 16:45:55 -
> > @@ -0,0 +1,11 @@
> > +I
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/10/29 01:04:28 Modified files: sysutils/coreboot-utils: Makefile distinfo sysutils/coreboot-utils/patches: patch-util_cbmem_cbmem_c sysutils/coreboot-utils/pkg: DESCR PLIST Added files: sysutils/coreboot-utils/patches: patch-util_cbfstool_Makefile_inc Log message: Update coreboot-utils to version 4.21, patch from cat This update adds the cbfstool binary. kn@: port-wise this looks good
Re: FIX games/scorched3d
Kirill Bychkov wrote (2023-10-28 20:56 CEST): > On Sat, October 28, 2023 10:39, Stefan Hagen wrote: > > Kirill Bychkov wrote (2023-10-26 19:09 CEST): > >> Hi! > >> Attached patch adds compatibility with wxWidgets-3.2 and fixes > >> some runtime issues. The game is crashing sometimes though. > >> > >> OK? > > > > It works for me with and without this patch, so I can't really > > tell what issues you're seeing. > > > > But for me it doesn't make anything worse, and if it fixes something for > > you, then OK sdk@ > > > > > Does "Settings" menu also works for you? Ah, now I see what you fixed. Yes it works, but with warnings. Thanks. Still OK of course.
Re: [new] archivers/draco 1.5.6
Landry Breuil wrote (2023-10-28 15:28 CEST): > i need this for gltf objects decoding in qgis 3.34, feedback welcome on > the port. Cf https://google.github.io/draco/ > --- > Draco is a library for compressing and decompressing 3D geometric meshes > and point clouds. It is intended to improve the storage and transmission > of 3D graphics. > --- Portcheck suggests a COMPILER line. It doesn't build with base-gcc, so: COMPILER= base-clang ports-gcc Thanks for providing the test target. 1 of 183 failed on amd64 26 of 183 failed on sparc64 That's probably not a concern, because qgis is not available on sparc64. OK sdk@ with the COMPILER line.
Re: [update] sysutils/coreboot-utils 4.21
cat wrote (2023-10-28 12:42 CEST):
> Updated coreboot-utils to most recent point release, now also includes
> cbfstool which is one of the most useful utilities coreboot provides.
>
> One patch was necessary for cbfstool support - removing a flag in the
> Makefile.inc file which caused building it to fail.
>
> Tested on amd64.
>
> I do not wish to maintain this further, and regardless coreboot-utils
> does not change much from release to release so I don't figure this
> will be much of an issue.
>
> Best regards,
> cat
Hi,
thanks for the update. No need to tell us about not wanting to maintain
it. You didn't include yourself as MAINTAINER in the file, so no
worries. We're happy for any help - even if it's not on a regular basis.
Regarding your update:
- Drop REVISION when you update the port version
- Run make update-patches as last step, so the patch hunk locations are
updated.
- If you manually weed out the PLIST, @comment the lines you don't want,
so make update-plist doesn't put them back in.
Also: Updates are better provided as diffs than archives.
Other than that, this looks good to me.
I don't know much about coreboot. Please read over the executables
I commented and confirm that those are not desired.
Diff below with the changes I mentioned. I also sorted UTILS.
Index: sysutils/coreboot-utils/Makefile
===
RCS file: /cvs/ports/sysutils/coreboot-utils/Makefile,v
diff -u -p -u -p -r1.13 Makefile
--- sysutils/coreboot-utils/Makefile27 Sep 2023 17:16:24 - 1.13
+++ sysutils/coreboot-utils/Makefile28 Oct 2023 16:45:55 -
@@ -4,10 +4,9 @@ ONLY_FOR_ARCHS = amd64
COMMENT = utilities to work on firmware images and hardware
-V =4.17
+V =4.21
DISTNAME = coreboot-${V}
PKGNAME = coreboot-utils-${V}
-REVISION = 0
CATEGORIES = sysutils devel
@@ -21,7 +20,7 @@ WANTLIB = c
SITES =https://coreboot.org/releases/
EXTRACT_SUFX = .tar.xz
-EXTRACT_FILES =${DISTNAME}/{src/commonlib,util}
+EXTRACT_FILES =
${DISTNAME}/{src/commonlib,src/vendorcode,util,3rdparty}
USE_GMAKE =Yes
@@ -34,7 +33,8 @@ MAKE_FLAGS = CC=${CC} \
FAKE_FLAGS = PREFIX=${PREFIX}
# XXX intelmetool requires unsupported pcilib access methods
-UTILS =cbmem \
+UTILS =cbfstool \
+ cbmem \
ectool \
ifdtool \
nvramtool
Index: sysutils/coreboot-utils/distinfo
===
RCS file: /cvs/ports/sysutils/coreboot-utils/distinfo,v
diff -u -p -u -p -r1.7 distinfo
--- sysutils/coreboot-utils/distinfo4 Jul 2022 16:36:53 - 1.7
+++ sysutils/coreboot-utils/distinfo28 Oct 2023 16:45:55 -
@@ -1,2 +1,2 @@
-SHA256 (coreboot-4.17.tar.xz) = ldoR0cakUDhRAaaHmSWKOYzpZfTkbM5v6NXr105QwSU=
-SIZE (coreboot-4.17.tar.xz) = 55676844
+SHA256 (coreboot-4.21.tar.xz) = /RtIhHnBZNgU03Ocw7bPm/WH+INywWayToaGABWAlWU=
+SIZE (coreboot-4.21.tar.xz) = 59528772
Index: sysutils/coreboot-utils/patches/patch-util_cbfstool_Makefile_inc
===
RCS file: sysutils/coreboot-utils/patches/patch-util_cbfstool_Makefile_inc
diff -N sysutils/coreboot-utils/patches/patch-util_cbfstool_Makefile_inc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ sysutils/coreboot-utils/patches/patch-util_cbfstool_Makefile_inc28 Oct
2023 16:45:55 -
@@ -0,0 +1,11 @@
+Index: util/cbfstool/Makefile.inc
+--- util/cbfstool/Makefile.inc.orig
util/cbfstool/Makefile.inc
+@@ -134,7 +134,6 @@ TOOLCPPFLAGS += -I$(top)/src
+ TOOLCPPFLAGS += -I$(top)/src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include
+
+ TOOLLDFLAGS ?=
+-HOSTCFLAGS += -fms-extensions
+
+ ifeq ($(shell uname -s | cut -c-7 2>/dev/null), MINGW32)
+ TOOLCFLAGS += -mno-ms-bitfields
Index: sysutils/coreboot-utils/patches/patch-util_cbmem_cbmem_c
===
RCS file: /cvs/ports/sysutils/coreboot-utils/patches/patch-util_cbmem_cbmem_c,v
diff -u -p -u -p -r1.6 patch-util_cbmem_cbmem_c
--- sysutils/coreboot-utils/patches/patch-util_cbmem_cbmem_c4 Jul 2022
16:36:53 - 1.6
+++ sysutils/coreboot-utils/patches/patch-util_cbmem_cbmem_c28 Oct 2023
16:45:55 -
@@ -3,7 +3,7 @@ Hint at mem(4) in error message
Index: util/cbmem/cbmem.c
--- util/cbmem/cbmem.c.orig
+++ util/cbmem/cbmem.c
-@@ -1582,7 +1582,7 @@ int main(int argc, char** argv)
+@@ -1811,7 +1811,7 @@ int main(int argc, char** argv)
mem_fd = open("/dev/mem", timestamp_id ? O_RDWR : O_RDONLY, 0);
if (mem_fd < 0) {
Index: sysutils/coreboot-utils/pkg/DESCR
===
Re: FIX games/scorched3d
Kirill Bychkov wrote (2023-10-26 19:09 CEST): > Hi! > Attached patch adds compatibility with wxWidgets-3.2 and fixes > some runtime issues. The game is crashing sometimes though. > > OK? It works for me with and without this patch, so I can't really tell what issues you're seeing. But for me it doesn't make anything worse, and if it fixes something for you, then OK sdk@
Re: UPDATE: Suricata-7.0.1
gonzalo wrote (2023-10-25 13:01 CEST):
> ping
I'm getting this error. Is there a patch missing?
util-privs.c:246:20: error: use of undeclared identifier 'SC_ERR_GID_FAILED'
SCLogError(SC_ERR_GID_FAILED, "unable to set the group ID,"
^
util-privs.c:254:20: error: use of undeclared identifier 'SC_ERR_UID_FAILED'
SCLogError(SC_ERR_UID_FAILED, "unable to set the user ID,"
^
2 errors generated.
*** Error 1 in target 'util-privs.o'
*** Error 1 in src (Makefile:3487 'util-privs.o')
*** Error 2 in src (Makefile:2684 'all')
*** Error 1 in /home/dpb/usr/ports/pobj/suricata-7.0.1/suricata-7.0.1
(Makefile:519 'all-recursive')
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3034
'/usr/ports/pobj/suricata-7.0.1/.build_done': @cd /usr/ports/pobj/suricata-7...)
*** Error 2 in /usr/ports/security/suricata
(/usr/ports/infrastructure/mk/bsd.port.mk:2677 'all': @lock=suricata-7.0.1;
export _LOCKS_HELD=...)
> On 10/18/23 16:42, Gonzalo L. Rodriguez wrote:
> > Hello,
> >
> > Update for Suricata to 7.0.1:
> >
> > https://github.com/OISF/suricata/releases/tag/suricata-7.0.1
> >
> > OK? Comments?
> >
> > Cheers.-
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/security/suricata/Makefile,v
> > retrieving revision 1.60
> > diff -u -p -r1.60 Makefile
> > --- Makefile27 Sep 2023 16:34:37 - 1.60
> > +++ Makefile18 Oct 2023 14:14:00 -
> > @@ -3,7 +3,7 @@ NOT_FOR_ARCHS = powerpc64 riscv64
> > COMMENT = high performance network IDS, IPS and security monitoring
> > -SURICATA_V = 6.0.12
> > +SURICATA_V = 7.0.1
> > SUPDATE_V = 1.2.7
> > DISTNAME =suricata-${SURICATA_V}
> > @@ -20,9 +20,8 @@ PERMIT_PACKAGE= Yes
> > SITES = https://www.openinfosecfoundation.org/download/
> > # uses pledge()
> > -WANTLIB += ${COMPILER_LIBCXX} c iconv jansson lz4 lzma m magic
> > -WANTLIB += maxminddb net nspr4 nss3 nssutil3 pcap pcre plc4 plds4
> > -WANTLIB += smime3 ssl3 yaml-0 z
> > +WANTLIB += ${COMPILER_LIBCXX} c elf iconv m pcap yaml-0 z
> > +WANTLIB += jansson lz4 magic maxminddb net pcre2-8
> > MODULES = lang/python
> > @@ -40,7 +39,7 @@ LIB_DEPENDS = archivers/lz4 \
> > devel/nspr \
> > devel/libyaml \
> > devel/libmagic \
> > - devel/pcre \
> > + devel/pcre2 \
> > net/libnet/1.1 \
> > net/libmaxminddb \
> > security/nss
> > @@ -49,7 +48,7 @@ COMPILER =base-clang ports-gcc
> > DEBUG_PACKAGES = ${BUILD_PACKAGES}
> > CONFIGURE_STYLE = autoconf
> > -AUTOCONF_VERSION = 2.69
> > +AUTOCONF_VERSION = 2.71
> > AUTOMAKE_VERSION =1.15
> > CONFIGURE_ENV = ac_cv_path_HAVE_PDFLATEX= \
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/security/suricata/distinfo,v
> > retrieving revision 1.20
> > diff -u -p -r1.20 distinfo
> > --- distinfo3 Jul 2023 08:22:31 - 1.20
> > +++ distinfo18 Oct 2023 14:14:00 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (suricata-6.0.12.tar.gz) =
> > BLIxYJNbAxl7CFwszJ2Ah1oz8RVYMFTRRgqw+2bYNLM=
> > -SIZE (suricata-6.0.12.tar.gz) = 27388535
> > +SHA256 (suricata-7.0.1.tar.gz) =
> > YEfHX555qbDMbWx2MgJKQSaBK8IS9SrPXTyBPMfJ+ws=
> > +SIZE (suricata-7.0.1.tar.gz) = 23439262
> > Index: patches/patch-configure_ac
> > ===
> > RCS file: /cvs/ports/security/suricata/patches/patch-configure_ac,v
> > retrieving revision 1.11
> > diff -u -p -r1.11 patch-configure_ac
> > --- patches/patch-configure_ac 3 Jul 2023 08:22:31 - 1.11
> > +++ patches/patch-configure_ac 18 Oct 2023 14:14:00 -
> > @@ -3,7 +3,7 @@ To remove the pid file, its directory mu
> > Index: configure.ac
> > --- configure.ac.orig
> > +++ configure.ac
> > -@@ -2764,7 +2764,7 @@ if test "$WINDOWS_PATH" = "yes"; then
> > +@@ -2559,7 +2559,7 @@ if test "$WINDOWS_PATH" = "yes"; then
> >fi
> >else
> >EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
> > Index: patches/patch-doc_userguide_Makefile_in
> > ===
> > RCS file:
> > /cvs/ports/security/suricata/patches/patch-doc_userguide_Makefile_in,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 patch-doc_userguide_Makefile_in
> > --- patches/patch-doc_userguide_Makefile_in 3 Jul 2023 08:22:31 -
> > 1.6
> > +++ patches/patch-doc_userguide_Makefile_in 18 Oct 2023 14:14:00 -
> > @@ -3,32 +3,6 @@ Index: doc/userguide/Makefile.in
> > +++ doc/userguide/Makefile.in
> > @@ -1,3 +1,4 @@
> > +
> > - # Makefile.in generated by automake 1.16.1 from Makefile.am.
> > + # Makefile.in generated by automake 1.16.5 from Makefile.am.
> ># @configure_input@
> > -
> > -@@ -623,14 +624,14 @@ uninstall-man:
Re: [new] security/certspotter 0.16.0
Renaud Allard wrote (2023-10-26 13:27 CEST):
> Hello and thanks for checking
>
> On 10/26/23 13:07, Stefan Hagen wrote:
> > Renaud Allard wrote (2023-10-25 09:46 CEST):
> > > Hello,
> > >
> > > Here is a new port for certspotter. This needs a change in user.list for
> > > the
> > > daemon user.
> > > Tested on amd64.
> > On the first look:
> >
> > $ portcheck
> > trailing whitespace in pkg/README
> > missing share/doc/pkg-readmes/${PKGSTEM} in PLIST
> >
> > $ make port-lib-depends-check
> > Missing: c.97 (/usr/local/bin/submitct) (system lib)
> > Missing: pthread.27 (/usr/local/bin/submitct) (system lib)
> > WANTLIB += c pthread
> >
> > In pkg/README, the {LOCALSTATEDIR} is missing a $.
> >
> > Why are you moving the watchlist to ${LOCALSTATEDIR}/certspotter,
> > while everything else goes into ${LOCALSTATEDIR}/certspotter/.certspotter?
> >
> > I see that not all files can be moved. There's only -watchlist and
> > -state-dir,
> > which is not enough to move everything.
> >
> > For simplicity sake, I'd just let all files reside in
> > ${LOCALSTATEDIR}/certspotter/.certspotter/
> >
> > Best regards,
> > Stefan
>
> Here is a better version. All config files are left in
> ${LOCALSTATEDIR}/certspotter/.certspotter/
>
> I also tested it on arm64
>
> Any other suggestions or OKs?
Looks good to me now.
ok sdk@
> Index: user.list
> ===
> RCS file: /cvs/ports/infrastructure/db/user.list,v
> retrieving revision 1.430
> diff -u -p -r1.430 user.list
> --- user.list 15 Aug 2023 15:54:30 - 1.430
> +++ user.list 25 Oct 2023 07:15:08 -
> @@ -402,3 +402,4 @@ id user group port
> 891 _kiwix-serve _kiwix-servewww/kiwix/kiwix-tools
> 892 _shiori _shiori www/shiori
> 893 _azorius _azoriuswww/azorius
> +894 _certspotter _certspottersecurity/certspotter
Re: [update] audio/picard to 2.10
Lucas Raab wrote (2023-10-26 02:26 CEST):
> On Fri, Oct 13, 2023 at 02:54:37AM +, Lucas Raab wrote:
> > Hello,
> >
> > Here's an update to audio/picard which has worked fine (in spite of my
> > previous issues :).
> >
> > changelog:
> > https://github.com/metabrainz/picard/releases/tag/release-2.10
> >
> > Any other tests?
> >
> > Thanks,
> > Lucas
>
> ping
ok sdk@
> realized that there were changes listed for the rc too, but weren't
> called out in the final:
> https://github.com/metabrainz/picard/releases/tag/release-2.10.0rc1
> diff /usr/ports
> commit - 247d310b7b93267a85e91bc72aa1a202d0ee0a5f
> path + /usr/ports
> blob - c98336fd6767761088b7dc51b18ad95a6a532758
> file + audio/picard/Makefile
> --- audio/picard/Makefile
> +++ audio/picard/Makefile
> @@ -1,6 +1,6 @@
> COMMENT =automatic audio files tagger using the MusicBrainz database
>
> -MODPY_EGG_VERSION = 2.9.2
> +MODPY_EGG_VERSION = 2.10
> DISTNAME = picard-${MODPY_EGG_VERSION}
>
> CATEGORIES = audio
> blob - 1aa98bb461f92a370f8e85308f7f5da7d8f9608e
> file + audio/picard/distinfo
> --- audio/picard/distinfo
> +++ audio/picard/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (picard-2.9.2.tar.gz) = z3iWuFJYImxRd0fqTelND9tvynZ4BhptR+5Whq+vpL0=
> -SIZE (picard-2.9.2.tar.gz) = 5526511
> +SHA256 (picard-2.10.tar.gz) = WpcTPjVJqBNnxRKGeCN7DLAT9JyoJ5uognKgmlzcOTk=
> +SIZE (picard-2.10.tar.gz) = 5800268
> blob - cfde89292a64b26e12889ce7fb4ee07e46bfa45f
> file + audio/picard/pkg/PLIST
> --- audio/picard/pkg/PLIST
> +++ audio/picard/pkg/PLIST
> @@ -13,6 +13,8 @@ lib/python${MODPY_VERSION}/site-packages/picard/${MODP
>
> lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}album.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}album.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}audit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}audit.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}cluster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}cluster.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}collection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -65,6 +67,7 @@ lib/python${MODPY_VERSION}/site-packages/picard/acoust
> lib/python${MODPY_VERSION}/site-packages/picard/acoustid/json_helpers.py
> lib/python${MODPY_VERSION}/site-packages/picard/acoustid/manager.py
> lib/python${MODPY_VERSION}/site-packages/picard/album.py
> +lib/python${MODPY_VERSION}/site-packages/picard/audit.py
> lib/python${MODPY_VERSION}/site-packages/picard/browser/
> lib/python${MODPY_VERSION}/site-packages/picard/browser/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/picard/browser/${MODPY_PYCACHE}/
> @@ -247,6 +250,8 @@ lib/python${MODPY_VERSION}/site-packages/picard/ui/${M
>
> lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}aboutdialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}aboutdialog.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}caa_types_selector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}caa_types_selector.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}cdlookup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}cdlookup.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}checkbox_list_item.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -283,6 +288,8 @@ lib/python${MODPY_VERSION}/site-packages/picard/ui/${M
>
> lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}passworddialog.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}playertoolbar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}playertoolbar.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}pluginupdatedialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}pluginupdatedialog.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/ui/${MODPY_PYCACHE}ratingwidget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
>
Re: [new] security/certspotter 0.16.0
Renaud Allard wrote (2023-10-25 09:46 CEST):
> Hello,
>
> Here is a new port for certspotter. This needs a change in user.list for the
> daemon user.
> Tested on amd64.
>
> Cert Spotter is a Certificate Transparency log monitor from SSLMate that
> alerts you when an SSL/TLS certificate is issued for one of your domains.
> Cert Spotter is easier to use than other open source CT monitors, since it
> does not require a database. It's also more robust, since it uses a special
> certificate parser that ensures it won't miss certificates.
>
> You can use Cert Spotter to detect:
>
> Certificates issued to attackers who have compromised your DNS and are
> redirecting your visitors to their malicious site.
> Certificates issued to attackers who have taken over an abandoned
> sub-domain in order to serve malware under your name.
> Certificates issued to attackers who have compromised a certificate
> authority and want to impersonate your site.
> Certificates issued in violation of your corporate policy or outside of
> your centralized certificate procurement process.
>
> Best Regards
On the first look:
$ portcheck
trailing whitespace in pkg/README
missing share/doc/pkg-readmes/${PKGSTEM} in PLIST
$ make port-lib-depends-check
Missing: c.97 (/usr/local/bin/submitct) (system lib)
Missing: pthread.27 (/usr/local/bin/submitct) (system lib)
WANTLIB += c pthread
In pkg/README, the {LOCALSTATEDIR} is missing a $.
Why are you moving the watchlist to ${LOCALSTATEDIR}/certspotter,
while everything else goes into ${LOCALSTATEDIR}/certspotter/.certspotter?
I see that not all files can be moved. There's only -watchlist and -state-dir,
which is not enough to move everything.
For simplicity sake, I'd just let all files reside in
${LOCALSTATEDIR}/certspotter/.certspotter/
Best regards,
Stefan
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/10/26 04:11:50 Modified files: sysutils/hcloud: Makefile distinfo Log message: Update hcloud to 1.19.0 Features - add --enable-protection flag to "create" commands - add "all list" command to list all resources in the project - iso: allow to filter list by type (public, private) - primary-ip: enable/disable-protection accept levels as arguments - server: add --enable-backup flag to "create" command - server: add --wait flag to "shutdown" command Bug Fixes - floating-ip: list command only returns first 50 entries - image: list does not parse "type" flag correctly - list outputs null instead of empty array when listing in JSON - build: ensure signature is properly generated
Re: [update] Lagrange to 1.17.2
Florian Viehweger wrote (2023-10-25 20:58 CEST):
> this is an update for Lagrange to 1.17.2.
> Some testing done on amd64. No issues found.
> portcheck and 'make port-lib-depends-check' are happy.
> Changes listed here [1].
> Comments?
>
> Thanks!
> [1] https://github.com/skyjake/lagrange/releases
Committed, thanks!
> Index: Makefile
> ===
> RCS file: /daten/openbsdmirror/cvs/mirror/ports/net/lagrange/Makefile,v
> retrieving revision 1.68
> diff -u -p -u -p -r1.68 Makefile
> --- Makefile 25 Oct 2023 06:32:40 - 1.68
> +++ Makefile 25 Oct 2023 18:46:40 -
> @@ -1,5 +1,5 @@
> COMMENT =SDL multi protocol navigator
> -VERSION =1.17.1
> +VERSION =1.17.2
>
> DISTNAME = lagrange-${VERSION}
>
> Index: distinfo
> ===
> RCS file: /daten/openbsdmirror/cvs/mirror/ports/net/lagrange/distinfo,v
> retrieving revision 1.56
> diff -u -p -u -p -r1.56 distinfo
> --- distinfo 25 Oct 2023 06:32:40 - 1.56
> +++ distinfo 25 Oct 2023 18:46:40 -
> @@ -1,2 +1,2 @@
> -SHA256 (lagrange-1.17.1.tar.gz) =
> ZXtMcD/otbx0kKRYOuhK9pJKOtiLYyfUhwy5BCgVAB8=
> -SIZE (lagrange-1.17.1.tar.gz) = 10201703
> +SHA256 (lagrange-1.17.2.tar.gz) =
> F1AGmN2fkO9G3Cw2DwCzkvJN3IXU8H5mSDTuBaSkD2I=
> +SIZE (lagrange-1.17.2.tar.gz) = 10205442
>
>
> --
> greetings,
>
> Florian Viehweger
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/10/26 03:49:38 Modified files: net/lagrange : Makefile distinfo Log message: update net/lagrange to 1.17.2; from MAINTAINER Florian Viehweger, thanks! Changes: https://github.com/skyjake/lagrange/releases/tag/v1.17.2
Re: UPDATE x11/specctrwm-3.5.0
Bjorn Ketelaars wrote (2023-10-22 11:48 CEST):
> spectrwm-3.5.0 has been released, which includes a bunch of major new
> features and improvements, such as dock/panel support, an always mapped
> window mode, floating workspace layout, transparent color support, tons
> of fixes, and more. Changelog can be found at
> https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_5_0.
>
> Changes to port:
> - Synced WANTLIB
> - Switched to DIST_TUPLE
>
> Run tested on amd64.
>
> Comments/OK?
I'm excited about this one. Thanks!
OK sdk@
> diff --git Makefile Makefile
> index e29ee65dc69..514dc05bbaa 100644
> --- Makefile
> +++ Makefile
> @@ -1,9 +1,8 @@
> COMMENT= small tiling window manager
>
> -GH_ACCOUNT= conformal
> -GH_PROJECT= spectrwm
> -GH_COMMIT= 06e3733175969c307a6fd47240a7a37b29d60513
> -DISTNAME=${GH_PROJECT}-3.4.1.20230507
> +V= 3.5.0
> +DIST_TUPLE= github conformal spectrwm SPECTRWM_${V:S/./_/g} /
> +DISTNAME=spectrwm-${V}
>
> SHARED_LIBS= swmhack 1.0
>
> @@ -16,8 +15,8 @@ MAINTAINER= Gonzalo L. R. , \
> PERMIT_PACKAGE= Yes
>
> # uses pledge()
> -WANTLIB += X11 X11-xcb Xcursor Xft c util xcb xcb-icccm xcb-keysyms
> -WANTLIB += xcb-randr xcb-util xcb-xinput xcb-xtest
> +WANTLIB += X11 X11-xcb Xcursor Xft c fontconfig util xcb xcb-icccm
> +WANTLIB += xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest
>
> RUN_DEPENDS= x11/dmenu>=4.5
>
> diff --git distinfo distinfo
> index f7f66c46998..a12233acd18 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (spectrwm-3.4.1.20230507-06e37331.tar.gz) =
> 1stB8RPoDDQYPHbg5BNgFYRdbqK8wvlyaKO8QMriJng=
> -SIZE (spectrwm-3.4.1.20230507-06e37331.tar.gz) = 172202
> +SHA256 (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) =
> tN6LLFkvxapMpNvQ6KQh9/0Wi31fVMetgZl63ADawg8=
> +SIZE (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) = 194387
> diff --git patches/patch-spectrwm_1 patches/patch-spectrwm_1
> index a2748e15bd8..e002bc0b708 100644
> --- patches/patch-spectrwm_1
> +++ patches/patch-spectrwm_1
> @@ -1,7 +1,7 @@
> Index: spectrwm.1
> --- spectrwm.1.orig
> +++ spectrwm.1
> -@@ -149,7 +149,7 @@ For example, starting
> +@@ -164,7 +164,7 @@ For example, starting
> via
> .Xr xinit 1 :
> .Bd -literal -offset indent
> diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
> index c6b86658164..6404edb119c 100644
> --- patches/patch-spectrwm_c
> +++ patches/patch-spectrwm_c
> @@ -1,8 +1,8 @@
> Index: spectrwm.c
> --- spectrwm.c.orig
> +++ spectrwm.c
> -@@ -331,7 +331,7 @@ uint32_t swm_debug = 0
> - #define SWM_CONF_KEYMAPPING (1)
> +@@ -373,7 +373,7 @@ uint32_t swm_debug = 0
> + #define SWM_CONF_WHITESPACE " \t\n"
>
> #ifndef SWM_LIB
> -#define SWM_LIB "/usr/local/lib/libswmhack.so"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/10/21 12:37:20 Modified files: sysutils/detox : Makefile distinfo sysutils/detox/pkg: PLIST Log message: Update detox from 1.2.0 to 1.4.5 Detox has moved to a new upstream. Changes: https://github.com/dharple/detox/releases Reported by Ray Kohler on ports@ Patch by me with hints from sthen
Re: [update] sysutils/detox 1.2.0 to 1.4.5 (was: sysutils/detox years out of date)
Stuart Henderson wrote (2023-10-21 11:41 CEST):
> I'd probably go with this, there doesn't seem any need to install two
> copies of the same sample files.
Sure, having the files can be a hint that these can be edited. But
it's okay to leave them out.
I'll commit your diff.
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/detox/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile 27 Sep 2023 17:16:24 - 1.6
> +++ Makefile 21 Oct 2023 09:40:15 -
> @@ -1,19 +1,18 @@
> COMMENT =utility designed to clean up filenames
>
> -DISTNAME = detox-1.2.0
> +V = 1.4.5
> +DISTNAME = detox-${V}
>
> CATEGORIES = sysutils
>
> -HOMEPAGE = http://detox.sourceforge.net/
> +HOMEPAGE = https://github.com/dharple/detox
>
> #BSD
> PERMIT_PACKAGE = Yes
>
> WANTLIB += c
>
> -SITES = ${SITE_SOURCEFORGE:=detox/}
> -
> -EXTRACT_SUFX = .tar.bz2
> +SITES = ${HOMEPAGE}/releases/download/v${V}/
>
> USE_GMAKE = Yes
>
> @@ -21,16 +20,6 @@ CONFIGURE_STYLE = gnu
>
> NO_TEST =Yes
>
> -do-install:
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/detox
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/detox
> - ${INSTALL_PROGRAM} ${WRKBUILD}/detox ${PREFIX}/bin
> - ${INSTALL_PROGRAM} ${WRKBUILD}/inline-detox ${PREFIX}/bin
> - ${INSTALL_MAN} ${WRKBUILD}/detox.1 ${PREFIX}/man/man1
> - ${INSTALL_MAN} ${WRKBUILD}/detoxrc.5 ${PREFIX}/man/man5
> - ${INSTALL_MAN} ${WRKBUILD}/detox.tbl.5 ${PREFIX}/man/man5
> - ${INSTALL_DATA} ${WRKBUILD}/detoxrc ${PREFIX}/share/examples/detox
> - ${INSTALL_DATA} ${WRKBUILD}/iso8859_1.tbl ${PREFIX}/share/detox
> - ${INSTALL_DATA} ${WRKBUILD}/unicode.tbl ${PREFIX}/share/detox
> +FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/detox
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/detox/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 18 Jan 2015 03:15:09 - 1.2
> +++ distinfo 21 Oct 2023 09:40:15 -
> @@ -1,2 +1,2 @@
> -SHA256 (detox-1.2.0.tar.bz2) = q/rZDufT4PxTzjudoyU/moAM3ZLj+MwSoZOUp7Hc2/g=
> -SIZE (detox-1.2.0.tar.bz2) = 86118
> +SHA256 (detox-1.4.5.tar.gz) = uKDtgw8wVPvgl3HSuO2K42Z1KWeMGnPrjlEmk+jHTTw=
> +SIZE (detox-1.4.5.tar.gz) = 147196
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/detox/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 11 Mar 2022 19:57:20 - 1.2
> +++ pkg/PLIST 21 Oct 2023 09:40:15 -
> @@ -1,11 +1,19 @@
> @bin bin/detox
> @bin bin/inline-detox
> @man man/man1/detox.1
> +@man man/man1/inline-detox.1
> @man man/man5/detox.tbl.5
> @man man/man5/detoxrc.5
> share/detox/
> share/detox/iso8859_1.tbl
> +@comment share/detox/iso8859_1.tbl.sample
> +share/detox/safe.tbl
> +@comment share/detox/safe.tbl.sample
> share/detox/unicode.tbl
> +@comment share/detox/unicode.tbl.sample
> +share/doc/detox/
> +share/doc/detox/README.md
> share/examples/detox/
> share/examples/detox/detoxrc
> @sample ${SYSCONFDIR}/detoxrc
> +@comment share/examples/detox/detoxrc.sample
>
Re: [update] sysutils/detox 1.2.0 to 1.4.5 (was: sysutils/detox years out of date)
Rafael Sadowski wrote (2023-10-21 10:28 CEST):
> On Sat Oct 21, 2023 at 10:15:42AM +0200, Stefan Hagen wrote:
> > Ray Kohler wrote (2023-10-20 20:12 CEST):
> > > This software moved to https://github.com/dharple/detox a while ago
> > > and development restarted.The old site (still around) is still listed
> > > in the package DESCR, which surely made it easy to miss the new
> > > versions. I haven't tried to build it myself.
> >
> > Here is an update to detox 1.4.5 from the new upstream site.
> > Changes: https://github.com/dharple/detox/releases
> >
> > Comments/OK?
> >
> > - Stefan
> >
> > Index: sysutils/detox/Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/detox/Makefile,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 Makefile
> > --- sysutils/detox/Makefile 27 Sep 2023 17:16:24 - 1.6
> > +++ sysutils/detox/Makefile 21 Oct 2023 08:14:14 -
> > @@ -1,19 +1,18 @@
> > COMMENT = utility designed to clean up filenames
> >
> > -DISTNAME = detox-1.2.0
> > +V =1.4.5
> > +DISTNAME = detox-${V}
> >
> > CATEGORIES = sysutils
> >
> > -HOMEPAGE = http://detox.sourceforge.net/
> > +HOMEPAGE = https://github.com/dharple/detox
> >
> > #BSD
> > PERMIT_PACKAGE = Yes
> >
> > WANTLIB += c
> >
> > -SITES =${SITE_SOURCEFORGE:=detox/}
> > -
> > -EXTRACT_SUFX = .tar.bz2
> > +SITES =${HOMEPAGE}/releases/download/v${V}/
> >
> > USE_GMAKE =Yes
> >
> > @@ -21,16 +20,10 @@ CONFIGURE_STYLE = gnu
> >
> > NO_TEST = Yes
> >
> > -do-install:
> > +post-install:
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/detox
> > - ${INSTALL_DATA_DIR} ${PREFIX}/share/detox
> > - ${INSTALL_PROGRAM} ${WRKBUILD}/detox ${PREFIX}/bin
> > - ${INSTALL_PROGRAM} ${WRKBUILD}/inline-detox ${PREFIX}/bin
> > - ${INSTALL_MAN} ${WRKBUILD}/detox.1 ${PREFIX}/man/man1
> > - ${INSTALL_MAN} ${WRKBUILD}/detoxrc.5 ${PREFIX}/man/man5
> > - ${INSTALL_MAN} ${WRKBUILD}/detox.tbl.5 ${PREFIX}/man/man5
> > - ${INSTALL_DATA} ${WRKBUILD}/detoxrc ${PREFIX}/share/examples/detox
> > - ${INSTALL_DATA} ${WRKBUILD}/iso8859_1.tbl ${PREFIX}/share/detox
> > - ${INSTALL_DATA} ${WRKBUILD}/unicode.tbl ${PREFIX}/share/detox
> > + mv ${WRKINST}/etc/detoxrc{,.sample} ${PREFIX}/share/examples/detox/
> > + mv ${PREFIX}/share/detox/{iso8859_1.tbl,safe.tbl,unicode.tbl}.sample \
> > + ${PREFIX}/share/examples/detox/
> >
> > .include
> > Index: sysutils/detox/distinfo
> > ===
> > RCS file: /cvs/ports/sysutils/detox/distinfo,v
> > retrieving revision 1.2
> > diff -u -p -u -p -r1.2 distinfo
> > --- sysutils/detox/distinfo 18 Jan 2015 03:15:09 - 1.2
> > +++ sysutils/detox/distinfo 21 Oct 2023 08:14:14 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (detox-1.2.0.tar.bz2) = q/rZDufT4PxTzjudoyU/moAM3ZLj+MwSoZOUp7Hc2/g=
> > -SIZE (detox-1.2.0.tar.bz2) = 86118
> > +SHA256 (detox-1.4.5.tar.gz) = uKDtgw8wVPvgl3HSuO2K42Z1KWeMGnPrjlEmk+jHTTw=
> > +SIZE (detox-1.4.5.tar.gz) = 147196
> > Index: sysutils/detox/pkg/PLIST
> > ===
> > RCS file: /cvs/ports/sysutils/detox/pkg/PLIST,v
> > retrieving revision 1.2
> > diff -u -p -u -p -r1.2 PLIST
> > --- sysutils/detox/pkg/PLIST11 Mar 2022 19:57:20 - 1.2
> > +++ sysutils/detox/pkg/PLIST21 Oct 2023 08:14:14 -
> > @@ -1,11 +1,19 @@
> > @bin bin/detox
> > @bin bin/inline-detox
> > @man man/man1/detox.1
> > +@man man/man1/inline-detox.1
> > @man man/man5/detox.tbl.5
> > @man man/man5/detoxrc.5
> > share/detox/
> > share/detox/iso8859_1.tbl
> > +share/detox/safe.tbl
> > share/detox/unicode.tbl
> > +share/doc/detox/
> > +share/doc/detox/README.md
> > share/examples/detox/
> > share/examples/detox/detoxrc
> > @sample ${SYSCONFDIR}/detoxrc
> > +share/examples/detox/detoxrc.sample
>
> I think this is still missing, isn't it?
>
> @sample ${SYSCONFDIR}/detoxrc/detoxrc.sample ?
Only detoxrc should go to ${SYSCONFDIR}.
> > +share/examples/detox/iso8859_1.tbl.sample
> @sample ${SYSCONFDIR}/detoxrc/... ?
The .sample files are usually installed to share/detox/ next to the
default .tbl files.
If a customized .tbl file should be used, the path is configured in
detoxrc. They're not searched for in /etc (imo).
See detoxrc(5)
iso8859_1 {filename "/path/to/filename";};
The .sample files can stay in examples/.
> > +share/examples/detox/safe.tbl.sample
> > +share/examples/detox/unicode.tbl.sample
Re: {Maintainer Update] lang/gleam 0.31.0
Volker Schlecht wrote (2023-10-20 17:57 CEST): > Update lang/gleam to latest release. > > Simple diff with the rust-typical dependency churn. > > Builds and runs fine on amd64, nothing depends on it. > > ok? $ make test 2>&1 | grep "test result:" test result: ok. 34 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.10s test result: ok. 1495 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.22s test result: ok. 27 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.05s Works fine here (also on amd64). ok sdk@ > Index: Makefile > === > RCS file: /cvs/ports/lang/gleam/Makefile,v > retrieving revision 1.5 > diff -u -p -r1.5 Makefile > --- Makefile 4 Sep 2023 13:02:38 - 1.5 > +++ Makefile 20 Oct 2023 15:53:43 - > @@ -2,8 +2,7 @@ COMMENT = statically typed language for > > GH_ACCOUNT = gleam-lang > GH_PROJECT = gleam > -GH_TAGNAME = v0.30.5 > -REVISION = 0 > +GH_TAGNAME = v0.31.0 > > HOMEPAGE = https://gleam.run > > Index: crates.inc > === > RCS file: /cvs/ports/lang/gleam/crates.inc,v > retrieving revision 1.3 > diff -u -p -r1.3 crates.inc > --- crates.inc7 Aug 2023 15:45:35 - 1.3 > +++ crates.inc20 Oct 2023 15:53:43 - > @@ -1,33 +1,33 @@ > +MODCARGO_CRATES += addr2line 0.21.0 # Apache-2.0 OR MIT > MODCARGO_CRATES += adler 1.0.2 # 0BSD OR MIT OR Apache-2.0 > -MODCARGO_CRATES += ahash 0.7.6 # MIT OR Apache-2.0 > -MODCARGO_CRATES += aho-corasick0.7.20 # Unlicense OR MIT > -MODCARGO_CRATES += aho-corasick1.0.2 # Unlicense OR MIT > -MODCARGO_CRATES += android-tzdata 0.1.1 # MIT OR Apache-2.0 > -MODCARGO_CRATES += arrayvec0.5.2 # MIT/Apache-2.0 > -MODCARGO_CRATES += askama 0.10.5 # MIT OR Apache-2.0 > -MODCARGO_CRATES += askama_derive 0.10.5 # MIT/Apache-2.0 > +MODCARGO_CRATES += aho-corasick1.0.4 # Unlicense OR MIT > +MODCARGO_CRATES += askama 0.12.0 # MIT OR Apache-2.0 > +MODCARGO_CRATES += askama_derive 0.12.1 # MIT/Apache-2.0 > MODCARGO_CRATES += askama_escape 0.10.3 # MIT OR Apache-2.0 > -MODCARGO_CRATES += askama_shared 0.11.2 # MIT/Apache-2.0 > -MODCARGO_CRATES += async-trait 0.1.68 # MIT OR Apache-2.0 > +MODCARGO_CRATES += asn1-rs 0.5.2 # MIT/Apache-2.0 > +MODCARGO_CRATES += asn1-rs-derive 0.4.0 # MIT/Apache-2.0 > +MODCARGO_CRATES += asn1-rs-impl0.1.0 # MIT/Apache-2.0 > +MODCARGO_CRATES += async-trait 0.1.73 # MIT OR Apache-2.0 > MODCARGO_CRATES += atty0.2.14 # MIT > MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT > +MODCARGO_CRATES += backtrace 0.3.69 # MIT OR Apache-2.0 > MODCARGO_CRATES += base16 0.2.1 # CC0-1.0 > MODCARGO_CRATES += base64 0.13.1 # MIT/Apache-2.0 > -MODCARGO_CRATES += base64 0.21.2 # MIT OR Apache-2.0 > +MODCARGO_CRATES += base64 0.21.3 # MIT OR Apache-2.0 > +MODCARGO_CRATES += basic-toml 0.1.4 # MIT OR Apache-2.0 > MODCARGO_CRATES += bincode 1.3.3 # MIT > MODCARGO_CRATES += bitflags1.3.2 # MIT/Apache-2.0 > +MODCARGO_CRATES += bitflags2.4.0 # MIT OR Apache-2.0 > MODCARGO_CRATES += bitmaps 2.1.0 # MPL-2.0+ > -MODCARGO_CRATES += bitvec 0.19.6 # MIT > MODCARGO_CRATES += block-buffer0.9.0 # MIT OR Apache-2.0 > -MODCARGO_CRATES += bstr1.5.0 # MIT OR Apache-2.0 > +MODCARGO_CRATES += bstr1.6.0 # MIT OR Apache-2.0 > MODCARGO_CRATES += bumpalo 3.13.0 # MIT/Apache-2.0 > MODCARGO_CRATES += bytes 1.4.0 # MIT > MODCARGO_CRATES += camino 1.1.6 # MIT OR Apache-2.0 > MODCARGO_CRATES += capnp 0.14.11 # MIT > MODCARGO_CRATES += capnpc 0.14.9 # MIT > -MODCARGO_CRATES += cc 1.0.79 # MIT OR Apache-2.0 > +MODCARGO_CRATES += cc 1.0.83 # MIT OR Apache-2.0 > MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0 > -MODCARGO_CRATES += chrono 0.4.26 # MIT/Apache-2.0 > MODCARGO_CRATES += clap3.2.25 # MIT OR Apache-2.0 > MODCARGO_CRATES += clap_derive 3.2.25 # MIT OR Apache-2.0 > MODCARGO_CRATES += clap_lex0.2.4 # MIT OR Apache-2.0 > @@ -37,34 +37,34 @@ MODCARGO_CRATES +=console 0.15.7 # MIT > MODCARGO_CRATES += console_error_panic_hook0.1.7 # Apache-2.0/MIT > MODCARGO_CRATES += core-foundation 0.9.3 # MIT / Apache-2.0 > MODCARGO_CRATES += core-foundation-sys 0.8.4 # MIT / Apache-2.0 > -MODCARGO_CRATES += cpufeatures 0.2.7 # MIT OR Apache-2.0 > +MODCARGO_CRATES += cpufeatures 0.2.9 # MIT OR Apache-2.0 > MODCARGO_CRATES += crc32fast 1.3.2 # MIT OR Apache-2.0 > MODCARGO_CRATES += crossbeam-channel 0.5.8 # MIT OR Apache-2.0 > MODCARGO_CRATES += crossbeam-utils 0.8.16 # MIT OR Apache-2.0 > -MODCARGO_CRATES += ctor
[update] sysutils/detox 1.2.0 to 1.4.5 (was: sysutils/detox years out of date)
Ray Kohler wrote (2023-10-20 20:12 CEST):
> This software moved to https://github.com/dharple/detox a while ago
> and development restarted.The old site (still around) is still listed
> in the package DESCR, which surely made it easy to miss the new
> versions. I haven't tried to build it myself.
Here is an update to detox 1.4.5 from the new upstream site.
Changes: https://github.com/dharple/detox/releases
Comments/OK?
- Stefan
Index: sysutils/detox/Makefile
===
RCS file: /cvs/ports/sysutils/detox/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- sysutils/detox/Makefile 27 Sep 2023 17:16:24 - 1.6
+++ sysutils/detox/Makefile 21 Oct 2023 08:14:14 -
@@ -1,19 +1,18 @@
COMMENT = utility designed to clean up filenames
-DISTNAME = detox-1.2.0
+V =1.4.5
+DISTNAME = detox-${V}
CATEGORIES = sysutils
-HOMEPAGE = http://detox.sourceforge.net/
+HOMEPAGE = https://github.com/dharple/detox
#BSD
PERMIT_PACKAGE = Yes
WANTLIB += c
-SITES =${SITE_SOURCEFORGE:=detox/}
-
-EXTRACT_SUFX = .tar.bz2
+SITES =${HOMEPAGE}/releases/download/v${V}/
USE_GMAKE =Yes
@@ -21,16 +20,10 @@ CONFIGURE_STYLE = gnu
NO_TEST = Yes
-do-install:
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/detox
- ${INSTALL_DATA_DIR} ${PREFIX}/share/detox
- ${INSTALL_PROGRAM} ${WRKBUILD}/detox ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKBUILD}/inline-detox ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKBUILD}/detox.1 ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKBUILD}/detoxrc.5 ${PREFIX}/man/man5
- ${INSTALL_MAN} ${WRKBUILD}/detox.tbl.5 ${PREFIX}/man/man5
- ${INSTALL_DATA} ${WRKBUILD}/detoxrc ${PREFIX}/share/examples/detox
- ${INSTALL_DATA} ${WRKBUILD}/iso8859_1.tbl ${PREFIX}/share/detox
- ${INSTALL_DATA} ${WRKBUILD}/unicode.tbl ${PREFIX}/share/detox
+ mv ${WRKINST}/etc/detoxrc{,.sample} ${PREFIX}/share/examples/detox/
+ mv ${PREFIX}/share/detox/{iso8859_1.tbl,safe.tbl,unicode.tbl}.sample \
+ ${PREFIX}/share/examples/detox/
.include
Index: sysutils/detox/distinfo
===
RCS file: /cvs/ports/sysutils/detox/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- sysutils/detox/distinfo 18 Jan 2015 03:15:09 - 1.2
+++ sysutils/detox/distinfo 21 Oct 2023 08:14:14 -
@@ -1,2 +1,2 @@
-SHA256 (detox-1.2.0.tar.bz2) = q/rZDufT4PxTzjudoyU/moAM3ZLj+MwSoZOUp7Hc2/g=
-SIZE (detox-1.2.0.tar.bz2) = 86118
+SHA256 (detox-1.4.5.tar.gz) = uKDtgw8wVPvgl3HSuO2K42Z1KWeMGnPrjlEmk+jHTTw=
+SIZE (detox-1.4.5.tar.gz) = 147196
Index: sysutils/detox/pkg/PLIST
===
RCS file: /cvs/ports/sysutils/detox/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- sysutils/detox/pkg/PLIST11 Mar 2022 19:57:20 - 1.2
+++ sysutils/detox/pkg/PLIST21 Oct 2023 08:14:14 -
@@ -1,11 +1,19 @@
@bin bin/detox
@bin bin/inline-detox
@man man/man1/detox.1
+@man man/man1/inline-detox.1
@man man/man5/detox.tbl.5
@man man/man5/detoxrc.5
share/detox/
share/detox/iso8859_1.tbl
+share/detox/safe.tbl
share/detox/unicode.tbl
+share/doc/detox/
+share/doc/detox/README.md
share/examples/detox/
share/examples/detox/detoxrc
@sample ${SYSCONFDIR}/detoxrc
+share/examples/detox/detoxrc.sample
+share/examples/detox/iso8859_1.tbl.sample
+share/examples/detox/safe.tbl.sample
+share/examples/detox/unicode.tbl.sample
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/10/21 00:56:58 Modified files: textproc : Makefile Log message: Add urlscan dir
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/10/21 00:54:37 Log message: Import textproc/urlscan 1.0.1 Urlscan is a small program that is designed to integrate with the "mutt" mailreader to allow you to easily launch a Web browser for URLs contained in email messages. It is a replacement for the "urlview" program with additional features. Port created by me, with help from Laurent and hint from Stuard. OK sthen, lraab Status: Vendor Tag: sdk Release Tags: sdk_20231021 N ports/textproc/urlscan/Makefile N ports/textproc/urlscan/distinfo N ports/textproc/urlscan/pkg/DESCR N ports/textproc/urlscan/pkg/PLIST N ports/textproc/urlscan/patches/patch-pyproject_toml No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/10/19 13:06:12 Modified files: sysutils/hcloud: Makefile distinfo modules.inc Log message: Update hcloud to 1.38.3 * build with Go 1.21 * iso: support deprecation info API * load-balancer: Add health status to list output
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/10/19 12:48:48 Modified files: security/qtpass: Makefile distinfo Log message: Update qtpass from 1.3.2 to 1.4.0 Changes: https://github.com/IJHack/QtPass/releases/tag/v1.4.0
Re: [new] textproc/urlscan 1.0.1 - a better urlview replacement
Stuart Henderson wrote (2023-10-18 15:10 CEST):
> On 2023/10/18 14:14, Stefan Hagen wrote:
> > Hi all,
> >
> > attached is a new port, which is bascially urlview, but better.
> >
>
> MODPY_PYBUILD = hatchling
>
> BUILD_DEPENDS = devel/py-hatchling${MODPY_FLAVOR} \
> devel/py-hatch-vcs${MODPY_FLAVOR}
>
> please replace the above MODPY_PYBUILD + BUILD_DEPENDS lines with
>
> MODPY_PYBUILD = hatch-vcs
>
> > Most notably, it shows context parts from the email, so it's easier to
> > know which link belongs to which reference text.
> >
> > cat pkg/DESCR:
> > Urlscan is a small program that is designed to integrate with the
> > "mutt" mailreader to allow you to easily launch a Web browser for URLs
> > contained in email messages. It is a replacement for the "urlview"
> > program.
>
> When I test, it lists the collected URLs and allows me to select.
> When I press enter on one of these, it then opens in links (as
> identified by pstree) but the screen doesn't change from urlscan's
> display. The only way to exit seems to be blindly typing commands
> from the browser, or ^C.
You're right. I could not make it work this way either. I assume it
has been built with graphical browsers in mind.
Starting it in a new terminal works: urlscan --run "xterm -e lynx"
Updated port attached. One more OK for import?
- Stefan
urlscan.tgz
Description: application/tar-gz
[new] textproc/urlscan 1.0.1 - a better urlview replacement
Hi all, attached is a new port, which is bascially urlview, but better. Most notably, it shows context parts from the email, so it's easier to know which link belongs to which reference text. cat pkg/DESCR: Urlscan is a small program that is designed to integrate with the "mutt" mailreader to allow you to easily launch a Web browser for URLs contained in email messages. It is a replacement for the "urlview" program. Relative to urlview, urlscan has the following additional features: * Support for emails in quoted-printable and base64 encodings. No more stripping out =40D from URLs by hand! * The context of each URL is provided along with the URL. For HTML mails, a crude parser is used to render the HTML into text. Context view can be toggled on/off with c. * URLs are shortened by default to fit on one line. Viewing full URL (for one or all) is toggled with s or S. * Jump to a URL by typing the number. * Incremental case-insensitive search with /. * Execute an arbitrary function (for example, copy URL to clipboard) instead of opening URL in a browser. * Use l to cycle through whether URLs are opened using the Python webbrowser module (default), xdg-open (if installed) or opened by a function passed on the command line with --run or --run-safe. * Configure colors and keybindings via ~/.config/urlscan/config.json. Generate default config file for editing by running urlscan -g. Cycle through available palettes with p. Set display width with --width. * Copy URL to clipboard with C or to primary selection with P. Requires xsel or xclip. * Run a command with the selected URL as the argument or pipe the selected URL to a command. * Show complete help menu with F1. Hide header on startup with --nohelp. * Use a custom regular expression with -E for matching urls or any other pattern. In junction with -r, this effectively turns urlscan into a general purpose CLI selector-type utility. * Scan certain email headers for URLs. Currently Link, Archived-At and List-* are scanned when --headers is passed. * Queue multiple URLs for opening and open them all at once with a and o. I started the port and will take MAINTAINER. Laurent polished it, thank you! Tested and in use for two weeks here on amd64. OK to import? - Stefan urlscan.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: www
CVSROOT:/cvs Module name:www Changes by: s...@cvs.openbsd.org2023/10/16 13:55:49 Modified files: faq/ports : ports.html Log message: Change example to show default PORTSDIR path Reported by mavavilj in #openbsd on matrix. OK kn
Re: NEW: legendary-gl - Downloader for Epic Games Store
Thomas Frohwein wrote (2023-10-15 17:25 CEST): > On Sat, Oct 14, 2023 at 09:10:51PM -0400, Thomas Frohwein wrote: > > Super-late *ping* with updated tarball of latest version on pypi.org, > > 0.20.33. It still works, and the below generally still applies. > > It now also depends on py-filelock. > > > > ok to import? > > I missed to update the PY stuff to 2023 preferences, that is > MODPY_PYBUILD=setuptools and no need to specify python3 as it's the > default. The MODPY_PYBUILD stuff changes PLIST a little, but the > resulting program still works. > > So here the updated tarball, still looking for an ok :) Again to the correct email thread: ok for import sdk@
Re: remove x11/wxglade
Thomas Frohwein wrote (2023-10-15 18:34 CEST): > On Sun, Oct 15, 2023 at 06:01:57PM +0200, Stefan Hagen wrote: > > Thomas Frohwein wrote (2023-10-15 17:26 CEST): > > > On Sun, Oct 15, 2023 at 11:18:16AM -0400, Thomas Frohwein wrote: > > > > > > [...] > > > > > > > +USE_NOBTCFI= Yes > > > > +USE_WXALLOWED= Yes > > > > > > Ignore these, it was just me blindly trying something which shouldn't > > > make its way into any potential update of the port. > > > > I authenticated, and downloaded Blazing Sails and Q.U.B.E 2. > > Works almost as advertised. > > > > Almost, because the games got installed to ~/Games/QUBE2 and > > ~/Games/BlazingSails. > > > > Portwise, maybe one or two more newlines at appropriate places before > > committing? > > > > OK for import sdk@ > > I assume the ok is for legendary, not wxglade... :] Uhm. Too many mutts. Yeah.
Re: remove x11/wxglade
Thomas Frohwein wrote (2023-10-15 17:26 CEST): > On Sun, Oct 15, 2023 at 11:18:16AM -0400, Thomas Frohwein wrote: > > [...] > > > +USE_NOBTCFI= Yes > > +USE_WXALLOWED= Yes > > Ignore these, it was just me blindly trying something which shouldn't > make its way into any potential update of the port. I authenticated, and downloaded Blazing Sails and Q.U.B.E 2. Works almost as advertised. Almost, because the games got installed to ~/Games/QUBE2 and ~/Games/BlazingSails. Portwise, maybe one or two more newlines at appropriate places before committing? OK for import sdk@
[faq] ports.html shows non-standard PORTSDIR in example
Hi, This example shows /built/source/ports, which is non standard an nowhere explained. OK to change this to /usr/ports? Best regards, Stefan Index: faq/ports/ports.html === RCS file: /cvs/www/faq/ports/ports.html,v retrieving revision 1.60 diff -u -p -r1.60 ports.html --- faq/ports/ports.html10 Apr 2023 02:55:09 - 1.60 +++ faq/ports/ports.html15 Oct 2023 12:10:55 - @@ -366,7 +366,7 @@ $ make install === Verifying install for metaauto-* in devel/metaauto === Checking files for metaauto-1.0p1 [...] -=== Installing metaauto-1.0p1 from /build/source/ports/packages/amd64/all/ +=== Installing metaauto-1.0p1 from /usr/ports/packages/amd64/all/ metaauto-1.0p1: ok === Returning to build of rsnapshot-1.4.2 === rsnapshot-1.4.2 depends on: metaauto-* - metaauto-1.0p1 @@ -389,12 +389,12 @@ metaauto-1.0p1: ok [...] === Building package for rsnapshot-1.4.2 [...] -Link to /build/source/ports/packages/amd64/all/rsnapshot-1.4.2.tgz -Link to /build/source/ports/packages/amd64/ftp/rsnapshot-1.4.2.tgz -Link to /build/source/ports/packages/amd64/cdrom/rsnapshot-1.4.2.tgz +Link to /usr/ports/packages/amd64/all/rsnapshot-1.4.2.tgz +Link to /usr/ports/packages/amd64/ftp/rsnapshot-1.4.2.tgz +Link to /usr/ports/packages/amd64/cdrom/rsnapshot-1.4.2.tgz === rsnapshot-1.4.2 depends on: p5-Lchown-* - not found [...] -=== Installing rsnapshot-1.4.2 from /build/source/ports/packages/amd64/all/ +=== Installing rsnapshot-1.4.2 from /usr/ports/packages/amd64/all/ rsnapshot-1.4.2: ok
Re: vis(e) broken: can't load library 'liblua5.4.so.5.4'
Klemens Nanni wrote (2023-10-04 20:14 CEST):
> 4 окт. 2023 г. 19:51:20 Stuart Henderson :
>
> > On 2023/10/04 15:58, James Cook wrote:
> >> After a recent pkg_add -Dsnap -u, running "vise" from the vis package
> >> gives:
> >>
> >> $ vise
> >> ld.so: vise: can't load library 'liblua5.4.so.5.4'
> >> Killed
> >>
> >> It looks like the vis package depends on the wrong version (5.3.6) of lua.
> >> If I manually install lua 5.4.6, vise works, but says "WARNING: could not
> >> find lpeg module" every time it starts up (even after I install the
> >> lua-lpeg
> >> package).
> >
> > if lua 5.4 is installed at build time:
> >
> > checking for liblua >= 5.2 ...
> > checking for lua... no
> > checking for lua5.4... no
> > checking for lua5.3... no
> > checking for lua5.2... no
> > checking for lua-5.3... no
> > checking for lua-5.2... no
> > checking for lua54... yes
> >
> > regardless of which lua version is used (the vis port specifically asks
> > for 5.3), vis' configure script needs patching to use the specified
> > version of lua rather than searching for the 'best' one.
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/editors/vis/Makefile,v
> > retrieving revision 1.17
> > diff -u -p -r1.17 Makefile
> > --- Makefile 26 Sep 2023 17:58:06 - 1.17
> > +++ Makefile 4 Oct 2023 16:49:49 -
> > @@ -2,7 +2,7 @@ COMMENT = vi-like editor with sam-style
> >
> > V = 0.8
> > DISTNAME = vis-${V}
> > -REVISION = 0
> > +REVISION = 1
> >
> > TEST_V = 0.5
> > TEST_DISTNAME = vis-test-${TEST_V}
> > @@ -33,6 +33,7 @@ RUN_DEPENDS = devel/lpeg,${MODLUA_FLAVO
> > TEST_DEPENDS = editors/vim
> >
> > CONFIGURE_STYLE = simple
> > +CONFIGURE_ENV = LUA_VER=${MODLUA_FLAVOR}
> > CONFIGURE_ARGS = --prefix=${PREFIX} \
> > --mandir=${PREFIX}/man
> >
> > Index: patches/patch-configure
> > ===
> > RCS file: /cvs/ports/editors/vis/patches/patch-configure,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 patch-configure
> > --- patches/patch-configure 11 Mar 2022 18:58:39 - 1.6
> > +++ patches/patch-configure 4 Oct 2023 16:49:49 -
> > @@ -11,3 +11,12 @@ Index: configure
> > tryflag CFLAGS -ffunction-sections
> > tryflag CFLAGS -fdata-sections
> > tryldflag LDFLAGS_AUTO -Wl,--gc-sections
> > +@@ -443,7 +442,7 @@ int main(int argc, char *argv[]) {
> > + }
> > + EOF
> > +
> > +- for liblua in lua lua5.4 lua5.3 lua5.2 lua-5.3 lua-5.2 lua54 lua53
> > lua52; do
> > ++ for liblua in $LUA_VER; do
> > + printf " checking for %s... " "$liblua"
> > +
> > + if test "$have_pkgconfig" = "yes" ; then
> That makes sense, OK kn if that works for you, sthen.
>
> I can't test until in a few hours.
Works as intended here. OK sdk
- Stefan
Re: audio/espeak-ng without audio?
Antoine Jacoutot wrote (2023-09-16 11:31 CEST):
> On Sat, Sep 16, 2023 at 11:28:13AM +0200, Stefan Hagen wrote:
> > Volker Schlecht wrote (2023-09-15 23:21 CEST):
> > > On my amd64 systems espeak-ng does not produce audio output.
> > >
> > > Interestingly it seems to have broken with the last commit:
> > >
> > > https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/audio/espeak/Makefile?rev=1.27=text/x-cvsweb-markup
> > >
> > > because when I add CPPFLAGS to CONFIGURE_ENV, it does actually
> > > speak, but it seems to be somehow important, that there are no
> > > line breaks in CONFIGURE_ENV.
> > >
> > > i.e. with the below patch it produces audio output. Does that
> > > make sense to anyone?
> >
> > Hi,
> >
> > I think your mail program has wrapped the lines in the patch. It doesn't
> > apply like this.
> >
> > I don't understand what you mean with the lines break in CONFIGURE_ENV.
> >
> > This works for me:
> > CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
> > CPPFLAGS="-I${LOCALBASE}/include"
> >
> >
> > The reason for why CPPFLAGS are needed is in the configure output.
> >
> > Without setting CPPFLAGS, pcaudiolib support will be disabled, because
> > configure is unable to find the header:
> > PCAudioLib:no
> >
> > Once CPPFLAGS is set correctly:
> > PCAudioLib:yes
> >
> > OK sdk@ for the fixed patch below.
> >
> >
> > Index: audio/espeak/Makefile
> > ===
> > RCS file: /cvs/ports/audio/espeak/Makefile,v
> > retrieving revision 1.27
> > diff -u -p -u -p -r1.27 Makefile
> > --- audio/espeak/Makefile 1 Jun 2023 20:58:21 - 1.27
> > +++ audio/espeak/Makefile 16 Sep 2023 09:23:59 -
> > @@ -4,7 +4,7 @@ GH_ACCOUNT= espeak-ng
> > GH_PROJECT=espeak-ng
> > GH_TAGNAME=1.51
> > PKGNAME= ${DISTNAME:S/-ng//}
> > -REVISION= 1
> > +REVISION= 2
> >
> > SHARED_LIBS += espeak-ng 0.0 # 2.51
> >
> > @@ -29,7 +29,9 @@ AUTORECONF= ./autogen.sh
> >
> > CONFIGURE_STYLE= autoreconf
> > # upstream is doing something odd and doesn't add LDFLAGS/CXXFLAGS if
> > CPPFLAGS is set
> > -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
> > +
> > +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
> > + CPPFLAGS="-I${LOCALBASE}/include"
>
> What about the comment above CONFIGURE_ENV?
Probably outdated.
The generated Makefile after the patch:
CPPFLAGS = -I/usr/local/include
LDFLAGS = -L/usr/local/lib -L/usr/X11R6/lib
The generated Makefile before the patch shows:
CPPFLAGS =
LDFLAGS = -L/usr/local/lib -L/usr/X11R6/lib
No change on the LDFLAGS.
I think we can remove the comment.
Index: audio/espeak/Makefile
===
RCS file: /cvs/ports/audio/espeak/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- audio/espeak/Makefile 1 Jun 2023 20:58:21 - 1.27
+++ audio/espeak/Makefile 16 Sep 2023 09:42:04 -
@@ -4,7 +4,7 @@ GH_ACCOUNT= espeak-ng
GH_PROJECT=espeak-ng
GH_TAGNAME=1.51
PKGNAME= ${DISTNAME:S/-ng//}
-REVISION= 1
+REVISION= 2
SHARED_LIBS += espeak-ng 0.0 # 2.51
@@ -28,8 +28,9 @@ AUTOMAKE_VERSION= 1.16
AUTORECONF=./autogen.sh
CONFIGURE_STYLE= autoreconf
-# upstream is doing something odd and doesn't add LDFLAGS/CXXFLAGS if CPPFLAGS
is set
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+ CPPFLAGS="-I${LOCALBASE}/include"
DEBUG_PACKAGES=${BUILD_PACKAGES}
Re: audio/espeak-ng without audio?
Volker Schlecht wrote (2023-09-15 23:21 CEST):
> On my amd64 systems espeak-ng does not produce audio output.
>
> Interestingly it seems to have broken with the last commit:
>
> https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/audio/espeak/Makefile?rev=1.27=text/x-cvsweb-markup
>
> because when I add CPPFLAGS to CONFIGURE_ENV, it does actually
> speak, but it seems to be somehow important, that there are no
> line breaks in CONFIGURE_ENV.
>
> i.e. with the below patch it produces audio output. Does that
> make sense to anyone?
Hi,
I think your mail program has wrapped the lines in the patch. It doesn't
apply like this.
I don't understand what you mean with the lines break in CONFIGURE_ENV.
This works for me:
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include"
The reason for why CPPFLAGS are needed is in the configure output.
Without setting CPPFLAGS, pcaudiolib support will be disabled, because
configure is unable to find the header:
PCAudioLib:no
Once CPPFLAGS is set correctly:
PCAudioLib:yes
OK sdk@ for the fixed patch below.
Index: audio/espeak/Makefile
===
RCS file: /cvs/ports/audio/espeak/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- audio/espeak/Makefile 1 Jun 2023 20:58:21 - 1.27
+++ audio/espeak/Makefile 16 Sep 2023 09:23:59 -
@@ -4,7 +4,7 @@ GH_ACCOUNT= espeak-ng
GH_PROJECT=espeak-ng
GH_TAGNAME=1.51
PKGNAME= ${DISTNAME:S/-ng//}
-REVISION= 1
+REVISION= 2
SHARED_LIBS += espeak-ng 0.0 # 2.51
@@ -29,7 +29,9 @@ AUTORECONF= ./autogen.sh
CONFIGURE_STYLE= autoreconf
# upstream is doing something odd and doesn't add LDFLAGS/CXXFLAGS if CPPFLAGS
is set
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+ CPPFLAGS="-I${LOCALBASE}/include"
DEBUG_PACKAGES=${BUILD_PACKAGES}
Re: [maintainer update] remind 4.2.5 -> 4.2.6
Martin Ziemer wrote (2023-09-13 08:11 CEST): > This patch updates remind from 4.2.5 to 4.2.6. > > Tested on amd64. ok sdk@ Tests and runtime test passes (also on amd64) > Index: Makefile > === > RCS file: /cvs/ports/misc/remind/Makefile,v > retrieving revision 1.65 > diff -u -p -r1.65 Makefile > --- Makefile 12 Apr 2023 09:04:21 - 1.65 > +++ Makefile 12 Sep 2023 19:22:41 - > @@ -1,7 +1,7 @@ > COMMENT= scripting language for reminders, with a Tk front end > > -DISTNAME=remind-04.02.05 > -PKGNAME= remind-4.2.5 > +DISTNAME=remind-04.02.06 > +PKGNAME= remind-4.2.6 > > CATEGORIES= misc > > Index: distinfo > === > RCS file: /cvs/ports/misc/remind/distinfo,v > retrieving revision 1.35 > diff -u -p -r1.35 distinfo > --- distinfo 12 Apr 2023 09:04:21 - 1.35 > +++ distinfo 12 Sep 2023 19:22:41 - > @@ -1,2 +1,2 @@ > -SHA256 (remind-04.02.05.tar.gz) = > nOEFhVwZvgUod+j/5ifllFgTS7I8+hOAeMSDlRH4+Ag= > -SIZE (remind-04.02.05.tar.gz) = 498783 > +SHA256 (remind-04.02.06.tar.gz) = > EhULOhpCrJltwe/Sq67n5hADCMeTpcGqaXRfOORzVjU= > +SIZE (remind-04.02.06.tar.gz) = 504145 > Index: pkg/PLIST > === > RCS file: /cvs/ports/misc/remind/pkg/PLIST,v > retrieving revision 1.14 > diff -u -p -r1.14 PLIST > --- pkg/PLIST 12 Feb 2023 07:04:31 - 1.14 > +++ pkg/PLIST 12 Sep 2023 19:22:41 - > @@ -28,6 +28,7 @@ share/remind/holidays/ > share/remind/holidays/ca.rem > share/remind/holidays/fr.rem > share/remind/holidays/gr.rem > +share/remind/holidays/ie.rem > share/remind/holidays/jewish.rem > share/remind/holidays/us.rem > share/remind/lang/ >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/10 10:32:01 Modified files: graphics/krita-gmic-plugin: Makefile Log message: Fix krita-gmic-plugin, add bash to BUILD_DEPENDS translations/lrelease.sh needs bash found by tb@
Re: UPDATE: x11/fvwm3 to 1.0.8
Michael wrote (2023-09-06 23:27 IST):
> Hi ports@,
>
> fvwm3 had another release version 1.0.8 just recently [1].
>
> This seems to be only a small update that includes the previously
> backported ewmh.c fix.
>
> Tested on amd64, patch below.
Committed, thank you!
- Stefan
> [1] https://github.com/fvwmorg/fvwm3/releases/tag/1.0.8
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/fvwm3/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 4 Sep 2023 11:00:34 - 1.9
> +++ Makefile 6 Sep 2023 18:50:08 -
> @@ -1,6 +1,6 @@
> COMMENT= multiple virtual desktop window manager
>
> -VERSION= 1.0.7
> +VERSION= 1.0.8
> DISTNAME=fvwm3-${VERSION}
>
> CATEGORIES= x11
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/fvwm3/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 4 Sep 2023 11:00:34 - 1.4
> +++ distinfo 6 Sep 2023 18:50:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (fvwm3-1.0.7.tar.gz) = OqzXz+/2DbG82cdzMtxXX+dxHS0wbwR5UlN43G2z0x4=
> -SIZE (fvwm3-1.0.7.tar.gz) = 4512128
> +SHA256 (fvwm3-1.0.8.tar.gz) = fQF8SCSvyJHvvbI3oyulnizZRUKs76sD4dmO3DHTQOs=
> +SIZE (fvwm3-1.0.8.tar.gz) = 5644021
> Index: patches/patch-fvwm_ewmh_c
> ===
> RCS file: patches/patch-fvwm_ewmh_c
> diff -N patches/patch-fvwm_ewmh_c
> --- patches/patch-fvwm_ewmh_c 4 Sep 2023 11:00:35 - 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,24 +0,0 @@
> -https://github.com/fvwmorg/fvwm3/commit/4d5a697fac3282af18cacebb6d061c92db410f1a
> -Fixes https://github.com/fvwmorg/fvwm3/issues/873
> -
> -Index: fvwm/ewmh.c
> fvwm/ewmh.c.orig
> -+++ fvwm/ewmh.c
> -@@ -458,7 +458,7 @@ void *atom_get(Window win, Atom to_get, Atom type, int
> - int asize;
> -
> - asize = atom_size(format_ret);
> --data = fxmalloc(num_ret * asize);
> -+data = fxmalloc(num_ret * asize + 1);
> - if (format_ret == 32 && asize * 8 != format_ret)
> - {
> - int i;
> -@@ -472,7 +472,7 @@ void *atom_get(Window win, Atom to_get, Atom type, int
> - {
> - if (data)
> - {
> --memcpy(data, retval, num_ret * asize);
> -+memcpy(data, retval, num_ret * asize + 1);
> - }
> - }
> - XFree(retval);
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/07 03:46:33 Modified files: x11/fvwm3 : Makefile distinfo Removed files: x11/fvwm3/patches: patch-fvwm_ewmh_c Log message: Update fvwm3 to version 1.0.8, from MAINTAINER Michael, thank you! This release contains the ewhm fix we had backported anyway. So this update is a nop.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/06 08:00:56 Modified files: sysutils/hcloud: Makefile distinfo modules.inc Log message: Update hcloud to 1.37.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/06 06:25:10 Modified files: graphics/krita-gmic-plugin: Makefile distinfo graphics/krita-gmic-plugin/patches: patch-src_gmic_cpp Log message: Update krita-gmic-plugin to version 3.2.4.1 Changes: https://github.com/amyspark/gmic/compare/v3.1.6.1...v3.2.4.1 ok caspar@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/05 05:04:51 Modified files: mail/mu: Makefile distinfo mail/mu/patches: patch-lib_mu-store_cc patch-mu_mu-cmd-server_cc mail/mu/pkg: PFRAG.guile PLIST Added files: mail/mu/patches: patch-mu_mu-options_cc Removed files: mail/mu/patches: patch-configure_ac Log message: Update mu to version 1.10.7 Big changes: https://github.com/djcb/mu/blob/release/1.10/NEWS.org The smaller changes are on the release page: https://github.com/djcb/mu/releases With some nits from op@ OK op@
Re: UPDATE: x11/fvwm3 to 1.0.7
Ingo Schwarze wrote (2023-09-04 16:27 IST): > Hi, > > Stuart Henderson wrote on Mon, Sep 04, 2023 at 11:07:52AM +0100: > > On 2023/09/04 11:05, Stefan Hagen wrote: > > >> $ man 1 autoconf > >> There is more than one version of this manpage available (show with -w). > > > oh that's a decent alternative. > > Indeed, in particular in combination with the other idea of only giving > the heads-up for clashes *with the same section number*. > > That reduces the waste of screen real estate to a single line, > even that is only printed when it really matters, and there are > only a handful of cases in the base system: > > genuine clashes in base: > ld(1)- ld.1 and ld.bfd.1 > perldelta(1) - perldelta.1 and perl5361delta.1 > > documentation bugs in base, same function documented twice: > CRYPTO_EX_dup(3), pem_password_cb(3), tls_reset(3) > > See below for an improved patch, resulting in: > >$ man FvwmPager > Multiple versions of FvwmPager(1) are available; list them with -w. > > FvwmPager(1) General Commands Manual FvwmPager(1) > > NAME >FvwmPager - the FVWM Pager module > [...] > >$ man autoconf > AUTOCONF(4) Device Drivers Manual (amd64)AUTOCONF(4) > > NAME > autoconf - diagnostics from the autoconfiguration code > [...] > >$ man 1 autoconf > Multiple versions of autoconf(1) are available; list them with -w. > > AUTOCONF(1) FSF AUTOCONF(1) > > NAME >autoconf - Generate configuration scripts > [...] > >$ man CRYPTO_EX_dup > Multiple versions of CRYPTO_EX_dup(3) are available; list them with -w. > > CRYPTO_SET_EX_DATA(3) Library Functions Manual CRYPTO_SET_EX_DATA(3) > > NAME > CRYPTO_EX_new, CRYPTO_EX_free, CRYPTO_EX_dup, CRYPTO_get_ex_new_index, > CRYPTO_set_ex_data, CRYPTO_get_ex_data, CRYPTO_free_ex_data, > CRYPTO_new_ex_data - functions supporting application-specific data > [...] > > Lightly tested so far. Works as intended here. I'd be happy with this. I'm already finding new manpages. > >> Then you could stop after the second match in the same section. > > Actually, i think that's not even worth bothering. On a relatively fast laptop it's not noticeable. Without your patch: Benchmark 1: man -c FvwmButtons Time (mean ± σ): 8.9 ms ± 0.5 ms[User: 4.3 ms, System: 3.6 ms] Range (min … max): 7.6 ms … 11.5 ms800 runs With your patch: Benchmark 1: man -c FvwmButtons Time (mean ± σ): 9.8 ms ± 0.6 ms[User: 5.2 ms, System: 3.8 ms] Range (min … max): 8.4 ms … 14.8 ms800 runs Do you want to loop tech@ in on this? Or collect more feedback? I'm keeping this in my tree for now and will let you know if something unexpected happens. Best regards, Stefan
Re: update graphics/imlib2 to 1.12.0
Omar Polo wrote (2023-09-04 15:43 IST): > On 2023/09/04 15:17:40 +0100, Stefan Hagen > wrote: > > Ah! I should have seen that. > > > > Now it builds, but nsxiv does not work anymore: > > $ nsxiv irrsi.png > > nsxiv: irrsi.png: Error opening image > > nsxiv: no more files to display, aborting > > > > $ nsxiv mpv-shot0001.jpg > > nsxiv: mpv-shot0001.jpg: Error opening image > > nsxiv: no more files to display, aborting > > > > This works with the previous version. > > since it's a major bump of the loader interface, you have to rebuild > nsixv as well. Yes, I did. But it didn't pick it up... 33605 nsxivNAMI "/usr/local/lib/libImlib2.so.8.0" After bumping REVISION on nsxiv it finally did the right thing. I must have something cached that make clean=all doesn't delete. OK sdk@
Re: update graphics/imlib2 to 1.12.0
Omar Polo wrote (2023-09-04 14:45 IST):
> On 2023/09/04 14:27:42 +0100, Stefan Hagen
> wrote:
> > Omar Polo wrote (2023-09-04 14:11 IST):
> > > As per subject. I'm not sure how to link the ChangeLog, but there has
> > > been quite a few changes. The 'interesting' ones seems to be the
> > > addition of the loader for y4m and raw files.
> > >
> > > I had to patch one Makefile.am since, due to the order of the -I
> > > flags, the decoders ended up loading the system' Imlib2_Loader.h
> > > instead of the one from the sources, causing 'interesting' error
> > > messages (and likely unpleasant loading failures.)
> > >
> > > I've sent the diff upstream so (hopefully) they'll see it. (hopefully
> > > because I haven't got any reply, nor indication that the mail was
> > > actually delivered, when I sent patch-src_bin_imlib2_load_c upstream.)
> > >
> > > Major bump due to the loader interface changed, otherwise only
> > > additions so consumers shouldn't be affected. I've tested with nsxiv
> > > and build tested a few (not all) of the consumers.
> > >
> > > I'm also adding myself as the maintainer. While I don't actively use
> > > it, I'm using a few programs that depends on imlib2 and so I care for
> > > it to be updated. Since I haven't found a RSS for these releases,
> > > maybe I'll get a mail from portroach :)
> > >
> > > ok?
> >
> > Hmm. It doesn't build here.
>
> Ooops... I forgot to add AUTO{CONF,MAKE}_VERSION since now I'm using
> CONFIGURE_STYLE=autoreconf.
Ah! I should have seen that.
Now it builds, but nsxiv does not work anymore:
$ nsxiv irrsi.png
nsxiv: irrsi.png: Error opening image
nsxiv: no more files to display, aborting
$ nsxiv mpv-shot0001.jpg
nsxiv: mpv-shot0001.jpg: Error opening image
nsxiv: no more files to display, aborting
This works with the previous version.
- Stefan
> > [...]
> > Switching back to CONFIGURE_STYLE= gnu goes further, but then:
>
> that's not going to work since I'm patching an automake file, so the
> Makefile.in needs to be re-generated.
>
> (i could have patched Makefile.in directly actually... anyway.)
>
> > [...]
>
> Thanks,
>
> Omar Polo
>
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/graphics/imlib2/Makefile,v
> retrieving revision 1.50
> diff -u -p -r1.50 Makefile
> --- Makefile 29 Aug 2023 18:25:16 - 1.50
> +++ Makefile 4 Sep 2023 13:29:05 -
> @@ -1,12 +1,13 @@
> COMMENT= image manipulation library
>
> -DISTNAME=imlib2-1.11.0
> -REVISION=0
> -SHARED_LIBS= Imlib2 8.0 # 12.0
> +DISTNAME=imlib2-1.12.0
> +SHARED_LIBS= Imlib2 9.0 # 13.0
> CATEGORIES= graphics
>
> HOMEPAGE=https://docs.enlightenment.org/api/imlib2/html/
>
> +MAINTAINER= Omar Polo
> +
> # BSD
> PERMIT_PACKAGE= Yes
>
> @@ -14,17 +15,19 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
>
> WANTLIB += ${COMPILER_LIBCXX} X11 X11-xcb Xau Xdmcp Xext aom brotlicommon
> WANTLIB += brotlidec brotlienc bz2 c dav1d de265 freetype gif
> -WANTLIB += heif hwy id3tag jpeg jxl jxl_threads lcms2 lzma m openjp2
> -WANTLIB += png sharpyuv tiff webp webpdemux x265 xcb xcb-shm z
> -WANTLIB += zstd
> +WANTLIB += heif hwy id3tag jasper jpeg jxl jxl_threads lcms2 lzma
> +WANTLIB += m openjp2 png raw sharpyuv tiff webp webpdemux x265
> +WANTLIB += xcb xcb-shm z zstd
>
> COMPILER=base-clang ports-gcc
>
> LIB_DEPENDS+=archivers/bzip2 \
> audio/libid3tag \
> graphics/giflib \
> + graphics/jasper \
> graphics/jpeg \
> graphics/libjxl \
> + graphics/libraw \
> graphics/libwebp \
> graphics/openjp2 \
> graphics/png \
> @@ -32,7 +35,10 @@ LIB_DEPENDS+= archivers/bzip2 \
> multimedia/libheif
>
> SEPARATE_BUILD= Yes
> -CONFIGURE_STYLE= gnu
> +CONFIGURE_STYLE= autoreconf
> +AUTOCONF_VERSION= 2.71
> +AUTOMAKE_VERSION= 1.16
> +
> .if ${MACHINE_ARCH} == "i386"
> CONFIGURE_ARGS+= --disable-mmx
> .endif
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/graphics/imlib2/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 7 May 2023 06:54:21 - 1.13
> +++ distinfo 4 Sep 2023 12:06:38 -
> @@ -1,2 +1,2 @@
> -SHA256 (imlib2-1.11.0.tar.gz) = lLdPfCjV0FrJNtR5+USnEiIxG4ztjQEv1XAQgw+q3jE=
> -SIZE (imlib2-1.11.0.t
Re: update graphics/imlib2 to 1.12.0
Omar Polo wrote (2023-09-04 14:11 IST):
> As per subject. I'm not sure how to link the ChangeLog, but there has
> been quite a few changes. The 'interesting' ones seems to be the
> addition of the loader for y4m and raw files.
>
> I had to patch one Makefile.am since, due to the order of the -I
> flags, the decoders ended up loading the system' Imlib2_Loader.h
> instead of the one from the sources, causing 'interesting' error
> messages (and likely unpleasant loading failures.)
>
> I've sent the diff upstream so (hopefully) they'll see it. (hopefully
> because I haven't got any reply, nor indication that the mail was
> actually delivered, when I sent patch-src_bin_imlib2_load_c upstream.)
>
> Major bump due to the loader interface changed, otherwise only
> additions so consumers shouldn't be affected. I've tested with nsxiv
> and build tested a few (not all) of the consumers.
>
> I'm also adding myself as the maintainer. While I don't actively use
> it, I'm using a few programs that depends on imlib2 and so I care for
> it to be updated. Since I haven't found a RSS for these releases,
> maybe I'll get a mail from portroach :)
>
> ok?
Hmm. It doesn't build here.
===> Generating configure for imlib2-1.12.0
Running autoreconf-2.13 in /usr/ports/pobj/imlib2-1.12.0/imlib2-1.12.0
Usage: autoreconf [-f] [-h] [--help] [-m dir] [--macrodir=dir]
[-l dir] [--localdir=dir] [--force] [--verbose] [--version]
[--cygnus] [--foreign] [--gnits] [--gnu] [-i] [--include-deps]
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2902
'_gen-finalize': @for d in /usr/ports/pobj/imlib2-1.12.0/imlib2-1.12.0; do c...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2942
'/usr/ports/pobj/imlib2-1.12.0/.gen_done': @cd /usr/ports/graphics/imlib2 &&...)
*** Error 2 in /usr/ports/graphics/imlib2
(/usr/ports/infrastructure/mk/bsd.port.mk:2634 'all': @lock=imlib2-1.12.0;
export _LOCKS_HELD=" i...)
Switching back to CONFIGURE_STYLE= gnu goes further, but then:
cd /usr/ports/pobj/imlib2-1.12.0/imlib2-1.12.0 && /bin/sh
/usr/ports/pobj/imlib2-1.12.0/imlib2-1.12.0/missing automake-1.16 --foreign
src/modules/loaders/Makefile
/usr/ports/pobj/imlib2-1.12.0/imlib2-1.12.0/missing[81]: automake-1.16: not
found
WARNING: 'automake-1.16' is missing on your system.
After installing automake-1.16.5:
Making all in loaders
cd /usr/ports/pobj/imlib2-1.12.0/imlib2-1.12.0 && /bin/sh
/usr/ports/pobj/imlib2-1.12.0/imlib2-1.12.0/missing automake-1.16 --foreign
src/modules/loaders/Makefile
Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir]
[-l dir] [--localdir=dir] [--version] [template-file]
automake-1.16: error: autoconf failed with exit status: 1
- Stefan
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/graphics/imlib2/Makefile,v
> retrieving revision 1.50
> diff -u -p -r1.50 Makefile
> --- Makefile 29 Aug 2023 18:25:16 - 1.50
> +++ Makefile 4 Sep 2023 12:58:57 -
> @@ -1,12 +1,13 @@
> COMMENT= image manipulation library
>
> -DISTNAME=imlib2-1.11.0
> -REVISION=0
> -SHARED_LIBS= Imlib2 8.0 # 12.0
> +DISTNAME=imlib2-1.12.0
> +SHARED_LIBS= Imlib2 9.0 # 13.0
> CATEGORIES= graphics
>
> HOMEPAGE=https://docs.enlightenment.org/api/imlib2/html/
>
> +MAINTAINER= Omar Polo
> +
> # BSD
> PERMIT_PACKAGE= Yes
>
> @@ -14,17 +15,19 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
>
> WANTLIB += ${COMPILER_LIBCXX} X11 X11-xcb Xau Xdmcp Xext aom brotlicommon
> WANTLIB += brotlidec brotlienc bz2 c dav1d de265 freetype gif
> -WANTLIB += heif hwy id3tag jpeg jxl jxl_threads lcms2 lzma m openjp2
> -WANTLIB += png sharpyuv tiff webp webpdemux x265 xcb xcb-shm z
> -WANTLIB += zstd
> +WANTLIB += heif hwy id3tag jasper jpeg jxl jxl_threads lcms2 lzma
> +WANTLIB += m openjp2 png raw sharpyuv tiff webp webpdemux x265
> +WANTLIB += xcb xcb-shm z zstd
>
> COMPILER=base-clang ports-gcc
>
> LIB_DEPENDS+=archivers/bzip2 \
> audio/libid3tag \
> graphics/giflib \
> + graphics/jasper \
> graphics/jpeg \
> graphics/libjxl \
> + graphics/libraw \
> graphics/libwebp \
> graphics/openjp2 \
> graphics/png \
> @@ -32,7 +35,7 @@ LIB_DEPENDS+= archivers/bzip2 \
> multimedia/libheif
>
> SEPARATE_BUILD= Yes
> -CONFIGURE_STYLE= gnu
> +CONFIGURE_STYLE= autoreconf
> .if ${MACHINE_ARCH} == "i386"
> CONFIGURE_ARGS+= --disable-mmx
> .endif
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/graphics/imlib2/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 7 May 2023 06:54:21 - 1.13
> +++ distinfo 4 Sep 2023 12:06:38 -
> @@ -1,2 +1,2 @@
> -SHA256 (imlib2-1.11.0.tar.gz) = lLdPfCjV0FrJNtR5+USnEiIxG4ztjQEv1XAQgw+q3jE=
> -SIZE
Re: UPDATE: qwt-6.2.0
Stefan Hagen wrote (2023-09-03 16:38 IST):
> Rafael Sadowski wrote (2023-08-31 07:00 IST):
> > Simple update qwt-6.2.0. Tested on amd64. OK?
>
> How to test it?
>
> It breaks gnuradio:
> /usr/ports/pobj/gnuradio-3.8.2.0/gnuradio-3.8.2.0/gr-qtgui/lib/../include/gnuradio/qtgui/DisplayPlot.h:44:10:
> fatal error: 'qwt_compat.h' file not found
>
> I'm trying qgis and bacula next.
gqis and bacula are working.
OK sdk@ for qwt.
> > Cheers Rafael
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/qwt/Makefile,v
> > retrieving revision 1.34
> > diff -u -p -u -p -r1.34 Makefile
> > --- Makefile31 Mar 2022 12:52:13 - 1.34
> > +++ Makefile31 Aug 2023 06:00:26 -
> > @@ -1,10 +1,9 @@
> > COMMENT= Qt widgets for technical applications
> >
> > -VERSION = 6.1.6
> > +VERSION = 6.2.0
> > DISTNAME = qwt-${VERSION}
> > -REVISION = 1
> >
> > -SHARED_LIBS = qwt${QTLIBSUFFIX} 7.1
> > +SHARED_LIBS = qwt${QTLIBSUFFIX} 8.0
> >
> > CATEGORIES = x11
> >
> > @@ -28,9 +27,8 @@ MODQMAKE_INSTALL_ROOT =
> > NO_TEST = Yes
> > USE_GMAKE =Yes
> >
> > -BUILD_DEPENDS =x11/qt5/qtsvg
> > -LIB_DEPENDS = x11/qt5/qttools,-main
> > -RUN_DEPENDS = x11/qt5/qtsvg
> > +LIB_DEPENDS = x11/qt5/qttools,-main \
> > + x11/qt5/qtsvg
> >
> > QTVER =qt5
> > SUBST_VARS = WRKINST QTVER QTLIBSUFFIX
> > @@ -38,7 +36,6 @@ SUBST_VARS = WRKINST QTVER QTLIBSUFFIX
> > pre-configure:
> > ${SUBST_CMD} ${WRKSRC}/{qwtconfig.pri,qwt.prf} \
> > ${WRKSRC}/designer/designer.pro \
> > - ${WRKSRC}/textengines/textengines.pri \
> > ${WRKSRC}/src/src.pro
> > post-configure:
> > # ensure CXXFLAGS/-std=c++11 is passed to all clang++
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/x11/qwt/distinfo,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 distinfo
> > --- distinfo19 Jan 2021 06:20:27 - 1.6
> > +++ distinfo31 Aug 2023 06:00:26 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (qwt-6.1.6.tar.bz2) = mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY=
> > -SIZE (qwt-6.1.6.tar.bz2) = 4306402
> > +SHA256 (qwt-6.2.0.tar.bz2) = kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=
> > +SIZE (qwt-6.2.0.tar.bz2) = 4815773
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/x11/qwt/pkg/PLIST,v
> > retrieving revision 1.7
> > diff -u -p -u -p -r1.7 PLIST
> > --- pkg/PLIST 11 Mar 2022 20:17:15 - 1.7
> > +++ pkg/PLIST 31 Aug 2023 06:00:26 -
> > @@ -4,6 +4,160 @@
> > @pkgpath x11/qwt,-main
> > @pkgpath x11/qwt,-common
> > @pkgpath x11/qwt,-main,qt5
> > +include/QwtAbstractLegend
> > +include/QwtAbstractScale
> > +include/QwtAbstractScaleDraw
> > +include/QwtAbstractSlider
> > +include/QwtAlphaColorMap
> > +include/QwtAnalogClock
> > +include/QwtArrowButton
> > +include/QwtAxis
> > +include/QwtAxisId
> > +include/QwtBezier
> > +include/QwtCPointerData
> > +include/QwtClipper
> > +include/QwtColorMap
> > +include/QwtColumnRect
> > +include/QwtColumnSymbol
> > +include/QwtCompass
> > +include/QwtCompassMagnetNeedle
> > +include/QwtCompassRose
> > +include/QwtCompassScaleDraw
> > +include/QwtCompassWindArrow
> > +include/QwtCounter
> > +include/QwtCurveFitter
> > +include/QwtDate
> > +include/QwtDateScaleDraw
> > +include/QwtDateScaleEngine
> > +include/QwtDial
> > +include/QwtDialNeedle
> > +include/QwtDialSimpleNeedle
> > +include/QwtDynGridLayout
> > +include/QwtEventPattern
> > +include/QwtGlobal
> > +include/QwtGraphic
> > +include/QwtHueColorMap
> > +include/QwtInterval
> > +include/QwtIntervalSample
> > +include/QwtIntervalSeriesData
> > +include/QwtIntervalSymbol
> > +include/QwtKnob
> > +include/QwtLegend
> > +include/QwtLegendData
> > +include/QwtLegendLabel
> > +include/QwtLinearColorMap
> > +include/QwtLinearScaleEngine
> > +include/QwtLogScaleEngine
> > +include/QwtLogTransform
> > +include/QwtMagnifier
> > +include/QwtMath
> > +include/QwtMatrixRasterData
> > +include/QwtNullPaintDevice
> > +include/QwtNullTransform
> > +include/QwtOHLCSample
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/09/04 05:00:35 Modified files: x11/fvwm3 : Makefile distinfo x11/fvwm3/patches: patch-configure patch-default-config_Makefile_in x11/fvwm3/pkg : PLIST Added files: x11/fvwm3/patches: patch-fvwm_ewmh_c Log message: Update fvwm3 to version 1.0.7 Changes: https://github.com/fvwmorg/fvwm3/releases/tag/1.0.7 Patch from MAINTAINER Michael, thank you! Manpage installation added by me (sdk).
Re: UPDATE: x11/fvwm3 to 1.0.7
Ingo Schwarze wrote (2023-09-04 01:42 IST): > Hi Marc, > > Marc Espie wrote on Mon, Sep 04, 2023 at 12:11:52AM +0200: > > On Sun, Sep 03, 2023 at 08:54:55PM +0200, Ingo Schwarze wrote: > > >> In addition to that, showing the complete list from man -w would > >> force man(1) to do additional work, slowing down display of the > >> manual page. When any of the -w, -a, or -k options is given, man(1) > >> always searches through the whole MANPATH. By contrast, in standard > >> mode, i.e. without any of these three options, it ends the search > >> after the first database that returns a match and displays that > >> match right away. For example, if you type "man printf", only the > >> base system manual page database is inspected and you do not have to > > > How much work is that actually ? I mean with the current database system > > if you just say "man something" it ought to be fairly quick, no ? > > > > (especially with just 3 databases) > > Actually, you have a point here. On my notebook, measuring the > difference isn't even trivial. I managed to do it by inserting calls to > clock_gettime(CLOCK_PROCESS_CPUTIME_ID, ...) > into the code. On my notebook, the variation of the times is quite > large while the times themselves are rather small, but anyway, > here are the results for a simple name lookup, not including times > for reading, parsing, and formatting the actual manual page file - > all times in milliseconds: > > program startup time until the program reaches main(): 2 - 4 ms > prep work before opening the database (option parsing etc.): 0.4 - 0.6 ms > lookup time in the base system database: 1 - 3 ms > lookup time in the Xenocara database: 0.5 - 1.5 ms > lookup time in the ports database: 0.9 - 2.3 ms > > It looks like the difference is measureable. I performed no rigorous > statistics, but a crude estimate might be that skipping the Xenocara > and ports databases as we currently do saves about half the lookup > time, or in absolute terms about 2 milliseconds on average on my > notebook. > > Frankly, i don't have a luna88k machine, but at least on modern > hardware, it looks like this doesn't matter at all. > > So *if* we want to show this information to the user, i guess i could > just take that micro-optimization out and always scan all databases. > > However, nobody told me so far that they like the idea of showing this > information, but one developer told me privately that they are not a fan. > > By the way, the point of getting rid of that optimization would be > that in a situation like this, > >$ man -w FvwmPager > /usr/X11R6/man/man1/FvwmPager.1 > /usr/local/man/man1/FvwmPager.1 > > we would get, with the patch and without the optimization, > >$ man FvwmPager > Showing: /usr/X11R6/man/man1/FvwmPager.1 > See also: /usr/local/man/man1/FvwmPager.1 Does it work for you like this? Because here it doesn't. It works for printf, but for FvwmPager / FvwmButtons, no alternatives are displayed. We should probably only display results from the same section. For other sections, the "SEE ALSO" part of the manpage is sufficient. This would also lead to the "feature" not run that often. Most of the time "man " should just show the manpage. For insanity reasons, I installed all autoconfs: $ man 1 autoconf Showing: /usr/local/man/man1/autoconf-2.52.1 See also: /usr/local/man/man1/autoconf-2.54.1 See also: /usr/local/man/man1/autoconf-2.56.1 See also: /usr/local/man/man1/autoconf-2.57.1 See also: /usr/local/man/man1/autoconf-2.58.1 See also: /usr/local/man/man1/autoconf-2.59.1 See also: /usr/local/man/man1/autoconf-2.60.1 See also: /usr/local/man/man1/autoconf-2.61.1 See also: /usr/local/man/man1/autoconf-2.62.1 See also: /usr/local/man/man1/autoconf-2.63.1 See also: /usr/local/man/man1/autoconf-2.64.1 See also: /usr/local/man/man1/autoconf-2.65.1 See also: /usr/local/man/man1/autoconf-2.67.1 See also: /usr/local/man/man1/autoconf-2.68.1 See also: /usr/local/man/man1/autoconf-2.69.1 See also: /usr/local/man/man1/autoconf-2.71.1 AUTOCONF(1) FSF AUTOCONF(1) ... Is this too much at the top of the man page? It should also be excluded for non-interactive use. Some web frontends do "man $thing | text2html > $thing.html" How about: $ man 1 autoconf There is more than one version of this manpage available (show with -w). AUTOCONF(1) FSF AUTOCONF(1) ... Then you could stop after the second match in the same section. Best regards, Stefan
Re: UPDATE: qwt-6.2.0
Rafael Sadowski wrote (2023-08-31 07:00 IST):
> Simple update qwt-6.2.0. Tested on amd64. OK?
How to test it?
It breaks gnuradio:
/usr/ports/pobj/gnuradio-3.8.2.0/gnuradio-3.8.2.0/gr-qtgui/lib/../include/gnuradio/qtgui/DisplayPlot.h:44:10:
fatal error: 'qwt_compat.h' file not found
I'm trying qgis and bacula next.
Best regards,
Stefan
> Cheers Rafael
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qwt/Makefile,v
> retrieving revision 1.34
> diff -u -p -u -p -r1.34 Makefile
> --- Makefile 31 Mar 2022 12:52:13 - 1.34
> +++ Makefile 31 Aug 2023 06:00:26 -
> @@ -1,10 +1,9 @@
> COMMENT= Qt widgets for technical applications
>
> -VERSION =6.1.6
> +VERSION =6.2.0
> DISTNAME = qwt-${VERSION}
> -REVISION = 1
>
> -SHARED_LIBS =qwt${QTLIBSUFFIX} 7.1
> +SHARED_LIBS =qwt${QTLIBSUFFIX} 8.0
>
> CATEGORIES = x11
>
> @@ -28,9 +27,8 @@ MODQMAKE_INSTALL_ROOT =
> NO_TEST =Yes
> USE_GMAKE = Yes
>
> -BUILD_DEPENDS = x11/qt5/qtsvg
> -LIB_DEPENDS =x11/qt5/qttools,-main
> -RUN_DEPENDS =x11/qt5/qtsvg
> +LIB_DEPENDS =x11/qt5/qttools,-main \
> + x11/qt5/qtsvg
>
> QTVER = qt5
> SUBST_VARS = WRKINST QTVER QTLIBSUFFIX
> @@ -38,7 +36,6 @@ SUBST_VARS =WRKINST QTVER QTLIBSUFFIX
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/{qwtconfig.pri,qwt.prf} \
> ${WRKSRC}/designer/designer.pro \
> - ${WRKSRC}/textengines/textengines.pri \
> ${WRKSRC}/src/src.pro
> post-configure:
> # ensure CXXFLAGS/-std=c++11 is passed to all clang++
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/qwt/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- distinfo 19 Jan 2021 06:20:27 - 1.6
> +++ distinfo 31 Aug 2023 06:00:26 -
> @@ -1,2 +1,2 @@
> -SHA256 (qwt-6.1.6.tar.bz2) = mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY=
> -SIZE (qwt-6.1.6.tar.bz2) = 4306402
> +SHA256 (qwt-6.2.0.tar.bz2) = kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=
> +SIZE (qwt-6.2.0.tar.bz2) = 4815773
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/qwt/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 PLIST
> --- pkg/PLIST 11 Mar 2022 20:17:15 - 1.7
> +++ pkg/PLIST 31 Aug 2023 06:00:26 -
> @@ -4,6 +4,160 @@
> @pkgpath x11/qwt,-main
> @pkgpath x11/qwt,-common
> @pkgpath x11/qwt,-main,qt5
> +include/QwtAbstractLegend
> +include/QwtAbstractScale
> +include/QwtAbstractScaleDraw
> +include/QwtAbstractSlider
> +include/QwtAlphaColorMap
> +include/QwtAnalogClock
> +include/QwtArrowButton
> +include/QwtAxis
> +include/QwtAxisId
> +include/QwtBezier
> +include/QwtCPointerData
> +include/QwtClipper
> +include/QwtColorMap
> +include/QwtColumnRect
> +include/QwtColumnSymbol
> +include/QwtCompass
> +include/QwtCompassMagnetNeedle
> +include/QwtCompassRose
> +include/QwtCompassScaleDraw
> +include/QwtCompassWindArrow
> +include/QwtCounter
> +include/QwtCurveFitter
> +include/QwtDate
> +include/QwtDateScaleDraw
> +include/QwtDateScaleEngine
> +include/QwtDial
> +include/QwtDialNeedle
> +include/QwtDialSimpleNeedle
> +include/QwtDynGridLayout
> +include/QwtEventPattern
> +include/QwtGlobal
> +include/QwtGraphic
> +include/QwtHueColorMap
> +include/QwtInterval
> +include/QwtIntervalSample
> +include/QwtIntervalSeriesData
> +include/QwtIntervalSymbol
> +include/QwtKnob
> +include/QwtLegend
> +include/QwtLegendData
> +include/QwtLegendLabel
> +include/QwtLinearColorMap
> +include/QwtLinearScaleEngine
> +include/QwtLogScaleEngine
> +include/QwtLogTransform
> +include/QwtMagnifier
> +include/QwtMath
> +include/QwtMatrixRasterData
> +include/QwtNullPaintDevice
> +include/QwtNullTransform
> +include/QwtOHLCSample
> +include/QwtPainter
> +include/QwtPainterCommand
> +include/QwtPanner
> +include/QwtPicker
> +include/QwtPickerClickPointMachine
> +include/QwtPickerClickRectMachine
> +include/QwtPickerDragLineMachine
> +include/QwtPickerDragPointMachine
> +include/QwtPickerDragRectMachine
> +include/QwtPickerMachine
> +include/QwtPickerPolygonMachine
> +include/QwtPickerTrackerMachine
> +include/QwtPixelMatrix
> +include/QwtPlainTextEngine
> +include/QwtPlot
> +include/QwtPlotAbstractBarChart
> +include/QwtPlotAbstractCanvas
> +include/QwtPlotBarChart
> +include/QwtPlotCanvas
> +include/QwtPlotCurve
> +include/QwtPlotDict
> +include/QwtPlotDirectPainter
> +include/QwtPlotGLCanvas
> +include/QwtPlotGraphicItem
> +include/QwtPlotGrid
> +include/QwtPlotHistogram
> +include/QwtPlotIntervalCurve
> +include/QwtPlotItem
> +include/QwtPlotLayout
> +include/QwtPlotLegendItem
> +include/QwtPlotMagnifier
> +include/QwtPlotMarker
> +include/QwtPlotMultiBarChart
> +include/QwtPlotOpenGLCanvas
> +include/QwtPlotPanner
> +include/QwtPlotPicker
> +include/QwtPlotRasterItem
>
Re: UPDATE: x11/fvwm3 to 1.0.7
Marc Espie wrote (2023-09-01 22:08 IST):
> On Thu, Aug 31, 2023 at 11:20:17PM +0200, Ingo Schwarze wrote:
> > Hi Stefan,
> >
> > Stefan Hagen wrote on Wed, Aug 30, 2023 at 09:41:20AM +0200:
> >
> > > There's no good way to handle a conflict that's introduced with an
> > > update. So what we would do is to move the manpages into the install
> > > directory. (thanks to espie@ for the suggestion)
> >
> > Actually, i regard that as bad advice, espie@ shouldn't say such things.
>
> I don't know. The ability of install versioned manpages for the same
> software doesn't seem to be a bad idea to me.
>
> And /etc/man.conf does feature new default paths, so why not ?
>
> If adding new directories isn't the right level, maybe new sections ?
> or explicit versionned stuff.
>
> Yeah, we've installed several versions of tcl for a long time.
>
> Oh, and man has a "-a" option to display ALL manual pages.
>
> We have currently ZERO mechanism to desambiguate anything outside of
> sections...
>
> if you say, man foo, it will give you the first foo, not even hinting
> there might be a second food behind it.
>
> Yeah, we can rename stuff so that man doesn't get confused, but why
> does man get confused in the first place ?
I think Espies suggestion is more discoverable because the user gets a
message on install he might see.
Ingos suggestion is technically "more correct". However, I asked 6 devs
and only one knew what -a/w does. So I don't think this is used.
From a user perspective, I think it would be nice if we cold make the
manpage display a tiny bit dynamic and show the output of man -w at the
bottom.
Example
MANPAGE VERSIONS:
fvwm3-FvwmButtons(1), FvwmButtons(1)
This would bring discoverability to Ingos solution. And we could freely
rename manpages, because our man(1) is clever enough to find them
anyway. (compared to linux man, which can't do this)
Another idea would be to print something to stderr when more than one
manpage for the search term is available. Either before the pager is
started or after the pager is closed.
I don't like what some linuxes do: SuSE for example shows the user a
list and asks which one to display. This is annoying.
---
I'm sending another diff with Ingos suggestion. I'm happy with this as
well. Both is inconvenient in a way, but at least the man pages are
there.
OK?
- Stefan
Index: x11/fvwm3/Makefile
===
RCS file: /cvs/ports/x11/fvwm3/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- x11/fvwm3/Makefile 24 Jan 2023 18:05:35 - 1.8
+++ x11/fvwm3/Makefile 1 Sep 2023 15:51:43 -
@@ -1,6 +1,6 @@
COMMENT= multiple virtual desktop window manager
-VERSION= 1.0.6a
+VERSION= 1.0.7
DISTNAME= fvwm3-${VERSION}
CATEGORIES= x11
@@ -20,13 +20,14 @@ WANTLIB += readline rsvg-2 event_core ev
MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${VERSION}/
+BUILD_DEPENDS+=textproc/asciidoctor
+
LIB_DEPENDS+= graphics/png \
x11/gnome/librsvg \
devel/libevent2
SUBST_VARS=VERSION
-SEPARATE_BUILD=Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-mandoc \
@@ -39,7 +40,14 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -
DEBUG_PACKAGES = ${BUILD_PACKAGES}
+USE_GMAKE =yes
+
post-install:
+ cd ${WRKINST}/${TRUEPREFIX}/man/man1 && for m in Fvwm*.1; \
+ do mv {,fvwm3-}$$m; done
+ cd ${WRKINST}/${TRUEPREFIX}/man/man1/ && \
+ mv fvwm3-FvwmCommand{,3}.1 && \
+ ln -s fvwm3-FvwmCommand3.1 FvwmCommand3.1
mv ${WRKINST}/${TRUEPREFIX}/bin/FvwmCommand{,3}
mv ${WRKINST}/${TRUEPREFIX}/share/FvwmScript-* \
${WRKINST}/${TRUEPREFIX}/share/fvwm3/
Index: x11/fvwm3/distinfo
===
RCS file: /cvs/ports/x11/fvwm3/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- x11/fvwm3/distinfo 22 Jan 2023 12:11:26 - 1.3
+++ x11/fvwm3/distinfo 1 Sep 2023 15:51:43 -
@@ -1,2 +1,2 @@
-SHA256 (fvwm3-1.0.6a.tar.gz) = RmWmYTPgcLeRkXsHlMxt9rdUZ56+kTBxhCfbZHm7W2g=
-SIZE (fvwm3-1.0.6a.tar.gz) = 4538100
+SHA256 (fvwm3-1.0.7.tar.gz) = OqzXz+/2DbG82cdzMtxXX+dxHS0wbwR5UlN43G2z0x4=
+SIZE (fvwm3-1.0.7.tar.gz) = 4512128
Index: x11/fvwm3/patches/patch-configure
===
RCS file: /cvs/ports/x11/fvwm3/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-configure
--- x11/fvwm3/patches/patch-configure 13 Oct 2022 16:00:45 - 1.3
+++ x11/fvwm3/patches/patch-configure 1 Sep 2023 15:51:43 -
@@ -1,7 +1,7 @@
Index: configure
Re: UPDATE: qpdfview-0.5
Rafael Sadowski wrote (2023-08-31 07:10 IST):
> Simple update qpdfview-0.5. Tested on amd64. OK?
OK sdk@
> Cheers Rafael
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/qpdfview/Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 Makefile
> --- Makefile 24 Apr 2023 11:41:28 - 1.2
> +++ Makefile 31 Aug 2023 06:09:34 -
> @@ -1,8 +1,7 @@
> COMMENT= tabbed DjVu/PDF/PS document viewer
> -V= 0.4.18
> -DISTNAME=qpdfview-$V
> +V= 0.5.0
> +DISTNAME=qpdfview-${V:C/\.0//g}
> CATEGORIES= textproc
> -REVISION=0
>
> HOMEPAGE=https://launchpad.net/qpdfview
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/qpdfview/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo 29 Apr 2022 14:30:45 - 1.1.1.1
> +++ distinfo 31 Aug 2023 06:09:34 -
> @@ -1,2 +1,2 @@
> -SHA256 (qpdfview-0.4.18.tar.gz) =
> zGQuf6dAKTc8qbn7wprcSIP4tFUTCnitVHRtaESgOWw=
> -SIZE (qpdfview-0.4.18.tar.gz) = 786577
> +SHA256 (qpdfview-0.5.tar.gz) = RO/EQKRhy911eps5bxRh7novQ2ToHfVb0CIfkQIZvpk=
> +SIZE (qpdfview-0.5.tar.gz) = 925408
> Index: patches/patch-sources_model_h
> ===
> RCS file: /cvs/ports/textproc/qpdfview/patches/patch-sources_model_h,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-sources_model_h
> --- patches/patch-sources_model_h 29 Apr 2022 14:30:45 - 1.1.1.1
> +++ patches/patch-sources_model_h 31 Aug 2023 06:09:34 -
> @@ -1,7 +1,7 @@
> Index: sources/model.h
> --- sources/model.h.orig
> +++ sources/model.h
> -@@ -27,6 +27,7 @@ along with qpdfview. If not, see +@@ -28,6 +28,7 @@ along with qpdfview. If not, see #include
> #include
> #include
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/textproc/qpdfview/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 29 Apr 2022 14:30:45 - 1.1.1.1
> +++ pkg/PLIST 31 Aug 2023 06:09:34 -
> @@ -9,7 +9,9 @@ share/icons/hicolor/scalable/apps/qpdfvi
> share/qpdfview/
> share/qpdfview.appdata.xml
> share/qpdfview/help.html
> +share/qpdfview/help_af.html
> share/qpdfview/help_az.html
> +share/qpdfview/help_ber.html
> share/qpdfview/help_bg.html
> share/qpdfview/help_ca.html
> share/qpdfview/help_cs.html
> @@ -21,6 +23,8 @@ share/qpdfview/help_fa.html
> share/qpdfview/help_fi.html
> share/qpdfview/help_fr.html
> share/qpdfview/help_gl.html
> +share/qpdfview/help_hi.html
> +share/qpdfview/help_id.html
> share/qpdfview/help_it.html
> share/qpdfview/help_ja.html
> share/qpdfview/help_ko.html
> @@ -31,12 +35,14 @@ share/qpdfview/help_pl.html
> share/qpdfview/help_pt.html
> share/qpdfview/help_pt_BR.html
> share/qpdfview/help_ru.html
> +share/qpdfview/help_rue.html
> share/qpdfview/help_sk.html
> share/qpdfview/help_sr.html
> share/qpdfview/help_sv.html
> share/qpdfview/help_tr.html
> share/qpdfview/help_uk.html
> share/qpdfview/help_vi.html
> +share/qpdfview/help_zgh.html
> share/qpdfview/help_zh_CN.html
> share/qpdfview/help_zh_TW.html
> @tag update-desktop-database
>
Re: UPDATE: yaml-cpp-0.8.0
Rafael Sadowski wrote (2023-08-31 09:04 IST): > Simple update yaml-cpp-0.8.0. Tested on amd64 by building and running > the test suite. OK? Something is broken... regen patches? Patching file yaml-cpp-config.cmake.in using Plan A... Hunk #1 failed at 3. 1 out of 1 hunks failed--saving rejects to yaml-cpp-config.cmake.in.rej done ***> patch-yaml-cpp-config_cmake_in did not apply cleanly ===> Failed patches: patch-CMakeLists_txt patch-yaml-cpp-config_cmake_in - Stefan > Cheers Rafael > > ? portcheck_devel_yaml-cpp.out > ? yaml-cpp-0.8.0-libyaml-cpp.so.4.0 > Index: Makefile > === > RCS file: /cvs/ports/devel/yaml-cpp/Makefile,v > retrieving revision 1.20 > diff -u -p -u -p -r1.20 Makefile > --- Makefile 11 Jun 2023 07:54:27 - 1.20 > +++ Makefile 31 Aug 2023 08:04:06 - > @@ -1,16 +1,12 @@ > COMMENT =YAML parser and emitter in C++ > > -V= 0.7.0 > GH_ACCOUNT= jbeder > GH_PROJECT= yaml-cpp > -GH_TAGNAME= yaml-cpp-$V > -DISTNAME = yaml-cpp-$V > +GH_TAGNAME= 0.8.0 > > -SHARED_LIBS =yaml-cpp4.0 # 0.5 > +SHARED_LIBS =yaml-cpp4.1 # 0.5 > > CATEGORIES = devel > - > -HOMEPAGE = https://github.com/jbeder/yaml-cpp > > # MIT > PERMIT_PACKAGE = Yes > Index: distinfo > === > RCS file: /cvs/ports/devel/yaml-cpp/distinfo,v > retrieving revision 1.6 > diff -u -p -u -p -r1.6 distinfo > --- distinfo 11 Jun 2023 07:54:27 - 1.6 > +++ distinfo 31 Aug 2023 08:04:06 - > @@ -1,2 +1,2 @@ > -SHA256 (yaml-cpp-0.7.0.tar.gz) = Q+ap/LFGrYcVFfDQhzlH5dSXocnGDFjLECqXtHIIt8M= > -SIZE (yaml-cpp-0.7.0.tar.gz) = 1033237 > +SHA256 (yaml-cpp-0.8.0.tar.gz) = ++dLvc7iHWVnFWiHBto8i+z9lG2SzURwXMYJi7I7OhY= > +SIZE (yaml-cpp-0.8.0.tar.gz) = 1017151 >
Re: UPDATE: fluidsynth-2.3.2
Rafael Sadowski wrote (2023-08-31 13:42 IST):
> Update fluidsynth to 2.3.2. I built all consumers happy expect from
> audio/qsynth (Looks like it needs an update).
>
> I would like to get positive feedback from people who have tested with
> the sndio backend.
It doesn't build here.
-- Found GLib2: /usr/local/lib/libglib-2.0.so.4201.10 (found suitable version
"2.76.4", minimum required is "2.6.5")
-- Found libffi: /usr/local/lib/libffi.so.2.0
-- Found SndFile: /usr/local/lib/libsndfile.so.7.0 (found suitable version
"1.2.0", minimum required is "1.0.0")
-- Checking for module 'sndio'
-- Found sndio, version 1.9.0
CMake Error at CMakeLists.txt:558 (message):
Could NOT find sndio
-- Configuring incomplete, errors occurred!
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2961 'do-configure':
@cd /usr/ports/pobj/fluidsynth-2.3.2/build-amd64 && /usr/bin...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2981
'/usr/ports/pobj/fluidsynth-2.3.2/build-amd64/.configure_done': @cd /usr/por...)
*** Error 2 in /usr/ports/audio/fluidsynth
(/usr/ports/infrastructure/mk/bsd.port.mk:2634 'all': @lock=fluidsynth-2.3.2;
export _LOCKS_HELD...)
- Stefan
> Cheers Rafael
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/fluidsynth/Makefile,v
> retrieving revision 1.34
> diff -u -p -u -p -r1.34 Makefile
> --- Makefile 5 Nov 2022 17:06:22 - 1.34
> +++ Makefile 31 Aug 2023 12:39:00 -
> @@ -1,50 +1,47 @@
> COMMENT =SoundFont2 software synthesizer
> +
> GH_ACCOUNT = FluidSynth
> GH_PROJECT = fluidsynth
> -GH_TAGNAME = v1.1.9
> -REVISION = 1
> +GH_TAGNAME = v2.3.2
>
> -SHARED_LIBS += fluidsynth 2.0 # 6.0
> +SHARED_LIBS += fluidsynth 3.0 # 6.0
>
> CATEGORIES = audio
> +
> HOMEPAGE = https://www.fluidsynth.org/
>
> # LGPLv2+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB = FLAC c glib-2.0 gthread-2.0 iconv intl m curses ogg opus
> -WANTLIB += pcre2-8 pthread readline sndfile sndio vorbis vorbisenc
> +WANTLIB += ${COMPILER_LIBCXX} SDL2 c glib-2.0 gthread-2.0 intl
> +WANTLIB += m readline sndfile sndio
>
> -LIB_DEPENDS =audio/libsndfile \
> - devel/glib2
> +MODULES =devel/cmake
>
> -AUTOCONF_VERSION = 2.69
> -AUTOMAKE_VERSION = 1.16
> -AUTORECONF = ./autogen.sh
> +LIB_DEPENDS =audio/libsndfile \
> + devel/glib2 \
> + devel/sdl2
>
> -# autogen.sh needs aclocal/lib-ld.m4
> BUILD_DEPENDS += devel/gettext,-tools
>
> -CONFIGURE_STYLE =autoreconf
> -CONFIGURE_ARGS +=--disable-coreaudio \
> - --disable-coremidi \
> - --disable-dart \
> - --disable-dbus-support \
> - --disable-lash \
> - --disable-ladcca \
> - --disable-midishare \
> - --disable-oss-support \
> - --disable-portaudio-support \
> - --disable-pulse-support
> +MODCMAKE_LDFLAGS = -lc
> +
> +CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=On \
> + -Denable-jack=OFF \
> + -Denable-coreaudio=OFF \
> + -Denable-coremidi=OFF \
> + -Denable-dart=OFF \
> + -Denable-dbus=OFF \
> + -Denable-lash=OFF \
> + -Denable-ladcca=OFF \
> + -Denable-midishare=OFF \
> + -Denable-oss=OFF \
> + -Denable-pipewire=OFF \
> + -Denable-pulseaudio=OFF
>
> -# broken
> -CONFIGURE_ARGS +=--disable-jack-support
> ++MODCMAKE_LDFLAGS = -lc
>
> post-patch:
> cp ${FILESDIR}/fluid_sndio.c ${WRKSRC}/src/drivers/
> - # not defined in autoconf build, but required by source code
> - # upstream really wants cmake, but the sndio patches need porting first
> - sed -i
> 's,DEFAULT_SOUNDFONT,"${LOCALBASE}/share/generaluser-gs/GeneralUser_GS.sf2",'
> \
> - ${WRKSRC}/src/synth/fluid_synth.c
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/fluidsynth/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- distinfo 25 Jun 2021 21:48:40 - 1.4
> +++ distinfo 31 Aug 2023 12:39:00 -
> @@ -1,2 +1,2 @@
> -SHA256 (fluidsynth-1.1.9.tar.gz) =
> 3WMh4Tp8h17zAyZEvTGX6Es9JJKOI3m8gGa3ys571BA=
> -SIZE (fluidsynth-1.1.9.tar.gz) = 630651
> +SHA256 (fluidsynth-2.3.2.tar.gz) =
> zWEIEPMFZuKPuYw2UB8ARGoG+muuPcViyM04aP4cD8c=
> +SIZE (fluidsynth-2.3.2.tar.gz) = 1773755
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file:
Re: UPDATE: Stripe-cli-1.17.2
Gonzalo L. Rodriguez wrote (2023-09-03 14:34 IST):
> Hello,
>
> Update for Stripe-cli to 1.17.2:
>
> https://github.com/stripe/stripe-cli/releases/tag/v1.17.2
>
> OK? Comments?
I can't test very far, but I can see help output and start the project
registration process.
portcheck complains about a trailing whitespace in DESCR, please remove
that before commit.
OK sdk@
> Cheers.-
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/stripe-cli/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile 19 Jun 2023 12:13:04 - 1.2
> +++ Makefile 3 Sep 2023 13:33:27 -
> @@ -1,7 +1,7 @@
>
> COMMENT =build, test, and manage your Stripe integration
>
> -V = 1.14.7
> +V = 1.17.2
> MODGO_MODNAME = github.com/stripe/stripe-cli
> MODGO_VERSION = v${V}
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/stripe-cli/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 19 Jun 2023 12:13:04 - 1.2
> +++ distinfo 3 Sep 2023 13:33:29 -
> @@ -872,7 +872,7 @@ SHA256 (go_modules/rsc.io/quote/v3/@v/v3
> SHA256 (go_modules/rsc.io/quote/v3/@v/v3.1.0.zip) =
> tDTLv8MsF7UijQsO3erqib707JvZC1yPxVtk+M4T7rk=
> SHA256 (go_modules/rsc.io/sampler/@v/v1.3.0.mod) =
> oq5uhUCkC4XldwPMYYuZxbEHU4bZWOiZmg4tTALzpwU=
> SHA256 (go_modules/rsc.io/sampler/@v/v1.3.0.zip) =
> 2iArDagDqyZhq5imgLuk9kEjoyblQMJVgrbNu53BFKo=
> -SHA256 (stripe-cli-v1.14.7.zip) =
> fag+0QPoVoIoi3ygxRopWkspAAlaie6e3lOX1Ke/t88=
> +SHA256 (stripe-cli-v1.17.2.zip) =
> /Apj0keragSCDSz9cwhqu0h2Mu2f0iApDXJGUjrC1C4=
> SIZE (go_modules/cloud.google.com/go/@v/v0.100.2.mod) = 531
> SIZE (go_modules/cloud.google.com/go/@v/v0.100.2.zip) = 567152
> SIZE (go_modules/cloud.google.com/go/@v/v0.26.0.mod) = 27
> @@ -1747,4 +1747,4 @@ SIZE (go_modules/rsc.io/quote/v3/@v/v3.1
> SIZE (go_modules/rsc.io/quote/v3/@v/v3.1.0.zip) = 2223
> SIZE (go_modules/rsc.io/sampler/@v/v1.3.0.mod) = 88
> SIZE (go_modules/rsc.io/sampler/@v/v1.3.0.zip) = 14308
> -SIZE (stripe-cli-v1.14.7.zip) = 1680580
> +SIZE (stripe-cli-v1.17.2.zip) = 1693112
> Index: modules.inc
> ===
> RCS file: /cvs/ports/sysutils/stripe-cli/modules.inc,v
> retrieving revision 1.2
> diff -u -p -r1.2 modules.inc
> --- modules.inc 19 Jun 2023 12:13:04 - 1.2
> +++ modules.inc 3 Sep 2023 13:33:29 -
> @@ -685,4 +685,3 @@ MODGO_MODFILES = \
> honnef.co/go/tools
> v0.0.0-20190523083050-ea95bdfd59fc \
> honnef.co/go/tools v0.0.1-2019.2.3 \
> honnef.co/go/tools v0.0.1-2020.1.3
> -
> --
>
>%gonzalo
>
