Re: [update] editors/neovim 0.10.0
Hi, On Thu, May 23, 2024 at 06:45:55PM +0200, Laurent Cheylus wrote: > OK, attached a new version of my diff This all looks good to me. `pkg_delete -a` fixed the lib depends thing I was having. I notice that emacs also LIB_DEPENDS on tree_sitter. I build tested it with your update. It built, but have no idea how to use emacs :P Unless anyone objects, I'll test this for a few days and commit it if nothing comes up. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: [update] editors/neovim 0.10.0
On Thu, May 23, 2024 at 12:37:31PM +0200, Laurent Cheylus wrote: > There is no option to build nvim with external sources for libtermkey (using > our devel/libtermkey port). Ah right. That being the case, yes, I agree we should leave it bundled. It's not worth the effort. > > no parser for 'vimdoc' language, see :help treesitter-parsersstack > I don't know if we must fix this error before updating editors/neovim port > for version 0.10.0. A better solution is to create an issue upstream and > fix/won't fix it after some additional debug. I don't think this will block the update, but I think we should update the testing comments, so that others can see that it's a known issue. If you could send a revised diff for that please? > You probably have an old version of devel/msgpack port. The msgpack library > was renamed from msgpackc to msgpack-c with the last update (5.0 -> 6.0, > commit by uaa@ Tue Feb 20 2024). > Need to clean your orphan packages via 'pkg_delete -a' to remove the old > version. Right, I'll try that later. Cheers -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: [update] editors/neovim 0.10.0
Hi, Thanks for this! On Wed, May 22, 2024 at 03:22:22PM +0200, Laurent Cheylus wrote: > - modify CONFIGURE_ARGS for LUV* variables (changes in version 0.10.0) > - remove termkey in WANTLIB and LIB_DEPENDS (termkey now bundled in Neovim > sources) Is this what we want? I know libtermkey is deprecated, but we have one other port (editors/vis) consuming it, and they may as well share the dep? > Build and tests OK on current/amd64. Besides the known failures, I've got this additional one: ``` >From test_breakindent.vim: Found errors in Test_linebreak_list(): ... no parser for 'vimdoc' language, see :help treesitter-parsersstack ``` If you run `:help treesitter-parserstack` you get: ``` E149: Sorry, no help for treesitter-parsersstack ``` Do we need to enable something in our treesitter port perhaps? port-lib-depends-check says: ``` neovim-0.10.0(editors/neovim): Missing lib: msgpackc.2 (/usr/local/bin/nvim) (NOT REACHABLE) Extra: msgpack-c.0 ``` Which confuses me, since devel/msgpack provides it, and we depend on it. Is it possible we are accidentally using a bundled one or something? Your treesitter and libvterm updates look good to me. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: [NEW] net/crawley-v1.7.5
Hi,
Sorry for the delay.
On Sun, May 19, 2024 at 12:45:45AM -0400, Russ Sharek wrote:
> > # Adapted from the test target in ${WRKSRC}/Makefile
> > MODGO_TEST_TARGET = cd ${WRKSRC} && \
> > CGO_ENABLED=1 ${MODGO_CMD} test -count 1 -v -tags=test
> > -coverprofile="cover.out" ./...
I was expecting a `do-install:`. What do others think?
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
Re: [NEW] net/crawley-v1.7.5
On Fri, May 10, 2024 at 06:41:22PM -0400, Russ Sharek wrote: > Edd said it looked good... Now, wait just a gosh darn minute :) Edd wanted the tests to be fixed too! I thought you were going to use the do-test target that we discussed with abieber@: On Wed, May 01, 2024 at 08:22:03AM -0600, Aaron Bieber wrote: > Looks like all of their tests are in "internal", you can do `go test > internal/...`. This seems to make tests work for me. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/05/10 14:38:34 Modified files: games/angband : Makefile distinfo games/angband/patches: patch-mk_buildsys_mk_in games/angband/pkg: PFRAG.sdl PLIST Added files: games/angband/patches: patch-src_main_c games/angband/pkg: PFRAG.no-no_x11 Removed files: games/angband/patches: patch-lib_help_version_txt patch-src_mon-blows_h Log message: games/angband: update to version 4.2.5. While here, use SDL2 instead of SDL1. (with some tweaks suggested by sthen@, thanks)
Re: [NEW] net/crawley-v1.7.5
On Wed, May 01, 2024 at 01:07:07AM -0400, Russ Sharek wrote:
> Here's a diff that adds both the NO_TEST and README.md to the port.
I know nothing about go, but I had a quick look into getting the tests working.
According to the interwebs, adding a do-test target this should run all tests
in the source dir:
```
do-test:
cd ${WRKSRC} && ${MODGO_CMD} test ./...
```
But if you run `go test cmd` much more tests are run, which leads me to believe
that the above isn't running all of the tests as advertised.
I'm not really sure why the default `do-test` isn't sufficient either.
Right, that's it. I'm invoking abieber@ :)
Any ideas abieber@?
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
UPDATE: games/angband to 4.2.5
Hi,
This updates angband to the latest.
I started this at p2k24, but it was more effort than expected. Please check
carefully for mistakes.
Notes:
- Use sdl2 instead of sdl1.
- Sound not working out of the box. Didn't try to fix it really. Not sure if
sound really adds much to a game like angband.
- Found a bug which upstream quickly patched. Local patch included.
- Sound not enabled by default any more, only if you enable SDL is it turned
on. I forced it off for the sdl FLAVOR.
- Only run tags for FLAVORs that would install icons and desktop files.
- Was surprised `PKG_ARGS += -Dno_x11=1` wasn't required to deselect
`PFRAG.no-no_x11` when necessary. Curious... I did check the contents of the
packages, that they include/exclude the right files for the right FLAVORs.
- Is the `BASELOCALSTATEDIR` stuff right?
- All FLAVORs build tested with dpb to look for missing deps. None
forthcoming.
Cheers
Index: Makefile
===
RCS file: /cvs/ports/games/angband/Makefile,v
diff -u -p -r1.39 Makefile
--- Makefile19 Apr 2024 13:07:46 - 1.39
+++ Makefile28 Apr 2024 21:27:59 -
@@ -3,10 +3,9 @@
COMMENT= rogue-like game with X11 support
COMMENT-no_x11=rogue-like game
-V =4.1.3
-REVISION = 1
-V_DLDIR = ${V:C/\.[0-9]$//}
-DISTNAME= angband-${V}
+V =4.2.5
+DISTNAME = Angband-${V}
+PKGNAME = ${DISTNAME:L}
CATEGORIES=games
HOMEPAGE= http://rephial.org
@@ -18,9 +17,9 @@ MAINTAINER = Edd Barrett https://github.com/angband/angband/releases/download/${V}/
CONFIGURE_STYLE= autoreconf
AUTOCONF_VERSION = 2.69
@@ -28,7 +27,7 @@ AUTOMAKE_VERSION =1.15
CONFIGURE_ENV += "LDFLAGS=-L${LOCALBASE}/lib"
CONFIGURE_ARGS += --with-setgid=games \
- --with-varpath=/var/games/angband \
+ --localstatedir=${BASELOCALSTATEDIR} \
--bindir=${PREFIX}/bin
USE_GMAKE =Yes
@@ -36,48 +35,50 @@ USE_GMAKE = Yes
FLAVORS= no_x11 sdl
FLAVOR?=
-RUN_DEPENDS = devel/desktop-file-utils
BUILD_DEPENDS =textproc/py-docutils,python3
.if ${FLAVOR:Mno_x11}
CONFIGURE_ARGS+= --without-x
.else
CONFIGURE_ARGS+= --with-x
+# We only install desktop files and icons for non-no_x11 FLAVORs.
+RUN_DEPENDS = devel/desktop-file-utils \
+ x11/gtk+4,-guic
WANTLIB+= ICE SM X11
.endif
.if ${FLAVOR:Msdl} # funky graphical mode and sounds
# Sound is currently broken:
-# http://trac.rephial.org/ticket/1977
-CONFIGURE_ARGS += --enable-sdl \
- --disable-sdl-mixer \
- --with-sdl-prefix=/usr/local
+# https://github.com/angband/angband/issues/5952
+#
+# It may not be hard to fix. I haven't tried.
+CONFIGURE_ARGS += --enable-sdl2 \
+ --disable-sdl2-mixer \
+ --with-sdl2-prefix=/usr/local
PKG_ARGS +=-Dsdl=1
-LIB_DEPENDS += devel/sdl-image \
- devel/sdl-ttf
-WANTLIB += SDL SDL_image SDL_ttf pthread
+LIB_DEPENDS += devel/sdl2-image \
+ devel/sdl2-ttf
+WANTLIB += SDL2 SDL2_image SDL2_ttf
.else
-CONFIGURE_ARGS += --disable-sdl-mixer # defaults to ON
PKG_ARGS +=-Dsdl=0
.endif
NO_TEST = Yes
-pre-configure:
- @perl -pi -e "s,/usr/share,${TRUEPREFIX}/share," \
- ${WRKSRC}/lib/icons/angband-*.desktop
-
-# Looks like upstream forgot to include a version file.
-# `cat: ../version: No such file or directory`
+# Kill `make -s`.
pre-build:
- echo ${V} > ${WRKSRC}/version
+ sed -i 's/$${MAKE} -s/$${MAKE}/g' ${WRKBUILD}/mk/buildsys.mk
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
- mv ${PREFIX}/share/angband/icons/*.desktop \
- ${PREFIX}/share/applications
+ # By default installs at most one desktop file (depending on configured
+ # GUI libs) and installs it as `angband.desktop`. Installs neither a
+ # desktop file, nor even the `applications` dir for no_x11 FLAVOR.
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
+ rm -f ${PREFIX}/share/applications/angband.desktop
+ ${INSTALL_DATA} ${WRKSRC}/lib/icons/angband-{sdl2,x11}.desktop \
+ ${PREFIX}/share/applications/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/
mv ${WRKINST}/etc/angband ${PREFIX}/share/examples/
- chmod -R u+rwX ${WRKINST}/var
+ chmod -R u+rwX ${WRKINST}/${BASELOCALSTATEDIR}/games/angband/
.include
Index: distinfo
===
RCS file: /cvs/ports/games/ang
Re: [NEW] net/crawley-v1.7.5
Hey Russ, On Fri, Apr 19, 2024 at 06:14:49PM -0400, Russ Sharek wrote: > Can someone please check this over? Is `ALL_TARGET = github.com/s0rg/crawley@v1.7.5` needed? Is it supposed to recurse out of the website you start inside, given enough time? I ran it on my own website, and I see links to external sites, but it doesn't appear to follow them looking for more. Maybe that's the intended behaviour? Cheers -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/19 15:29:52 Modified files: lang/swi-prolog: Makefile distinfo lang/swi-prolog/patches: patch-packages_ssl_crypto4pl_c patch-packages_ssl_cryptolib_c patch-packages_ssl_ssl4pl_c lang/swi-prolog/pkg: PLIST Added files: lang/swi-prolog/patches: patch-packages_clib_nonblockio_c patch-packages_cpp_SWI-cpp2_cpp patch-packages_cpp_SWI-cpp2_h patch-packages_cpp_test_cpp_cpp Removed files: lang/swi-prolog/patches: patch-src_Makefile_in Log message: lang/swi-prolog: update to 9.2.3. Got help from tb@ with the LibreSSL patches. Many thanks. OK tb@ and sthen@. Cheers.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/16 16:46:01 Modified files: textproc : Makefile Log message: Link textproc/slides.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/16 16:43:07 Log message: Import textproc/slides. pkg/DESCR: ``` Slides is a terminal-based presentation tool, using Markdown files and optionally embedded code blocks. ``` OK, and input from, sthen@. Thanks! Status: Vendor Tag: edd Release Tags: edd_20240416 N ports/textproc/slides/Makefile N ports/textproc/slides/modules.inc N ports/textproc/slides/distinfo N ports/textproc/slides/pkg/DESCR N ports/textproc/slides/pkg/PLIST N ports/textproc/slides/patches/patch-internal_code_languages_go No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/16 14:23:21 Modified files: print/xournalpp: Makefile distinfo print/xournalpp/patches: patch-CMakeLists_txt patch-src_util_Stacktrace_cpp Log message: print/xournalpp: update to v1.2.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/16 14:01:09 Modified files: devel/pasmo: Makefile distinfo devel/pasmo/pkg: PLIST Log message: devel/pasmo: update to version 0.5.5.
Re: NEW: textproc/slides
On Tue, Apr 16, 2024 at 05:35:57PM +0100, Stuart Henderson wrote: > oh, here's a proposal for a more informative pkg/DESCR: > > Slides is a terminal-based presentation tool, using Markdown files and > optionally embedded code blocks. Revised tarball with your tweaks applied. OK? -- Best Regards Edd Barrett https://www.theunixzoo.co.uk slides2.tgz Description: application/tar-gz
Re: [new] gurk-rs - a cli signal client
On Sat, Mar 23, 2024 at 09:56:07PM +0100, Stefan Hagen wrote: > 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. I just tried this and it worked until someone sent me a message, then it dropped me back to the shall and spammed the screen with weird characters. Such a shame, I could really use a client like this. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
NEW: textproc/slides
Hiya, This is a little go program that lets you write terminal presentations in markdown. https://github.com/maaslalani/slides It's a bit like textproc/mdp, but allows easier theming and it can shell out to external programs for rendering parts of the slides, or you could use it to invoke an image viewer. (It contains a wacky SSH server mode, which I don't care much for, but luckily you don't have to use it) OK? -- Best Regards Edd Barrett https://www.theunixzoo.co.uk slides.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/16 07:33:19 Modified files: math/graphviz : Makefile distinfo math/graphviz/patches: patch-configure_ac math/graphviz/pkg: PLIST-main PLIST-tcl Added files: math/graphviz/patches: patch-cmd_tools_mm2gv_1 patch-lib_gvc_gvconfig_c Log message: math/graphviz: update to 10.0.1. TCL support remains broken (as it was before). We may remove that support later. Shout if you want to keep it. All consumers compile tested on amd64. No obvious issues. OK sthen@, thanks.
Re: UPDATE: graphviz-10.0.0.1
On Tue, Apr 16, 2024 at 12:46:36PM +0100, Stuart Henderson wrote: > I tried running some of the > tcl/wish based examples; they fail on both 10.0.1 and 7.1.0. Since that's > not a regression from the existing version I don't think it's a blocker > so ok with me. Thanks for testing. I wonder if there's any worth in the TCL support? It's pretty niche, and no one has noticed that it is broken. Nothing depends upon it. Shall we kill TCL support perhaps? -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
UPDATE: graphviz-10.0.0.1
gtk_VERSION}
+@lib lib/graphviz/libgvplugin_kitty.so.${LIBgvplugin_kitty_VERSION}
@lib
lib/graphviz/libgvplugin_neato_layout.so.${LIBgvplugin_neato_layout_VERSION}
@lib lib/graphviz/libgvplugin_pango.so.${LIBgvplugin_pango_VERSION}
@lib lib/graphviz/libgvplugin_poppler.so.${LIBgvplugin_poppler_VERSION}
@lib lib/graphviz/libgvplugin_rsvg.so.${LIBgvplugin_rsvg_VERSION}
-@lib lib/graphviz/libgvplugin_visio.so.${LIBgvplugin_visio_VERSION}
+@lib lib/graphviz/libgvplugin_vt.so.${LIBgvplugin_vt_VERSION}
@lib lib/graphviz/libgvplugin_webp.so.${LIBgvplugin_webp_VERSION}
@lib lib/graphviz/libgvplugin_xlib.so.${LIBgvplugin_xlib_VERSION}
lib/graphviz/perl/
@@ -87,14 +85,12 @@ lib/graphviz/perl/gv.pm
@lib lib/libcgraph.so.${LIBcgraph_VERSION}
@lib lib/libgvc.so.${LIBgvc_VERSION}
@lib lib/libgvpr.so.${LIBgvpr_VERSION}
-@lib lib/liblab_gamut.so.${LIBlab_gamut_VERSION}
@lib lib/libpathplan.so.${LIBpathplan_VERSION}
@lib lib/libxdot.so.${LIBxdot_VERSION}
lib/pkgconfig/libcdt.pc
lib/pkgconfig/libcgraph.pc
lib/pkgconfig/libgvc.pc
lib/pkgconfig/libgvpr.pc
-lib/pkgconfig/liblab_gamut.pc
lib/pkgconfig/libpathplan.pc
lib/pkgconfig/libxdot.pc
${P5ARCH}/
Index: pkg/PLIST-tcl
===
RCS file: /cvs/ports/math/graphviz/pkg/PLIST-tcl,v
diff -u -p -r1.1 PLIST-tcl
--- pkg/PLIST-tcl 1 Mar 2023 11:30:26 - 1.1
+++ pkg/PLIST-tcl 14 Apr 2024 20:24:06 -0000
@@ -1,4 +1,5 @@
@conflict graphviz-<3
+lib/tcl/
lib/tcl/graphviz/
@so lib/tcl/graphviz/libgdtclft.so
@so lib/tcl/graphviz/libgv_tcl.so
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/15 04:02:33 Modified files: audio/navidrome: Makefile distinfo modules.inc Log message: audio/navidrome: update to v0.51.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/14 15:13:11 Modified files: textproc/mdbook: Makefile distinfo modules.inc Log message: textproc/mdbook: update to v0.4.37.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/14 09:41:23 Modified files: devel/cutter : Makefile distinfo Removed files: devel/cutter/patches: patch-src_widgets_GraphGridLayout_cpp Log message: devel/cutter: update to version 2.3.4. OK, and input from, sthen@. thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/14 09:39:33 Modified files: devel/rizin: Makefile distinfo devel/rizin/patches: patch-librz_analysis_p_analysis_mips_cs_c patch-librz_debug_p_native_reg_c devel/rizin/pkg: PLIST Added files: devel/rizin/patches: patch-meson_build Log message: devel/rizin: update to 0.7.2. OK sthen@, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/14 08:40:54 Modified files: net/wormhole-william: Makefile distinfo modules.inc Log message: net/wormhole-william: update to version 1.0.7. OK paco@, thanks.
UPDATE: wormhole-william-1.0.7
Hey,
This updates wormhole-william to the latest.
Pretty simple. I only post here to check I got the go modules stuff right.
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/wormhole-william/Makefile,v
diff -u -p -r1.6 Makefile
--- Makefile3 Jul 2023 20:01:11 - 1.6
+++ Makefile14 Apr 2024 10:46:15 -
@@ -1,7 +1,7 @@
COMMENT = magic wormhole implementation in Go
MODGO_MODNAME =github.com/psanford/wormhole-william
-MODGO_VERSION = v1.0.6
+MODGO_VERSION = v1.0.7
DISTNAME = wormhole-william-${MODGO_VERSION}
CATEGORIES = net
Index: distinfo
===
RCS file: /cvs/ports/net/wormhole-william/distinfo,v
diff -u -p -r1.4 distinfo
--- distinfo3 Jul 2023 20:01:11 - 1.4
+++ distinfo14 Apr 2024 10:46:41 -
@@ -1,91 +1,18 @@
-SHA256 (go_modules/cloud.google.com/go/@v/v0.26.0.mod) =
IhijTyC5cbwZUhbUGV9XUgoqy9hd5/wxrPxEAmZwTBE=
-SHA256 (go_modules/cloud.google.com/go/@v/v0.34.0.mod) =
IhijTyC5cbwZUhbUGV9XUgoqy9hd5/wxrPxEAmZwTBE=
-SHA256 (go_modules/cloud.google.com/go/@v/v0.38.0.mod) =
IRVe7cPkx6CccZziPHA/vxTDSspC7QDcCHdN5uu+gAc=
-SHA256 (go_modules/cloud.google.com/go/@v/v0.44.1.mod) =
0lFpfc+oXnGvn470xm+euU9mTDCz6WS6EyoXOXtrmXU=
-SHA256 (go_modules/cloud.google.com/go/@v/v0.44.2.mod) =
mrgY5bGZiiX607YbwvI2E/hWzIXnF8Savu81REp166s=
-SHA256 (go_modules/cloud.google.com/go/@v/v0.45.1.mod) =
8o6hRgc0Vf8GZWLxectMcrJa8hhEJt3PO/sa8SR3bdw=
-SHA256 (go_modules/cloud.google.com/go/@v/v0.46.3.mod) =
ZPIDHVZNPVDrh3Pjhmsk4KCRp4biOJbjlHjOcH0lSOA=
-SHA256 (go_modules/cloud.google.com/go/@v/v0.46.3.zip) =
CuZpDufZX5bTneML7FYEfR6Ruf+v0NVVCO9WTh38E7I=
-SHA256 (go_modules/cloud.google.com/go/bigquery/@v/v1.0.1.mod) =
mSISTdoOJp78FTZOomO/maQgsac2OHEAfrHLwtGx3Hw=
-SHA256 (go_modules/cloud.google.com/go/bigquery/@v/v1.0.1.zip) =
c40fcmziT2GO51Y/bJQZ5jB/iBRUj0WtiiJ8/7sUSMA=
-SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.0.0.mod) =
A0xS+1OSg3+NsnVIX7DpXRDmzSUw3Ty2c9fTUJ4WsuY=
-SHA256 (go_modules/cloud.google.com/go/datastore/@v/v1.0.0.zip) =
Qek+yVJq5YDakDANfkIabTnXnLYRjWKtHTwGQi2Kcb8=
-SHA256 (go_modules/cloud.google.com/go/firestore/@v/v1.1.0.mod) =
nJQs6dfFXQTC1H4wb3ZOtc4RvmDSbI22rdTsoow+4ig=
-SHA256 (go_modules/cloud.google.com/go/firestore/@v/v1.1.0.zip) =
QRVtIpxTxOXghFJPP+y7KnDQ7JrJivejBBPr2ejrSp4=
-SHA256 (go_modules/cloud.google.com/go/pubsub/@v/v1.0.1.mod) =
SB+3lg2As4sxevbIrYOJhyGKfymA2RtC9sfhZohgzEk=
-SHA256 (go_modules/cloud.google.com/go/pubsub/@v/v1.0.1.zip) =
i8pGp8Xw3NV20j+ppfEHlVMW1vDY8wbuHW+qfemcPSk=
-SHA256 (go_modules/cloud.google.com/go/storage/@v/v1.0.0.mod) =
o0tc2WleqzSwH4fy2d46BdD0ffsrwSMJLdRRDJ7HEhU=
-SHA256 (go_modules/cloud.google.com/go/storage/@v/v1.0.0.zip) =
uuxHVsVz7eWPGet65KyuvXrD8MVkE+y70hatRqWJpdo=
-SHA256
(go_modules/dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod)
= +sTF2PaC+eyXchsvyf1TBiqxcLLSt/q4/8EK4YOhlR4=
-SHA256
(go_modules/dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.zip)
= ylMwkB/NqD0JVTrDYldtGWxTEVe8nFAudrI3zKJitAA=
-SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.mod) =
KAIbQYClnDmTYHqVsY4jDdC8a+pSQv/o6ou/tPT3tNc=
-SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.zip) =
gVxuWUdF8tiEL/mksFacZpXmzf1eB+Wz2Y0GtyykHjw=
-SHA256
(go_modules/github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod)
= luveICsJL29NHzkwvAfPGKVpmZjd6lG5T+hYETspqNg=
-SHA256
(go_modules/github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.zip)
= 9Slix/vsqB6op3fR+LHx0lgD3EN/u0kPJTNEIyiEMo4=
-SHA256 (go_modules/github.com/!one!of!one/xxhash/@v/v1.2.2.mod) =
l7ZeMrMlElrr6MN8KHCeMIxaHGZOGnfd98SxsLltdzs=
-SHA256 (go_modules/github.com/!one!of!one/xxhash/@v/v1.2.2.zip) =
tKfU3QM+ljEsBrQ9QqZCXgCDfAJUdBvNVpyaCQmyb50=
SHA256 (go_modules/github.com/!vivid!cortex/ewma/@v/v1.1.1.mod) =
3qcgZM9b0EmfFqzs1BeItYegnmKl2a1c2NN4mCdhYTo=
SHA256 (go_modules/github.com/!vivid!cortex/ewma/@v/v1.1.1.zip) =
7r7nwPIOlqu9oWEe0qPSa0wsEDk8qmot/RYFdjpcGhI=
-SHA256
(go_modules/github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod)
= wCGTza/yP3AiRZc5CDL1aCUK84T5jcQ3iutb+P7GkPw=
-SHA256
(go_modules/github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.zip)
= ht4zN6R14yOg+1TvAzhqTklWgiAfQnlb175kbAUphpI=
-SHA256
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod)
= OCfpPXMq9WzJwaAz8pWZwTlzMN5FK7UWY9mJHHmYL1A=
-SHA256
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.zip)
= LJVeTQnBII9FQuCFFbW0CcNv+McM9HGtVoWetehvcnE=
-SHA256
(go_modules/github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod)
= JCKh4fO7lGhCnzbga85FR4EzakCXJi909d2lp1Tpvng=
-SHA256
(go_modules/github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip)
= OBnN4mzUslxAQ9yThNp7DBwp/Qbm46OGBPSmkz/AF+0=
-SHA256
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/14 04:40:39 Modified files: sysutils/dinit : Makefile distinfo sysutils/dinit/patches: patch-configs_mconfig_OpenBSD Log message: sysutils/dinit: update to version 0.18.0.
UPDATE: cutter-2.3.4
Hi,
An update to cutter, to be committed with the rizin update.
The local patch we had appears to have been applied upstream, so we no longer
need it.
Had a quick play around disassembling /bin/ls and looking at the control flow
graph. All seems to work.
OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/cutter/Makefile,v
diff -u -p -r1.20 Makefile
--- Makefile26 Sep 2023 17:58:05 - 1.20
+++ Makefile14 Apr 2024 09:44:30 -
@@ -1,10 +1,9 @@
COMMENT = RE platform powered by rizin
-V =2.1.0
+V =2.3.4
GH_ACCOUNT = rizinorg
GH_PROJECT = cutter
GH_TAGNAME = v${V}
-REVISION = 0
# Requires the translations submodule. For the next release there should be a
# proper vendored tarball and this step should not be needed.
Index: distinfo
===
RCS file: /cvs/ports/devel/cutter/distinfo,v
diff -u -p -r1.6 distinfo
--- distinfo12 Aug 2022 20:12:51 - 1.6
+++ distinfo14 Apr 2024 09:44:35 -
@@ -1,4 +1,4 @@
-SHA256 (cutter-2.1.0.tar.gz) = YKrOrRYEwtyK+tQjlzKtENWIKrOIKOaVwPU9HhNMKlw=
+SHA256 (cutter-2.3.4.tar.gz) = XcB9akkDzNtsAxMQqFN3eT7fJNwLiZDnCo9clK8GoqI=
SHA256 (cutter-translations-97429865.tar.gz) =
mp1Cdpwek2TfxpSWiwWZTQLqhAgTozsWympsvoDJAGk=
-SIZE (cutter-2.1.0.tar.gz) = 2732264
+SIZE (cutter-2.3.4.tar.gz) = 2699925
SIZE (cutter-translations-97429865.tar.gz) = 595073
Index: patches/patch-src_widgets_GraphGridLayout_cpp
===
RCS file: patches/patch-src_widgets_GraphGridLayout_cpp
diff -N patches/patch-src_widgets_GraphGridLayout_cpp
--- patches/patch-src_widgets_GraphGridLayout_cpp 18 Aug 2022 12:47:56
- 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-Fix build on 32-bit.
-
-Index: src/widgets/GraphGridLayout.cpp
src/widgets/GraphGridLayout.cpp.orig
-+++ src/widgets/GraphGridLayout.cpp
-@@ -547,7 +547,7 @@ void GraphGridLayout::calculateEdgeMainColumn(GraphGri
-
- struct Event
- {
--size_t blockId;
-+ut64 blockId;
- size_t edgeId;
- int row;
- enum Type { Edge = 0, Block = 1 } type;
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
UPDATE: rizin-0.7.2
btree.h +include/librz/rz_util/rz_regex.h include/librz/rz_util/rz_serialize.h include/librz/rz_util/rz_signal.h include/librz/rz_util/rz_spaces.h @@ -135,33 +141,26 @@ include/librz/rz_util/rz_strpool.h include/librz/rz_util/rz_subprocess.h include/librz/rz_util/rz_sys.h include/librz/rz_util/rz_table.h +include/librz/rz_util/rz_th_ht.h include/librz/rz_util/rz_time.h include/librz/rz_util/rz_tree.h include/librz/rz_util/rz_uleb128.h include/librz/rz_util/rz_utf16.h include/librz/rz_util/rz_utf32.h include/librz/rz_util/rz_utf8.h +include/librz/rz_util/rz_version.h include/librz/rz_util/rz_x509.h +include/librz/rz_util/set.h include/librz/rz_vector.h -include/librz/rz_version.h +include/librz/rz_windows.h include/librz/rz_windows_heap.h include/librz/sdb/ include/librz/sdb/buffer.h include/librz/sdb/cdb.h include/librz/sdb/cdb_make.h -include/librz/sdb/config.h -include/librz/sdb/ht_inc.h -include/librz/sdb/ht_pp.h -include/librz/sdb/ht_pu.h -include/librz/sdb/ht_up.h -include/librz/sdb/ht_uu.h include/librz/sdb/ls.h include/librz/sdb/sdb.h -include/librz/sdb/sdb_userconf.h -include/librz/sdb/sdb_version.h include/librz/sdb/sdbht.h -include/librz/sdb/set.h -include/librz/sdb/types.h include/librz/sflib/ include/librz/sflib/common/ include/librz/sflib/common/sfsocketcall.h @@ -305,7 +304,6 @@ lib/pkgconfig/rz_syscall.pc lib/pkgconfig/rz_type.pc lib/pkgconfig/rz_util.pc @man man/man1/rizin.1 -@man man/man1/rz-agent.1 @man man/man1/rz-asm.1 @man man/man1/rz-ax.1 @man man/man1/rz-bin.1 @@ -313,7 +311,6 @@ lib/pkgconfig/rz_util.pc @man man/man1/rz-find.1 @man man/man1/rz-gg.1 @man man/man1/rz-hash.1 -@man man/man1/rz-pm.1 @man man/man1/rz-run.1 @man man/man1/rz-sign.1 @man man/man7/rz-esil.7 @@ -354,8 +351,10 @@ share/rizin/cons/focus share/rizin/cons/gb share/rizin/cons/gentoo share/rizin/cons/lima +share/rizin/cons/mars share/rizin/cons/matrix share/rizin/cons/monokai +share/rizin/cons/nord share/rizin/cons/ogray share/rizin/cons/onedark share/rizin/cons/pink @@ -490,7 +489,9 @@ share/rizin/format/dll/dsound.sdb share/rizin/format/dll/gsprop32.sdb share/rizin/format/dll/iertutil.sdb share/rizin/format/dll/kernel32.sdb +share/rizin/format/dll/mfc100u.sdb share/rizin/format/dll/mfc120.sdb +share/rizin/format/dll/mfc140u.sdb share/rizin/format/dll/mfc30.sdb share/rizin/format/dll/mfc40.sdb share/rizin/format/dll/mfc42.sdb @@ -526,7 +527,6 @@ share/rizin/format/elf64 share/rizin/format/elf_enums share/rizin/format/mz share/rizin/format/pe32 -share/rizin/format/trx share/rizin/format/zip share/rizin/fortunes/ share/rizin/fortunes/fortunes.fun @@ -640,6 +640,7 @@ share/rizin/types/cc-riscv-64.sdb share/rizin/types/cc-sparc-32.sdb share/rizin/types/cc-spc700-16.sdb share/rizin/types/cc-sysz-64.sdb +share/rizin/types/cc-tricore-32.sdb share/rizin/types/cc-x86-16.sdb share/rizin/types/cc-x86-32.sdb share/rizin/types/cc-x86-64.sdb -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/04/03 09:44:40 Modified files: fonts/iosevka-fonts: Makefile.inc fonts/iosevka-fonts/aile: distinfo fonts/iosevka-fonts/default: distinfo fonts/iosevka-fonts/etoile: distinfo fonts/iosevka-fonts/slab: distinfo Log message: fonts/iosevka-fonts: update to version 29.0.5. Diff from Justin Berthault, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/02/16 08:09:13 Modified files: net/syncthing : Makefile net/syncthing/pkg: README Log message: net/syncthing: add docs for running as a normal user. Diff from Jag Talon, with tweaks from me. OK kn@, thanks.
Re: [Update] Add examples to Syncthing README
On Fri, Feb 16, 2024 at 09:56:08AM +, Edd Barrett wrote:
> kn@ is about to commit an update to syncthing. I'll add this change on top
> after.
Here's an updated diff.
I made a couple of tweaks:
- Added the required REVISION bump.
- You had `:openfiles-cur=4096:\` twice. I assume you meant openfiles-max for
the second occurance?
CC kn@. OK?
Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
diff -u -p -r1.61 Makefile
--- Makefile16 Feb 2024 10:04:39 - 1.61
+++ Makefile16 Feb 2024 11:11:32 -
@@ -1,6 +1,7 @@
COMMENT = open decentralized synchronization utility
V =1.27.3
+REVISION = 0
DISTNAME = syncthing-${V}
DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
Index: pkg/README
===
RCS file: /cvs/ports/net/syncthing/pkg/README,v
diff -u -p -r1.7 README
--- pkg/README 17 Dec 2023 15:43:12 - 1.7
+++ pkg/README 16 Feb 2024 11:15:17 -
@@ -62,13 +62,26 @@ Syncthing more file descriptors by addin
:openfiles-max=4096:\
:tc=daemon:
+If you run Syncthing manually, you can add the following to the appropriate
+login class. If you're in the staff login class, you can add the following
+lines under the staff section:
+
+ staff:\
+[...]
+:openfiles-cur=4096:\
+:openfiles-max=4096:\
+[...]
+
Don't forget to rebuild the login.conf.db file (if necessary):
-# [ -f /etc/login.conf.db ] && cap_mkdb /etc/login.conf
+ # [ -f /etc/login.conf.db ] && cap_mkdb /etc/login.conf
Note that in addition to ulimits, there is a kernel-level file descriptor limit
which may also need to be adjusted. This limit is managed through the
-kern.maxfiles sysctl(8).
+kern.maxfiles sysctl(8):
+
+ # sysctl kern.maxfiles=4096
+ # echo "kern.maxfiles=4096" >> /etc/sysctl.conf
Another option is to turn off the file watcher and use only periodic scans.
This will result in much reduced file descriptor usage at the cost of a
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
Re: [Update] Add examples to Syncthing README
On Mon, Feb 12, 2024 at 12:03:07PM -0500, Jag Talon wrote: > What do you think, edd@ ? Looks good to me. kn@ is about to commit an update to syncthing. I'll add this change on top after. Cheers -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: [UPDATE] devel/msgpack-6.0.0
On Sat, Feb 03, 2024 at 06:33:41PM +0900, SASANO Takayoshi wrote: > > editors/neovim Looks fine to me. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: Remove: x11/qt5/qtwebkit preparations
On Sun, Feb 04, 2024 at 08:25:13AM +0100, Rafael Sadowski wrote: > - net/qsyncthingtray: dead upstream? Looks very dead to me. Feel free to kill it. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: rust-analyzer: proc-macro support broken
Hi, On Mon, Jan 22, 2024 at 01:49:16PM +0100, Sebastien Marie wrote: > It would be interesting to know if it is enough for the user who > contacted you. FWIW, the user provided the minimal example I posted in my prior message. If that works, I think you have your answer. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
rust-analyzer: proc-macro support broken
Hi,
We imported rust-analyzer last week, and right off the bat I've had a user
report that it doesn't work right with proc macros.
src/main.rs:
```
[tokio::main]
async fn main() {
println!("Hello, world!");
}
```
Cargo.toml:
```
[package]
name = "pmtest"
version = "0.1.0"
edition = "2021"
[dependencies]
tokio = { version = "1.35.1", features = ["rt", "macros", "rt-multi-thread"] }
tokio-macros = "2.2.0"
```
`cargo check` succeeds, but vim's LSP tells me (at line 1):
```
■ proc macro `main` not expanded: cannot find proc-macro server in sysroot
`/usr/local`
```
Running with `RA_LOG=debug RA_LOG_FILE=ra.log` I don't see much useful in the
log file:
```
...
[DEBUG rust_analyzer::main_loop] Instant { tv_sec: 38661, tv_nsec: 903448618 }
handle_event(Diagnostics([(FileId(0), [Diagnostic { range: Range { start:
Position { line: 0, character: 0 }, end: Position { line: 0, character: 14 } },
severity: Some(Error), code: Some(String("unresolved-proc-macro")),
code_description: Some(CodeDescription { href: Url { scheme: "https",
cannot_be_a_base: false, username: "", password: None, host:
Some(Domain("rust-analyzer.github.io")), port: None, path: "/manual.html",
query: None, fragment: Some("unresolved-proc-macro") } }), source:
Some("rust-analyzer"), message: "proc macro `main` not expanded: cannot find
proc-macro server in sysroot `/usr/local`", related_information: None, tags:
None, data: None }])]))
[INFO rust_analyzer::main_loop] task queue len: 2
[DEBUG lsp_server::msg] >
{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"uri":"file:///vol/spinner/tmp/src/main.rs","diagnostics":[{"range":{"start":{"line":0,"character":0},"end":{"line":0,"character":14}},"severity":1,"code":"unresolved-proc-macro","codeDescription":{"href":"https://rust-analyzer.github.io/manual.html#unresolved-proc-macro"},"source":"rust-analyzer","message":"proc
macro `main` not expanded: cannot find proc-macro server in sysroot
`/usr/local`"}],"version":0}}
...
```
This does not occur when using the LSP with a rustup-installed toolchain on
Linux.
I don't recall seeing this error when I was building RA from source (the magic
command I used to use to build/install was `cargo xtask install --server`).
I notice that in the source code there is a crate called `proc-macro-srv` and
on my linux box there is a binary `rust-analyzer-proc-macro-srv`. Perhaps this
is missing?
I've not had time to look deeper, but wanted to report it here in case someone
already knows the fix.
Cheers
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/01/19 15:01:51 Modified files: fonts/iosevka-fonts: Makefile.inc fonts/iosevka-fonts/aile: Makefile distinfo fonts/iosevka-fonts/aile/pkg: DESCR PLIST fonts/iosevka-fonts/default: Makefile distinfo fonts/iosevka-fonts/default/pkg: DESCR PLIST fonts/iosevka-fonts/etoile: Makefile distinfo fonts/iosevka-fonts/etoile/pkg: DESCR PLIST fonts/iosevka-fonts/slab: Makefile distinfo fonts/iosevka-fonts/slab/pkg: PLIST Log message: fonts/iosevka-fonts: update to version 28.0.5. Also updates all the DESCR files so that the variant descriptions match those at: https://github.com/be5invis/Iosevka/blob/main/doc/PACKAGE-LIST.md Diff from Manuel Giraud. Thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/01/19 10:02:48 Modified files: devel : Makefile Log message: Link devel/rust-analyzer.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/01/19 10:01:39 Log message: Import devel/rust-analyzer. This is the result of combining independent porting efforts from gnezdo@ and Laurent Cheylus, with tweaks added from myself, Benjamin Stürz, tb@ and semarie@. OK semarie@ (tb@ OK'd an earlier attempt) Status: Vendor Tag: edd Release Tags: edd_20240119 N ports/devel/rust-analyzer/Makefile N ports/devel/rust-analyzer/crates.inc N ports/devel/rust-analyzer/distinfo N ports/devel/rust-analyzer/pkg/DESCR N ports/devel/rust-analyzer/pkg/PLIST N ports/devel/rust-analyzer/patches/patch-crates_sourcegen_src_lib_rs N ports/devel/rust-analyzer/patches/patch-crates_rust-analyzer_tests_slow-tests_tidy_rs No conflicts created by this import
Re: Add devel/rust-analyzer
Hi,
> I am unsure to properly understand here. You need rust,-src and rustfmt
> to build the port now ?
You're right, that's bogus. Fixed.
> post-build:
> cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/asciidoctor \
> docs/user/manual.adoc
Fixed, and using -safe.
> Please install both manual.html and manual.adoc. AsciiDoc format is
> readable in a terminal.
Fixed.
Diff to previous. OK?
diff -urNa /tmp/rust-analyzer/Makefile ./Makefile
--- /tmp/rust-analyzer/Makefile Fri Jan 19 11:16:07 2024
+++ ./Makefile Fri Jan 19 15:48:07 2024
@@ -14,9 +14,9 @@
RUN_DEPENDS = lang/rust,-src \
lang/rust,-rustfmt
-BUILD_DEPENDS =${RUN_DEPENDS} \
- textproc/ruby-rouge \
+BUILD_DEPENDS =textproc/ruby-rouge \
textproc/asciidoctor
+TEST_DEPENDS = lang/rust,-rustfmt
WANTLIB += ${MODCARGO_WANTLIB} m
@@ -34,12 +34,14 @@
# generate manual.html
post-build:
- asciidoctor ${WRKSRC}/docs/user/manual.adoc
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ${LOCALBASE}/bin/asciidoctor --safe docs/user/manual.adoc
DOCDIR = ${PREFIX}/share/doc/rust-analyzer
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/docs/user/manual.html ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/user/manual.adoc ${DOCDIR}
.include "crates.inc"
diff -urNa /tmp/rust-analyzer/pkg/PLIST ./pkg/PLIST
--- /tmp/rust-analyzer/pkg/PLISTFri Jan 19 11:13:23 2024
+++ ./pkg/PLIST Fri Jan 19 15:16:31 2024
@@ -1,3 +1,4 @@
@bin bin/rust-analyzer
share/doc/rust-analyzer/
+share/doc/rust-analyzer/manual.adoc
share/doc/rust-analyzer/manual.html
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
Re: Add devel/rust-analyzer
"Failed to run rustfmt from toolchain 'stable'. \
+- Please run `rustup component add rustfmt --toolchain stable`
to install it.",
+-);
++let version = cmd!(sh, "rustfmt --version").read().unwrap_or_default();
++// FIXME: OpenBSD's rustfmt doesn't report it's version correctly.
++// At the time of writing, `rustfmt --version` gives `rustfmt 1.7.0-`
(i.e. missing the
++// `-stable` suffix.
++if !version.contains("rustfmt") {
++panic!("Failed to run rustfmt from toolchain 'stable'.");
+ }
+ }
+
+@@ -146,13 +146,10 @@ pub fn reformat(text: String) -> String {
+ let sh = Shell::new().unwrap();
+ ensure_rustfmt();
+ let rustfmt_toml = project_root().join("rustfmt.toml");
+-let mut stdout = cmd!(
+-sh,
+-"rustup run stable rustfmt --config-path {rustfmt_toml} --config
fn_single_line=true"
+-)
+-.stdin(text)
+-.read()
+-.unwrap();
++let mut stdout = cmd!(sh, "rustfmt --config-path {rustfmt_toml} --config
fn_single_line=true")
++.stdin(text)
++.read()
++.unwrap();
+ if !stdout.ends_with('\n') {
+ stdout.push('\n');
+ }
diff -urNa rust-analyzer.old/pkg/PLIST rust-analyzer/pkg/PLIST
--- rust-analyzer.old/pkg/PLIST Fri Jan 19 10:49:54 2024
+++ rust-analyzer/pkg/PLIST Fri Jan 19 11:13:23 2024
@@ -1 +1,3 @@
@bin bin/rust-analyzer
+share/doc/rust-analyzer/
+share/doc/rust-analyzer/manual.html
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
ra.tgz
Description: application/tar-gz
Re: Add devel/rust-analyzer
On Thu, Jan 18, 2024 at 09:44:20AM -, Laurent Cheylus wrote: > The RDEP on lang/rust,-src is not optional, rust-analyzer tool needs Rust > sources to work properly. Agreed, but on the other hand, you may not be using the packaged version of Rust, in which case you'd point RUST_SRC_PATH elsewhere, and the packaged rust-src would be unused. Then again, given how difficult rust is to bootstrap on OpenBSD, I doubt anyone is using their own build of rust, so actually I'm fine with making rust-src a hard dependency. Also, disk is cheap. We should probably mention RUST_SRC_PATH in a package README. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/01/17 07:17:59 Modified files: editors/neovim : Makefile distinfo Log message: editors/neovim: simple update to version 0.9.5. Diff from Laurent Cheylus. Thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/01/09 08:59:26 Modified files: mail/isync : Makefile mail/isync/pkg : PLIST Added files: mail/isync/pkg : README Log message: mail/isync: Add README documenting implicit xoauth2 dependency. XOAUTH2 requires cyrus-sasl-xoauth2. OK kn@, thanks!
Re: mail/isync: improve an error message
On Tue, Jan 09, 2024 at 03:26:48PM +, Klemens Nanni wrote:
> README can always be read in advance, is easy to maintain and, imho, one
> of the first places to look at if you run into ports/package problems.
>
> This just makes more sense to me.
In that case, here is the first patch I wrote :)
Index: Makefile
===
RCS file: /cvs/ports/mail/isync/Makefile,v
diff -u -p -r1.57 Makefile
--- Makefile7 Nov 2023 14:19:36 - 1.57
+++ Makefile9 Jan 2024 13:59:35 -
@@ -1,7 +1,7 @@
COMMENT= synchronize IMAP4 and maildir mailboxes
DISTNAME= isync-1.4.4
-REVISION= 2
+REVISION= 3
CATEGORIES=mail
SITES= ${SITE_SOURCEFORGE:=isync/}
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/isync/pkg/PLIST,v
diff -u -p -r1.10 PLIST
--- pkg/PLIST 10 Mar 2022 12:03:32 - 1.10
+++ pkg/PLIST 9 Jan 2024 14:07:44 -
@@ -9,5 +9,6 @@ share/doc/isync/ChangeLog
share/doc/isync/NEWS
share/doc/isync/README
share/doc/isync/TODO
+share/doc/pkg-readmes/${PKGSTEM}
share/examples/isync/
share/examples/isync/mbsyncrc.sample
Index: pkg/README
===
RCS file: pkg/README
diff -N pkg/README
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/README 9 Jan 2024 14:15:49 -
@@ -0,0 +1,17 @@
++---
+| Running ${PKGSTEM} on OpenBSD
++---
+
+Using XOAUTH2
+=
+
+If you need to use the `XOAUTH2` authentication mechanism, then you will need
+to install the cyrus-sasl-xoauth2 package:
+
+# pkg_add cyrus-sasl-xoauth2
+
+Failure to do so gives a cryptic error message like:
+
+ IMAP error: selected SASL mechanism(s) not available;
+ selected: XOAUTH2
+ available: SCRAM-SHA-512 SCRAM-SHA-384...
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
Re: mail/isync: improve an error message
On Tue, Jan 09, 2024 at 03:04:39PM +, Klemens Nanni wrote: > Does XOAUTH2 appear in the list of available mechanisms once you install > that package? I assume so. The error goes away once the package is installed. > Either way, you can also hint at that package in DESCR or README in case > OAuth2 configuration is non-trivial. The first version of this diff was a README, but I figured that users may not look to a package README to fix that kind of error message, and that it might just be better to print the hint as part of the error message itself. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
mail/isync: improve an error message
Hi,
On a couple of occasions now I've wasted time deciphering this error message
from `mbsync`:
```
IMAP error: selected SASL mechanism(s) not available;
selected: XOAUTH2
available: SCRAM-SHA-512 SCRAM-SHA-384 SCRAM-SHA-256 SCRAM-SHA-224
SCRAM-SHA-1 DIGEST-MD5 EXTERNAL OTP CRAM-MD5 NTLM LOGIN PLAIN ANONYMOUS
```
In my case it's because I don't have the cyrus-sasl-xoauth2 package installed,
but that's not very obvious for a user.
This patch improves the error message with a hint that I hope will save others
(and my future self) some time.
If we like this, I can try an upstream it.
OK?
Index: Makefile
===
RCS file: /cvs/ports/mail/isync/Makefile,v
diff -u -p -r1.57 Makefile
--- Makefile7 Nov 2023 14:19:36 - 1.57
+++ Makefile9 Jan 2024 14:20:33 -
@@ -1,7 +1,7 @@
COMMENT= synchronize IMAP4 and maildir mailboxes
DISTNAME= isync-1.4.4
-REVISION= 2
+REVISION= 3
CATEGORIES=mail
SITES= ${SITE_SOURCEFORGE:=isync/}
Index: patches/patch-src_drv_imap_c
===
RCS file: /cvs/ports/mail/isync/patches/patch-src_drv_imap_c,v
diff -u -p -r1.12 patch-src_drv_imap_c
--- patches/patch-src_drv_imap_c11 Mar 2022 19:34:38 - 1.12
+++ patches/patch-src_drv_imap_c9 Jan 2024 14:39:36 -
@@ -1,4 +1,4 @@
-Use pledge.
+Use pledge and improve an error message.
Index: src/drv_imap.c
--- src/drv_imap.c.orig
@@ -12,6 +12,15 @@ Index: src/drv_imap.c
#ifdef HAVE_LIBSSL
enum { SSL_None, SSL_STARTTLS, SSL_IMAPS };
#endif
+@@ -2477,7 +2479,7 @@ imap_open_store_authenticate2( imap_store_t *ctx )
+ saslavail = "(none)";
+ if (!auth_login) {
+ error( "IMAP error: selected SASL mechanism(s) not
available;\n"
+- " selected:%s\n available: %s\n", saslmechs,
saslavail );
++ " selected:'%s'\n available: %s\nYou may
need to install a cyrus-sasl plugin\n", saslmechs, saslavail );
+ goto skipnote;
+ }
+ info( "NOT using available SASL mechanism(s): %s\n", saslavail
);
@@ -3768,6 +3770,8 @@ imap_parse_store( conffile_t *cfg, store_conf_t **stor
#endif
143;
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2024/01/08 03:33:09 Modified files: shells/zsh : Makefile Added files: shells/zsh/patches: patch-Completion_Unix_Type__diff_options Log message: shells/zsh: Fix diff(1) completions for OpenBSD. https://sourceforge.net/p/zsh/code/ci/996b51515600859ce7f952f22c6262ecd24578e1/ OK sthen@, thanks!
shells/zsh: fix diff(1) completions
Hi, I noticed that if you are using `compinit`, diff(1) completions don't work right. E.g. if you do `diff -u /etc/doas.conf /etc/exa` (expecting it to complete to `/etc/examples`), it won't complete. Mentioned this on their IRC channel and someone there by the name Mikachu pointed me to: https://sourceforge.net/p/zsh/code/ci/996b51515600859ce7f952f22c6262ecd24578e1/ The below diff applies that patch, thus fixing diff completions. Thanks to Mikachu! OK to commit? Index: Makefile === RCS file: /cvs/ports/shells/zsh/Makefile,v diff -u -p -r1.97 Makefile --- Makefile27 Sep 2023 16:41:31 - 1.97 +++ Makefile30 Dec 2023 13:20:31 - @@ -1,6 +1,7 @@ COMMENT= Z shell, Bourne shell-compatible V= 5.9 +REVISION= 0 DISTNAME= zsh-$V CATEGORIES=shells Index: patches/patch-Completion_Unix_Type__diff_options === RCS file: patches/patch-Completion_Unix_Type__diff_options diff -N patches/patch-Completion_Unix_Type__diff_options --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-Completion_Unix_Type__diff_options30 Dec 2023 13:26:53 - @@ -0,0 +1,75 @@ +Fix diff(1) completions for OpenBSD. + +https://sourceforge.net/p/zsh/code/ci/996b51515600859ce7f952f22c6262ecd24578e1/ + +Index: Completion/Unix/Type/_diff_options +--- Completion/Unix/Type/_diff_options.orig Completion/Unix/Type/_diff_options +@@ -133,33 +133,44 @@ else + case $OSTYPE in + openbsd*|solaris2.<9->) + of+=' -u -U' ++;| ++openbsd*|solaris*) ++ of+=' -n -C -D' ++;| ++solaris*) ++ of+=' -h' ++;| ++openbsd*) ++ of+=' -q' ++;| ++# modifications to "$of" should be done above this line so that it is ++# uniformly defined while constructing $args ++openbsd*|solaris2.<9->) + args+=( +- "($of)-u[output a unified diff]" +- "($of)-U+[output a unified diff]:lines of context" ++"($of)-u[output a unified diff]" ++"($of)-U+[output a unified diff]:lines of context" + ) + ;| + openbsd*|solaris*) + args+=( +- "($of)-C+[output a context diff]:lines of context" +- "($of)-D+[output merged file with preprocessor directives]:preprocessor symbol" +- '-i[case insensitive]' +- '-l[long output format (paginate with pr(1))]' +- '-s[report on identical files]' +- '-t[expand tabs in output lines]' ++"($of)-C+[output a context diff]:lines of context" ++"($of)-D+[output merged file with preprocessor directives]:preprocessor symbol" ++'-i[case insensitive]' ++'-s[report on identical files]' ++'-t[expand tabs in output lines]' + ) + ;| + solaris*) +- of+=' -h -n' + args+=( +- '-w[ignore all white space]' +- "($of)-h[do a fast, half-hearted job]" +- "($of)-n[output a reversed ed script]" ++'-w[ignore all white space]' ++"($of)-h[do a fast, half-hearted job]" ++"($of)-n[output a reversed ed script]" + '-S+[set first file in comparison]:start with file:_files' ++'-l[long output format (paginate with pr(1))]' + ) + ;; + openbsd*) +- of+=' -n -q -u -C -D -U' +- args=( ++ args+=( + "($of)-n[output an rcsdiff(1)-compatible diff]" + "($of)-q[only print a line when the files differ; does not produce a list of changes]" + '-a[treat all files as ASCII text]' +@@ -173,7 +184,7 @@ else + '-P[treat absent files in the second directory as if they were empty]' + '-S[start a directory diff from a file name]:file name:_files' + '*-X[exclude files and subdirectories whose basenames match lines in a file]:file name:_files' +-'-x[exclude files and subdirectories whose basenames match a pattern]:pattern' ++'*-x[exclude files and subdirectories whose basenames match a pattern]:pattern' + ) + ;; + esac -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: net/syncthing: update to 1.27.1
On Wed, Dec 27, 2023 at 07:37:36PM +0100, Paco Esteban wrote: > Builds and works fine for me on amd64. > Most of tests pass. The ones failing are network related which is > probably fine, as I use PORTS_PRIVSEP It's a known issue for the "connections" tests to fail: https://github.com/syncthing/syncthing/issues/8421 Is it those? -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/12/19 09:03:27 Modified files: audio/navidrome: Makefile audio/navidrome/pkg: navidrome.rc Log message: audio/navidrome: add daemon_logger to rc script. OK jca@, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/12/19 08:48:32 Modified files: editors/neovim : Makefile distinfo Log message: editors/neovim: Fix uv_close() crash. https://github.com/neovim/neovim/issues/25086 Diff from Laurent Cheylus, then tweaked by kn@.
Re: Patch to fix crash for neovim-0.9.4
On Tue, Dec 19, 2023 at 10:44:47AM +, Klemens Nanni wrote: > > Please, could you test and commit my patch if OK for you ? I'm running with your diff. If all is well by the end of the day, I'll commit. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: Dealing with daemons that don't behave like daemons in rc scripts
On Sat, Dec 09, 2023 at 01:03:31PM +, Edd Barrett wrote:
> (If we are fine with the general approach, and if this is something that we
> are
> going to need to do for other ports, perhaps it would be better for rc.d to
> have some kind of built-in support for using a daemon-wrapper? I don't know)
Maybe that'd look something like this:
```
--- rc.subr.origSat Dec 9 18:28:27 2023
+++ rc.subr Sat Dec 9 18:44:51 2023
@@ -174,7 +174,7 @@
}
rc_start() {
- rc_exec "${daemon} ${daemon_flags}"
+ rc_exec "${daemon_wrapper:+${daemon_wrapper} }${daemon} ${daemon_flags}"
}
```
With a rc script looking like this:
```
#!/bin/ksh
daemon="/usr/local/bin/navidrome"
daemon_user="_navidrome"
daemon_flags="-c /etc/navidrome.toml"
daemon_wrapper="/usr/local/sbin/daemon"
. /etc/rc.d/rc.subr
rc_reload=NO
rc_cmd $1
```
(Still doesn't start right when `daemon_logger` is set though)
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
Dealing with daemons that don't behave like daemons in rc scripts
Hi,
I'm in the middle of this ongoing saga to get audio/navidrome to be startable
at boot time via an rc script. Despite the moaning below, I do like it as a
music player/streamer.
The problem: navidrome doesn't behave like a daemon:
- it doesn't setsid(2)
- it doesn't background itself
- it doesn't log to syslog: it logs to stdout
- it dies when sent SIGHUP
This is an unfortunate thing to want to run from an rc script at boot time, as
what seems to happen is:
- rc(8) forks off a navidrome, navidrome starts
- when rc is done starting everything, it exits, taking the controlling
terminal away with it.
- any child that didn't setsid(2) is sent SIGHUP as a result
- navidrome didn't, it dies - amsuingly they bother to catch SIGHUP, but just
exit anyway.
This kind of "daemon" appears to be a trend fuelled by things like systemd,
which are happy to host such services.
Navidrome upstream pointed be at this design principle document they are
following, which AFAICS, is in conflict with traditional daemonisation (it
proposes to run in the foreground and only ever logging to stdout):
https://12factor.net/
I suspect (but have not confirmed) that this same problem that people are
having with node.js daemons:
https://marc.info/?l=openbsd-ports=169583837426245=2
Whether we like it or not, if that's the kind of thing third-party software
wants to do, then what can we do? We can either patch everything that does this
(which is laborious for us), or use a hack like FreeBSD's daemon(8) tool to
first setsid(2) and then exec(3) the software in question:
https://man.freebsd.org/cgi/man.cgi?query=daemon=0=0=FreeBSD+14.0-RELEASE+and+Ports=default=html
There's also this similar (but seemingly unmaintained) "daemonize" tool:
https://linux.die.net/man/1/daemonize
I'm therefore exploring whether we want to try to use a daemon-a-like tool to
help daemonise unwilling programs.
Disclaimer: Nothing you are going to see below is production ready. I'm just
hacking quickly and experimenting to see what works and what doesn't.
After reviewing FreeBSD daemon(8) and daemonize(1), I decided they are too
complicated, and we don't need more than half of their features. I very quickly
put together my own minimal `daemon` program:
https://github.com/vext01/daemon
It just does what sanitisation we can, calls daemon(3) (with `noclose=1` for
now) and execs the program you asked for. A quickly hacked together port is
attached.
Then with the diff below, navidrome can be started at boot time.
With this hack though, for some reason you can't use `daemon_logger` to have
the logs go to syslog. If you try, then the navidrome starts, but `rcctl start`
reports a timeout.
I suspect something clever needs to be done with `pexp` to have `rc_check()`
match when logger(1) is in the mix. I burned a couple of hours trying to figure
this out yesterday and eventually gave up. If someone knowledgeable about rc.d
could help, I'd be most grateful.
But Even without syslog support, at least now you can start the damned thing at
boot!
(If we are fine with the general approach, and if this is something that we are
going to need to do for other ports, perhaps it would be better for rc.d to
have some kind of built-in support for using a daemon-wrapper? I don't know)
What do people think about all of this? Dead end, or worthwhile?
Thanks
Index: Makefile
===
RCS file: /cvs/ports/audio/navidrome/Makefile,v
diff -u -p -r1.16 Makefile
--- Makefile4 Dec 2023 21:06:03 - 1.16
+++ Makefile9 Dec 2023 12:08:46 -
@@ -2,6 +2,7 @@ COMMENT = modern music server and stream
MODGO_MODNAME =github.com/navidrome/navidrome
MODGO_VERSION =v0.50.1
+REVISION = 0
DISTNAME = navidrome-${MODGO_VERSION}
@@ -27,7 +28,8 @@ WANTLIB += ${COMPILER_LIBCXX} pthread z
LIB_DEPENDS = audio/taglib
-RUN_DEPENDS = graphics/ffmpeg
+RUN_DEPENDS = graphics/ffmpeg \
+ sysutils/daemon
MODULES = lang/go
Index: pkg/navidrome.rc
===
RCS file: /cvs/ports/audio/navidrome/pkg/navidrome.rc,v
diff -u -p -r1.3 navidrome.rc
--- pkg/navidrome.rc30 Nov 2023 14:04:10 - 1.3
+++ pkg/navidrome.rc9 Dec 2023 12:08:25 -
@@ -1,12 +1,12 @@
#!/bin/ksh
-daemon="${TRUEPREFIX}/bin/navidrome"
+daemon="${LOCALBASE}/sbin/daemon"
daemon_user="_navidrome"
-daemon_flags="-c ${SYSCONFDIR}/navidrome.toml"
+daemon_flags="${TRUEPREFIX}/bin/navidrome -c ${SYSCONFDIR}/navidrome.toml"
. /etc/rc.d/rc.subr
-rc_bg=YES
+pexp="${daemon_flags}"
rc_reload=NO
rc_cmd $1
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
daemon.tgz
Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/12/07 11:47:58 Modified files: editors/py-neovim: Makefile distinfo editors/py-neovim/pkg: PLIST Removed files: editors/py-neovim/patches: patch-test_conftest_py Log message: editors/py-neovim: update to version 0.5.0. Diff from Justin Berthault, with tweaks from myself. Thanks
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/12/07 11:45:53 Modified files: fonts/iosevka-fonts: Makefile.inc fonts/iosevka-fonts/aile: Makefile fonts/iosevka-fonts/default: Makefile fonts/iosevka-fonts/etoile: Makefile fonts/iosevka-fonts/slab: Makefile Log message: fonts/iosevka-fonts: don't duplicate do-install. OK sdk@ and sthen@, thanks both.
iosevka: remove duplicated do-install
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?
Index: Makefile.inc
===
RCS file: /cvs/ports/fonts/iosevka-fonts/Makefile.inc,v
diff -u -p -r1.7 Makefile.inc
--- Makefile.inc21 Sep 2023 15:28:05 - 1.7
+++ Makefile.inc6 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/Makefile11 Mar 2022 19:00:20 - 1.2
+++ default/Makefile6 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
Re: [update] editors/py-neovim to 0.5.0
PY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/pynvim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pynvim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/pynvim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/pynvim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pynvim/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pynvim/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/pynvim/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynvim/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pynvim/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pynvim/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynvim/_version.py
lib/python${MODPY_VERSION}/site-packages/pynvim/api/
lib/python${MODPY_VERSION}/site-packages/pynvim/api/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pynvim/api/${MODPY_PYCACHE}/
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/12/04 14:06:04 Modified files: audio/navidrome: Makefile distinfo modules.inc audio/navidrome/files: navidrome.toml audio/navidrome/pkg: README Log message: audio/navidrome: update to version v0.50.1. OK sdk@, thanks!
Re: Node and rc.d
Hi Remi, On Thu, Sep 28, 2023 at 11:37:32AM +0400, Remi L. wrote: > While this workaround is effective for now, I'm still open to a more proper > solution if one comes up. If you or anyone else has any further insights, > I'd greatly appreciate it. I have the same issue with audio/navidrome: it starts fine manually, but not at boot time with the rc script. If I turn on verbose logging and add a `daemon_logger` to the rc.d script, then I can see from the logs that it comes up, but shortly after receives a SIGHUP, which causes it to stop dead. ``` Dec 4 20:44:11 arrakis navidrome[33817]: time="2023-12-04T20:44:11Z" level=info msg="> Navidrome server is ready!" address="0.0.0.0:4533" startupTime=357ms tlsEnabled=false ... Dec 4 20:44:12 arrakis navidrome[33817]: time="2023-12-04T20:44:12Z" level=info msg="Received termination signal" signal=hangup Dec 4 20:44:12 arrakis navidrome[33817]: time="2023-12-04T20:44:12Z" level=info msg="Stopping HTTP server" ``` Ignoring the fact that a SIGHUP should cause a daemon to *restart* (not halt), I still don't know where the SIGHUP is coming from. I wonder if this is the same issue as you are seeing with your Node stuff? So does anyone know where a SIGHUP might come from as the system is coming up? -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/30 07:04:10 Modified files: audio/navidrome: Makefile audio/navidrome/pkg: PLIST README navidrome.rc Added files: audio/navidrome/files: navidrome.toml Log message: audio/navidrome: use a config file. At the moment we encourage users to configure navidrome via command line arguments in the rc script. Besides that being a bit crusty, the next version of navidrome supports subsonic "jukebox mode" which can't be configured via the command line (only via a config file). This diff therefore makes the port install and use a config file. Input and OK sthen@, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/30 07:00:59 ports/audio/navidrome/files Update of /cvs/ports/audio/navidrome/files In directory cvs.openbsd.org:/tmp/cvs-serv27213/files Log Message: Directory /cvs/ports/audio/navidrome/files added to the repository
Re: audio/navidrome: use a config file
Morning Stuart,
Thanks for the fast reply.
On Thu, Nov 30, 2023 at 09:28:17AM +, Stuart Henderson wrote:
> I think in this case, if the user has overridden flags it should stay
> working, and the installed file seems to match what the old default
> flags do, ...
This is correct to my knowledge, so no need for a mention.
> > +# To allow other hosts to connect, change to "localhost".
>
> 0.0.0.0 rather than localhost. But according to
> https://www.navidrome.org/docs/usage/configuration-options/ the default
> is to bind to 0.0.0.0 _and_ ::, so it might be better for users to
> comment this out if they want to allow connections from other hosts.
> (Check that though, in case they really mean "listen to :: and hope it
> sees v4 too", like so many other programs).
I can confirm that when commenting out the `Addresss` line, other hosts can
connect via IPv4.
Updated diff (OK?):
Index: Makefile
===
RCS file: /cvs/ports/audio/navidrome/Makefile,v
diff -u -p -r1.14 Makefile
--- Makefile28 Nov 2023 06:22:47 - 1.14
+++ Makefile30 Nov 2023 09:48:45 -
@@ -2,6 +2,7 @@ COMMENT = modern music server and stream
MODGO_MODNAME =github.com/navidrome/navidrome
MODGO_VERSION =v0.49.3
+REVISION = 0
DISTNAME = navidrome-${MODGO_VERSION}
@@ -31,11 +32,14 @@ RUN_DEPENDS = graphics/ffmpeg
MODULES = lang/go
-SUBST_VARS = LOCALSTATEDIR
-
post-extract:
cd ${WRKSRC} && tar -C ${WRKSRC}/ui/ -zxf \
${FULLDISTDIR}/navidrome-build-${MODGO_VERSION}.tar.gz
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/navidrome
+ ${SUBST_CMD} -c -m 755 ${FILESDIR}/navidrome.toml \
+ ${PREFIX}/share/examples/navidrome/navidrome.toml
.include "modules.inc"
Index: files/navidrome.toml
===
RCS file: files/navidrome.toml
diff -N files/navidrome.toml
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/navidrome.toml30 Nov 2023 09:49:39 -
@@ -0,0 +1,15 @@
+# The address to bind to.
+#
+# To allow other hosts to connect, comment this line out.
+Address = "127.0.0.1"
+
+# Where Navidrome finds music.
+#
+# Make sure the _navidrome user has read access to the music files.
+MusicFolder = "${LOCALSTATEDIR}/navidrome/music"
+
+# Where Navidrome stores its database etc.
+DataFolder = "${LOCALSTATEDIR}/navidrome/"
+
+# Uncomment to make logging more verbose.
+#LogLevel = 'DEBUG'
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/navidrome/pkg/PLIST,v
diff -u -p -r1.4 PLIST
--- pkg/PLIST 28 Nov 2023 06:22:47 - 1.4
+++ pkg/PLIST 30 Nov 2023 10:08:53 -
@@ -6,6 +6,9 @@
@group _navidrome
@sample ${LOCALSTATEDIR}/navidrome/
@sample ${LOCALSTATEDIR}/navidrome/music/
+share/examples/navidrome/
+share/examples/navidrome/navidrome.toml
+@sample ${SYSCONFDIR}/navidrome.toml
@mode
@owner
@group
Index: pkg/README
===
RCS file: /cvs/ports/audio/navidrome/pkg/README,v
diff -u -p -r1.2 README
--- pkg/README 11 Mar 2022 18:20:21 - 1.2
+++ pkg/README 30 Nov 2023 09:50:07 -
@@ -2,20 +2,24 @@
| Running ${PKGSTEM} on OpenBSD
+---
+Config File
+===
+
+When using the included rc.d(8) script, ${PKGSTEM} uses the config file at
+`${SYSCONFDIR}/navidrome.toml`.
+
Adding Music
=
-Music can be added by copying it to ${VARBASE}/navidrome/music/ or by changing
-the `--datafolder` directory used.
+Music can be added by copying it to `${LOCALSTATEDIR}/navidrome/music/` or
+by changing `MusicFolder` in the config file.
Web Interface
=
-${PKGSTEM} serves up a web interface on:
-
-http://localhost:4533
+By default, ${PKGSTEM} serves up a web interface on:
-If you wish to listen on a different interface or change the location
-${PKGSTEM} looks for music, you can modify it via rcctl:
+http://127.0.0.1:4533
- # rcctl set navidrome flags -a 0.0.0.0 --datafolder /home/music
+If you wish to listen on a different address, change the `Address` setting in
+the config file.
Index: pkg/navidrome.rc
===
RCS file: /cvs/ports/audio/navidrome/pkg/navidrome.rc,v
diff -u -p -r1.2 navidrome.rc
--- pkg/navidrome.rc11 Mar 2022 18:20:21 - 1.2
+++ pkg/navidrome.rc30 Nov 2023 09:48:30 -
@@ -2,7 +2,7 @@
daemon="${TRUEPREFIX}/bin/navidrome"
daemon_user="_navidrome"
-daemon_flags="-a localhost --datafolder ${VARBASE}/navidrome --musicfolder
${VARBASE}/navidrome/music"
+daemon_flags="-c ${SYSCONFDIR}/navidrome.toml"
. /etc/rc.d/rc.subr
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
audio/navidrome: use a config file
Hi,
At the moment we encourage users to configure navidrome via command line
arguments in the rc script.
Besides that being a bit crusty, the next version of navidrome supports
subsonic "jukebox mode" which can't be configured via the command line (only
via a config file).
This diff therefore makes the port install and use a config file.
While here, remove adding LOCALSTATEDIR to SUBST_VARS (it's already there), and
update a straggling VARBASE in the pkg README.
Questions:
- Did I use LOCALSTATEDIR correctly?
- Do we need to mention this change on -current.html?
(Once this is in, I'll post a diff to update to the latest version)
Comments, OK?
Index: Makefile
===
RCS file: /cvs/ports/audio/navidrome/Makefile,v
diff -u -p -r1.14 Makefile
--- Makefile28 Nov 2023 06:22:47 - 1.14
+++ Makefile29 Nov 2023 19:20:26 -
@@ -2,6 +2,7 @@ COMMENT = modern music server and stream
MODGO_MODNAME =github.com/navidrome/navidrome
MODGO_VERSION =v0.49.3
+REVISION = 0
DISTNAME = navidrome-${MODGO_VERSION}
@@ -31,11 +32,16 @@ RUN_DEPENDS = graphics/ffmpeg
MODULES = lang/go
-SUBST_VARS = LOCALSTATEDIR
+LOCALSTATEDIR =${BASELOCALSTATEDIR}/navidrome
post-extract:
cd ${WRKSRC} && tar -C ${WRKSRC}/ui/ -zxf \
${FULLDISTDIR}/navidrome-build-${MODGO_VERSION}.tar.gz
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/navidrome
+ ${SUBST_CMD} -c -m 755 ${FILESDIR}/navidrome.toml \
+ ${PREFIX}/share/examples/navidrome/navidrome.toml
.include "modules.inc"
Index: files/navidrome.toml
===
RCS file: files/navidrome.toml
diff -N files/navidrome.toml
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/navidrome.toml30 Nov 2023 08:25:59 -
@@ -0,0 +1,15 @@
+# The address to bind to.
+#
+# To allow other hosts to connect, change to "localhost".
+Address = "127.0.0.1"
+
+# Where Navidrome finds music.
+#
+# Make sure the _navidrome user has read access to the music files.
+MusicFolder = "${LOCALSTATEDIR}/music"
+
+# Where Navidrome stores its database etc.
+DataFolder = "${LOCALSTATEDIR}"
+
+# Uncomment to make logging more verbose.
+#LogLevel = 'DEBUG'
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/navidrome/pkg/PLIST,v
diff -u -p -r1.4 PLIST
--- pkg/PLIST 28 Nov 2023 06:22:47 - 1.4
+++ pkg/PLIST 29 Nov 2023 19:19:35 -
@@ -4,8 +4,11 @@
@mode 755
@owner _navidrome
@group _navidrome
-@sample ${LOCALSTATEDIR}/navidrome/
-@sample ${LOCALSTATEDIR}/navidrome/music/
+@sample ${LOCALSTATEDIR}/
+@sample ${LOCALSTATEDIR}/music/
+share/examples/navidrome/
+share/examples/navidrome/navidrome.toml
+@sample ${SYSCONFDIR}/navidrome.toml
@mode
@owner
@group
Index: pkg/README
===
RCS file: /cvs/ports/audio/navidrome/pkg/README,v
diff -u -p -r1.2 README
--- pkg/README 11 Mar 2022 18:20:21 - 1.2
+++ pkg/README 30 Nov 2023 08:34:11 -
@@ -2,20 +2,24 @@
| Running ${PKGSTEM} on OpenBSD
+---
+Config File
+===
+
+When using the included rc.d(8) script, ${PKGSTEM} uses the config file at
+`${SYSCONFDIR}/navidrome.toml`.
+
Adding Music
=
-Music can be added by copying it to ${VARBASE}/navidrome/music/ or by changing
-the `--datafolder` directory used.
+Music can be added by copying it to `${LOCALSTATEDIR}/music/` or by changing
+`MusicFolder` in the config file.
Web Interface
=
-${PKGSTEM} serves up a web interface on:
-
-http://localhost:4533
+By default, ${PKGSTEM} serves up a web interface on:
-If you wish to listen on a different interface or change the location
-${PKGSTEM} looks for music, you can modify it via rcctl:
+http://127.0.0.1:4533
- # rcctl set navidrome flags -a 0.0.0.0 --datafolder /home/music
+If you wish to listen on a different address, change the `Address` setting in
+the config file.
Index: pkg/navidrome.rc
===
RCS file: /cvs/ports/audio/navidrome/pkg/navidrome.rc,v
diff -u -p -r1.2 navidrome.rc
--- pkg/navidrome.rc11 Mar 2022 18:20:21 - 1.2
+++ pkg/navidrome.rc29 Nov 2023 18:58:43 -
@@ -2,7 +2,7 @@
daemon="${TRUEPREFIX}/bin/navidrome"
daemon_user="_navidrome"
-daemon_flags="-a localhost --datafolder ${VARBASE}/navidrome --musicfolder
${VARBASE}/navidrome/music"
+daemon_flags="-c ${SYSCONFDIR}/navidrome.toml"
. /etc/rc.d/rc.subr
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
Re: fonts/iosevka-fonts: fix packaging of slab variant
On Fri, Nov 17, 2023 at 05:19:14PM +0100, Florian Obser wrote: > I see this already went in. Thanks for fixing this up. No worries. There are a couple of other tweaks coming soon too. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/17 08:23:42 Modified files: sysutils/dinit : Makefile distinfo sysutils/dinit/patches: patch-configs_mconfig_OpenBSD sysutils/dinit/pkg: PLIST Log message: sysutils/dinit: Update to version 0.17.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/17 07:22:28 Modified files: net/syncthing : Makefile distinfo net/syncthing/patches: patch-build_go patch-lib_build_build_go Log message: net/syncthing: update to version 1.26.1. Diff from Justin Berthault, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/17 05:29:14 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: devel/quirks: 'iosevka-fixed-slab' => 'iosevka-slab' OK sthen@, thanks.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/17 05:28:09 Modified files: fonts/iosevka-fonts: Makefile Added files: fonts/iosevka-fonts/slab: Makefile distinfo fonts/iosevka-fonts/slab/pkg: DESCR PLIST Removed files: fonts/iosevka-fonts/fixed-slab: Makefile distinfo fonts/iosevka-fonts/fixed-slab/pkg: DESCR PLIST Log message: fonts/iosevka-fonts: fix packaging of slab variant. The iosevka-fixed-slab SUBDIR packages what upstream calls a "sub-package", but all the other SUBDIRs package a top-level upstream package. For details of top-level and sub- iosevka packages look at: https://github.com/be5invis/Iosevka/blob/main/doc/PACKAGE-LIST.md We want consistency. I don't think it's worth packaging at such a fine-grained level as sub-packages, so I propose that each SUBDIR should be a top-level iosevka package. Therefore, this diff removes the `fixed-slab` SUBDIR in favour of a `slab` SUBDIR. Follow up commit for quirks coming soon. OK sthen@, thanks.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/17 05:21:55 ports/fonts/iosevka-fonts/slab/pkg Update of /cvs/ports/fonts/iosevka-fonts/slab/pkg In directory cvs.openbsd.org:/tmp/cvs-serv92399/slab/pkg Log Message: Directory /cvs/ports/fonts/iosevka-fonts/slab/pkg added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/17 05:21:24 ports/fonts/iosevka-fonts/slab Update of /cvs/ports/fonts/iosevka-fonts/slab In directory cvs.openbsd.org:/tmp/cvs-serv74597/slab Log Message: Directory /cvs/ports/fonts/iosevka-fonts/slab added to the repository
fonts/iosevka-fonts: fix packaging of slab variant
slab-thin.ttc
Index: fonts/iosevka-fonts/slab/Makefile
===
RCS file: fonts/iosevka-fonts/slab/Makefile
diff -N fonts/iosevka-fonts/slab/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ fonts/iosevka-fonts/slab/Makefile 16 Nov 2023 21:41:27 -
@@ -0,0 +1,10 @@
+COMMENT = slender typeface for code (slab variant)
+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
Index: fonts/iosevka-fonts/slab/distinfo
===
RCS file: fonts/iosevka-fonts/slab/distinfo
diff -N fonts/iosevka-fonts/slab/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -
+++ fonts/iosevka-fonts/slab/distinfo 16 Nov 2023 20:37:03 -
@@ -0,0 +1,2 @@
+SHA256 (ttc-iosevka-slab-26.0.1.zip) =
D/eU0IbtPQSKive0iLQ+ffTfrAfjDvTfvNGvQPWJy2E=
+SIZE (ttc-iosevka-slab-26.0.1.zip) = 100746070
Index: fonts/iosevka-fonts/slab/pkg/DESCR
===
RCS file: fonts/iosevka-fonts/slab/pkg/DESCR
diff -N fonts/iosevka-fonts/slab/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -
+++ fonts/iosevka-fonts/slab/pkg/DESCR 16 Nov 2023 21:50:17 -
@@ -0,0 +1,3 @@
+Coders' typeface, built from code.
+
+This package is for the slab (monospace, slab-serif) variant.
Index: fonts/iosevka-fonts/slab/pkg/PLIST
===
RCS file: fonts/iosevka-fonts/slab/pkg/PLIST
diff -N fonts/iosevka-fonts/slab/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -
+++ fonts/iosevka-fonts/slab/pkg/PLIST 16 Nov 2023 20:52:11 -
@@ -0,0 +1,13 @@
+@conflict iosevka-fixed-slab-*
+@pkgpath fonts/iosevka-fonts/fixed-slab
+share/fonts/
+@fontdir share/fonts/iosevka/
+share/fonts/iosevka/iosevka-slab-bold.ttc
+share/fonts/iosevka/iosevka-slab-extrabold.ttc
+share/fonts/iosevka/iosevka-slab-extralight.ttc
+share/fonts/iosevka/iosevka-slab-heavy.ttc
+share/fonts/iosevka/iosevka-slab-light.ttc
+share/fonts/iosevka/iosevka-slab-medium.ttc
+share/fonts/iosevka/iosevka-slab-regular.ttc
+share/fonts/iosevka/iosevka-slab-semibold.ttc
+share/fonts/iosevka/iosevka-slab-thin.ttc
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
diff -u -p -r1.1574 Makefile
--- devel/quirks/Makefile 15 Nov 2023 13:39:27 - 1.1574
+++ devel/quirks/Makefile 16 Nov 2023 20:40:03 -
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-6.190
+PKGNAME = quirks-6.191
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -p -r1.1586 Quirks.pm
--- devel/quirks/files/Quirks.pm15 Nov 2023 13:39:27 - 1.1586
+++ devel/quirks/files/Quirks.pm16 Nov 2023 20:39:02 -
@@ -801,6 +801,7 @@ my $stem_extensions = {
'py-intervaltree' => 'py3-intervaltree',
'py-sortedcontainers' => 'py3-sortedcontainers',
'py-future' => 'py3-future',
+ 'iosevka-fixed-slab' => 'iosevka-slab',
};
my $obsolete_reason = {};
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/14 05:05:43 Modified files: shells/yash: Makefile Added files: shells/yash/patches: patch-lineedit_editing_c Log message: shells/yash: Fix a buffer overflow in emacs-capitalize-word. Found by me, fixed by upstream. OK sthen@, thanks.
shells/yash: fix a buffer overflow
Hi,
When experimenting with yash, I found a crash.
Reported it and upstream fixed it quickly. Diff to our port below.
OK?
Index: Makefile
===
RCS file: /cvs/ports/shells/yash/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile21 Sep 2023 14:00:28 - 1.14
+++ Makefile13 Nov 2023 20:28:31 -
@@ -1,6 +1,7 @@
COMMENT= POSIX-compliant command line shell
VERSION= 2.55
+REVISION = 0
DISTNAME= yash-${VERSION}
CATEGORIES=shells
HOMEPAGE= https://magicant.github.io/yash/
Index: patches/patch-lineedit_editing_c
===
RCS file: patches/patch-lineedit_editing_c
diff -N patches/patch-lineedit_editing_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lineedit_editing_c13 Nov 2023 20:28:15 -
@@ -0,0 +1,20 @@
+Don't overrun buffer in emacs-capitalize-word.
+
+https://github.com/magicant/yash/commit/6a60fd9747d0170c396322e9466734e7c6567b54
+
+Index: lineedit/editing.c
+--- lineedit/editing.c.orig
lineedit/editing.c
+@@ -3199,8 +3199,10 @@ void cmd_emacs_capitalize_word(wchar_t c __attribute__
+ do {
+ while (*s != L'\0' && !iswalnum(*s))
+ s++;
+- *s = towupper(*s);
+- s++;
++ if (*s != L'\0') {
++ *s = towupper(*s);
++ s++;
++ }
+ while (*s != L'\0' && iswalnum(*s))
+ s++;
+ } while (*s != L'\0' && --count > 0);
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/11 02:02:29 Modified files: fonts/iosevka-fonts: Makefile Added files: fonts/iosevka-fonts/aile: Makefile distinfo fonts/iosevka-fonts/aile/pkg: DESCR PLIST Log message: fonts/iosevka-fonts: add the Aile variant. Diff from Manuel Giraud. Thanks.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/11 01:59:37 ports/fonts/iosevka-fonts/aile/pkg Update of /cvs/ports/fonts/iosevka-fonts/aile/pkg In directory cvs.openbsd.org:/tmp/cvs-serv83543/aile/pkg Log Message: Directory /cvs/ports/fonts/iosevka-fonts/aile/pkg added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/11/11 01:57:43 ports/fonts/iosevka-fonts/aile Update of /cvs/ports/fonts/iosevka-fonts/aile In directory cvs.openbsd.org:/tmp/cvs-serv25307/aile Log Message: Directory /cvs/ports/fonts/iosevka-fonts/aile added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/10/13 13:30:15 Modified files: editors/neovim : Makefile distinfo editors/neovim/patches: patch-static-deps_luajit_src_host_buildvm_asm_c patch-static-deps_luajit_src_lj_arch_h editors/neovim/pkg: PLIST Log message: editors/neovim: update to version 0.9.4. Diff from Laurent Cheylus. OK kn@. Thanks both.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/10/13 13:24:39 Modified files: books/tex-by-topic: Makefile distinfo Added files: books/tex-by-topic/patches: patch-Makefile Log message: books/tex-by-topic: update to version 20230810. Needed to build with TeX Live 2023. I contacted the author asking if he will be making any more formal releases, and he said he won't be. Hence using a git snapshot.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/10/13 13:16:16 ports/books/tex-by-topic/patches Update of /cvs/ports/books/tex-by-topic/patches In directory cvs.openbsd.org:/tmp/cvs-serv28566/patches Log Message: Directory /cvs/ports/books/tex-by-topic/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/10/13 13:15:18 Modified files: print/texlive : Makefile.inc print/texlive/base: Makefile distinfo print/texlive/base/patches: patch-texk_dvisvgm_dvisvgm-src_src_Makefile_in patch-texk_web2c_luatexdir_lua_luatex-core_c print/texlive/base/pkg: PLIST-main PLIST-mktexlsr PLIST-synctex README-main print/texlive/texmf: Makefile adj.mk distinfo symlinks.mk print/texlive/texmf/files: mk_adj.py update_plist_hints.py write_plists.py print/texlive/texmf/patches: patch-texmf-dist_doc_man_man1_bib2gls_1 patch-texmf-dist_doc_man_man1_convertgls2bib_1 patch-texmf-dist_web2c_texmf_cnf patch-texmf-dist_web2c_texmfcnf_lua print/texlive/texmf/pkg: PLIST-buildset PLIST-context PLIST-docs PLIST-full PLIST-main Added files: print/texlive/texmf/patches: patch-texmf-dist_doc_info_latex2e-es_info patch-texmf-dist_scripts_context_lua_mtxrun_lua patch-texmf-dist_tex_context_base_mkiv_data-res_lua print/texlive/texmf/pkg: MESSAGE-context Removed files: print/texlive/base/patches: patch-texk_dvisvgm_dvisvgm-src_src_Ghostscript_cpp print/texlive/texmf/patches: patch-texmf-dist_scripts_context_stubs_unix_mtxrun Log message: print/texlive: Update to 2023. Unfortunately I was unable to get ConTeXt working with the new luametatex engine, so ConTeXt is broken for now. I will attempt to fix it at some point, but in the meantime, we can't let it block the TeX Live update. OK, tb@, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/10/13 10:25:57 Modified files: print : Makefile Log message: Link print/luametatex.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/10/13 10:24:49 Log message: Import print/luametatex. Minimal TeX engine for use with ConTeXt. OK tb@, thanks. Status: Vendor Tag: edd Release Tags: edd_20231013 N ports/print/luametatex/Makefile N ports/print/luametatex/distinfo N ports/print/luametatex/pkg/DESCR N ports/print/luametatex/pkg/PLIST No conflicts created by this import
Re: UPDATE: neovim-0.9.2
Hi, Thanks for the tweaks. On Thu, Sep 28, 2023 at 11:21:22AM +0100, Stuart Henderson wrote: > no big opinion on before/after 7.4, though I would tend not to unless > it fixes something important, given that there are some fairly machine- > dependent parts to the build which have changed i.e. new luajit version, > and we probably won't learn about breakage on some archs until it's > too late to fix Here's the release notes: https://github.com/neovim/neovim/releases/tag/v0.9.2 It's hard to say if any of that is important, but unless anyone has other thoughts, I'd say wait until after lock. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
UPDATE: neovim-0.9.2
Hi,
Relatively simple update to neovim.
Only lightly tested. Please try it out.
OK?
Index: Makefile
===
RCS file: /cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile21 Sep 2023 12:22:34 - 1.38
+++ Makefile23 Sep 2023 11:00:20 -
@@ -13,8 +13,7 @@ COMMENT = continuation and extension of
GH_ACCOUNT = neovim
GH_PROJECT = neovim
-GH_TAGNAME = v0.9.1
-REVISION = 0
+GH_TAGNAME = v0.9.2
# embedded luajit
USE_NOBTCFI = Yes
@@ -24,8 +23,8 @@ HOMEPAGE =https://neovim.io
MAINTAINER = Edd Barrett
# The versions listed here must match those in cmake.deps/CMakeLists.txt.
-LUV_VER = 093a977b82077591baefe1e880d37dfa2730bd54
-LUAJIT_VER = 505e2c03de35e2718eef0d2d3660712e06dadf1f
+LUV_VER = 1.45.0-0
+LUAJIT_VER = 03c31124cc3b521ef54fe398e10fa55660a5057d
LUACOMPAT_VER =v0.9
SITES.a = https://github.com/luvit/luv/archive/
@@ -85,7 +84,7 @@ CONFIGURE_ARGS += -DUSE_BUNDLED=OFF \
-DLIBLUV_INCLUDE_DIR=${STATIC_DEPS_INST}/include \
-DLIBLUV_LIBRARY=${STATIC_DEPS_INST}/lib/libluv.a
.if ${EMBED_LUAJIT} == "Yes"
-CONFIGURE_ARGS += -DLUA_PRG=${STATIC_DEPS_INST}/bin/luajit-2.1.0-beta3 \
+CONFIGURE_ARGS += -DLUA_PRG=${STATIC_DEPS_INST}/bin/luajit \
-DLUAJIT_INCLUDE_DIR=${STATIC_DEPS_INST}/include/luajit-2.1 \
-DLUAJIT_LIBRARY=${STATIC_DEPS_INST}/lib/libluajit-5.1.a
.else
Index: distinfo
===
RCS file: /cvs/ports/editors/neovim/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo5 Jun 2023 13:22:15 - 1.20
+++ distinfo23 Sep 2023 11:00:20 -
@@ -1,8 +1,8 @@
SHA256 (lua-compat-5.3-v0.9.tar.gz) =
rQVUDS2WpIclu3mh3vNc9mUqTi7CY3biYXyM4rqm9BY=
-SHA256 (luajit-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz) =
Z8iDmbkBoi6aI29Ld+b+Oa8A9rcUTOndb1EUHZIfEHY=
-SHA256 (luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz) =
Iis4tkJfCSYhjhTn2oFIH93m+WYMH+rCWlPm+1LohuY=
-SHA256 (neovim-0.9.1.tar.gz) = jbF8Kh9HdtzaAOWUieoNmLqC99Go6gMoHWQOWNijoA4=
+SHA256 (luajit-03c31124cc3b521ef54fe398e10fa55660a5057d.tar.gz) =
YdzHrj9UOuPMMOZtsGDjHip35L407mXjcMlT0RK01gw=
+SHA256 (luv-1.45.0-0.tar.gz) = l+iZQPnuqo37NPHBn4DdNzKZxCcZ0VIo7HkPQV1OSWU=
+SHA256 (neovim-0.9.2.tar.gz) = BrhRi61CN6KKZ6T7wW7DJYHzXyFrJ/TJg0es7n9fs2k=
SIZE (lua-compat-5.3-v0.9.tar.gz) = 53599
-SIZE (luajit-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz) = 1075264
-SIZE (luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz) = 127241
-SIZE (neovim-0.9.1.tar.gz) = 11567358
+SIZE (luajit-03c31124cc3b521ef54fe398e10fa55660a5057d.tar.gz) = 1073919
+SIZE (luv-1.45.0-0.tar.gz) = 130334
+SIZE (neovim-0.9.2.tar.gz) = 11580390
Index: patches/patch-static-deps_luajit_src_host_buildvm_asm_c
===
RCS file:
/cvs/ports/editors/neovim/patches/patch-static-deps_luajit_src_host_buildvm_asm_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-static-deps_luajit_src_host_buildvm_asm_c
--- patches/patch-static-deps_luajit_src_host_buildvm_asm_c 11 Mar 2022
18:58:33 - 1.2
+++ patches/patch-static-deps_luajit_src_host_buildvm_asm_c 23 Sep 2023
11:00:20 -
@@ -3,7 +3,7 @@
Index: static-deps/luajit/src/host/buildvm_asm.c
--- static-deps/luajit/src/host/buildvm_asm.c.orig
+++ static-deps/luajit/src/host/buildvm_asm.c
-@@ -327,7 +327,7 @@ void emit_asm(BuildCtx *ctx)
+@@ -330,7 +330,7 @@ void emit_asm(BuildCtx *ctx)
#if !(LJ_TARGET_PS3 || LJ_TARGET_PSVITA)
fprintf(ctx->fp, "\t.section .note.GNU-stack,\"\"," ELFASM_PX
"progbits\n");
#endif
Index: patches/patch-static-deps_luajit_src_lj_arch_h
===
RCS file:
/cvs/ports/editors/neovim/patches/patch-static-deps_luajit_src_lj_arch_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-static-deps_luajit_src_lj_arch_h
--- patches/patch-static-deps_luajit_src_lj_arch_h 4 Jul 2022 14:49:03
- 1.3
+++ patches/patch-static-deps_luajit_src_lj_arch_h 23 Sep 2023 11:00:20
-
@@ -5,7 +5,7 @@ ignore the gcc version check ifdef hell
Index: static-deps/luajit/src/lj_arch.h
--- static-deps/luajit/src/lj_arch.h.orig
+++ static-deps/luajit/src/lj_arch.h
-@@ -432,7 +432,7 @@
+@@ -445,7 +445,7 @@
/* -- Checks for requirements - */
/* Check for minimum required compiler versions. */
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/09/23 04:58:37 Modified files: math/wxMaxima : Makefile Log message: x11/wxMaxima: drop MAINTAINER. I don't use this any more, but I do hope we keep it :)
Re: UPDATE: TeX Live (ConTeXt users, please read)
On Fri, Sep 08, 2023 at 08:54:48PM +0100, Edd Barrett wrote: > I'll do another bulk shortly to double check my work. Bulk all built fine. Has anyone had a chance to do some testing? Cheers -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/09/08 12:53:52 Modified files: print/xournalpp: Makefile distinfo print/xournalpp/patches: patch-CMakeLists_txt patch-man_CMakeLists_txt patch-src_util_Stacktrace_cpp print/xournalpp/pkg: PLIST Added files: print/xournalpp/patches: patch-src_core_control_settings_LatexSettings_h patch-src_core_control_settings_Settings_h Removed files: print/xournalpp/patches: patch-src_control_settings_LatexSettings_h patch-src_control_settings_Settings_cpp Log message: print/xournalpp: update to version 1.2.1. OK sthen@, thanks.
UPDATE: xournal++-1.2.1
Hi,
An update to the latest.
A bit of flux due to source files moving around a bit.
OK?
Index: Makefile
===
RCS file: /cvs/ports/print/xournalpp/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile24 Apr 2023 11:41:25 - 1.2
+++ Makefile6 Sep 2023 14:30:00 -
@@ -2,8 +2,7 @@ COMMENT = handwriting notetaking with PD
GH_ACCOUNT = xournalpp
GH_PROJECT = xournalpp
-GH_TAGNAME = v1.1.3
-REVISION = 0
+GH_TAGNAME = v1.2.1
CATEGORIES = print graphics productivity
@@ -14,9 +13,9 @@ MAINTAINER = Edd Barrett =1970p0 \
print/poppler \
- x11/gtk+3
+ x11/gtk+3 \
+ x11/gtksourceview4
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+4,-guic
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/src/control/settings/LatexSettings.h
+ ${SUBST_CMD} ${WRKSRC}/src/core/control/settings/LatexSettings.h
${SUBST_CMD} ${WRKSRC}/src/util/Stacktrace.cpp
.include
Index: distinfo
===
RCS file: /cvs/ports/print/xournalpp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo19 Apr 2023 08:17:35 - 1.1.1.1
+++ distinfo6 Sep 2023 13:44:15 -
@@ -1,2 +1,2 @@
-SHA256 (xournalpp-1.1.3.tar.gz) = UCHHqPU2h+2zp1ngecVNI9WRjYP40fX80Iodos6BvYs=
-SIZE (xournalpp-1.1.3.tar.gz) = 15096883
+SHA256 (xournalpp-1.2.1.tar.gz) = H0RTN9gLv3rmqKXnSXXQo7hMtUbdzv1+ZEjhV4Aa6eg=
+SIZE (xournalpp-1.2.1.tar.gz) = 16702391
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/print/xournalpp/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt19 Apr 2023 08:17:35 - 1.1.1.1
+++ patches/patch-CMakeLists_txt6 Sep 2023 14:01:27 -
@@ -3,12 +3,12 @@ install the desktop files on OpenBSD too
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -272,7 +272,7 @@ install (DIRECTORY resources
- )
+@@ -324,7 +324,7 @@ install(DIRECTORY resources
+ )
# Install desktop shortcuts for Linux
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if ((${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR (${CMAKE_SYSTEM_NAME} MATCHES
"OpenBSD"))
- message ("Installing desktop files")
+ message("Installing desktop files")
- # Install icons
+ # Install icons
Index: patches/patch-man_CMakeLists_txt
===
RCS file: /cvs/ports/print/xournalpp/patches/patch-man_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-man_CMakeLists_txt
--- patches/patch-man_CMakeLists_txt19 Apr 2023 08:17:35 - 1.1.1.1
+++ patches/patch-man_CMakeLists_txt6 Sep 2023 13:53:17 -
@@ -3,18 +3,18 @@ Don't install compressed man pages.
Index: man/CMakeLists.txt
--- man/CMakeLists.txt.orig
+++ man/CMakeLists.txt
-@@ -9,27 +9,23 @@ mark_as_advanced(HELP2MAN)
+@@ -12,27 +12,23 @@ mark_as_advanced(HELP2MAN)
if (HELP2MAN)
set(MAN_INCLUDE "${PROJECT_SOURCE_DIR}/man/extra.groff")
set(MAN_PAGE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1")
- set(MAN_FILE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1.gz")
add_custom_command(
-- OUTPUT ${MAN_FILE}
-+ OUTPUT ${MAN_PAGE}
- COMMAND ${HELP2MAN} --no-info -i ${MAN_INCLUDE} -o ${MAN_PAGE}
--version-string=${PROJECT_VERSION} --name="open-source hand note-taking
program" ${CMAKE_BINARY_DIR}/src/xournalpp
-- COMMAND gzip -n -f -9 ${MAN_PAGE}
- DEPENDS ${CMAKE_BINARY_DIR}/src/xournalpp
+- OUTPUT ${MAN_FILE}
++ OUTPUT ${MAN_PAGE}
+ COMMAND ${HELP2MAN} --no-info -i ${MAN_INCLUDE} -o ${MAN_PAGE}
--version-string=${PROJECT_VERSION} --name="open-source hand note-taking
program" ${CMAKE_BINARY_DIR}/xournalpp
+- COMMAND gzip -n -f -9 ${MAN_PAGE}
+ DEPENDS ${CMAKE_BINARY_DIR}/xournalpp
)
set(MAN_PAGE_THUMBNAILER
"${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1")
Index: patches/patch-src_control_settings_LatexSettings_h
===
RCS file: patches/patch-src_control_settings_LatexSettings_h
diff -N patches/patch-src_control_settings_LatexSettings_h
--- patches/patch-src_control_settings_LatexSettings_h 19 Apr 2023 08:17:35
- 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-Pre-fill the LaTeX template path.
-
-Index: src/control/settings/LatexSettings.h
src/control/settings/LatexSettings.h.orig
-+++ src/control/settings/LatexSettings.h
-@@ -18,7 +18,7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/09/05 06:36:05 Modified files: net/syncthing : Makefile distinfo Log message: net/syncthing: update to 1.24.0 and re-enable quic. OK tb@, thanks.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/08/15 12:52:48 Modified files: net/syncthing : Makefile distinfo Log message: net/syncthing: unbreak and update. Syncthing was broken by the go 1.21 update (quic doesn't work). This change therefore disables quic for now. We can turn it back on later. Update to syncthing-1.23.7 while we are here. OK tb@, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2023/08/10 14:14:56
Modified files:
print/texlive/base: Makefile distinfo
print/texlive/base/pkg: PLIST-mktexlsr
print/texlive/texmf: Makefile
print/texlive/texmf/files: update_plist_hints.py write_plists.py
print/texlive/texmf/pkg: PLIST-buildset
Log message:
print/texlive: fix texlive_mktexlsr.
Naddy noticed that texlive_mktexlsr, when installed alone (without the rest of
texlive), doesn't work. In turn this breaks the mktexlsr-local @tag.
The reason: although texlive_mktexlsr installs ${PREFIX}/bin/mktexlsr, it's a
symlink to a shell script provided by texlive_buildset (which texlive_mktexlsr
doesn't depend upon).
(It's likely that ${PREFIX}/bin/mktexlsr wasn't always a symlink, because this
must have worked when espie@ created texlive_mktexlsr and added the @tag for
it)
Solution: move the shell script into texlive_mktexlsr.
LGTM sthen@, thanks.
FIX: texlive_mktexlsr
_DEPENDS-docs +=texlive_base->=${V}:print/texlive/base,-main \
x11/p5-Tk
-RUN_DEPENDS-buildset +=
texlive_mktexlsr->=${V}:print/texlive/base,-mktexlsr
+RUN_DEPENDS-buildset +=
texlive_mktexlsr->=${V}p0:print/texlive/base,-mktexlsr
MULTI_PACKAGES = -context -docs -full -main -buildset
Index: texmf/files/update_plist_hints.py
===
RCS file: /cvs/ports/print/texlive/texmf/files/update_plist_hints.py,v
retrieving revision 1.6
diff -u -p -r1.6 update_plist_hints.py
--- texmf/files/update_plist_hints.py 11 Mar 2022 19:51:09 - 1.6
+++ texmf/files/update_plist_hints.py 7 Aug 2023 21:46:39 -
@@ -281,7 +281,9 @@ def should_comment_file(f, commented_fil
# TeX live installer, we never want
("tlmgr" in f and "doc/texlive" not in f) or
# We don't need build instructions in our binary packages
-f.endswith("/tlbuild.info")
+f.endswith("/tlbuild.info") or
+# mktexlsr is provided by texlive_base,-mktexlsr
+f == "share/texmf-dist/scripts/texlive/mktexlsr"
)
Index: texmf/files/write_plists.py
===
RCS file: /cvs/ports/print/texlive/texmf/files/write_plists.py,v
retrieving revision 1.7
diff -u -p -r1.7 write_plists.py
--- texmf/files/write_plists.py 24 Nov 2022 20:01:19 - 1.7
+++ texmf/files/write_plists.py 8 Aug 2023 18:31:15 -
@@ -29,6 +29,7 @@ TOP_MATTER = {
"@conflict texlive_texmf-minimal-<%s" % YEAR,
"@conflict texlive_texmf-full-<%s" % YEAR,
"@conflict texlive_texmf-context-<%s" % YEAR,
+"@conflict texlive_base,-mktexlsr-<%sp0" % YEAR,
"@pkgpath print/texlive/texmf-minimal",
"@pkgpath print/teTeX/texmf",
# Scaffold a dir for ports wishing to install extra tex macros.
Index: texmf/pkg/PLIST-buildset
===
RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-buildset,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST-buildset
--- texmf/pkg/PLIST-buildset24 Nov 2022 20:01:21 - 1.17
+++ texmf/pkg/PLIST-buildset8 Aug 2023 18:31:26 -
@@ -4,6 +4,7 @@
@conflict texlive_texmf-minimal-<2022
@conflict texlive_texmf-full-<2022
@conflict texlive_texmf-context-<2022
+@conflict texlive_base,-mktexlsr-<2022p0
@pkgpath print/texlive/texmf-minimal
@pkgpath print/teTeX/texmf
share/texmf-local/
@@ -5851,7 +5852,6 @@ share/texmf-dist/scripts/texlive/
share/texmf-dist/scripts/texlive/fmtutil-sys.sh
share/texmf-dist/scripts/texlive/fmtutil-user.sh
share/texmf-dist/scripts/texlive/fmtutil.pl
-share/texmf-dist/scripts/texlive/mktexlsr
share/texmf-dist/scripts/texlive/mktexlsr.pl
share/texmf-dist/scripts/texlive/mktexmf
share/texmf-dist/scripts/texlive/mktexpk
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
Re: fixed-slab variant for iosevka font
On Sun, Aug 06, 2023 at 09:40:18PM +0100, Edd Barrett wrote: > Hi, > > On Sun, Aug 06, 2023 at 05:02:59PM +0200, Florian Obser wrote: > > I recently discovered the iosevka font and I like the Fixed Slab variant > > best. > > First, can I check that "fixed slab" is correct and not just "slab". Arch has a "slab" package, but not a "fixed slab" package: https://archlinux.org/packages/?q=ttc-iosevka Same for fedora: https://copr.fedorainfracloud.org/coprs/peterwu/iosevka/packages/ Same for FreeBSD: https://cgit.freebsd.org/ports/tree/x11-fonts/iosevka/Makefile So is slab and fixed-slab the same thing, or? -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: fixed-slab variant for iosevka font
Hi, On Sun, Aug 06, 2023 at 05:02:59PM +0200, Florian Obser wrote: > I recently discovered the iosevka font and I like the Fixed Slab variant > best. First, can I check that "fixed slab" is correct and not just "slab". I think it is right, and "slab" would be a different "variant" again? > +COMMENT =slender typeface for code (default variant) ^ That being the case, should this read `(fixed slab variant)`? > +This package is for the slab variant. ^ And this too? Otherwise LGTM, and seems to work. Cheers -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: emacs and textroc/tree-sitter: drop tree-sittter cli program?
On Thu, Aug 03, 2023 at 07:28:44AM +0200, Paco Esteban wrote: > ok paco. I'd say go ahead. We will soon find out if neovim needs it or not. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/07/28 07:27:57 Modified files: net/syncthing : Makefile distinfo Log message: net/syncthing: easy update to version 1.23.6. Also fixes: https://nvd.nist.gov/vuln/detail/CVE-2022-46165
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/07/28 07:19:32 Modified files: devel/vim-command-t: Makefile Log message: devel/vim-command-t: Drop MAINTAINER. I no longer use this plugin.
