Re: [update] x11/dwm 6.4 -> 6.5

[Stefan Hagen]

David Uhden Collado wrote (2024-09-03 07:41 CEST):
> In this email, I have attached a diff to update x11/dwm to version 6.5.
> 
> OK? Comments?
> 
> Additionally, I would like to suggest adding x11/st as a dependency in this
> window manager, as well as x11/dmenu, this window manager is intended to be
> used with this terminal emulator, and I do not understand why it is replaced
> by xterm in this port. On the other hand, we could remove the man page patch
> this way. I have also attached a diff with these proposed changes and look
> forward to your comments.

Please don't. People are using dwm with other terminal emulators. And 
more important, people use dwm with patched versions of st, which would
create a conflict when the ports vanilla st is installed as well.

The same goes for dmenu. People use rofi, or patched versions of dmenu.

You didn't regen the patches properly. The config.def.h patch doesn't 
apply and the config.mk patch needs a slight change in the context.

I fixed that below. OK sdk@ for the update without st/dmenu changes.

Thanks for the update.

Best regards,
Stefan

Index: x11/dwm/Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
diff -u -p -u -p -r1.40 Makefile
--- x11/dwm/Makefile27 Sep 2023 20:37:03 -  1.40
+++ x11/dwm/Makefile3 Sep 2024 06:14:53 -
@@ -1,6 +1,6 @@
 COMMENT=   dynamic window manager
 
-V= 6.4
+V= 6.5
 DISTNAME=  dwm-${V}
 
 CATEGORIES=x11
Index: x11/dwm/distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
diff -u -p -u -p -r1.22 distinfo
--- x11/dwm/distinfo13 Oct 2022 18:15:36 -  1.22
+++ x11/dwm/distinfo3 Sep 2024 06:14:53 -
@@ -1,2 +1,2 @@
-SHA256 (dwm-6.4.tar.gz) = +pwNaaWESFB2z8GICf1wXlwggNr7E9XnKaNkbKdwOm4=
-SIZE (dwm-6.4.tar.gz) = 25321
+SHA256 (dwm-6.5.tar.gz) = Ideev6ny+5MUGDbCZmy4H0eExp1k5/GyNS+blwuglyk=
+SIZE (dwm-6.5.tar.gz) = 25588
Index: x11/dwm/patches/patch-config_def_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
diff -u -p -u -p -r1.18 patch-config_def_h
--- x11/dwm/patches/patch-config_def_h  13 Oct 2022 18:15:36 -  1.18
+++ x11/dwm/patches/patch-config_def_h  3 Sep 2024 06:14:53 -
@@ -37,16 +37,16 @@ Index: config.def.h
  };
  
  /* layout(s) */
-@@ -57,7 +60,7 @@ static const Layout layouts[] = {
- 
+@@ -58,7 +61,7 @@ static const Layout layouts[] = {
  /* commands */
- static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", 
col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in 
spawn() */
+ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", 
dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", 
col_gray4, NULL };
 -static const char *termcmd[]  = { "st", NULL };
 +static const char *termcmd[]  = { "xterm", NULL };
  
  static const Key keys[] = {
/* modifier keyfunctionargument */
-@@ -65,7 +68,9 @@ static const Key keys[] = {
+@@ -66,7 +69,9 @@ static const Key keys[] = {
{ MODKEY|ShiftMask, XK_Return, spawn,  {.v = 
termcmd } },
{ MODKEY,   XK_b,  togglebar,  {0} },
{ MODKEY,   XK_j,  focusstack, {.i = +1 } },
Index: x11/dwm/patches/patch-config_mk
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_mk,v
diff -u -p -u -p -r1.16 patch-config_mk
--- x11/dwm/patches/patch-config_mk 13 Oct 2022 18:15:36 -  1.16
+++ x11/dwm/patches/patch-config_mk 3 Sep 2024 06:14:53 -
@@ -14,7 +14,7 @@ Index: config.mk
  INCS = -I${X11INC} -I${FREETYPEINC}
 @@ -28,8 +28,8 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIB
  # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L 
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L 
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
  #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
 -CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} 
${CPPFLAGS}
 -LDFLAGS  = ${LIBS}

Re: Update Request for kitty Port to Version 0.36.1

[Stefan Hagen]

Stuart Henderson wrote (2024-09-01 23:53 CEST):
> The nerd fonts distfile needs renaming to include the version number using
> the {url} syntax in DISTFILES, or maybe better write a separate port for
> that. (Ports will normally extract all distfiles under WRKDIR for you, so if
> not doing as a separate port, just move or link from the extracted dir
> rather than extracting again from DISTDIR)

Yes I know. The port was rushed and I gave up when I read openmp.

> When multiple distfiles are fetched from different sources, use the
> DISTFILES.suffix and SITE.suffix mechanism (added to ports since I wrote
> that diff)
> 
> I think it would need a port of https://github.com/simd-everywhere/simde too

Attached is a devel/simde port.

Below an updated kitty diff that compiles and works.

The test target is a bit of an adventure...
test_ssh_copy (kitty_tests.ssh.SSHKitten.test_ssh_copy) ... Error: open 
/tmp/�j��X�UYպ�%�pt�?N�}�ېLs.shm: invalid argument

And it fills up my /tmp with such files:
-rw---1 _pbuild  wheel  30.8K Sep  2 07:32 x?M??sŀ=_?d??}]yQ?F 
?H'???-.shm
-rw---1 _pbuild  wheel  30.8K Sep  2 07:31 ???%?8y??P???1?o?p?$?k?\ 
???.shm
...
I haven't looked into that yet.

Best regards,
Stefan

Index: x11/kitty/Makefile
===
RCS file: /cvs/ports/x11/kitty/Makefile,v
diff -u -p -u -p -r1.27 Makefile
--- x11/kitty/Makefile  6 May 2024 12:24:17 -   1.27
+++ x11/kitty/Makefile  2 Sep 2024 05:31:34 -
@@ -3,25 +3,29 @@ ONLY_FOR_ARCHS =  aarch64 amd64 i386
 
 COMMENT =  fast, feature full, GPU-based terminal emulator
 
-# 0.27.1 runs the newly built kitty binary during build, but expects
-# it to be in the path (try PORTPATH=${WRKSRC}/linux-package/bin:${PATH})
-# build also fails if you have an older version of kitty installed -
-# it also wants to download go modules during build
-MODPY_EGG_VERSION =0.26.5
+MODPY_EGG_VERSION =0.36.1
 DISTNAME = kitty-${MODPY_EGG_VERSION}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
+
+# the font could be a separate port
+FONT_V =   3.2.1
+DISTFILES.font =   
NerdFontsSymbolsOnly-${FONT_V}{NerdFontsSymbolsOnly}.tar.xz
+DISTFILES.vendor = kitty-vendor-${MODPY_EGG_VERSION}.tar.gz
 CATEGORIES =   x11
 HOMEPAGE = https://sw.kovidgoyal.net/kitty/
-REVISION = 1
 
 # GPLv3+
 PERMIT_PACKAGE =   Yes
 
 # canberra, fontconfig, freetype are loaded dynamically
-WANTLIB += GL X11 X11-xcb Xcursor Xinerama Xrandr c canberra crypto dbus-1
-WANTLIB += fontconfig freetype harfbuzz intl lcms2 m png pthread rsync
-WANTLIB += util xcb xkbcommon xkbcommon-x11 z ${MODPY_WANTLIB}
+WANTLIB +=  ${MODPY_WANTLIB} GL X11 X11-xcb Xcursor Xinerama Xrandr c
+WANTLIB += canberra crypto dbus-1 fontconfig freetype harfbuzz intl
+WANTLIB += lcms2 m png pthread rsync util xcb xkbcommon xkbcommon-x11
+WANTLIB += xxhash z
 
 SITES =
https://github.com/kovidgoyal/kitty/releases/download/v${MODPY_EGG_VERSION}/
+SITES.font =   
https://github.com/ryanoasis/nerd-fonts/releases/download/v$(FONT_V)/
+SITES.vendor = https://ptrace.org/
 EXTRACT_SUFX = .tar.xz
 
 # C11
@@ -30,6 +34,7 @@ COMPILER =base-clang ports-gcc
 CFLAGS +=  "-DOPENSSL_clear_free=freezero"
 
 MODULES =  lang/python
+
 MODPY_DISTUTILS_BUILD =linux-package
 MODPY_SETUP_ARGS +=--verbose \
--ignore-compiler-warnings \
@@ -38,6 +43,9 @@ MODPY_SETUP_ARGS +=   --verbose \
 # this disables checking upstream for updates
 MODPY_SETUP_ARGS +=--update-check-interval=0
 
+MAKE_ARGS +=   NEON64_CFLAGS=" " \
+   AVX2_CFLAGS=" "
+
 # optional dependencies:
 # graphics/ImageMagick (to use the kitty icat tool to display images in
 #  the terminal)
@@ -49,26 +57,51 @@ LIB_DEPENDS =   audio/libcanberra \
graphics/lcms2 \
graphics/png \
net/librsync \
+   sysutils/xxhash \
x11/dbus \
x11/xkbcommon
 
+BUILD_DEPENDS =devel/simde \
+   lang/go
+
 TEST_ENV = CI=true \
TMPDIR=${WRKDIR}/tmp \
-   KITTY_CACHE_DIRECTORY=${WRKDIR}/tmp/cache
+   KITTY_CACHE_DIRECTORY=${WRKDIR}/tmp/cache \
+   PYTHONPATH=${WRKSRC}
 
-# needed for 'make test'
+# runs newly-built binary during build
+PORTPATH = ${WRKSRC}/linux-package/bin:${PATH}
+PORTHOME = ${WRKDIR}
+
+# needed for 'make test'; lots of failures though
 USE_GMAKE =Yes
 
 pre-test:
mkdir -p ${WRKDIR}/tmp/cache
+   cp ${WRKSRC}/linux-package/bin/kitty ${WRKSRC}/kitty/launcher/
+
+pre-build:
+   mkdir -p $(WRKSRC)/fonts/
+   cp ${WRKDIR}/{SymbolsNerdFontMono-Regular.ttf,

Re: Update Request for kitty Port to Version 0.36.1

[Stefan Hagen]

Aditya Mukherjee wrote (2024-09-01 20:01 CEST):
> Hello everyone, I am looking to contribute to OpenBSD.
> 
> I am currently using OpenBSD 7.5 and I extensively use the kitty terminal.
> However, in the ports tree the package is out of date
> . I would like to help bring this
> package up to date with upstream which is currently v0.36.1
> .
> 
> I have read the porting FAQ and the porting guide.
> 
> According to the porting guide, I should get in touch with the port
> maintainer which according to the makefile, is ports@openbsd.org.
> 
> How can I help to bring the port up to the latest version?
> 
> Thank you for your time and for maintaining the ports collection.

Based on sthens previous attempt to update kitty to 0.27.1, I updated 
the vendor file, adapted the exiting patches and added a pre-build hook
that downloads a missing font, which is required to build.

It starts to build now, and stops at:

In file included from kitty/simd-string-128.c:9:
kitty/simd-string-impl.h:36:10: fatal error: 'simde/x86/avx2.h' file not found
#include 
 ^~
1 error generated.

My knowledge stops here. This seems to be the simd implementation from
openmp, which we don't have.

Best regards,
Stefan

Index: x11/kitty/Makefile
===
RCS file: /cvs/ports/x11/kitty/Makefile,v
diff -u -p -u -p -r1.27 Makefile
--- x11/kitty/Makefile  6 May 2024 12:24:17 -   1.27
+++ x11/kitty/Makefile  1 Sep 2024 19:54:32 -
@@ -3,15 +3,13 @@ ONLY_FOR_ARCHS =  aarch64 amd64 i386
 
 COMMENT =  fast, feature full, GPU-based terminal emulator
 
-# 0.27.1 runs the newly built kitty binary during build, but expects
-# it to be in the path (try PORTPATH=${WRKSRC}/linux-package/bin:${PATH})
-# build also fails if you have an older version of kitty installed -
-# it also wants to download go modules during build
-MODPY_EGG_VERSION =0.26.5
+MODPY_EGG_VERSION =0.36.1
 DISTNAME = kitty-${MODPY_EGG_VERSION}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
+   NerdFontsSymbolsOnly.tar.xz \
+   kitty-vendor-${MODPY_EGG_VERSION}.tar.gz
 CATEGORIES =   x11
 HOMEPAGE = https://sw.kovidgoyal.net/kitty/
-REVISION = 1
 
 # GPLv3+
 PERMIT_PACKAGE =   Yes
@@ -21,7 +19,9 @@ WANTLIB += GL X11 X11-xcb Xcursor Xinera
 WANTLIB += fontconfig freetype harfbuzz intl lcms2 m png pthread rsync
 WANTLIB += util xcb xkbcommon xkbcommon-x11 z ${MODPY_WANTLIB}
 
-SITES =
https://github.com/kovidgoyal/kitty/releases/download/v${MODPY_EGG_VERSION}/
+SITES =
https://github.com/kovidgoyal/kitty/releases/download/v${MODPY_EGG_VERSION}/ \
+   
https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/ \
+   https://ptrace.org/
 EXTRACT_SUFX = .tar.xz
 
 # C11
@@ -30,6 +30,7 @@ COMPILER =base-clang ports-gcc
 CFLAGS +=  "-DOPENSSL_clear_free=freezero"
 
 MODULES =  lang/python
+
 MODPY_DISTUTILS_BUILD =linux-package
 MODPY_SETUP_ARGS +=--verbose \
--ignore-compiler-warnings \
@@ -51,24 +52,46 @@ LIB_DEPENDS =   audio/libcanberra \
net/librsync \
x11/dbus \
x11/xkbcommon
+BUILD_DEPENDS =lang/go
 
 TEST_ENV = CI=true \
TMPDIR=${WRKDIR}/tmp \
-   KITTY_CACHE_DIRECTORY=${WRKDIR}/tmp/cache
+   KITTY_CACHE_DIRECTORY=${WRKDIR}/tmp/cache \
+   PYTHONPATH=${WRKSRC}
+
+# runs newly-built binary during build
+PORTPATH = ${WRKSRC}/linux-package/bin:${PATH}
+PORTHOME = ${WRKDIR}
 
-# needed for 'make test'
+# needed for 'make test'; lots of failures though
 USE_GMAKE =Yes
 
 pre-test:
mkdir -p ${WRKDIR}/tmp/cache
+   cp ${WRKSRC}/linux-package/bin/kitty ${WRKSRC}/kitty/launcher/
+
+pre-build:
+   mkdir -p $(WRKSRC)/fonts
+   cd $(WRKSRC)/fonts && xz -d -c $(DISTDIR)/NerdFontsSymbolsOnly.tar.xz | 
tar xvf -
 
 do-install:
${INSTALL_PROGRAM} \
-   ${WRKSRC}/linux-package/bin/kitty ${PREFIX}/bin/
+   ${WRKSRC}/linux-package/bin/{kitty,kitten} ${PREFIX}/bin/
${INSTALL_DATA_DIR} ${PREFIX}/lib/kitty
${INSTALL_MAN} ${WRKSRC}/linux-package/man/man1/kitty.1 \
${PREFIX}/man/man1/
@cp -R ${WRKSRC}/linux-package/lib/kitty/*  ${PREFIX}/lib/kitty/
@cp -R ${WRKSRC}/linux-package/share/*  ${PREFIX}/share/
+
+vendor: patch
+   cd ${WRKSRC}; \
+   ${_PBUILD} chmod -R ug=rwX,o=rX .; \
+   go mod tidy; \
+   go mod vendor; \
+   chmod -R ug=rwX,o=rX vendor; \
+   cd ..; \
+   ${_PBUIL

[maint-update] mail/mu 1.10.8 -> 1.12.6

[Stefan Hagen]

Hello,

this is a major update to mail/mu.

There are a lot of changes. Please read /usr/local/share/doc/mu/NEWS.org
or its online equivalent https://github.com/djcb/mu/blob/master/NEWS.org

The test target has one test failing for mu, and two failing for
mu-guile. That's expected as they both access paths not allowed with
enabled privsep in ports. When executed manually outside the ports 
infrastructure, they run fine.

I'm mainly using "mu" with mutt, therefore I'm looking for people that
use the mu4e and the guile part for some tests and OKs / comments.

Best Regards,
Stefan

Index: mail/mu/Makefile
===
RCS file: /cvs/ports/mail/mu/Makefile,v
diff -u -p -u -p -r1.44 Makefile
--- mail/mu/Makefile10 Nov 2023 09:59:14 -  1.44
+++ mail/mu/Makefile24 Aug 2024 14:53:04 -
@@ -18,7 +18,7 @@ PERMIT_PACKAGE =  Yes
 WANTLIB += ${COMPILER_LIBCXX} c gio-2.0 glib-2.0 gmime-3.0 gobject-2.0
 WANTLIB += m xapian
 
-DIST_TUPLE =   github djcb mu v1.10.8 .
+DIST_TUPLE =   github djcb mu v1.12.6 .
 
 EXTRACT_SUFX = .tar.xz
 
@@ -41,7 +41,7 @@ CONFIGURE_ARGS += -Dguile=disabled
 .endif
 
 # needs readline >= 8.0
-CONFIGURE_ARGS +=  -Dreadline=disabled
+CONFIGURE_ARGS +=  -Dreadline=disabled -Dcld2=disabled
 
 pre-configure:
sed -e 's/exec guile/exec guile${GUILE_V}/' -i \
Index: mail/mu/distinfo
===
RCS file: /cvs/ports/mail/mu/distinfo,v
diff -u -p -u -p -r1.28 distinfo
--- mail/mu/distinfo10 Nov 2023 09:59:14 -  1.28
+++ mail/mu/distinfo24 Aug 2024 14:53:04 -
@@ -1,2 +1,2 @@
-SHA256 (djcb-mu-v1.10.8.tar.gz) = dh4HSuS7+ZXJMVB1O+VchJDz6XwZox5CiYMpZKh5G7E=
-SIZE (djcb-mu-v1.10.8.tar.gz) = 768318
+SHA256 (djcb-mu-v1.12.6.tar.gz) = E9VapW++h0ZQSlhYEXuAkmYMXL1ZxIybGmA4+ZstErA=
+SIZE (djcb-mu-v1.12.6.tar.gz) = 963258
Index: mail/mu/patches/patch-lib_mu-store-worker_hh
===
RCS file: mail/mu/patches/patch-lib_mu-store-worker_hh
diff -N mail/mu/patches/patch-lib_mu-store-worker_hh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mail/mu/patches/patch-lib_mu-store-worker_hh24 Aug 2024 14:53:04 
-
@@ -0,0 +1,12 @@
+Index: lib/mu-store-worker.hh
+--- lib/mu-store-worker.hh.orig
 lib/mu-store-worker.hh
+@@ -159,7 +159,7 @@ class StoreWorker { (private)
+   size_t cleanup_orphans();
+ 
+   QueueType q_;
+-  Store& store_;;
++  Store& store_;
+   std::thread runner_;
+   std::atomic running_{};
+   SexpCommandHandler sexp_handler_{};
Index: mail/mu/patches/patch-lib_mu-store_cc
===
RCS file: mail/mu/patches/patch-lib_mu-store_cc
diff -N mail/mu/patches/patch-lib_mu-store_cc
--- mail/mu/patches/patch-lib_mu-store_cc   5 Sep 2023 11:04:50 -   
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-fix time_t format specifier
-
-Index: lib/mu-store.cc
 lib/mu-store.cc.orig
-+++ lib/mu-store.cc
-@@ -699,7 +699,7 @@ Store::set_dirstamp(const std::string& path, time_t ts
- {
-   std::array data{};
-   const auto len = static_cast(
--  g_snprintf(data.data(), data.size(), "%zx", tstamp));
-+  g_snprintf(data.data(), data.size(), "%lld", (long long)tstamp));
- 
-   set_metadata(path, std::string{data.data(), len});
- }
Index: mail/mu/patches/patch-lib_utils_mu-readline_cc
===
RCS file: /cvs/ports/mail/mu/patches/patch-lib_utils_mu-readline_cc,v
diff -u -p -u -p -r1.3 patch-lib_utils_mu-readline_cc
--- mail/mu/patches/patch-lib_utils_mu-readline_cc  31 Jul 2022 11:43:48 
-  1.3
+++ mail/mu/patches/patch-lib_utils_mu-readline_cc  24 Aug 2024 14:53:04 
-
@@ -3,7 +3,7 @@
 Index: lib/utils/mu-readline.cc
 --- lib/utils/mu-readline.cc.orig
 +++ lib/utils/mu-readline.cc
-@@ -74,7 +74,7 @@ Mu::have_readline()
+@@ -73,7 +73,7 @@ Mu::have_readline()
  void
  Mu::setup_readline(const std::string& histpath, size_t maxlines)
  {
Index: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
===
RCS file: mail/mu/patches/patch-lib_utils_mu-utils-format_hh
diff -N mail/mu/patches/patch-lib_utils_mu-utils-format_hh
--- mail/mu/patches/patch-lib_utils_mu-utils-format_hh  19 Dec 2022 18:38:39 
-  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: lib/utils/mu-utils-format.hh
 lib/utils/mu-utils-format.hh.orig
-+++ lib/utils/mu-utils-format.hh
-@@ -52,7 +52,7 @@ std::string format(const char* frm, ...) __attribute__
-  *
-  * @return a formatted string
-  */
--std::string vformat(const char* frm, va_list args) 
__attribute__((format(printf, 1, 0)));
-+std::string vformat(const char* frm, __va_list args) 
__attribute__((format(printf, 1, 0)));
- 
- 
- } // namepace Mu
Index: mail/mu/patc

Re: NEW: x11/emwm & x11/emwm-utils, clarification wanted.

[Stefan Hagen]

izzy Meyer wrote (2024-08-22 16:29 CEST):
> On Tue, 23 Jul 2024 11:48:06 +0100
> Stuart Henderson  wrote:
> 
> > Tweaks in the attached tgz:
> > 
> > - separate var names from contents with tabs as is normally done in
> > ports
> > - set flags instead of patching
> > - fix wantlib for emwm-utils
> > 
> > Does that still work for you? If so, it's ok sthen for someone to
> > import

I've imported both with the following changes:

- both: sorted the Makefile to look more like all the others
- emwm-utils: in the DESCR file, I replaced "X11 config directory"
  with the actual path of the rc file ($PREFIX/lib/X11/toolboxrc).

Thanks, sdk

> > On 2024/04/12 23:44, izder456 wrote:
> > > Hello ports@,
> > > 
> > > I initially made a thread in this list around the time 7.5 was
> > > nearing release, and the thread went stagnant, I assume since focus
> > > was on stability, and whatever. (might be misremembering here, I
> > > have a spotty memory).
> > > 
> > > See threads:
> > > x11/emwm => https://marc.info/?t=17055468082&r=1&w=2 
> > > x11/emwm-utils => https://marc.info/?t=17056918761&r=1&w=2
> > > 
> > > The only criticism I got aside from nits and tips on DISTFILES,
> > > seemed to come from a place of the quality of upstream code, which
> > > is fair if you are discussing comparing it to motif or whatever,
> > > but doesn't seem to be a reason against merging this. I use this WM
> > > quite frequently as a fallback. It would be personally nice to
> > > have. 
> > > 
> > > But some of the reasons I see this being beneficial to merge: 
> > > 
> > > Its the same legacy that motif wm has, but with modern niceties.
> > > fullscreen firefox/chromium is handled as expected, EWMH hints are
> > > respected, (so if you use a compositor or something), XFT font
> > > support is a biggie imho, thats one of the selling points for me.
> > > And emwm-utils has a nice toolchest application that is just nice to
> > > use/configure.
> > > 
> > > Hell- I made some personal config backups on my Github profile, cos
> > > its just a nice floating WM.
> > > 
> > > I know that necro-bumps are generally discouraged online- so heres a
> > > thread to ask this:
> > > 
> > > now that 7.5 is released, would this be good to merge into -CURRENT?
> > > 
> > > They are both attached.
> > > 
> > > Thoughts?
> > > 
> > > Thanks.

Re: NEW: descent3 - engine for 6DOF shooter Descent 3

[Stefan Hagen]

Thomas Frohwein wrote (2024-08-21 20:15 CEST):
> New tarball, now with correct header file for malloc(3) - thanks brynet
> for spotting!

It works for me and brings back some good memories.

Attached again with the following changes:

- moved share/{lib/netgames,online} to share/Descent3/{lib/netgames,online}
  by setting -DCMAKE_INSTALL_DATADIR and -DCMAKE_INSTALL_LIBDIR
- "mkdir -p" in the README
- removed pre-configure. It seems good enough to pass --prefix linux
  only to CONFIGURE_ARGS

Best Regards,
Stefan

> On Tue, Aug 20, 2024 at 10:33:56AM -0400, Thomas Frohwein wrote:
> > 
> > Hi,
> > 
> > The Descent series of video games was an influential sci-fi
> > 6-degrees-of-freedom shooter from the 1990's. We can already run Descent
> > 1&2 via dxx-rebirth. The source code of Descent 3 was released in April
> > this year.
> > 
> > The port builds with relatively little modification. I've started a PR
> > to upstream some of the patches [1]. It needs the game assets to run,
> > either from the original CD/DVD or via GOG or Steam digital download.
> > README lists an example how to extract the files and launch the game.
> > It seems to only look in $PWD for the game files and, annoyingly,
> > creates directory 'custom/' with empty subdirectories wherever it's
> > launched, so be aware of that if accidentally launching from the wrong
> > dir.
> > 
> > Release notes state that it's for 64bit (amd64 & arm64) and NOT for
> > 32-bit arches [2]. I didn't restrict the port arches as I haven't
> > tested those claims and they might only be referring to what they
> > built for release binaries.
> > 
> > I've launched it on my amd64, watched most of the intro video and
> > played the tutorial level a little bit using mouse controls, all
> > without issues.
> > 
> > ok? or any issues or comments?
> > 
> > Thx to brynet@ for helping me with what to do about
> > malloc_usable_size!
> > 
> > [1] https://github.com/DescentDevelopers/Descent3/pull/542
> > [2] https://github.com/DescentDevelopers/Descent3/releases/tag/v1.5.0
> 
> 




descent3.tgz
Description: application/tar-gz

Re: [feedback] VeraCrypt update remove TC compatibility - ok/not ok?

[Stefan Hagen]

m...@tietoturvamies.fi wrote (2023-10-10 09:33 CEST):
> with the new VeraCrypt update there came a change that removes the TC
> Mode support:
> "Remove TrueCrypt Mode support. Version 1.25.9 can be used to mount or
> convert TrueCrypt volumes."
> 
> As it's better and recommended to use OpenBSD tools for disk encryption,
> this port is often seen as being for purpose of backward
> compatibility (with VC volumes, but also with TC).
> 
> I'd like to ask people who might be using this port - is it ok for you
> to throw away backward compatibility with TC and have newer VC or do you
> prefer keeping the port as is for the sake of backward compatibility
> with TC?

I think the fact that you got no answer in almost a year means you can
go ahead. VeryCrypt is not only there for backwards compatibility on 
OpenBSD. Afaik, it's the only disk encryption software that can be used
across OpenBSD, FreeBSD, Windows, Linux, OSX, maybe others.

In my opinion: Yes, move on and follow upstream.

Best Regards,
Stefan

Re: UPDATE: cad/kicad

[Stefan Hagen]

Rafael Sadowski wrote (2024-08-15 07:52 CEST):
> Please find below a kicad 8.0.4 update diff (inline) and attached
> kicad-share.diff (which is simple an make update-plist diff).
> 
> Here are some customisations and I would like to explain them:
> 
> - Enable i18n translation by default.
> - Remove Git dependency to build it
> - Set NANODBC_ENABLE_UNICODE to unbreak the build (conflicts with system
>   libs)
> - Remove CMAKE_BUILD_TYPE=Release, it's our default target.
> - Disable auto updates for kicad
> 
> - When you open a project, the message ‘Configuration Global Footprint
>   Library Table’ is shown with 3 options. The default recommended option
>   leads in crashes in my tests.
> 
>   Creating an empty global fingerprint footprint table works properly,
>   so I decided to chance option recommendations. (See
>   patch-common_dialogs_dialog_global_lib_table_config_cpp)
> 
> I played a little bit with the system templates.
> 
> OK to update kicad?

Hi Rafael,

Importing settings from an older kicad version leads to crashes. I had
to rm -rf .config/kicad .local/share/kicad after that to be able to open
the pcb editor on a demo project.

However, clicking around there makes it crash again and it doesn't recover 
when started again.

To reproduce:
1. Open the first demo project (complex hierarchy)
2. Open the schematic editor by clicking on the pcb file
3. Choose empty global fingerprint footprint table as recommended
4. Open the footprint editor from the schematic editor

Video: https://ptrace.org/kicad_trial.mp4

I didn't look at the changes, but I noticed that a build log file
snuck into the diff:

> diff --git a/cad/kicad-share/packages3D/_ok_configure.pbh 
> b/cad/kicad-share/packages3D/_ok_configure.pbh
> new file mode 100644
> index 000..bd6da5b8a4a
> --- /dev/null
> +++ b/cad/kicad-share/packages3D/_ok_configure.pbh
> @@ -0,0 +1,13 @@
> +===> Building from scratch kicad-packages3D-8.0.4
> +===> kicad-packages3D-8.0.4 depends on: cmake-* -> cmake-3.30.1v1
> +===> kicad-packages3D-8.0.4 depends on: ninja-* -> ninja-1.11.1p0v0
> +===> kicad-packages3D-8.0.4 depends on: bzip2-* -> bzip2-1.0.8p0
> +===>  Checking files for kicad-packages3D-8.0.4
> +`/usr/ports/distfiles/kicad-packages3D-8.0.4.tar.bz2' is up to date.
> +>> (SHA256) kicad-packages3D-8.0.4.tar.bz2: OK
> +===>  Extracting for kicad-packages3D-8.0.4
> +
> +Signal caught, cleaning up.
> +*** Signal SIGINT in . (do-extract)
> +*** Signal SIGINT in . (/usr/ports/pobj/kicad-packages3D-8.0.4/.extract_done)
> +*** Error 1 in /home/rsadowski/wip-ports/cad/kicad-share/packages3D 
> (/usr/ports/infrastructure/mk/bsd.port.mk:2704 'configure': @lock=kicad-...)

Best regards,
Stefan

Re: UPDATE x11/spectrwm-3.6.0

[Stefan Hagen]

Bjorn Ketelaars wrote (2024-07-11 05:34 CEST):
> Diff below brings spectrwm to 3.6.0. Changes:
> https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_6_0
> 
> Major of shared library requires a major bump because of removal of
> symbols.
> 
> Run tested on amd64.
> 
> Comments/OK?

Works fine for me too.

OK sdk@

Re: [update] x11/zutty to 0.16

[Stefan Hagen]

Hey,

Released 20 hours ago. How are you doing this?

Feel free to commit. 

OK sdk@

Lucas Raab wrote (2024-06-08 02:49 CEST):
> Hello,
> 
> Here's an update for zutty that's been working fine on amd64.
> 
> changelog: https://git.hq.sig7.se/zutty.git/shortlog
> 
> Thanks,
> Lucas

> diff /usr/ports
> commit - d9e9c3c039df8f17812a57691458464b64fa7d47
> path + /usr/ports
> blob - a7acae0fdfa59dd947f700cbb0759e0819a80ca6
> file + x11/zutty/Makefile
> --- x11/zutty/Makefile
> +++ x11/zutty/Makefile
> @@ -1,8 +1,7 @@
>  COMMENT =X terminal which uses OpenGL ES Compute Shaders
>  
> -V =  0.15
> +V =  0.16
>  DISTNAME =   zutty-$V
> -REVISION =   0
>  
>  CATEGORIES = x11
>  
> blob - 76ad00bff05a07e1f9fbb0d9804d4061cd09903e
> file + x11/zutty/distinfo
> --- x11/zutty/distinfo
> +++ x11/zutty/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (zutty-0.15.tar.gz) = S0I0ljWm5C95nKG3AuhNeSlNZcBJs1ESpzA3T1zJO78=
> -SIZE (zutty-0.15.tar.gz) = 351752
> +SHA256 (zutty-0.16.tar.gz) = x5S6dp9L2XPQuDbHwTjdL4J6zoNZ93LToTbu5nGtqkA=
> +SIZE (zutty-0.16.tar.gz) = 361065

Re: [new] gurk-rs - a cli signal client

[Stefan Hagen]

James Cook wrote (2024-05-14 21:21 CEST):
> > I wasn't able to link to my phone because the QR code is not displayed in a
> > usable way.  Here are the first three lines of what I assume is supposed to
> > be a QR code.
> > 
> > $ gurk
> > Linking new device with device name: gurk@angel
> >▄▄▄ ▄ ▄   ▄  
> >  ▄▄ ▄ ▄  ▄  ▄  ▄  ▄ ▄ ▄ ▄
> > ▄ ▄ ▄   ▄▄▄▄ ▄    ▄▄ ▄▄   ▄▄▄
> 
> Sorry, format=flowed messed that up. Here are the first three lines
> again:
> 
>▄▄▄ ▄ ▄   ▄   ▄▄ ▄ ▄  ▄
> ▄  ▄  ▄ ▄ ▄ ▄ ▄ ▄ ▄
> ▄▄▄▄ ▄    ▄▄ ▄▄   ▄▄▄

Try playing with a different font / different terminal.
It should look like a square'ish block that resembles
a QR code.

Best regards,
Stefan

[maintainer update] sysutils/hcloud 1.42.0 -> 1.43.1

[Stefan Hagen]

Hi,

Is anyone besides me using the hetzner cloud cli tool?

Changelogs:
https://github.com/hetznercloud/cli/releases/tag/v1.43.0
https://github.com/hetznercloud/cli/releases/tag/v1.43.1

port checks + test target pass.

- Stefan

Index: sysutils/hcloud/Makefile
===
RCS file: /cvs/ports/sysutils/hcloud/Makefile,v
diff -u -p -u -p -r1.17 Makefile
--- sysutils/hcloud/Makefile21 Feb 2024 06:20:48 -  1.17
+++ sysutils/hcloud/Makefile6 May 2024 05:43:54 -
@@ -1,5 +1,5 @@
 COMMENT =  command-line interface for Hetzner Cloud
-V =1.42.0
+V =1.43.1
 
 MODGO_MODNAME =github.com/hetznercloud/cli
 MODGO_VERSION =v${V}
Index: sysutils/hcloud/distinfo
===
RCS file: /cvs/ports/sysutils/hcloud/distinfo,v
diff -u -p -u -p -r1.14 distinfo
--- sysutils/hcloud/distinfo21 Feb 2024 06:20:48 -  1.14
+++ sysutils/hcloud/distinfo6 May 2024 05:43:54 -
@@ -1,7 +1,7 @@
 SHA256 (go_modules/github.com/!vivid!cortex/ewma/@v/v1.2.0.mod) = 
ILNcJxBBj+a8SPgF/mQlwJXr0GKZrGH8kQfZtR18EeY=
 SHA256 (go_modules/github.com/!vivid!cortex/ewma/@v/v1.2.0.zip) = 
+s/u7C2sRHIR5zPtbxkOkGioqJ13DqQLHWlV+mz/Ns8=
-SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.mod) = 
17OszAg8LYhxB+e5mY0rfap993NS0WnmnW+75plfuL0=
-SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.zip) = 
jzMPNcpCm2acOXzy5rWLjNaJT7bWQ39wmZMdLRQAuQk=
+SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.4.0.mod) = 
17OszAg8LYhxB+e5mY0rfap993NS0WnmnW+75plfuL0=
+SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.4.0.zip) = 
7x6m/q0h5fzJ4VMhh4iMjHxPPrvbAFh6tnoZJFIGymY=
 SHA256 
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.mod)
 = ftH6kO7vq7UGWGCrf2fdM/5ysTVwVCejb0515qgQBls=
 SHA256 
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.zip)
 = tiQ310pSMImvRroBFezhzhG8peMh/h4dTJduzKbueKo=
 SHA256 (go_modules/github.com/beorn7/perks/@v/v1.0.1.mod) = 
yHCz/lC2lE+rCVsGII2ciJh2PpFzyx7tMljD1YMJumY=
@@ -41,7 +41,6 @@ SHA256 (go_modules/github.com/goccy/go-y
 SHA256 (go_modules/github.com/goccy/go-yaml/@v/v1.11.3.zip) = 
sQ7xaCrXMisnASAAdBrdFyvGACGzB0nmTQmqfn4700M=
 SHA256 (go_modules/github.com/golang/mock/@v/v1.6.0.mod) = 
v7apfudscqVtouisXf2SYWb3k9/q+7+4DLM+agYDAag=
 SHA256 (go_modules/github.com/golang/mock/@v/v1.6.0.zip) = 
+iWRa1RvkNpJQY9Dbjph5MXa6JjPPIKwAHtab6t0Jhs=
-SHA256 (go_modules/github.com/golang/protobuf/@v/v1.2.0.mod) = 
wKIDG/J3CHdJ2MzEMkSfaxN1eH6shkHdL5MAdCMar7Q=
 SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.0.mod) = 
c4y7HelrZ6YjisO4CBzYsb+w2uvPbJu+jL221zuuzRk=
 SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.3.mod) = 
fI52EFJ6/Xckx+i36EPxMrDbYejJ3UncWJ1DDokpvMQ=
 SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.3.zip) = 
k72m6I1KCkk6mLSB3mehAACnVdFfFqgAtJprltG9b4E=
@@ -49,16 +48,16 @@ SHA256 (go_modules/github.com/google/go-
 SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.9.mod) = 
58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0=
 SHA256 (go_modules/github.com/google/go-cmp/@v/v0.6.0.mod) = 
58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0=
 SHA256 (go_modules/github.com/google/go-cmp/@v/v0.6.0.zip) = 
S06b9sSCEQgGUbSR37SNaLc2xmowW8+UYFYG4bouqko=
-SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.5.6.mod) = 
U6yrsr8kHxtWra3zhHTdIdO9sC/T7xbMTI3t1MCAHTk=
-SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.5.6.zip) = 
yaVtNzRFwrpqtNuM6Mg4+gqfNzREEbgNVm7G8DrYsdI=
-SHA256 (go_modules/github.com/hetznercloud/hcloud-go/v2/@v/v2.6.0.mod) = 
ft0ZdUGUm8HoXwOnBjYGZAm58OFu2xlhGTlOYajKWGA=
-SHA256 (go_modules/github.com/hetznercloud/hcloud-go/v2/@v/v2.6.0.zip) = 
dRgolglIBmxn5mgmR6xo7TFBhl1IqeDoDGRE4OAPVaE=
+SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.7.1.mod) = 
U6yrsr8kHxtWra3zhHTdIdO9sC/T7xbMTI3t1MCAHTk=
+SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.7.1.zip) = 
MOO5DvYGYROE8/CPV64Gt2jBy9Uo7VUjxHEDhAyq3Ls=
+SHA256 (go_modules/github.com/hetznercloud/hcloud-go/v2/@v/v2.7.2.mod) = 
DDndFm2NZawdAECRNB5giqWol2/PCxSqVtVemjJ4sv8=
+SHA256 (go_modules/github.com/hetznercloud/hcloud-go/v2/@v/v2.7.2.zip) = 
JFuH60eVHFOkaZvX35gz0YmNX9pQ4Ys4hASbH2HPJYk=
 SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.1.0.mod) = 
HBsVkRqooL1c0PZnDsI9EIZJbzYV/fUzBq/ytHbOm+E=
 SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.1.0.zip) = 
UmZ03mJNfbEIz+dlPvEQzN/Ze8hQJiVCJIFVZ5KO0kM=
 SHA256 
(go_modules/github.com/jessevdk/go-flags/@v/v1.4.1-0.20181029123624-5de817a9aa20.mod)
 = n/9I81DbxrsGZZTpRJbe+hlei1UgbSYcpbL5ifZ4Ki0=
 SHA256 
(go_modules/github.com/jessevdk/go-flags/@v/v1.4.1-0.20181029123624-5de817a9aa20.zip)
 = mGXGOBfZ/cyky2L5Kdmyu9hS3jXasawE5CS3vyQle1o=
-SHA256 (go_modules/github.com/jmattheis/goverter/@v/v1.3.0.mod) = 
hvxDHo1hO1R7mibht4DtCGA5NAIvM9VVMaIibxwBN84=
-SHA256 (go_modules/github.c

Re: [maintainer-update] www/luakit to 2.3.6

[Stefan Hagen]

Stefan Hagen wrote (2024-02-23 07:51 CET):
> luakit now works with libsoup3 and webkitgtk4.1. And some bugs have
> been fixed.
> 
> Changes: https://luakit.github.io/news/
> 
> The test target runs fine on amd64.
> portcheck/p-l-d-check are happy.
> 
> OK?

*ping*

The test target is also happy.

- Stefan

Index: www/luakit/Makefile
===
RCS file: /cvs/ports/www/luakit/Makefile,v
diff -u -p -u -p -r1.44 Makefile
--- www/luakit/Makefile 20 Apr 2024 14:42:27 -  1.44
+++ www/luakit/Makefile 6 May 2024 06:01:57 -
@@ -1,8 +1,7 @@
 COMMENT =  fast, small, webkit based browser written in lua
 
-V =2.3.3
+V =2.3.6
 DISTNAME = luakit-${V}
-REVISION = 3
 
 EPOCH =1
 
@@ -21,10 +20,10 @@ USE_GMAKE = Yes
 
 COMPILER = base-clang ports-gcc
 
-WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB =  atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
-WANTLIB += intl javascriptcoregtk-4.0 pango-1.0 pangocairo-1.0 pthread
-WANTLIB += soup-2.4 sqlite3 webkit2gtk-4.0
+WANTLIB += intl javascriptcoregtk-4.1 pango-1.0 pangocairo-1.0 pthread
+WANTLIB += soup-3.0 sqlite3 webkit2gtk-4.1
 
 # luajit archs
 .if ${MACHINE_ARCH} == "arm" \
@@ -52,7 +51,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
net/luasocket \
textproc/lua-markdown
 
-LIB_DEPENDS += www/webkitgtk4
+LIB_DEPENDS += www/webkitgtk4,webkitgtk41
 
 TEST_DEPENDS = devel/luassert \
devel/luacheck
Index: www/luakit/distinfo
===
RCS file: /cvs/ports/www/luakit/distinfo,v
diff -u -p -u -p -r1.14 distinfo
--- www/luakit/distinfo 9 Nov 2022 18:18:35 -   1.14
+++ www/luakit/distinfo 6 May 2024 06:01:57 -
@@ -1,2 +1,2 @@
-SHA256 (luakit-2.3.3.tar.gz) = jmVx8REZsx56ND23sD9o2CPx/Rdf3/SHDUCir9nnMtU=
-SIZE (luakit-2.3.3.tar.gz) = 507343
+SHA256 (luakit-2.3.6.tar.gz) = ggL8UVx+ZN3AeUtWIxZ7Ny9pa851fm92fF4Dv74r66A=
+SIZE (luakit-2.3.6.tar.gz) = 508466

Re: [new] gurk-rs - a cli signal client

[Stefan Hagen]

Stefan Hagen wrote (2024-03-23 10:11 CET):
> Rafael Sadowski wrote (2024-03-23 10:02 CET):
> > On Fri Feb 10, 2023 at 07:28:52PM +0100, Stefan Hagen wrote:
> > 
> > What is the status here? I see 0.4.2 upstream.
> 
> 0.4.2 is in openbsd-wip, feel free to try. It's buggy as hell
> and crashes frequently.
> 
> I'll resubmit it to ports@ once it works better.

I've updated gurk-rs on openbsd-wip to version 0.4.3. It seems to start
more reliable now. I could exchange a few messages. Once a message got
deleted, further messages could not be sent from gurk.

Re: [new] gurk-rs - a cli signal client

[Stefan Hagen]

Rafael Sadowski wrote (2024-03-23 10:02 CET):
> On Fri Feb 10, 2023 at 07:28:52PM +0100, Stefan Hagen wrote:
> 
> What is the status here? I see 0.4.2 upstream.

0.4.2 is in openbsd-wip, feel free to try. It's buggy as hell
and crashes frequently.

I'll resubmit it to ports@ once it works better.

Re: [fix] misc/remind: gtk-update-icon-cache: Failed to open file

[Stefan Hagen]

Martin Ziemer wrote (2024-03-20 09:10 CET):

[...]

> And now there is also a newer version of remind.
> 
> Below is a diff which removes the icon-cache and the matching depends
> and updates to the new version.
> 
> Tested on amd64.

Nice, thank you. I've committed this diff.

> Index: Makefile
> ===
> RCS file: /cvs/ports/misc/remind/Makefile,v
> retrieving revision 1.71
> diff -u -p -r1.71 Makefile
> --- Makefile  4 Mar 2024 10:22:45 -   1.71
> +++ Makefile  20 Mar 2024 08:05:21 -
> @@ -1,7 +1,7 @@
>  COMMENT= scripting language for reminders, with a Tk front end
>  
> -DISTNAME=remind-04.03.02
> -PKGNAME= remind-4.3.2
> +DISTNAME=remind-04.03.03
> +PKGNAME= remind-4.3.3
>  
>  CATEGORIES=  misc
>  
> @@ -32,7 +32,6 @@ RUN_DEPENDS=${MODTK_RUN_DEPENDS} \
>   converters/p5-JSON-MaybeXS \
>   graphics/p5-Cairo \
>   devel/p5-Pango \
> - x11/gtk+4,-guic \
>   devel/desktop-file-utils
>  
>  CONFIGURE_STYLE= gnu
> Index: distinfo
> ===
> RCS file: /cvs/ports/misc/remind/distinfo,v
> retrieving revision 1.40
> diff -u -p -r1.40 distinfo
> --- distinfo  4 Mar 2024 10:22:45 -   1.40
> +++ distinfo  20 Mar 2024 08:05:21 -
> @@ -1,2 +1,2 @@
> -SHA256 (remind-04.03.02.tar.gz) = 
> tL5Ntb/RIoT9mKcdU1ndBo/pGwhtIsRnTV0lL6Sg1Vw=
> -SIZE (remind-04.03.02.tar.gz) = 523684
> +SHA256 (remind-04.03.03.tar.gz) = 
> +/vX6Nu0F84mZcEnd9jFlaVKbJIQQOJiPsxspKF+klQ=
> +SIZE (remind-04.03.03.tar.gz) = 528047
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/misc/remind/pkg/PLIST,v
> retrieving revision 1.16
> diff -u -p -r1.16 PLIST
> --- pkg/PLIST 4 Mar 2024 10:22:45 -   1.16
> +++ pkg/PLIST 20 Mar 2024 08:05:21 -
> @@ -55,4 +55,3 @@ share/remind/seasons.rem
>  share/remind/site/
>  share/remind/site/README
>  @tag update-desktop-database
> -@tag gtk-update-icon-cache %D/share/icons/tkremind
> 

[fix] misc/remind: gtk-update-icon-cache: Failed to open file

[Stefan Hagen]

Hi,

$ pkg_add remind
quirks-7.14 signed on 2024-03-17T12:22:05Z
remind-4.3.2:[..snip the deps..]
remind-4.3.2:p5-JSON-MaybeXS-1.004005: ok
remind-4.3.2:tcl-8.6.13: ok
remind-4.3.2:tk-8.6.13: ok
remind-4.3.2:p5-Cairo-1.109: ok
remind-4.3.2:p5-Glib2-1.3294: ok
remind-4.3.2:p5-Pango-1.227p3: ok
remind-4.3.2:tcl-8.5.19p6: ok
remind-4.3.2:tcllib-1.21pl0p0: ok
remind-4.3.2: ok
Running 
tags||100%
gtk-update-icon-cache: Failed to open file 
/usr/local/share/icons/tkremind/.icon-theme.cache : No such file or directory
system(/bin/sh, -c, /usr/local/bin/gtk-update-icon-cache -q -t 
/usr/local/share/icons/tkremind) failed:  exit(1)
Running tags: ok
New and changed readme(s):
/usr/local/share/doc/pkg-readmes/tcl-8.5
/usr/local/share/doc/pkg-readmes/tcl-8.6

This is because:

cat pkg/PLIST:
@tag gtk-update-icon-cache %D/share/icons/tkremind

But nothing was installed to ../share/icons/..

I think we can remove this line.

OK?

Best Regards,
Stefan

Index: misc/remind/Makefile
===
RCS file: /cvs/ports/misc/remind/Makefile,v
diff -u -p -u -p -r1.71 Makefile
--- misc/remind/Makefile4 Mar 2024 10:22:45 -   1.71
+++ misc/remind/Makefile18 Mar 2024 13:29:27 -
@@ -2,6 +2,7 @@ COMMENT=scripting language for reminder
 
 DISTNAME=  remind-04.03.02
 PKGNAME=   remind-4.3.2
+REVISION=  0
 
 CATEGORIES=misc
 
Index: misc/remind/pkg/PLIST
===
RCS file: /cvs/ports/misc/remind/pkg/PLIST,v
diff -u -p -u -p -r1.16 PLIST
--- misc/remind/pkg/PLIST   4 Mar 2024 10:22:45 -   1.16
+++ misc/remind/pkg/PLIST   18 Mar 2024 13:29:27 -
@@ -55,4 +55,3 @@ share/remind/seasons.rem
 share/remind/site/
 share/remind/site/README
 @tag update-desktop-database
-@tag gtk-update-icon-cache %D/share/icons/tkremind

Re: [mpv] --vo=gpu not working, permission denied

[Stefan Hagen]

beecdadd...@danwin1210.de wrote (2024-02-26 22:54 CET):
> libEGL warning: failed to open /dev/dri/card0: Permission denied

You can fix it with: chown  /dev/dri/card0 /dev/dri/renderD128

Xenodm does this automatically when you log in.
See /etc/X11/xenodm/GiveConsole

The permission are also set when you log in on ttyC0.
See /etc/fbtab and fbtab(5)

Therefore the permissions are changing when you jump out of X
with ctrl+alt+f1 and log in as root. When you hop back into X,
the permissions are wrong.

This only happens on the first console. Use another one instead 
(ctrl+alt+f2,3,4) while using X.

Best Regards,
Stefan

[update] www/luakit to 2.3.6

[Stefan Hagen]

Hi,

luakit now works with libsoup3 and webkitgtk4.1. And some bugs have been
fixed.

Changes: https://luakit.github.io/news/

The test target runs fine on amd64.
portcheck/p-l-d-check are happy.

OK?

Index: www/luakit/Makefile
===
RCS file: /cvs/ports/www/luakit/Makefile,v
diff -u -p -u -p -r1.43 Makefile
--- www/luakit/Makefile 27 Sep 2023 19:13:03 -  1.43
+++ www/luakit/Makefile 23 Feb 2024 06:40:18 -
@@ -1,8 +1,7 @@
 COMMENT =  fast, small, webkit based browser written in lua
 
-V =2.3.3
+V =2.3.6
 DISTNAME = luakit-${V}
-REVISION = 2
 
 EPOCH =1
 
@@ -21,10 +20,10 @@ USE_GMAKE = Yes
 
 COMPILER = base-clang ports-gcc
 
-WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB =  atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
-WANTLIB += intl javascriptcoregtk-4.0 pango-1.0 pangocairo-1.0 pthread
-WANTLIB += soup-2.4 sqlite3 webkit2gtk-4.0
+WANTLIB += intl javascriptcoregtk-4.1 pango-1.0 pangocairo-1.0 pthread
+WANTLIB += soup-3.0 sqlite3 webkit2gtk-4.1
 
 # luajit archs
 .if ${MACHINE_ARCH} == "arm" \
@@ -52,7 +51,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
net/luasocket \
textproc/lua-markdown
 
-LIB_DEPENDS += www/webkitgtk4
+LIB_DEPENDS += www/webkitgtk4,webkitgtk41
 
 TEST_DEPENDS = devel/luassert \
devel/luacheck
Index: www/luakit/distinfo
===
RCS file: /cvs/ports/www/luakit/distinfo,v
diff -u -p -u -p -r1.14 distinfo
--- www/luakit/distinfo 9 Nov 2022 18:18:35 -   1.14
+++ www/luakit/distinfo 23 Feb 2024 06:40:18 -
@@ -1,2 +1,2 @@
-SHA256 (luakit-2.3.3.tar.gz) = jmVx8REZsx56ND23sD9o2CPx/Rdf3/SHDUCir9nnMtU=
-SIZE (luakit-2.3.3.tar.gz) = 507343
+SHA256 (luakit-2.3.6.tar.gz) = ggL8UVx+ZN3AeUtWIxZ7Ny9pa851fm92fF4Dv74r66A=
+SIZE (luakit-2.3.6.tar.gz) = 508466

Re: [OpenBSD -current] xpdf: core dump

[Stefan Hagen]

Marcel Logen wrote (2024-01-26 12:53 CET):
> | t20$ xpdf
> | xpdf:/usr/X11R6/lib/libX11.so.17.1: /usr/X11R6/lib/libX11.so.18.0 : 
> WARNING: symbol(_XkeyTable) size mismatch, relink your program
> | QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-user20'
> | Cannot mix incompatible Qt library (5.9.8) with this library (5.15.11)
> | Abort trap (core dumped) 
> | t20$ 
> 
> What can I do, or is it a problem of the package maintainer?

This happens after you ran pkg_add -u?
My xpdf is not looking for libX11.so.17.1 anymmore and it works fine.

- Stefan

Re: [NEW] misc/remindcal v0.1.1

[Stefan Hagen]

Omar Polo wrote (2024-01-26 09:44 CET):
> On 2024/01/26 07:35:08 +0100, Stefan Hagen  
> wrote:
> > Russ Sharek wrote (2024-01-25 20:36 CET):
> > > While working on this port, I sent a bugfix to the developer and they 
> > > were kind enough to merge it in quickly and tag a new release.
> > > 
> > > Here's an update to a shiny new remindcal-v0.1.1, hot off the forge. 
> > > 
> > > OK?
> > 
> > Looks good to me now. Thanks!
> > 
> > OK for import sdk@
> 
> Some nits, then it's ok op@ too
> 
>  - use tabs to 'indent' the values, not spaces
>  - UNLICENSE is popular enough that we don't have to put the link to the
>website in the license comment IMHO
>  - tweaked a bit the DESCR
> 
> the $EDITOR tip could even be moved in DESCR to avoid using a README
> file only for it, but I don't have a strong opinion.
> 
> I've briefly tried it (not a remind user, just curious) and seems to
> work fine :)
> 
> I'm attaching an updated tarball that's ok for me to import.

I've imported it. Thanks!

Re: [Update] www/gallery-dl-1.26.7

[Stefan Hagen]

grodzio wrote (2024-01-25 14:46 CET):
> Attached is an update to gallery-dl to 1.26.7. As always,
> tested on amd64.

Committed, thank you!

Re: [NEW] misc/remindcal v0.1.1

[Stefan Hagen]

Russ Sharek wrote (2024-01-25 20:36 CET):
> While working on this port, I sent a bugfix to the developer and they 
> were kind enough to merge it in quickly and tag a new release.
> 
> Here's an update to a shiny new remindcal-v0.1.1, hot off the forge. 
> 
> OK?

Looks good to me now. Thanks!

OK for import sdk@

Re: [NEW] misc/remindcal v0.1.0

[Stefan Hagen]

Russ Sharek wrote (2024-01-21 20:18 CET):
> On January 10, 2024 12:16:50 AM EST, Russ Sharek  wrote:
> >Hello!
> >
> >I found a cool little TUI front-end for the misc/remind calendar tool, 
> >and have put together a port.
> >
> >homepage: https://github.com/realsirjoe/remindcal
> >
> >I've tested this on amd64.
> >
> >Notes? OK?
> 
> Haven't heard anything regarding this port. 
> 
> Can someone please have a look?
> 

Hi,

I can give some feedback.

I don't mind the README, but it should be correct. remincal has a
fallback to "vim". So when vim is installed, EDITOR is not required
to be set.

See: remind.go:160  if editor == "" { editor = "vim" }


$ cat distinfo
SHA256 (v0.1.0.tar.gz) = /81STC/8eMW46gcHCF1/3UQJYrHL9EagggXr0daVkiI=
SIZE (v0.1.0.tar.gz) = 66383

This is no good and can clash in DISTDIR. The distfile name can be
altered by using the construct fixed-filename{download-filename}.tgz.

Like so:
DISTFILES = remindcal-${V}{v${V}}${EXTRACT_SUFX}


You don't need to define EXTRACT_SUFX. It's ".tar.gz" by default.


There's a better way to do this port. Your approach would be good if 
the author would have uploaded proper release tarballs. But as we're 
grabbing a tagged version, we can use the DIST_TUPLE mechanism, which
also sets HOMEPAGE and DISTFILES correctly.

My proposal for the Makefile:

---
COMMENT =   terminal frontend for remind
DIST_TUPLE =github realsirjoe remindcal v0.1.0 .
CATEGORIES =misc

MAINTAINER =Russ Sharek 

# UNLICENSE: https://unlicense.org
PERMIT_PACKAGE =Yes

WANTLIB += c curses pthread

MODULES =   lang/go

RUN_DEPENDS =   misc/remind

ALL_TARGET =github.com/realsirjoe/remindcal

.include 
---

Best Regards,
Stefan

Re: [new] irctk - graphical IRC client

[Stefan Hagen]

Omar Polo wrote (2024-01-20 17:40 CET):
> On 2023/12/30 15:39:39 +0100, Omar Polo  wrote:
> > On 2023/12/15 16:50:50 +0100, Omar Polo  wrote:
> > > IRCTk is a graphical IRC client written in Tcl/Tk.  I've been using it
> > > for several months now.  I'm using it also for icb via a (customized)
> > > icbirc.
> > > 
> > > A quickstart guide is available here, with screenshots
> > > 
> > 
> > Due to a wrong dependency line the scripts were re-generated during fake
> > time and recorded fake-time PREFIX, thus trying to run stuff in
> > pobj/irctk-1.0.0/...  Now fixed.
> 
> ...and I also missed the dependency on tcllib and the fact that
> tk.port.mk doesn't append to BUILD/RUN_DEPENDS.  Hopefully this is
> finally the right port :-)
> 
> ok to import?

The patch doesn't apply. You patched the Makefile, but you need to patch 
Makefile.m4.

Updated version attached.

ok sdk@


irctk.tgz
Description: application/tar-gz

Re: [Update] www/gallery-dl-1.26.6

[Stefan Hagen]

grodzio wrote (2024-01-12 15:02 CET):
> Attached is an update for gallery-dl to version 1.26.6. This version
> adds several new extractors and fixes many others.
> -grodzio1

Your PLIST diff didn't apply. A few files it tried to add were already present.
It looks like you created the diff against an earlier version than what
was in the ports tree.

No big deal, just so you know.

I fixed it and committed the update. Thanks!

Best regards,
Stefan

[fix] net/synapse update README

[Stefan Hagen]

Hi,

while setting up a synapse instance, I saw that the command below
doesn't work anymore. You can either supply --generate-config OR
--generate-keys, but not both.

When doing a --generate-config, the keys are generated as well,
so this switch can simply be left out.

Maintainer on CC.

OK?

Best regards,
Stefan

Index: net/synapse/Makefile
===
RCS file: /cvs/ports/net/synapse/Makefile,v
diff -u -p -u -p -r1.69 Makefile
--- net/synapse/Makefile1 Jan 2024 14:14:49 -   1.69
+++ net/synapse/Makefile8 Jan 2024 09:40:19 -
@@ -7,6 +7,8 @@ GH_PROJECT =synapse
 GH_TAGNAME =   v${MODPY_EGG_VERSION}
 CATEGORIES =   net
 
+REVISION = 0
+
 HOMEPAGE = https://matrix.org/
 
 MAINTAINER =   Renaud Allard 
Index: net/synapse/pkg/README
===
RCS file: /cvs/ports/net/synapse/pkg/README,v
diff -u -p -u -p -r1.4 README
--- net/synapse/pkg/README  21 Nov 2022 14:03:29 -  1.4
+++ net/synapse/pkg/README  8 Jan 2024 09:40:19 -
@@ -9,7 +9,7 @@ As root (or _synapse), go into ${LOCALST
 doas -u _synapse ${MODPY_BIN} -m synapse.app.homeserver \
-c ${LOCALSTATEDIR}/synapse/homeserver.yaml --generate-config \
--server-name matrix.example.com --report-stats=no \
-   --generate-keys --keys-directory ${LOCALSTATEDIR}/synapse
+   --keys-directory ${LOCALSTATEDIR}/synapse
 
 Register a user
 ===

Re: [NEW] audio/stmp v0.0.3

[Stefan Hagen]

Russ Sharek wrote (2023-12-30 05:02 CET):
> Thanks to a *lot* of help from Aaron Bieber (again), I've put together 
> another port! This time it's stmp, a terminal-based client for subsonic 
> API servers. Now that we have two of them in ports, it seemed like we 
> needed a simple client.
> 
> homepage: https://github.com/wildeyedskies/stmp
> 
> It's been tested on amd64 against navidrome.
> 
> OK, please?

Oh this is cool. I looked at stmp before, but failed figuring out the go-mpv 
issue.

Unfortunatels it doesn't run here:

$ stmp
panic: function not implemented

goroutine 1 [running]:
main.InitGui(0xc8c6e0?, 0x2c7a58?, 0x5?, 0xc000180500?)

/usr/ports/pobj/stmp-0.0.3/go/src/github.com/wildeyedskies/stmp/gui.go:889 
+0x945
main.main()

/usr/ports/pobj/stmp-0.0.3/go/src/github.com/wildeyedskies/stmp/stmp.go:91 
+0x605

Best regards,
Stefan

Re: [new] x11/mate/backgrounds 1.27.1

[Stefan Hagen]

Rafael Sadowski wrote (2023-12-24 14:07 CET):
> On Sun Dec 24, 2023 at 01:11:59PM +0100, Stefan Hagen wrote:
> > mkf9 wrote (2023-12-24 10:47 CET):
> > > I've noticed there is no mate-backgrounds package in openbsd. upstream
> > > source: https://github.com/mate-desktop/mate-backgrounds/
> > > 
> > > may i make a request for this package to be added? ny thanks :)
> > 
> > Do users nowadays really need wallpaper packages?
> > Such a waste of resources...
> > 
> > Port attached.
> 
> Waste of resources? We are talking about wallpapers :-D.  More
> seriously, most desktop environments expects at least some default
> wallpapers in a know directory.
> 
> Feliz Navidad

Marry Christmas to you too!

I had disk space on package and distfile mirrors in mind. Not build time.

We're not packaging simple scripts because people can just download and
run them. But we're packaging image files that people can also just
download and use? It just sounds unnecessary to me. That's all.

[new] x11/mate/backgrounds 1.27.1

[Stefan Hagen]

mkf9 wrote (2023-12-24 10:47 CET):
> I've noticed there is no mate-backgrounds package in openbsd. upstream
> source: https://github.com/mate-desktop/mate-backgrounds/
> 
> may i make a request for this package to be added? ny thanks :)

Do users nowadays really need wallpaper packages?
Such a waste of resources...

Port attached.


mate-backgrounds.tgz
Description: application/tar-gz

Re: [maintainer update] remind 4.2.7 -> 4.2.8

[Stefan Hagen]

Martin Ziemer wrote (2023-12-15 08:02 CET):
> This patch updates remind from 4.2.7 to 4.2.8.
> 
> Tested on amd64.

Looks good and all my tests worked.

ok sdk@

> Index: Makefile
> ===
> RCS file: /cvs/ports/misc/remind/Makefile,v
> retrieving revision 1.68
> diff -u -p -r1.68 Makefile
> --- Makefile  12 Oct 2023 18:21:31 -  1.68
> +++ Makefile  15 Dec 2023 06:59:08 -
> @@ -1,7 +1,7 @@
>  COMMENT= scripting language for reminders, with a Tk front end
>  
> -DISTNAME=remind-04.02.07
> -PKGNAME= remind-4.2.7
> +DISTNAME=remind-04.02.08
> +PKGNAME= remind-4.2.8
>  
>  CATEGORIES=  misc
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/misc/remind/distinfo,v
> retrieving revision 1.37
> diff -u -p -r1.37 distinfo
> --- distinfo  12 Oct 2023 18:21:31 -  1.37
> +++ distinfo  15 Dec 2023 06:59:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (remind-04.02.07.tar.gz) = 
> A+EtkNmQOcz3Mb4q7qQGNL6pyCnRus4nqNor485tsZA=
> -SIZE (remind-04.02.07.tar.gz) = 509579
> +SHA256 (remind-04.02.08.tar.gz) = 
> GBuX5sQbY7oXcm8QTlWXcX6lrwgqQRF1UTBZ3zPTChU=
> +SIZE (remind-04.02.08.tar.gz) = 510979
> 

Re: maintainer update productivity/khard --> 0.19.1

[Stefan Hagen]

Paco Esteban wrote (2023-12-14 19:14 CET):
> Hi ports@,
> 
> This is very simple update for productivity/khard to its latest version 0.19.1
> Tests pass and works for me on amd64.
> 
> Ok to commit ?

Looks good.

OK sdk

> diff /usr/ports
> commit - 3b3b2b7d829c4b6ff74b701a804e186ec5309991
> path + /usr/ports
> blob - 500e8740faba45f4d1dc1ebcee0d6fad0cea2524
> file + productivity/khard/Makefile
> --- productivity/khard/Makefile
> +++ productivity/khard/Makefile
> @@ -1,6 +1,6 @@
>  COMMENT =console vCard address book
>  
> -MODPY_EGG_VERSION =  0.18.0
> +MODPY_EGG_VERSION =  0.19.1
>  DISTNAME =   khard-${MODPY_EGG_VERSION}
>  
>  CATEGORIES = productivity
> blob - caa6b5e77a231cd842ca85a02843bf3f6fbc3232
> file + productivity/khard/distinfo
> --- productivity/khard/distinfo
> +++ productivity/khard/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (khard-0.18.0.tar.gz) = /ojUtH/dlIYQrFc8AfoT0beZYmXLxEORCFdhr5oDBhU=
> -SIZE (khard-0.18.0.tar.gz) = 602016
> +SHA256 (khard-0.19.1.tar.gz) = WfMKDaPD2j6wT02+GO5HY5E7aF2Z7IQY/VdKiMSRxJA=
> +SIZE (khard-0.19.1.tar.gz) = 605230
> 
> -- 
> Paco Esteban.
> 0x5818130B8A6DBC03
> 

Re: nrpe: "I'm not dead yet!"

[Stefan Hagen]

Lyndon Nerenberg (VE7TFX/VE6BBM) wrote (2023-12-09 00:17 CET):
> On Sep 6 a commit landed in the Github nrpe repo that deleted
> the notice about nrpe being depricated.
> 
> It might be worth revisiting the admonition in the port's
> pkg/MESSAGE file.
> 
> --lyndon

Yes, this was 3 months ago. Since then, nothing happened. No commit, no
active branch, no activity on the authors account fork and no discussion
on PRs.

This "admonition" is taken from the README.md which is in the tarball of
the release and installed to ${PREFIX}/share/doc/nrpe/README.md.

The port is correct for the version we have. We'll update pkg/MESSAGE
when a new release shows up.

Best,
Stefan

Re: iosevka: remove duplicated do-install

[Stefan Hagen]

Edd Barrett wrote (2023-12-06 21:47 CET):
> Hi,
> 
> The do-install is the same for all iosevka sub-packages. I wonder why we don't
> lift it up into Makefile.inc?
> 
> OK?

That makes sense.

OK sdk@

> Index: Makefile.inc
> ===
> RCS file: /cvs/ports/fonts/iosevka-fonts/Makefile.inc,v
> diff -u -p -r1.7 Makefile.inc
> --- Makefile.inc  21 Sep 2023 15:28:05 -  1.7
> +++ Makefile.inc  6 Dec 2023 20:39:31 -
> @@ -18,3 +18,7 @@ WRKDIST =   ${WRKDIR}
>  PKG_ARCH =   *
>  
>  FONTDIR =${PREFIX}/share/fonts/iosevka
> +
> +do-install:
> + ${INSTALL_DATA_DIR} ${FONTDIR}
> + ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR}
> Index: aile/Makefile
> ===
> RCS file: /cvs/ports/fonts/iosevka-fonts/aile/Makefile,v
> diff -u -p -r1.1 Makefile
> --- aile/Makefile 11 Nov 2023 09:02:29 -  1.1
> +++ aile/Makefile 6 Dec 2023 20:39:52 -
> @@ -2,8 +2,4 @@ COMMENT = slender typeface for code (ai
>  PKGNAME =iosevka-aile-${V}
>  DISTFILES =  ttc-iosevka-aile-${V}${EXTRACT_SUFX}
>  
> -do-install:
> - ${INSTALL_DATA_DIR} ${FONTDIR}
> - ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR}
> -
>  .include 
> Index: default/Makefile
> ===
> RCS file: /cvs/ports/fonts/iosevka-fonts/default/Makefile,v
> diff -u -p -r1.2 Makefile
> --- default/Makefile  11 Mar 2022 19:00:20 -  1.2
> +++ default/Makefile  6 Dec 2023 20:39:05 -
> @@ -2,8 +2,4 @@ COMMENT = slender typeface for code (de
>  PKGNAME =iosevka-${V}
>  DISTFILES =  ttc-iosevka-${V}${EXTRACT_SUFX}
>  
> -do-install:
> - ${INSTALL_DATA_DIR} ${FONTDIR}
> - ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR}
> -
>  .include 
> Index: etoile/Makefile
> ===
> RCS file: /cvs/ports/fonts/iosevka-fonts/etoile/Makefile,v
> diff -u -p -r1.1 Makefile
> --- etoile/Makefile   2 Nov 2023 17:13:16 -   1.1
> +++ etoile/Makefile   6 Dec 2023 20:39:39 -
> @@ -2,8 +2,4 @@ COMMENT = slender typeface for code (et
>  PKGNAME =iosevka-etoile-${V}
>  DISTFILES =  ttc-iosevka-etoile-${V}${EXTRACT_SUFX}
>  
> -do-install:
> - ${INSTALL_DATA_DIR} ${FONTDIR}
> - ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR}
> -
>  .include 
> Index: slab/Makefile
> ===
> RCS file: /cvs/ports/fonts/iosevka-fonts/slab/Makefile,v
> diff -u -p -r1.1 Makefile
> --- slab/Makefile 17 Nov 2023 12:28:09 -  1.1
> +++ slab/Makefile 6 Dec 2023 20:39:45 -
> @@ -3,8 +3,4 @@ PKGNAME = iosevka-slab-${V}
>  DISTFILES =  ttc-iosevka-slab-${V}${EXTRACT_SUFX}
>  REVISION =   0
>  
> -do-install:
> - ${INSTALL_DATA_DIR} ${FONTDIR}
> - ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR}
> -
>  .include 
> 
> -- 
> Best Regards
> Edd Barrett
> 
> https://www.theunixzoo.co.uk
> 

misc/sent - add command line options patch

[Stefan Hagen]

Hi,

I'd like to add the command line patch to misc/sent to make it more usable.
This allows to specify the font and colors using command lines switches.

$ sent -f serif -c \#cc88cc -b gray90 sample.txt

OK?

Best regards,
Stefan

Index: misc/sent/Makefile
===
RCS file: /cvs/ports/misc/sent/Makefile,v
diff -u -p -u -p -r1.7 Makefile
--- misc/sent/Makefile  27 Sep 2023 09:52:12 -  1.7
+++ misc/sent/Makefile  5 Dec 2023 06:39:35 -
@@ -1,6 +1,7 @@
 COMMENT=   simple plaintext presentation tool
 
 DISTNAME=  sent-1
+REVISION=  0
 
 CATEGORIES=misc productivity
 
@@ -14,6 +15,10 @@ PERMIT_PACKAGE=  Yes
 WANTLIB=   X11 Xft c fontconfig m
 
 SITES= http://dl.suckless.org/tools/
+SITES.p=   https://tools.suckless.org/sent/patches/cmdline_options/
+
+PATCHFILES.p=  sent-options-20190213-72d33d4.diff
+PATCH_DIST_STRIP=  -p1
 
 RUN_DEPENDS=   archivers/bzip2 \
graphics/farbfeld
Index: misc/sent/distinfo
===
RCS file: /cvs/ports/misc/sent/distinfo,v
diff -u -p -u -p -r1.3 distinfo
--- misc/sent/distinfo  14 Nov 2017 17:19:37 -  1.3
+++ misc/sent/distinfo  5 Dec 2023 06:39:35 -
@@ -1,2 +1,4 @@
 SHA256 (sent-1.tar.gz) = e/PekxHOKR/zat9TFbePpyNz46uAynE4f7WIS8vXvjM=
+SHA256 (sent-options-20190213-72d33d4.diff) = 
unoDJNdgd7ijRW7orZ6o6B8sIH5Lijq9VaecAGr57vk=
 SIZE (sent-1.tar.gz) = 15285
+SIZE (sent-options-20190213-72d33d4.diff) = 1536

[new] textproc/ding - dictionary lookup program for X11

[Stefan Hagen]

Hi,

This thing is very old. But it's also quite handy to have on a key
binding (ding "$(xclip -o)") to quickly look something up.

cat pkg/DESCR
DIctionary Nice Grep is a dictionary lookup program for the X window
system. It comes with a German-English Dictionary with approximately
326,000 entries. It is based on Tk version >= 8.3 and uses the agrep or
egrep tools for searching.

HOMEPAGE: https://www-user.tu-chemnitz.de/~fri/ding

Comments/OK?

Best Regards,
Stefan



ding.tgz
Description: application/tar-gz

Re: New: games/serioussam

[Stefan Hagen]

Stefan Hagen wrote (2023-12-03 18:38 CET):
> Morgan Aldridge wrote (2023-12-03 17:04 CET):
> > On Sun, Dec 3, 2023 at 09:57 Александр Павлов  wrote:
> > 
> > > Hello!
> > > This is my first ever port for OpenBSD. It's the open source Serious Sam
> > > Classic engine.
> > >
> > > Tested on amd64 and i386 architectures. Works just as well as on Linux or
> > > FreeBSD.
> > >
> > > I wish to get this added to the official ports tree, so please leave
> > > any feedback or suggestions on what can be improved. Thank you!
> > >
> > > Source on Github:
> > > https://github.com/tx00100xt/SeriousSamClassic
> > >
> > 
> > Excellent and thanks! We were just discussing your work in #openbsd-gamin
> > on irc.libera.chat yesterday.
> > 
> > There was no attachment for your submission and a .tgz containing the new
> > port directory is preferred for new ports. I saw you submitted a PR to an
> > individual's WIP ports repo on GitHub:
> > 
> > <https://github.com/jasperla/openbsd-wip/pull/170>
> > 
> > I haven't tested, but I'd suggest tarballing that (less the 'FINISHED'
> > file) and attaching it here for easier testing by porters.
> 
> Ahh so many memories. I played quite a bit of ssam on lan parties.
> Back then, when monitors were small and heavy. :-)
> 
> Tarball attached with the following changes:
> 
> - changed to DIST_TUPLE
> - Added missing RUN_DEPENDS
> - Uncommented the aarch64 + armv7 bits (let's try to build it)
> - Removed REVISION (not needed on a new port)
> - simplified the README
> - some indentation changes
> - update-plist (for @tag update-desktop-database after adding RDEPS)

I forgot to remove ONLY_FOR_ARCH, thanks mbuhl@ for spotting.

There was also a trailing \ at LIB_DEPENDS.
While there, I also sorted *DEPENDS and WANTLIB.
And I changed the COMMENT wording to read a bit more fluent in English.

@Alexander: This is a pretty good first contribution. All the stuff I'm
changeing is pretty much nit picking. The port worked on the first try!

Updated tarball attached.

Stefan



serioussam.tgz
Description: application/tar-gz

Re: New: games/serioussam

[Stefan Hagen]

Morgan Aldridge wrote (2023-12-03 17:04 CET):
> On Sun, Dec 3, 2023 at 09:57 Александр Павлов  wrote:
> 
> > Hello!
> > This is my first ever port for OpenBSD. It's the open source Serious Sam
> > Classic engine.
> >
> > Tested on amd64 and i386 architectures. Works just as well as on Linux or
> > FreeBSD.
> >
> > I wish to get this added to the official ports tree, so please leave
> > any feedback or suggestions on what can be improved. Thank you!
> >
> > Source on Github:
> > https://github.com/tx00100xt/SeriousSamClassic
> >
> 
> Excellent and thanks! We were just discussing your work in #openbsd-gamin
> on irc.libera.chat yesterday.
> 
> There was no attachment for your submission and a .tgz containing the new
> port directory is preferred for new ports. I saw you submitted a PR to an
> individual's WIP ports repo on GitHub:
> 
> 
> 
> I haven't tested, but I'd suggest tarballing that (less the 'FINISHED'
> file) and attaching it here for easier testing by porters.

Ahh so many memories. I played quite a bit of ssam on lan parties.
Back then, when monitors were small and heavy. :-)

Tarball attached with the following changes:

- changed to DIST_TUPLE
- Added missing RUN_DEPENDS
- Uncommented the aarch64 + armv7 bits (let's try to build it)
- Removed REVISION (not needed on a new port)
- simplified the README
- some indentation changes
- update-plist (for @tag update-desktop-database after adding RDEPS)

Best Regards,
Stefan


serioussam.tgz
Description: application/tar-gz

Change VARBASE to LOCALSTATEDIR in multiple ports

[Stefan Hagen]

Hi,

I'm progressing in removing VARBASE usage in the ports tree. Most ports are
updated already, but there are a few left for which I haven't gotten an OK yet.

Attached are diffs for:

No response from maintainer in the last week:
security/vaultwarden
net/znc

Maintainer address is handeled by gmail, which doesn't accept my mails at the 
moment:
productivity/radicale
sysutils/slant

No maintainer:
databases/influxdb
productivity/radicale2
sysutils/facette

I'm looking for OKs for these.

No REVISION bump is intentional, because the plist doesn't change.

Best regards,
Stefan
Index: security/vaultwarden/Makefile
===
RCS file: /cvs/ports/security/vaultwarden/Makefile,v
diff -u -p -u -p -r1.29 Makefile
--- security/vaultwarden/Makefile   12 Nov 2023 06:08:41 -  1.29
+++ security/vaultwarden/Makefile   24 Nov 2023 21:21:52 -
@@ -47,7 +47,7 @@ WANTLIB +=pq
 LIB_DEPENDS += databases/postgresql
 .endif
 
-SUBST_VARS +=  WRKSRC VARBASE
+SUBST_VARS +=  WRKSRC
 
 post-configure:
mv ${WRKDIR}/myvendordir ${WRKSRC}
Index: security/vaultwarden/pkg/PLIST
===
RCS file: /cvs/ports/security/vaultwarden/pkg/PLIST,v
diff -u -p -u -p -r1.5 PLIST
--- security/vaultwarden/pkg/PLIST  18 Mar 2023 04:37:36 -  1.5
+++ security/vaultwarden/pkg/PLIST  24 Nov 2023 21:21:52 -
@@ -4,7 +4,7 @@
 @mode 750
 @owner _vaultwarden
 @group _vaultwarden
-@sample ${VARBASE}/vaultwarden/data/
+@sample ${LOCALSTATEDIR}/vaultwarden/data/
 @mode
 @owner
 @group
@@ -14,4 +14,4 @@ share/doc/vaultwarden/.env.template
 @mode 640
 @owner _vaultwarden
 @group _vaultwarden
-@sample ${VARBASE}/vaultwarden/.env
+@sample ${LOCALSTATEDIR}/vaultwarden/.env
Index: net/znc/Makefile
===
RCS file: /cvs/ports/net/znc/Makefile,v
diff -u -p -u -p -r1.51 Makefile
--- net/znc/Makefile27 Sep 2023 14:18:42 -  1.51
+++ net/znc/Makefile24 Nov 2023 20:36:13 -
@@ -36,6 +36,4 @@ CXXFLAGS+=-DHAVE_OPAQUE_SSL
 
 NO_TEST=   Yes
 
-SUBST_VARS+=   VARBASE
-
 .include 
Index: net/znc/pkg/PLIST-main
===
RCS file: /cvs/ports/net/znc/pkg/PLIST-main,v
diff -u -p -u -p -r1.2 PLIST-main
--- net/znc/pkg/PLIST-main  4 May 2022 09:52:20 -   1.2
+++ net/znc/pkg/PLIST-main  24 Nov 2023 20:36:13 -
@@ -4,8 +4,8 @@
 @rcscript ${RCDIR}/znc
 @owner _znc
 @group _znc
-@sample ${VARBASE}/znc/
-@sample ${VARBASE}/znc/configs/
+@sample ${LOCALSTATEDIR}/znc/
+@sample ${LOCALSTATEDIR}/znc/configs/
 @owner
 @group
 @bin bin/znc
Index: productivity/radicale/Makefile
===
RCS file: /cvs/ports/productivity/radicale/Makefile,v
diff -u -p -u -p -r1.44 Makefile
--- productivity/radicale/Makefile  13 Nov 2022 20:31:00 -  1.44
+++ productivity/radicale/Makefile  24 Nov 2023 20:38:31 -
@@ -20,7 +20,6 @@ MODPY_PYBUILD =   setuptools
 RUN_DEPENDS =  security/py-passlib${MODPY_FLAVOR}
 
 NO_TEST =  Yes
-SUBST_VARS +=  VARBASE
 
 pre-configure:
@${SUBST_CMD} ${WRKSRC}/radicale/config.py
Index: productivity/radicale/pkg/PLIST
===
RCS file: /cvs/ports/productivity/radicale/pkg/PLIST,v
diff -u -p -u -p -r1.19 PLIST
--- productivity/radicale/pkg/PLIST 13 Nov 2022 20:31:00 -  1.19
+++ productivity/radicale/pkg/PLIST 24 Nov 2023 20:38:31 -
@@ -93,9 +93,9 @@ share/examples/radicale/log
 @mode 640
 @owner _radicale
 @group _radicale
-@sample ${VARBASE}/log/radicale
+@sample ${LOCALSTATEDIR}/log/radicale
 @mode 700
-@sample ${VARBASE}/db/radicale/
+@sample ${LOCALSTATEDIR}/db/radicale/
 @sample ${SYSCONFDIR}/radicale/private/
 @mode
 @owner
Index: sysutils/slant/Makefile
===
RCS file: /cvs/ports/sysutils/slant/Makefile,v
diff -u -p -u -p -r1.10 Makefile
--- sysutils/slant/Makefile 27 Sep 2023 17:16:34 -  1.10
+++ sysutils/slant/Makefile 24 Nov 2023 21:17:15 -
@@ -25,8 +25,6 @@ LIB_DEPENDS = databases/sqlite3
 
 SITES =https://kristaps.bsd.lv/slant/snapshots/
 
-SUBST_VARS = VARBASE
-
 CONFIGURE_STYLE =  simple
 
 CONFIGURE_ARGS +=  CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
Index: sysutils/slant/pkg/PLIST
===
RCS file: /cvs/ports/sysutils/slant/pkg/PLIST,v
diff -u -p -u -p -r1.2 PLIST
--- sysutils/slant/pkg/PLIST11 Mar 2022 19:58:02 -  1.2
+++ sysutils/slant/pkg/PLIST24 Nov 2023 21:17:15 -
@@ -7,7 +7,7 @@
 sbin/slant-upgrade
 share/slant/
 share/slant/slant.kwbp
-@cwd ${VARBASE}/www
+@cwd ${LOCALSTATEDIR}/www
 @rcscript ${RCDIR}/slant_collectd
 @bin cgi-bin/slant-cgi
 @exec

Re: [new] net/iamb, a terminal-based matrix client for vim addicts

[Stefan Hagen]

Landry Breuil wrote (2023-12-01 09:26 CET):
> hi,
> 
> here's a quick port for http://iamb.chat/, written in rust. untested yet
> but starts fine. since gomuks is half-broken, might aswell have a rust
> one..
> 
> feedback welcome, oks too

It fell on its nose pretty fast here.

===>  Extracting for iamb-0.0.8
[modcargo] moving crates to 
/usr/ports/pobj/iamb-0.0.8/iamb-0.0.8/modcargo-crates
[modcargo] Removing libsrc for onig_sys-69.8.1
[modcargo] Replacing libsrc for ring-0.16.20
cp: /usr/local/share/ring-0.16.20: No such file or directory
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2810 
'_post-extract-finalize': @echo "[modcargo] moving crates to /usr/ports/pobj...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2803 
'/usr/ports/pobj/iamb-0.0.8/.extract_done': @cd /usr/ports/net/iamb && PKGPA...)
*** Error 2 in /usr/ports/net/iamb 
(/usr/ports/infrastructure/mk/bsd.port.mk:2702 'all': @lock=iamb-0.0.8;  export 
_LOCKS_HELD=" iamb-0.0.8"...)

Re: [Maintainer Update] sysutils/eza 0.16.2

[Stefan Hagen]

Volker Schlecht wrote (2023-11-30 17:02 CET):
> Ping *and* an update to 0.16.2 ...
> 
> On 2023-11-10 17:04, Volker Schlecht wrote:
> > Not a ping, just an update to 0.15.3 ...
> > 
> > On 2023-11-07 17:13, Volker Schlecht wrote:
> > > * Updates sysutils/eza to the latest release.
> > > * Since we have nushell in ports, also installs nushell shell completions,
> > > but under examples/, since there doesn't seem to be a place to install 
> > > them
> > > systemwide.
> > > 
> > > Built and tested on amd64, nothing depends on it.
> > > 
> > > ok?

Builds fine, tests run.
I did not try the nushell completions.

OK sdk@

> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/eza/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile  22 Oct 2023 17:48:09 -  1.1.1.1
> +++ Makefile  30 Nov 2023 15:22:42 -
> @@ -2,7 +2,7 @@ COMMENT = ls alternative written in Rus
>  
>  GH_ACCOUNT = eza-community
>  GH_PROJECT = eza
> -GH_TAGNAME = v0.15.0
> +GH_TAGNAME = v0.16.2
>  
>  HOMEPAGE =   https://eza.rocks/
>  
> @@ -31,9 +31,11 @@ post-install:
>   lowdown -s -tman -m section=${sec} -mtitle=${name} -mvolume='' 
> ${WRKSRC}/man/${name}.${sec}.md > ${PREFIX}/man/man${sec}/${name}.${sec}
>  .endfor
>   cd ${PREFIX}/share; ${INSTALL_DATA_DIR} fish/completions \
> - zsh/site-functions bash-completion/completions
> + zsh/site-functions bash-completion/completions \
> + examples/eza/completions/nushell
>   ${INSTALL_DATA} ${WRKSRC}/completions/fish/eza.fish 
> ${PREFIX}/share/fish/completions/
>   ${INSTALL_DATA} ${WRKSRC}/completions/zsh/_eza 
> ${PREFIX}/share/zsh/site-functions/
>   ${INSTALL_DATA} ${WRKSRC}/completions/bash/eza 
> ${PREFIX}/share/bash-completion/completions/
> + ${INSTALL_DATA} ${WRKSRC}/completions/nush/eza.nu 
> ${PREFIX}/share/examples/eza/completions/nushell/
>  
>  .include 
> Index: crates.inc
> ===
> RCS file: /cvs/ports/sysutils/eza/crates.inc,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 crates.inc
> --- crates.inc22 Oct 2023 17:48:09 -  1.1.1.1
> +++ crates.inc30 Nov 2023 15:22:42 -
> @@ -2,13 +2,16 @@ MODCARGO_CRATES +=  aho-corasick1.0.5   # 
>  MODCARGO_CRATES +=   android-tzdata  0.1.1   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   android_system_properties   0.1.5   # MIT/Apache-2.0
>  MODCARGO_CRATES +=   anes0.1.6   # MIT OR Apache-2.0
> +MODCARGO_CRATES +=   ansi_colours1.2.2   # LGPL-3.0-or-later
>  MODCARGO_CRATES +=   ansiterm0.12.2  # MIT
>  MODCARGO_CRATES +=   anstream0.6.4   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   anstyle 1.0.3   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   anstyle-parse   0.2.1   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   anstyle-query   1.0.0   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   anstyle-wincon  3.0.1   # MIT OR Apache-2.0
> +MODCARGO_CRATES +=   approx  0.5.1   # Apache-2.0
>  MODCARGO_CRATES +=   autocfg 1.1.0   # Apache-2.0 OR MIT
> +MODCARGO_CRATES +=   base64  0.21.5  # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   bitflags1.3.2   # MIT/Apache-2.0
>  MODCARGO_CRATES +=   bitflags2.4.0   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   bumpalo 3.13.0  # MIT/Apache-2.0
> @@ -33,35 +36,37 @@ MODCARGO_CRATES +=crossbeam-deque 0.8.3
>  MODCARGO_CRATES +=   crossbeam-epoch 0.9.15  # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   crossbeam-utils 0.8.16  # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   datetime0.5.2   # MIT
> +MODCARGO_CRATES +=   deranged0.3.9   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   dunce   1.0.4   # CC0-1.0 OR MIT-0 OR Apache-2.0
>  MODCARGO_CRATES +=   either  1.9.0   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   equivalent  1.0.1   # Apache-2.0 OR MIT
>  MODCARGO_CRATES +=   errno   0.3.3   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   errno-dragonfly 0.1.2   # MIT
> +MODCARGO_CRATES +=   fast-srgb8  1.0.0   # MIT OR Apache-2.0 OR CC0-1.0
>  MODCARGO_CRATES +=   fastrand2.0.0   # Apache-2.0 OR MIT
>  MODCARGO_CRATES +=   filetime0.2.22  # MIT/Apache-2.0
>  MODCARGO_CRATES +=   form_urlencoded 1.0.1   # MIT/Apache-2.0
>  MODCARGO_CRATES +=   git20.18.1  # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   glob0.3.1   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   half1.8.2   # MIT OR Apache-2.0
> -MODCARGO_CRATES +=   hashbrown   0.14.0  # MIT OR Apache-2.0
> +MODCARGO_CRATES +=   hashbrown   0.14.2  # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   hermit-abi  0.3.2   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   humantime   2.1.0   # MIT/Apache-2.0
>  MODCARGO_CRATES +=   humantime-serde 1.1.1   # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   iana-time-zone  0.1.57  # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   iana-time-zone-haiku0.1.2   # MIT

Re: UPDATE x11/spectrwm-3.5.1

[Stefan Hagen]

Bjorn Ketelaars wrote (2023-11-25 11:37 CET):
> Diff below brings spectrwm to 3.5.1. Changes:
> https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_5_1
> 
> OK?

I'm running the last commit already. Nice that there's a release now.

OK sdk@

> diff --git Makefile Makefile
> index 45da60f00e1..fae035a6dde 100644
> --- Makefile
> +++ Makefile
> @@ -1,6 +1,6 @@
>  COMMENT= small tiling window manager
>  
> -V=   3.5.0
> +V=   3.5.1
>  DIST_TUPLE=  github conformal spectrwm SPECTRWM_${V:S/./_/g} /
>  DISTNAME=spectrwm-${V}
>  
> diff --git distinfo distinfo
> index a12233acd18..2e0f3b923c5 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) = 
> tN6LLFkvxapMpNvQ6KQh9/0Wi31fVMetgZl63ADawg8=
> -SIZE (conformal-spectrwm-SPECTRWM_3_5_0.tar.gz) = 194387
> +SHA256 (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) = 
> f+QmAgilLZ+4RCkdCv5q8YiHxUUt8Lkh7XgK97kiPw8=
> +SIZE (conformal-spectrwm-SPECTRWM_3_5_1.tar.gz) = 196431
> diff --git patches/patch-spectrwm_1 patches/patch-spectrwm_1
> index e002bc0b708..08dc93fa75b 100644
> --- patches/patch-spectrwm_1
> +++ patches/patch-spectrwm_1
> @@ -1,12 +1,12 @@
>  Index: spectrwm.1
>  --- spectrwm.1.orig
>  +++ spectrwm.1
> -@@ -164,7 +164,7 @@ For example, starting
> - via
> - .Xr xinit 1 :
> +@@ -1990,7 +1990,7 @@ via
> + .Pa LD_PRELOAD
> + must be specified.
>   .Bd -literal -offset indent
>  -LD_PRELOAD=/usr/lib/libswmhack.so.0.0 urxvtd -q -o -f
>  +LD_PRELOAD=${PREFIX}/lib/libswmhack.so.${LIBswmhack_VERSION} urxvtd -q -o -f
>   .Ed
>   .Pp
> - Spawned programs automatically have
> + Note that some operating systems may ignore
> diff --git patches/patch-spectrwm_c patches/patch-spectrwm_c
> index 6404edb119c..6fc372bca93 100644
> --- patches/patch-spectrwm_c
> +++ patches/patch-spectrwm_c
> @@ -1,7 +1,7 @@
>  Index: spectrwm.c
>  --- spectrwm.c.orig
>  +++ spectrwm.c
> -@@ -373,7 +373,7 @@ uint32_t swm_debug = 0
> +@@ -379,7 +379,7 @@ uint32_t swm_debug = 0
>   #define SWM_CONF_WHITESPACE " \t\n"
>   
>   #ifndef SWM_LIB
> 

Re: mumble doesn't start on current

[Stefan Hagen]

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

[Stefan Hagen]

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]

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);
-   

Re: GZDoom update, next attempt

[Stefan Hagen]

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

Re: GZDoom update, next attempt

[Stefan Hagen]

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&m=169132550927983&w=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&m=169132550927983&w=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

[Stefan Hagen]

*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)

[Stefan Hagen]

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';

Re: [new] multimedia/ytfzf

[Stefan Hagen]

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.

[fix] www/wwwoffle - allow users to view the example file

[Stefan Hagen]

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

[Stefan Hagen]

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
 
lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE}jixie.${MODPY_P

Re: [update] www/yt-dlp to 2023.11.16

[Stefan Hagen]

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
> > >  
> > > lib/python${MODPY_VERSION}/site-p

Re: [update] www/yt-dlp to 2023.11.16

[Stefan Hagen]

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}
> -lib/python${MODPY_VERSION}/site-packages/yt_dlp/extractor/${MODPY_PYCACHE

Re: amd64: llvm 16 fallout (2023-11-14)

[Stefan Hagen]

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

[Stefan Hagen]

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

[Stefan Hagen]

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&m=169132550927983&w=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&m=169132550927983&w=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/

Re: Add DIST_TUPLE to Makefile.template

[Stefan Hagen]

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 DI

Re: Add DIST_TUPLE to Makefile.template

[Stefan Hagen]

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

[Stefan Hagen]

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

[Stefan Hagen]

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

[Stefan Hagen]

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

[Stefan Hagen]

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

[Stefan Hagen]

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

Re: [NEW] sysutils/fclones

[Stefan Hagen]

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

Re: [update] mail/mu to version 1.10.8 + dist_tuple + minor tweaks

[Stefan Hagen]

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

[Stefan Hagen]

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

[Stefan Hagen]

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&m=169132550927983&w=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&m=169132550927983&w=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)
> + add_link_opti

Re: patch: allow shortened commits in dist-tuple

[Stefan Hagen]

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/
> 

Re: [new] x11/srandrd 0.6.3 - the missing hotplug daemon for X outputs

[Stefan Hagen]

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

[Stefan Hagen]

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)

[Stefan Hagen]

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

[Stefan Hagen]

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
>  share/examples/dictd/dic

Re: Update from Maintainer: databases/sqlcipher 4.5.4 -> 4.5.5

[Stefan Hagen]

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
> 

Re: [update] sysutils/coreboot-utils 4.21

[Stefan Hagen]

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 -

Re: FIX games/scorched3d

[Stefan Hagen]

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

[Stefan Hagen]

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

[Stefan Hagen]

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
===
R

Re: FIX games/scorched3d

[Stefan Hagen]

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

[Stefan Hagen]

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: un

Re: [new] security/certspotter 0.16.0

[Stefan Hagen]

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

[Stefan Hagen]

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}
>  
> lib/python${MODPY_VERSION}/site-packages/picard/ui/

Re: [new] security/certspotter 0.16.0

[Stefan Hagen]

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

Re: [update] Lagrange to 1.17.2

[Stefan Hagen]

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
> 

Re: UPDATE x11/specctrwm-3.5.0

[Stefan Hagen]

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"

Re: [update] sysutils/detox 1.2.0 to 1.4.5 (was: sysutils/detox years out of date)

[Stefan Hagen]

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)

[Stefan Hagen]

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

[Stefan Hagen]

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)

[Stefan Hagen]

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

Re: [new] textproc/urlscan 1.0.1 - a better urlview replacement

[Stefan Hagen]

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

[Stefan Hagen]

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

Re: NEW: legendary-gl - Downloader for Epic Games Store

[Stefan Hagen]

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

[Stefan Hagen]

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

[Stefan Hagen]

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

[Stefan Hagen]

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'

[Stefan Hagen]

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?

[Stefan Hagen]

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&content-type=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?

[Stefan Hagen]

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&content-type=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

[Stefan Hagen]

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/
> 

Re: UPDATE: x11/fvwm3 to 1.0.8

[Stefan Hagen]

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);
>