CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/30 04:31:38 Modified files: lang/compcert : Makefile Log message: mark BROKEN-i386
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/30 04:20:56 Modified files: security/dropbear: Makefile distinfo Added files: security/dropbear/patches: patch-src_common-session_c patch-src_default_options_h patch-src_svr-authpasswd_c Removed files: security/dropbear/patches: patch-common-session_c patch-default_options_h patch-svr-authpasswd_c Log message: update to dropbear-2024.85
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/30 04:20:54 Modified files: sysutils/py-filelock: Makefile distinfo Log message: update to py3-filelock-3.14.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/30 04:20:47 Modified files: devel/py-build : Makefile distinfo devel/py-build/pkg: PLIST Log message: update to py3-build-1.2.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/30 04:18:19 Modified files: net/eduvpn/vpn-user-portal: Makefile distinfo net/eduvpn/vpn-user-portal/pkg: PLIST Log message: update to vpn-user-portal-3.6.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/30 04:18:13 Modified files: devel/py-virtualenv: Makefile distinfo Log message: update to py3-virtualenv-20.26.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/30 04:18:15 Modified files: devel/py-pyproject_hooks: Makefile distinfo devel/py-pyproject_hooks/pkg: PLIST Log message: update to py3-pyproject_hooks-1.1.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/29 15:38:55 Modified files: sysutils/borgmatic: Makefile distinfo Log message: update to borgmatic-1.8.11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/27 11:02:03 Modified files: editors/micro : Makefile Log message: mark broken; uses syscall
i386 build failures: eduke32 netsurf nblood openclonk compcert dino
> eduke32, nblood: ld: error: undefined symbol: startbanner_pixdata > openclonk, netsurf/browser: [ 89%] Generating mape-resource.c failed to load "/pobj/openclonk-8.1/openclonk-release-8.1-src/src/res/ocd.ico": Couldn?t recognize the image file format for file ?/pobj/openclonk-8.1/openclonk -release-8.1-src/src/res/ocd.ico? /pobj/openclonk-8.1/openclonk-release-8.1-src/src/res/mape.xml: Child process exited with code 1. glib-compile-resources --generate-source --sourcedir frontends/gtk/res --target=build/OpenBSD-gtk3/netsurf_gresource.c frontends/gtk/res/netsurf.gresource.xml failed to load "frontends/gtk/res/netsurf.xpm": Couldn?t recognize the image file format for file ?frontends/gtk/res/netsurf.xpm? frontends/gtk/res/netsurf.gresource.xml: Child process exited with code 1. > compcert: various linker relocation/preempted symbol errors following ocaml update > dino: /pobj/dino-0.4.3/build-i386/exports/gpgme.vapi:59:25: error: no member named 'subkeys_length1' in 'struct _gpgme_key' - neither gpgme nor gnupg have been updated recently enough to be implicated
Re: CVS: cvs.openbsd.org: ports
On 2024/04/21 14:55, Frederic Cambus wrote: > CVSROOT: /cvs > Module name: ports > Changes by: fcam...@cvs.openbsd.org 2024/04/21 14:55:33 > > Modified files: > emulators/hatari: Makefile distinfo > emulators/hatari/patches: patch-CMakeLists_txt > emulators/hatari/pkg: PLIST > > Log message: > Update hatari to 2.5.0 and take back maintainership. > Hidden dep on capstone, either needs disabling or LIB_DEPENDS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/26 08:14:55 Modified files: textproc/wkhtmltopdf: Makefile distinfo textproc/wkhtmltopdf/patches: patch-qt_configure Log message: update to wkhtmltopdf-0.12.6, ok Frank Groeneveld (former maintainer, but he's not using it any more)
Re: wkhtmltopdf update
On 2024/04/26 16:09, Frank Groeneveld wrote: > Fine by me, I’m not using it anymore. Maybe unlist me as maintainer as well? sure, thanks!
wkhtmltopdf update
I noticed this was behind the latest version, ok to update?
I simplified the distfile fetching as this is a good place to use
DIST_TUPLE.
Upstream has now archived the repository - and it has weak CSS support
as it's an ld qtwebkit, and breaks totally with more complex pages,
but chromium/iridium broke headless mode somewhere between 117 and 120,
likely in 120 where I think they changed to new headless mode, and
wkhtmltopdf does at least work for getting image/pdf dumps in some
cases, so it still seems slightly useful to have for now.
ok?
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
diff -u -p -r1.30 Makefile
--- Makefile5 Apr 2024 16:08:43 - 1.30
+++ Makefile26 Apr 2024 14:00:36 -
@@ -6,16 +6,10 @@ DPB_PROPERTIES = parallel nojunk
COMMENT = convert HTML to PDF using Webkit
-GH_ACCOUNT = wkhtmltopdf
-GH_PROJECT = wkhtmltopdf
-GH_TAGNAME = 0.12.5
-QT_COMMIT =5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
-SITES.a = https://github.com/wkhtmltopdf/qt/archive/
-DISTFILES =${DISTNAME}.tar.gz
-DISTFILES.a = wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz
-REVISION = 6
+DIST_TUPLE = github wkhtmltopdf wkhtmltopdf 0.12.6 . \
+ github wkhtmltopdf qt
aa2e3129f8ef05dfa72c4b183feb8b7e1927ac8a qt
-SHARED_LIBS = wkhtmltox 1.0 # 0.12
+SHARED_LIBS = wkhtmltox 2.0 # 0.12
CATEGORIES = textproc
@@ -27,7 +21,7 @@ MAINTAINER = Frank Groeneveld
Re: aarch64 bulk build report
On 2024/04/26 15:44, Rafael Sadowski wrote: > > http://build-failures.rhaalovely.net/aarch64/2024-04-23/x11/qt5/qt3d.log > > http://build-failures.rhaalovely.net/aarch64/2024-04-23/x11/qt5/qtwebchannel.log > > > Fixed by naddy. Looks like removing folders also needs a bump. Ah I missed the lack of bump. Any PLIST change (or change to a variable which is substed in the PLIST) requires a REVISION bump, but not a @conflict for directory +/-
Re: net/rsync: rrsync is a python3 script...
OK sthen On 2024/04/26 12:31, Landry Breuil wrote: > Le Fri, Apr 26, 2024 at 10:49:44AM +0100, Stuart Henderson a écrit : > > On 2024/04/26 11:14, Landry Breuil wrote: > > > hi, > > > > > > on a bare machine with only rsync installed, trying to use rrsync > > > wrapper script fails: > > > > > > env: python3: No such file or directory > > > rsync: connection unexpectedly closed (0 bytes received so far) [sender] > > > rsync error: error in rsync protocol data stream (code 12) at io.c(231) > > > [sender=3.2.7] > > > > > > i know it's a bit unfortunate, but i suppose adding python3 as > > > RUN_DEPENDS is a bit ... gross ? should it be mentioned in a MESSAGE ? a > > > README ? > > > > > > Landry > > > > > > > I don't really like README for such a small note and don't want to add > > the run dep for something that many people won't use. Personally I think > > a quick note in DESCR would be enough but it could be a MESSAGE. > > > > (the error message is pretty obvious though..) > > so, something like this.. > > Index: Makefile > === > RCS file: /cvs/ports/net/rsync/Makefile,v > retrieving revision 1.100 > diff -u -r1.100 Makefile > --- Makefile 27 Sep 2023 14:18:31 - 1.100 > +++ Makefile 26 Apr 2024 10:31:03 - > @@ -1,7 +1,7 @@ > COMMENT =mirroring/synchronization over low bandwidth links > > DISTNAME = rsync-3.2.7 > -REVISION = 1 > +REVISION = 2 > CATEGORIES = net > HOMEPAGE = https://rsync.samba.org/ > > Index: pkg/DESCR > === > RCS file: /cvs/ports/net/rsync/pkg/DESCR,v > retrieving revision 1.5 > diff -u -r1.5 DESCR > --- pkg/DESCR 10 Oct 2013 12:01:31 - 1.5 > +++ pkg/DESCR 26 Apr 2024 10:31:03 - > @@ -12,3 +12,7 @@ > Flavor: iconv > extra dependency, for people wanting to bring files from other OSes with > more versatile filenames. > + > +To use the rrsync wrapper, python3 should be installed. > + > +# pkg_add python3 >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/26 06:43:31 Added files: sysutils/dmidecode/patches: patch-Makefile Log message: fix packaging if bash-completions directory wasn't present on the build machine. reported/analysed by naddy@
Re: net/rsync: rrsync is a python3 script...
On 2024/04/26 11:14, Landry Breuil wrote: > hi, > > on a bare machine with only rsync installed, trying to use rrsync > wrapper script fails: > > env: python3: No such file or directory > rsync: connection unexpectedly closed (0 bytes received so far) [sender] > rsync error: error in rsync protocol data stream (code 12) at io.c(231) > [sender=3.2.7] > > i know it's a bit unfortunate, but i suppose adding python3 as > RUN_DEPENDS is a bit ... gross ? should it be mentioned in a MESSAGE ? a > README ? > > Landry > I don't really like README for such a small note and don't want to add the run dep for something that many people won't use. Personally I think a quick note in DESCR would be enough but it could be a MESSAGE. (the error message is pretty obvious though..)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/25 05:57:41 Modified files: mail/neomutt : Makefile distinfo Log message: update to neomutt-20240425
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/25 05:53:34 Modified files: sysutils/dmidecode: Makefile distinfo sysutils/dmidecode/pkg: PLIST Log message: update to dmidecode-3.6
Re: lang/sbcl - building and installing libsbcl.so ?
On 2024/04/25 10:24, Dima Pasechnik wrote:
>
> 1) Is there a standard way to set up .so's major.minor version
> in the port, and propagate it to the build?
> (hardcoding major.minor in several patched places is a pain, obviously)
>
> In port's makefile I now have a line
>
> SHARED_LIBS += sbcl 0.0
>
> - is this "0.0" being stored somewhere usable?
You can use LIBsbcl_VERSION in the port Makefile. This can either
be passed to the build via a make variable (usually preferable)
or by patching (one option is to patch to ${LIBsbcl_VERSION},
SUBST_VARS+=LIBsbcl_VERSION, and use ${SUBST_CMD} to replace it, perhaps
in a pre-configure target).
> 2) What is the easiest way to create acceptable to the build system patches
> in patches/ ?
> I just do "git diff > patchifile" and manually edit patchfile, but
> that's clearly suboptimal.
Copy the clean original file to have the suffix .orig.port, edit,
then run "make update-patches" from the port dir. If you're using
SUBST_CMD then "update-patches" needs to be run at the right time.
Re: archivers/pixz: new port (1.0.7)
On 2024/04/23 23:36, Kirill A. Korinsky wrote: > Thanks for review, > > On Tue, 23 Apr 2024 23:19:47 +0200, > Stuart Henderson wrote: > > > > Small tweaks, mostly to fix things so the tests run properly (symlink > > gstat -> WRKDIR/bin/stat, and BDEP on cppcheck). The cppcheck still > > fails but due to a detected error rather than because it can't run. > > > > - > > Checking ../src/write.c ... > > ../src/write.c:460:24: error: Uninitialized variable: obuf [uninitvar] > > if (fwrite(obuf, CHUNKSIZE - gStream.avail_out, 1, gOutFile) != > > 1) > >^ > > ../src/write.c:527:24: error: Uninitialized variable: obuf [uninitvar] > > if (fwrite(obuf, CHUNKSIZE - gStream.avail_out, 1, gOutFile) != > > 1) > >^ > > - > > > > Looking at the code it seems cppcheck is probably right? > > > > Seems so, and upstream had already fixed that issue [1] which I've > backported into attached archive. > > Footnotes: > [1] > https://github.com/vasi/pixz/commit/2f4db115586bd3d98c1f05eb64c125495bf0331a > > -- > wbr, Kirill That one's OK with me to import.
Re: archivers/pixz: new port (1.0.7)
On 2024/04/01 12:55, Kirill A. Korinsky wrote: > Folks, > > Despite of current security issue with xz/lzma the algortihm itself provides > great compression, and the existing XZ Utils provide great compression in > the .xz file format, but they produce just one big block of compressed data. > > Here, a new port which is called archivers/pixz which produces a collection > of smaller blocks which makes random access to the original data possible. > This is especially useful for large tarballs. > > This can be used as seprated application or via tar, that described on > homepage: https://github.com/vasi/pixz > > -- > wbr, Kirill Small tweaks, mostly to fix things so the tests run properly (symlink gstat -> WRKDIR/bin/stat, and BDEP on cppcheck). The cppcheck still fails but due to a detected error rather than because it can't run. - Checking ../src/write.c ... ../src/write.c:460:24: error: Uninitialized variable: obuf [uninitvar] if (fwrite(obuf, CHUNKSIZE - gStream.avail_out, 1, gOutFile) != 1) ^ ../src/write.c:527:24: error: Uninitialized variable: obuf [uninitvar] if (fwrite(obuf, CHUNKSIZE - gStream.avail_out, 1, gOutFile) != 1) ^ - Looking at the code it seems cppcheck is probably right? pixz.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/23 15:03:15 Modified files: sysutils/docker-compose: Makefile distinfo sysutils/docker-compose/patches: patch-vendor_github_com_tonistiigi_fsutil_fs_go patch-vendor_github_com_tonistiigi_fsutil_send_go patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go Added files: sysutils/docker-compose/patches: patch-vendor_github_com_tonistiigi_fsutil_filter_go patch-vendor_github_com_tonistiigi_fsutil_followlinks_go Log message: update to docker-compose-2.26.1, from Kirill A. Korinsky
Re: archivers/bzip3: new port (version 1.4.0)
This is OK sthen@ to import
On 2024/04/16 13:30, Kirill A. Korinsky wrote:
> On Tue, 16 Apr 2024 12:07:09 +0200,
> Stuart Henderson wrote:
> >
> > I don't really like COMMENT but don't have a better idea right away.
> >
>
> Original comment was a copy and paste from it's home page. But it can be
> reworded to something a bit more netural.
>
> What do you think abot this one?
>
> diff --git archivers/bzip3/Makefile archivers/bzip3/Makefile
> index 57916867067..7ba01cb69b7 100644
> --- archivers/bzip3/Makefile
> +++ archivers/bzip3/Makefile
> @@ -1,4 +1,4 @@
> -COMMENT= a better, faster and stronger spiritual successor to BZip2
> +COMMENT= tools and libraries for compressing and decompressing bzip3
> files
>
> V= 1.4.0
> DISTNAME=bzip3-${V}
> diff --git archivers/bzip3/pkg/DESCR archivers/bzip3/pkg/DESCR
> index 2f724e31661..2a53d435e5e 100644
> --- archivers/bzip3/pkg/DESCR
> +++ archivers/bzip3/pkg/DESCR
> @@ -1,7 +1,6 @@
> -A better, faster and stronger spiritual successor to BZip2. Features
> -higher compression ratios and better performance thanks to a order-0
> -context mixing entropy coder, a fast Burrows-Wheeler transform code
> -making use of suffix arrays and a RLE with Lempel Ziv+Prediction pass
> +These are tools and libraries for compressing, decompressing, printing,
> +and searching bzip3 files. bzip3 features higher compression ratios and
> +better performance than bzip2 thanks to an order-0 context mixing
> +entropy coder, a fast Burrows-Wheeler transform code making use of
> +suffix arrays and a run-length encoding with Lempel-Ziv prediction pass
> based on LZ77-style string matching and PPM-style context modeling.
> -
> -Like its ancestor, BZip3 excels at compressing text or code.
>
> --
> wbr, Kirill
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/23 15:00:51 Modified files: sysutils/docker-cli: Makefile distinfo Removed files: sysutils/docker-cli/patches: patch-cli-plugins_socket_socket_nodarwin_go patch-cli-plugins_socket_socket_openbsd_go Log message: update to docker-cli-26.0.1, from Kirill A. Korinsky
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/23 15:00:38 Modified files: sysutils/docker-buildx: Makefile distinfo sysutils/docker-buildx/patches: patch-vendor_github_com_tonistiigi_fsutil_fs_go patch-vendor_github_com_tonistiigi_fsutil_send_go patch-vendor_github_com_tonistiigi_fsutil_tarwriter_go Added files: sysutils/docker-buildx/patches: patch-vendor_github_com_tonistiigi_fsutil_filter_go patch-vendor_github_com_tonistiigi_fsutil_followlinks_go Log message: update to docker-buildx-0.14.0, from Kirill A. Korinsky
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/23 14:57:37 Modified files: misc : Makefile Log message: +openhab, openhab-addons
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/23 14:53:01 Modified files: misc/openhab : Makefile misc/openhab/pkg: PLIST Log message: set SUBST_VARS=V to reduce PLIST churn during updates
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/23 14:50:21 Log message: import ports/misc/openhab-addons, from Chaz Kettleson, ok bentley@ Status: Vendor Tag: sthen Release Tags: sthen_20240423 N ports/misc/openhab-addons/Makefile N ports/misc/openhab-addons/distinfo N ports/misc/openhab-addons/pkg/README N ports/misc/openhab-addons/pkg/DESCR N ports/misc/openhab-addons/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/23 14:48:11 Modified files: misc/openhab : Makefile distinfo misc/openhab/files: openhab.conf misc/openhab/pkg: PLIST README openhab.rc Log message: update to openhab-4.1.2, add more to README, fix commented-out path in conf file, from Chaz Kettleson tweak from me so that files under share/examples stay root-owned and only the @sample'd versions are owned by _openhab uid.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/23 14:45:37 Log message: import ports/misc/openhab, from Chaz Kettleson, ok bentley@ (I changed uid after ok) --- The open Home Automation Bus (openHAB) project aims at providing a universal integration platform for all things around home automation. It is a pure Java solution, fully based on OSGi. It is designed to be vendor-neutral as well as hardware/protocol-agnostic. openHAB brings together different bus systems, hardware devices, and interface protocols by dedicated bindings. These bindings send and receive commands and status updates on the openHAB event bus. This concept allows designing user interfaces with a unique look, but with the possibility to operate devices based on a big number of different technologies. Besides the user interfaces, it also brings the power of automation logic across different system boundaries. --- Status: Vendor Tag: sthen Release Tags: sthen_20240423 N ports/misc/openhab/Makefile N ports/misc/openhab/distinfo N ports/misc/openhab/pkg/DESCR N ports/misc/openhab/pkg/openhab.rc N ports/misc/openhab/pkg/PLIST N ports/misc/openhab/pkg/README N ports/misc/openhab/files/openhab.conf No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/23 14:42:50 Modified files: infrastructure/db: user.list Log message: reserve 899 for openhab
Re: [new] lang/mujs
On 2024/04/23 22:09, Pascal Stumpf wrote:
> On Tue, 23 Apr 2024 20:51:59 +0100, Stuart Henderson wrote:
> > On 2024/04/23 21:10, Pascal Stumpf wrote:
> > > MuJS is a lightweight Javascript interpreter designed for embedding
> > > in other software to extend them with scripting capabilities.
> > >
> > > MuJS was designed with a focus on small size, correctness, and
> > > simplicity. It is written in portable C and implements ECMAScript
> > > as specified by ECMA-262. The interface for binding with native
> > > code is designed to be as simple as possible to use, and is very
> > > similar to Lua. There is no need to interact with byzantine C++
> > > template mechanisms, or worry about marking and unmarking garbage
> > > collection roots, or wrestle with obscure build systems.
> > >
> > >
> > > Useful for js in an upcoming port of the new elinks codebase.
> > >
> > > textproc/mupdf,js needs a small fix to cope with an external libmujs.
> >
> > Any reason not to use the shared library?
>
> Not really, other than upstream apparently preferring the static one.
That's normal for them :)
If it's static, you'll need to bump any ports that depend on it after
any update.
> Updated tarball with shared library.
OK
> > --- Makefile.orig Tue Apr 23 18:49:24 2024
> > +++ MakefileTue Apr 23 20:51:10 2024
> > @@ -1,5 +1,7 @@
> > COMMENT = lightweight Javascript interpreter
> >
> > +SHARED_LIBS = mujs 0.0
> > +
> > V =1.3.4
> > DISTNAME = mujs-$V
> >
> > @@ -16,12 +18,13 @@ WANTLIB += c m readline
> >
> > SITES =https://mujs.com/downloads/
> >
> > -MAKE_FLAGS = OPTIM="${CFLAGS}"
> > +MAKE_FLAGS = OPTIM="${CFLAGS}" SO="so.${LIBmujs_VERSION}"
> >
> > USE_GMAKE =Yes
> >
> > NO_TEST = Yes
> >
> > ALL_TARGET = release
> > +INSTALL_TARGET = install-shared
> >
> > .include
Re: [new] lang/mujs
On 2024/04/23 21:10, Pascal Stumpf wrote:
> MuJS is a lightweight Javascript interpreter designed for embedding
> in other software to extend them with scripting capabilities.
>
> MuJS was designed with a focus on small size, correctness, and
> simplicity. It is written in portable C and implements ECMAScript
> as specified by ECMA-262. The interface for binding with native
> code is designed to be as simple as possible to use, and is very
> similar to Lua. There is no need to interact with byzantine C++
> template mechanisms, or worry about marking and unmarking garbage
> collection roots, or wrestle with obscure build systems.
>
>
> Useful for js in an upcoming port of the new elinks codebase.
>
> textproc/mupdf,js needs a small fix to cope with an external libmujs.
Any reason not to use the shared library?
--- Makefile.orig Tue Apr 23 18:49:24 2024
+++ MakefileTue Apr 23 20:51:10 2024
@@ -1,5 +1,7 @@
COMMENT = lightweight Javascript interpreter
+SHARED_LIBS = mujs 0.0
+
V =1.3.4
DISTNAME = mujs-$V
@@ -16,12 +18,13 @@ WANTLIB += c m readline
SITES =https://mujs.com/downloads/
-MAKE_FLAGS = OPTIM="${CFLAGS}"
+MAKE_FLAGS = OPTIM="${CFLAGS}" SO="so.${LIBmujs_VERSION}"
USE_GMAKE =Yes
NO_TEST = Yes
ALL_TARGET = release
+INSTALL_TARGET = install-shared
.include
Re: lang/mupdf: Use external mujs
On 2024/04/23 21:13, Pascal Stumpf wrote:
> Required to work with new lang/mujs port.
>
> Lightly tested with some PDFs containing JavaScript.
I'd rather not at this point.
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/textproc/mupdf/Makefile,v
> diff -u -p -r1.127 Makefile
> --- Makefile 28 Feb 2024 09:10:55 - 1.127
> +++ Makefile 23 Apr 2024 18:00:16 -
> @@ -5,6 +5,7 @@ SHARED_LIBS += mupdf 9.
> V = 1.23.11
> DISTNAME = mupdf-$V-source
> PKGNAME =mupdf-${V:S/-rc/rc/}
> +REVISION = 0
>
> CATEGORIES = textproc x11
>
> @@ -76,8 +77,9 @@ CFLAGS += -DFZ_ENABLE_JS=0
> # js support can't be knocked out completely
> MAKE_FLAGS +=HAVE_GLUT=No
> .else
> -MAKE_FLAGS +=ENABLE_MUJS=yes
> +MAKE_FLAGS +=ENABLE_MUJS=yes USE_SYSTEM_MUJS=yes
> WANTLIB += GL glut
> +BUILD_DEPENDS +=lang/mujs
> LIB_DEPENDS += graphics/freeglut
> .endif
>
Re: [UPDATE] OCaml 4.14.1 -> 4.14.2
On 2024/04/23 11:29, Dave Voutila wrote:
>
> Stuart Henderson writes:
>
> > The updated ocaml version fails to build on i386; the new ocamlc.opt run
> > as part of the build segfaults segfaults, looks like during runtime linking.
> >
>
> This fixes it in my i386 vm. Can you try this? Should probably get
> tested with other ocaml-based ports on i386 before I commit this time :|
I've built opam and coccinelle (and thus various dependencies as well) with
this.
> diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
> index 244c1b7315f..d88cb8f466d 100644
> --- a/lang/ocaml/Makefile
> +++ b/lang/ocaml/Makefile
> @@ -3,6 +3,7 @@ COMMENT =ML language with complete class-based
> objective system
> # XXX Don't even think of updating ocaml alone.
> # Do check that the ports that depend on it still work, or repair them.
> VERSION= 4.14.2
> +REVISION=0
Doesn't hurt but I'd drop REVISION because it didn't build on i386
before, and the change doesn't affect other archs.
> # if the ocaml compiler gains support for BTI, as well as
> # removing USE_NOBTCFI here (or changing to an arch-dependent
> @@ -60,8 +61,6 @@ LDFLAGS += -L${LOCALBASE}/lib
> .if ${MACHINE_ARCH} == "i386"
> # configure: error: fma does not work, enable emulation with
> --enable-imprecise-c99-float-ops
> CONFIGURE_ARGS +=--enable-imprecise-c99-float-ops
> -# non-PIC assembly in asmrun/i386.S
> -LDFLAGS+=-Wl,-z,notext
> .endif
>
> USE_GMAKE= Yes
OK
Re: influxdb not starting after upgrade to 7.5
On 2024/04/23 15:42, Landry Breuil wrote: > with the attached diff, influxd starts on -current. That's all the testing > i've done :) definitely better than what's there now. > feedback from real world testing welcome ! not using it myself, but FWIW I'm OK with either this or Kirill's alternative bumping to 1.3.9, definitely real world testing would be helpful.
Re: [new] lnav 0.12.1
On 2024/04/23 10:29, Landry Breuil wrote: > Le Sun, Apr 21, 2024 at 10:17:44PM +0200, Frederic Cambus a écrit : > > On Fri, Apr 19, 2024 at 05:50:09AM +0200, Landry Breuil wrote: > > > > > this is a second attempt at a port for https://lnav.org, after > > > https://marc.info/?t=15333968122=1=2 some years ago, which > > > fcambus@ reminded me about. He pushed it to wip but had issues with it > > > linking against two readline libs. > > > > Thanks for picking this up again! > > > > > i had originally put it under textproc/ but frederic had it in > > > sysutils/, no strong opinion on that. > > > > FWIW both FreeBSD and NetBSD have it in sysutils, but no strong opinion > > either. > > > > > the attached port links against only one readline (the one from ports), > > > and i've tried to do my best to have tests running. For now it seems one > > > hangs.. > > > > > > PASS: lnav_doctests > > > PASS: test_abbrev > > > PASS: test_ansi_scrubber > > > PASS: test_auto_fd > > > PASS: test_auto_mem > > > PASS: test_bookmarks > > > ../test-driver: line 112: 69425 Abort trap (core dumped) > > > "$@" >> "$log_file" 2>&1 > > > FAIL: test_date_time_scanner > > > PASS: test_format_installer.sh > > > > > > > > > in 0.12.1 a PRQL feature was added > > > (https://github.com/tstack/lnav/commit/bdc9c5a28d8308a53ba4f881b29c307cff7cd97a) > > > but it relies on rust/cargo being run from gmake and at that point i've > > > just disabled this feature. > > > > Makes sense, yes. > > > > > feedback & testing welcome > > > > The build fails at link time if devel/fmt is installed. > > i've tried it, and with fmt 10.2.1 installed the build doesnt fail. when > you saw that failure i suppose that was with the previous fmt version > installed ? It's preferring libfmt in /usr/local for headers in some of the compiler commands lines - "-I/usr/local/include -I./.. -I./../fmtlib" - so even if it works now, things will likely break again in the future. It would be best to figure out how to get the -I reordered so that -I./../fmtlib comes before -Iusr/local/include. You can check by installing fmt, editing /usr/local/include/fmt/format.h to add a #error at the top, and make sure that lnav still builds.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/23 03:31:30 Modified files: databases/influxdb: Makefile Log message: influxdb: mark broken for now, uses go modules which still require syscall
Re: influxdb not starting after upgrade to 7.5
On 2024/04/23 11:22, Kirill A. Korinsky wrote: > On Tue, 23 Apr 2024 10:59:30 +0200, > Landry Breuil wrote: > > > > > > > > OpenBSD was changed so that syscalls can only be made by libc. However > > > some software (especially software written in Go) still relies on being > > > able to call syscalls directly from the main program and this will no > > > longer run on OpenBSD. > > > > rejoice ! influxdb 3 is written in rust ! > > > > Ports has 2x which is go-based and which was released last week [1], anyway, > they had quite clear that they won't do anything with 2x except of bugfixing > in README [2]. > > But I haven't found any influxdb3 release at GitHub [3] nor at website [4] > nor at docker registry [5]. > > From where I stand it looks like influxdb3 aren't ready to be used. > > Have I missed something? That's the impression I get too. And 3 doesn't have some features which are used by other software that uses influxdb v2.
Re: influxdb not starting after upgrade to 7.5
On 2024/04/22 23:26, Zé Loff wrote:
>
> Hi all
>
> After upgrading an amd64 machine to 7.5-stable, influxdb fails to start,
> saying:
>
> 2024-04-22T22:07:42.599907Z infoWelcome to InfluxDB {"log_id":
> "0oiySb1l000", "version": "2.7.3", "commit": "none", "build_date":
> "2024-04-22T22:07:42Z", "log_level": "info"}
> 2024-04-22T22:07:42.601348Z error Failed opening bolt {"log_id":
> "0oiySb1l000", "error": "function not implemented"}
>
> Starting with a clean /var/influxdb doesn't help, nor does doing it as
> root (which also starts with a clean slate, at /root/.influxdbv2).
> Removing and reinstalling the package didn't help either.
>
> Has anyone else seen the same thing and/or has any advice?
>
> Thanks in advance
>
> --
>
>
OpenBSD was changed so that syscalls can only be made by libc. However
some software (especially software written in Go) still relies on being
able to call syscalls directly from the main program and this will no
longer run on OpenBSD.
One of the go modules used by influxdb is an old version of bbolt.
This problem is fixed in an update to bbolt, but even the most recent
influxdb release (2.7.6) still uses an old bbolt from before the fix.
Some other modules may have a problem too (influxdb uses
modernc.org/sqlite which definitely used syscall in some use cases; I'm
unsure if that got fixed or whether influxdb's use of it triggers those
cases).
I'm not too familiar with influxdb but it seems bolt/bbolt is a required
part of it, so I think we might as well mark it broken for now, it's not
going to magically start working unless changes are made.
Re: x11/qt5 doesn't cleanup some files
On 2024/04/22 21:09, Rafael Sadowski wrote: > > Thanks Stuart, here's a new diff with all your input. I'm pretty > confident with the new diff, except for the duplicate @conflicts tags. > Is that ok? > diff --git a/x11/qt5/qtremoteobjects/pkg/PLIST-examples > b/x11/qt5/qtremoteobjects/pkg/PLIST-examples > index 5f40b82b4f8..dabeb5855ce 100644 > --- a/x11/qt5/qtremoteobjects/pkg/PLIST-examples > +++ b/x11/qt5/qtremoteobjects/pkg/PLIST-examples > @@ -1,4 +1,5 @@ > @conflict qtremoteobjects-<5.15.2p0 > +@conflict qtremoteobjects-<5.15.12p0 You can remove the first one, it's covered by the second. With that: ok.
Re: -current Haskell ports aborting with SIGILL
On 2024/04/22 10:30, Greg Steuck wrote: > > If it would help, I could update my old AMD machine to -current > > and check ghc works with the two patches removed, once I've finished > > trying out the patch I just sent for 7.5. > > Thanks James for working through this. Yes, we need the new development > to happen on -current ports with -current base system. We'd also want a > more complicated patch than the one you just sent because base supports > avx-512 now. We probably don't need any patches for this in -current now that avx-512 opcodes are supported by the OS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/22 11:39:56 Modified files: databases/mongo-tools: Makefile distinfo databases/mongo-tools/pkg: DESCR PLIST Log message: update to mongo-tools-100.9.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/22 11:34:33 Modified files: net/fping : Makefile distinfo net/fping/patches: patch-src_fping_c Log message: update to fping-5.2
Re: x11/qt5 doesn't cleanup some files
On 2024/04/22 16:47, Rafael Sadowski wrote: > On Sat Apr 20, 2024 at 11:17:47AM GMT, Stuart Henderson wrote: > > On 2024/04/20 02:07, Kirill A. Korinsky wrote: > > > ports@, > > > > > > Let assume that I have a system without x11/qt5, and to install it I do > > > something like this: > > > > > > ~ $ ls /usr/local/lib/qt5 > > > ls: /usr/local/lib/qt5: No such file or directory > > > ~ $ doas pkg_add -a py3-qt5 > > > quirks-7.18 signed on 2024-04-18T15:06:29Z > > > py3-qt5-5.15.9p1:py3-ply-3.11p6: ok > > > py3-qt5-5.15.9p1:pcaudiolib-1.2: ok > > > py3-qt5-5.15.9p1:espeak-1.51p2: ok > > > py3-qt5-5.15.9p1:libao-1.2.0p2: ok > > > py3-qt5-5.15.9p1:dotconf-1.3p0: ok > > > py3-qt5-5.15.9p1:py3-xdg-0.28p2: ok > > > py3-qt5-5.15.9p1:speech-dispatcher-0.11.5: ok > > > py3-qt5-5.15.9p1:qtbase-5.15.12pl151p0: ok > > > py3-qt5-5.15.9p1:libsigc++-2.12.1: ok > > > py3-qt5-5.15.9p1:glib2mm-2.66.7: ok > > > py3-qt5-5.15.9p1:gstreamer1mm-1.10.0p9: ok > > > py3-qt5-5.15.9p1:qtdeclarative-5.15.12pl31: ok > > > py3-qt5-5.15.9p1:qtmultimedia-5.15.12pl2: ok > > > py3-qt5-5.15.9p1:qtspeech-5.15.12pl1: ok > > > py3-qt5-5.15.9p1:hyphen-2.8.8p0: ok > > > py3-qt5-5.15.9p1:qtwebsockets-5.15.12pl2: ok > > > py3-qt5-5.15.9p1:qtwebchannel-5.15.12pl3: ok > > > py3-qt5-5.15.9p1:qtserialport-5.15.12: ok > > > py3-qt5-5.15.9p1:qtlocation-5.15.12pl6: ok > > > py3-qt5-5.15.9p1:qtsensors-5.15.12: ok > > > py3-qt5-5.15.9p1:libnotify-0.8.3: ok > > > py3-qt5-5.15.9p1:avahi-glib-0.8p2: ok > > > py3-qt5-5.15.9p1:glib2-networking-2.80.0: ok > > > py3-qt5-5.15.9p1:libpsl-0.21.1: ok > > > py3-qt5-5.15.9p1:libsoup3-3.4.4: ok > > > py3-qt5-5.15.9p1:geoclue2-2.7.1p0: ok > > > py3-qt5-5.15.9p1:qtwebkit-5.212.0alpha4p9v0: ok > > > py3-qt5-5.15.9p1:qtx11extras-5.15.12: ok > > > py3-qt5-5.15.9p1:qtxmlpatterns-5.15.12: ok > > > py3-qt5-5.15.9p1:py3-sip-6.7.11p0v0: ok > > > py3-qt5-5.15.9p1:py3-pyqt5_sip-12.12.2: ok > > > py3-qt5-5.15.9p1:qtconnectivity-5.15.12pl6: ok > > > py3-qt5-5.15.9p1:qtsvg-5.15.12pl6: ok > > > py3-qt5-5.15.9p1:llvm-16.0.6p24: ok > > > py3-qt5-5.15.9p1:qttools-5.15.12pl4: ok > > > py3-qt5-5.15.9p1:qtremoteobjects-5.15.12: ok > > > py3-qt5-5.15.9p1: ok > > > Running tags: ok > > > New and changed readme(s): > > > /usr/local/share/doc/pkg-readmes/llvm-16 > > > ~ $ > > > > > > now, let remove it: > > > > > > ~ $ doas pkg_delete -a > > > lcms2-2.16p0:py3-qt5-5.15.9p1: ok > > > lcms2-2.16p0:qtspeech-5.15.12pl1: ok > > > lcms2-2.16p0:qtmultimedia-5.15.12pl2: ok > > > lame-3.100p2:speech-dispatcher-0.11.5: ok > > > lame-3.100p2:espeak-1.51p2: ok > > > lame-3.100p2:pcaudiolib-1.2: ok > > > gsettings-desktop-schemas-46.0:qtwebkit-5.212.0alpha4p9v0: ok > > > gsettings-desktop-schemas-46.0:geoclue2-2.7.1p0: ok > > > gsettings-desktop-schemas-46.0:libsoup3-3.4.4: ok > > > gsettings-desktop-schemas-46.0:glib2-networking-2.80.0: ok > > > py3-pyqt5_sip-12.12.2: ok > > > qtx11extras-5.15.12: ok > > > qtwebchannel-5.15.12pl3: ok > > > avahi-glib-0.8p2: ok > > > libpsl-0.21.1: ok > > > qtbase-5.15.12pl151p0:qtsensors-5.15.12: ok > > > qtbase-5.15.12pl151p0:qtlocation-5.15.12pl6: ok > > > qtbase-5.15.12pl151p0:qtserialport-5.15.12: ok > > > qtbase-5.15.12pl151p0:qtwebsockets-5.15.12pl2: ok > > > qtbase-5.15.12pl151p0:qttools-5.15.12pl4: ok > > > qtbase-5.15.12pl151p0:qtxmlpatterns-5.15.12: ok > > > qtbase-5.15.12pl151p0:qtconnectivity-5.15.12pl6: ok > > > qtbase-5.15.12pl151p0:qtremoteobjects-5.15.12: ok > > > qtbase-5.15.12pl151p0:qtdeclarative-5.15.12pl31: ok > > > qtbase-5.15.12pl151p0:qtsvg-5.15.12pl6: ok > > > qtbase-5.15.12pl151p0: ok > > > glib2mm-2.66.7:gstreamer1mm-1.10.0p9: ok > > > glib2mm-2.66.7: ok > > > py3-ply-3.11p6:py3-sip-6.7.11p0v0: ok > > > py3-ply-3.11p6: ok > > > libsigc++-2.12.1: ok > > > libao-1.2.0p2: ok > > > dotconf-1.3p0: ok > > > llvm-16.0.6p24: ok > > > hyphen-2.8.8p0: ok > > > libnotify-0.8.3: ok > > > py3-xdg-0.28p2: ok > > > Running tags: ok > > > Read shared items: ok > > > ---
Re: dpb always rebuild rust-bootstrap
On 2024/04/21 13:53, Solene Rapenne wrote:
> On Sun, Apr 21, 2024 at 11:56:30AM GMT, Stuart Henderson wrote:
> > On 2024/04/21 11:35, Solene Rapenne wrote:
> > > On Sat, Apr 20, 2024 at 10:02:38AM GMT, Solene Rapenne wrote:
> > > > On Sat, Apr 20, 2024 at 09:00:30AM GMT, Sebastien Marie wrote:
> > > > > Solene Rapenne writes:
> > > > >
> > > > > > hi, on a fresh current amd64 I had to set up dpb because it seems
> > > > > > there was a libc bump at the wrong time for me :)
> > > > > >
> > > > > > however, now I have my working dpb (easy to setup once you
> > > > > > understand
> > > > > > it), I don't understand why dpb -R something_depending_on_rust
> > > > > > always have to recompile lang/rust, in the packages directory, only
> > > > > > the rust bootstrap package is changed everytime I run dpb.
> > > > > >
> > > > > > I'm not sure which logs I could provide though. This is quite
> > > > > > annoying because lang/rust is heavy to compile and I like to trigger
> > > > > > dpb every time I try a diff.
> > > > > >
> > > > > > Am I the only one with this issue?
> > > > >
> > > > > I'm interested to know if there are any problems with the way I did
> > > > > rust-bootstrap.
> > > > >
> > > > > Currently, it is marked with 'always-update', because the package
> > > > > content depend on the build host (system libraries are embedded in the
> > > > > package for the bootstrap purpose). I expected that if the package
> > > > > isn't
> > > > > installed (and it shouldn't in standard usage) it will not be a
> > > > > problem.
> > > > >
> > > > > Do you have it installed ? If it isn't the case, and dpb is rebuilding
> > > > > it without purpose (I assume no port depending on it), it might be a
> > > > > problem in dpb, or some side effect for a subpackage having
> > > > > 'always-update'.
> > > > >
> > > > > I could look to remove the 'always-update' option from rust-bootstrap
> > > > > without too much trouble.
> > > > >
> > > > > Thanks.
> > > > > --
> > > > > Sebastien Marie
> > > >
> > > > rust-bootstrap is not installed in the chroot after using dpb -R
> > > > shells/nushell
> > > > that rebuilt rust-bootstrap , I don't think junking happened
> > > >
> > > > I'll try without always-update
> > > >
> > >
> > > dpb stopped rebuilding rust everytime since I removed always-update
> > >
> > > I don't know if REVISION could be set only for bootstrap, but
> > > following diff works for me
> >
> > The plain REVISION bump like you've done is correct.
> >
> > I would set WANTLIB-bootstrap to the list of libraries used in the
> > bootstrap. That way it will be automically updated when necessary.
> > (Ignore the "not needed" from check-lib-depends).
> >
> > > diff --git a/lang/rust/Makefile b/lang/rust/Makefile
> > > index 035767f1126..ba65386765a 100644
> > > --- a/lang/rust/Makefile
> > > +++ b/lang/rust/Makefile
> > > @@ -17,6 +17,7 @@ COMMENT-src = Rust source component
> > >
> > > V = 1.77.2
> > > DISTNAME = rustc-${V}-src
> > > +REVISION = 0
> > >
> > > # rustc bootstrap version
> > > BV-aarch64 = 1.77.0-20240320
> > > diff --git a/lang/rust/pkg/PLIST-bootstrap b/lang/rust/pkg/PLIST-bootstrap
> > > index 17001b7230c..1b28ca27ca2 100644
> > > --- a/lang/rust/pkg/PLIST-bootstrap
> > > +++ b/lang/rust/pkg/PLIST-bootstrap
> > > @@ -1,2 +1 @@
> > > -@option always-update
> > > lib/rustc-bootstrap-${MACHINE_ARCH}.tar
> > >
>
> I'm not entirely sure how to make a WANTLIB-boostrap,
>
> I got an issue with a lib trying to generate it for bootstrap, so I
> first checked -main using port-lib-depends-check on -main subpackage
> but it reported an issue about ssh2 library, is this expected? There
> is security/libssh2 and LIB_DEPENDS-main so it should be fine?
>
> I have to admit I became a bit rusty with the ports tree :-)
>
> ryzen$ env SUBPACKAGE=-main make port-lib-depends-check
> ===> Checking f
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/21 06:29:44 Modified files: net/librenms : Makefile distinfo Log message: update to librenms-24.4.1
Re: [update] geo/traccar 6.1
On 2024/04/20 10:18, Renaud Allard wrote: > Hello, > > Here is an update for geo/traccar 6.1. > Tested on amd64 I'll take a look soon. > Legacy app is now removed by default from 6.0 onwards, but is still > available on GitHub for those who still want to use it. This should maybe > be added to upgrade76.html. It's only worth adding to update notes if we can tell people what to do. A vague "available on github" isn't useful (also, github is not accessible from some parts of the world).
Re: Followup after update lang/sbcl
On 2024/04/21 08:45, Timo Myyrä wrote: > On Fri, Apr 19 2024, Sebastien Marie wrote: > > > (Adding Cc to stumpwm maintainer) > > > > Kirill A. Korinsky writes: > > > >> Greetings, > >> > >> I've encountered an edge case with update of sbcl which lead to broken > >> stumpwm. > >> > >> My stumpwm configuration uses mpd modules which requires sb-bsd-sockets, so > >> after update of sbcl... it was broken. > >> > >> To overstep that issue I must rebuild stumpwm because it is saved image > >> which includes sbcl which was used when it was build. > >> > >> To avoid such issue in the future I suggest to add a note inside lang/sbcl > >> that after update x11/stumpwm should have increased revision. > >> > >> I haven't found any other port which depends on lang/sbcl. > > > > I commited a REVISION bump to x11/stumpwm (REVISION starts at 0). > > > > if I properly understand the problem, it is due that you are using both > > stumpwm (compiled with older sbcl compiler) and sbcl parts (for a mpd > > module), and the version mismatches. > > > > For now, bumping stumpwm is the simpler, but I wonder if it would be > > possible to use stumpwm somehow from source and let's sbcl compilation > > to refresh the fasl files if updated. Timo, any idea ? > > > > Thanks. > > I don't like the revision bump approach as why SBCL port should be > changed for each libraries/application using it. That being said, I do > not have anything better to offer here at the moment. It's simple and means that users can verify that the binary on their system is the one from the downloaded package. And really if the compiler version changes, we'd like to make sure that users get updated binaries, so this seems a sane approach. Rather than REVISION it could use the SYSTEM_VERSION mechanism like we do with go or changes to the compiler in base, but while it's only 1 or a handful of ports using it, REVISION is simpler.
Re: dpb always rebuild rust-bootstrap
On 2024/04/21 11:35, Solene Rapenne wrote:
> On Sat, Apr 20, 2024 at 10:02:38AM GMT, Solene Rapenne wrote:
> > On Sat, Apr 20, 2024 at 09:00:30AM GMT, Sebastien Marie wrote:
> > > Solene Rapenne writes:
> > >
> > > > hi, on a fresh current amd64 I had to set up dpb because it seems
> > > > there was a libc bump at the wrong time for me :)
> > > >
> > > > however, now I have my working dpb (easy to setup once you understand
> > > > it), I don't understand why dpb -R something_depending_on_rust
> > > > always have to recompile lang/rust, in the packages directory, only
> > > > the rust bootstrap package is changed everytime I run dpb.
> > > >
> > > > I'm not sure which logs I could provide though. This is quite
> > > > annoying because lang/rust is heavy to compile and I like to trigger
> > > > dpb every time I try a diff.
> > > >
> > > > Am I the only one with this issue?
> > >
> > > I'm interested to know if there are any problems with the way I did
> > > rust-bootstrap.
> > >
> > > Currently, it is marked with 'always-update', because the package
> > > content depend on the build host (system libraries are embedded in the
> > > package for the bootstrap purpose). I expected that if the package isn't
> > > installed (and it shouldn't in standard usage) it will not be a problem.
> > >
> > > Do you have it installed ? If it isn't the case, and dpb is rebuilding
> > > it without purpose (I assume no port depending on it), it might be a
> > > problem in dpb, or some side effect for a subpackage having
> > > 'always-update'.
> > >
> > > I could look to remove the 'always-update' option from rust-bootstrap
> > > without too much trouble.
> > >
> > > Thanks.
> > > --
> > > Sebastien Marie
> >
> > rust-bootstrap is not installed in the chroot after using dpb -R
> > shells/nushell
> > that rebuilt rust-bootstrap , I don't think junking happened
> >
> > I'll try without always-update
> >
>
> dpb stopped rebuilding rust everytime since I removed always-update
>
> I don't know if REVISION could be set only for bootstrap, but
> following diff works for me
The plain REVISION bump like you've done is correct.
I would set WANTLIB-bootstrap to the list of libraries used in the
bootstrap. That way it will be automically updated when necessary.
(Ignore the "not needed" from check-lib-depends).
> diff --git a/lang/rust/Makefile b/lang/rust/Makefile
> index 035767f1126..ba65386765a 100644
> --- a/lang/rust/Makefile
> +++ b/lang/rust/Makefile
> @@ -17,6 +17,7 @@ COMMENT-src = Rust source component
>
> V = 1.77.2
> DISTNAME = rustc-${V}-src
> +REVISION = 0
>
> # rustc bootstrap version
> BV-aarch64 = 1.77.0-20240320
> diff --git a/lang/rust/pkg/PLIST-bootstrap b/lang/rust/pkg/PLIST-bootstrap
> index 17001b7230c..1b28ca27ca2 100644
> --- a/lang/rust/pkg/PLIST-bootstrap
> +++ b/lang/rust/pkg/PLIST-bootstrap
> @@ -1,2 +1 @@
> -@option always-update
> lib/rustc-bootstrap-${MACHINE_ARCH}.tar
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/20 07:05:46 Modified files: databases/p5-DBD-Mock: Makefile databases/p5-DBD-Mock/pkg: PLIST devel/p5-IO-Handle-Util: Makefile devel/p5-IO-Handle-Util/pkg: PLIST devel/p5-MooseX-Traits: Makefile devel/p5-MooseX-Traits/pkg: PLIST devel/p5-MooseX-Types-Structured: Makefile devel/p5-MooseX-Types-Structured/pkg: PLIST devel/p5-TOML-Parser: Makefile devel/p5-TOML-Parser/pkg: PLIST devel/p5-Test-Deep-Fuzzy: Makefile devel/p5-Test-Deep-Fuzzy/pkg: PLIST geo/p5-Geo-UK-Postcode-Regex: Makefile geo/p5-Geo-UK-Postcode-Regex/pkg: PLIST www/p5-Starman : Makefile www/p5-Starman/pkg: PLIST www/p5-XML-Atom: Makefile www/p5-XML-Atom/pkg: PLIST Log message: newer p5-Module-Build-Tiny no longer installs 0-byte manuals; fix plists
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/20 06:57:37 Modified files: graphics/gimp/snapshot: Makefile Log message: add BDEP on bison, used if detected during build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/20 04:44:03 Modified files: net/librenms : Makefile distinfo net/librenms/patches: patch-misc_config_definitions_json net/librenms/pkg: PLIST Log message: update to librenms-24.4.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/20 04:43:35 Modified files: mail/elm : Makefile Log message: add license marker
Re: x11/qt5 doesn't cleanup some files
On 2024/04/20 02:07, Kirill A. Korinsky wrote: > ports@, > > Let assume that I have a system without x11/qt5, and to install it I do > something like this: > > ~ $ ls /usr/local/lib/qt5 > ls: /usr/local/lib/qt5: No such file or directory > ~ $ doas pkg_add -a py3-qt5 > quirks-7.18 signed on 2024-04-18T15:06:29Z > py3-qt5-5.15.9p1:py3-ply-3.11p6: ok > py3-qt5-5.15.9p1:pcaudiolib-1.2: ok > py3-qt5-5.15.9p1:espeak-1.51p2: ok > py3-qt5-5.15.9p1:libao-1.2.0p2: ok > py3-qt5-5.15.9p1:dotconf-1.3p0: ok > py3-qt5-5.15.9p1:py3-xdg-0.28p2: ok > py3-qt5-5.15.9p1:speech-dispatcher-0.11.5: ok > py3-qt5-5.15.9p1:qtbase-5.15.12pl151p0: ok > py3-qt5-5.15.9p1:libsigc++-2.12.1: ok > py3-qt5-5.15.9p1:glib2mm-2.66.7: ok > py3-qt5-5.15.9p1:gstreamer1mm-1.10.0p9: ok > py3-qt5-5.15.9p1:qtdeclarative-5.15.12pl31: ok > py3-qt5-5.15.9p1:qtmultimedia-5.15.12pl2: ok > py3-qt5-5.15.9p1:qtspeech-5.15.12pl1: ok > py3-qt5-5.15.9p1:hyphen-2.8.8p0: ok > py3-qt5-5.15.9p1:qtwebsockets-5.15.12pl2: ok > py3-qt5-5.15.9p1:qtwebchannel-5.15.12pl3: ok > py3-qt5-5.15.9p1:qtserialport-5.15.12: ok > py3-qt5-5.15.9p1:qtlocation-5.15.12pl6: ok > py3-qt5-5.15.9p1:qtsensors-5.15.12: ok > py3-qt5-5.15.9p1:libnotify-0.8.3: ok > py3-qt5-5.15.9p1:avahi-glib-0.8p2: ok > py3-qt5-5.15.9p1:glib2-networking-2.80.0: ok > py3-qt5-5.15.9p1:libpsl-0.21.1: ok > py3-qt5-5.15.9p1:libsoup3-3.4.4: ok > py3-qt5-5.15.9p1:geoclue2-2.7.1p0: ok > py3-qt5-5.15.9p1:qtwebkit-5.212.0alpha4p9v0: ok > py3-qt5-5.15.9p1:qtx11extras-5.15.12: ok > py3-qt5-5.15.9p1:qtxmlpatterns-5.15.12: ok > py3-qt5-5.15.9p1:py3-sip-6.7.11p0v0: ok > py3-qt5-5.15.9p1:py3-pyqt5_sip-12.12.2: ok > py3-qt5-5.15.9p1:qtconnectivity-5.15.12pl6: ok > py3-qt5-5.15.9p1:qtsvg-5.15.12pl6: ok > py3-qt5-5.15.9p1:llvm-16.0.6p24: ok > py3-qt5-5.15.9p1:qttools-5.15.12pl4: ok > py3-qt5-5.15.9p1:qtremoteobjects-5.15.12: ok > py3-qt5-5.15.9p1: ok > Running tags: ok > New and changed readme(s): > /usr/local/share/doc/pkg-readmes/llvm-16 > ~ $ > > now, let remove it: > > ~ $ doas pkg_delete -a > lcms2-2.16p0:py3-qt5-5.15.9p1: ok > lcms2-2.16p0:qtspeech-5.15.12pl1: ok > lcms2-2.16p0:qtmultimedia-5.15.12pl2: ok > lame-3.100p2:speech-dispatcher-0.11.5: ok > lame-3.100p2:espeak-1.51p2: ok > lame-3.100p2:pcaudiolib-1.2: ok > gsettings-desktop-schemas-46.0:qtwebkit-5.212.0alpha4p9v0: ok > gsettings-desktop-schemas-46.0:geoclue2-2.7.1p0: ok > gsettings-desktop-schemas-46.0:libsoup3-3.4.4: ok > gsettings-desktop-schemas-46.0:glib2-networking-2.80.0: ok > py3-pyqt5_sip-12.12.2: ok > qtx11extras-5.15.12: ok > qtwebchannel-5.15.12pl3: ok > avahi-glib-0.8p2: ok > libpsl-0.21.1: ok > qtbase-5.15.12pl151p0:qtsensors-5.15.12: ok > qtbase-5.15.12pl151p0:qtlocation-5.15.12pl6: ok > qtbase-5.15.12pl151p0:qtserialport-5.15.12: ok > qtbase-5.15.12pl151p0:qtwebsockets-5.15.12pl2: ok > qtbase-5.15.12pl151p0:qttools-5.15.12pl4: ok > qtbase-5.15.12pl151p0:qtxmlpatterns-5.15.12: ok > qtbase-5.15.12pl151p0:qtconnectivity-5.15.12pl6: ok > qtbase-5.15.12pl151p0:qtremoteobjects-5.15.12: ok > qtbase-5.15.12pl151p0:qtdeclarative-5.15.12pl31: ok > qtbase-5.15.12pl151p0:qtsvg-5.15.12pl6: ok > qtbase-5.15.12pl151p0: ok > glib2mm-2.66.7:gstreamer1mm-1.10.0p9: ok > glib2mm-2.66.7: ok > py3-ply-3.11p6:py3-sip-6.7.11p0v0: ok > py3-ply-3.11p6: ok > libsigc++-2.12.1: ok > libao-1.2.0p2: ok > dotconf-1.3p0: ok > llvm-16.0.6p24: ok > hyphen-2.8.8p0: ok > libnotify-0.8.3: ok > py3-xdg-0.28p2: ok > Running tags: ok > Read shared items: ok > --- -geoclue2-2.7.1p0 --- > You should also run /usr/sbin/userdel _geoclue > You should also run /usr/sbin/groupdel _geoclue > --- -py3-xdg-0.28p2 --- > Error deleting directory /usr/local/lib/qt5/examples: Directory not empty > Error deleting directory /usr/local/lib/qt5: Directory not empty > ~ $ > > as you see, it left /usr/local/lib/qt5: > > ~ $ find /usr/local/lib/qt5 > /usr/local/lib/qt5 > /usr/local/lib/qt5/examples > /usr/local/lib/qt5/examples/bluetooth > /usr/local/lib/qt5/examples/bluetooth/btscanner > /usr/local/lib/qt5/examples/bluetooth/heartrate-game > /usr/local/lib/qt5/examples/bluetooth/heartrate-server > /usr/local/lib/qt5/examples/bluetooth/lowenergyscanner > /usr/local/lib/qt5/examples/remoteobjects > /usr/local/lib/qt5/examples/remoteobjects/ssl > /usr/local/lib/qt5/examples/remoteobjects/ssl/sslserver > /usr/local/lib/qt5/examples/remoteobjects/ssl/sslserver/cert > /usr/local/lib/qt5/examples/remoteobjects/websockets > /usr/local/lib/qt5/examples/remoteobjects/websockets/common > /usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert > ~ $ > > -- > wbr, Kirill > Some files are in PLISTs which don't include the parent directory, for example the readme here is in ,-main but the dir is in ,-examples.
Re: Fix emulators/dosbox-x build on riscv64
On 2024/04/20 06:59, SASANO Takayoshi wrote: > Hi, > > I compared Brad's diff with current DOSBox-X code on GitHub > https://github.com/joncampbell123/dosbox-x/commit/53fe254c9ce25a48dbe11582416cbf3a49516dce > > Copyright date is different (2002-2021 should be 2002-2024) but > others are same. > > I think this is ok. > -- > SASANO Takayoshi (JG1UAA) > ok.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/20 04:10:11 Modified files: textproc/py-sphinx: Makefile distinfo Log message: update to py3-sphinx-7.3.7
Re: -current Haskell ports aborting with SIGILL
On 2024/04/19 17:58, Greg Steuck wrote: > James Cook writes: > > > Here are some results of debugging with lldb. > > > > > > With cabal-bundler and pandoc, it seems to be the xgetbv instruction > > itself: > > > > > > $ lldb /usr/local/bin/cabal-bundler > > (lldb) target create "/usr/local/bin/cabal-bundler" > > Current executable set to '/usr/local/bin/cabal-bundler' (x86_64). > > (lldb) run > > Process 90738 launched: '/usr/local/bin/cabal-bundler' (x86_64) > > Process 90738 stopped > > * thread #1, stop reason = signal SIGILL > > frame #0: 0x004c12ba cabal-bundler`___lldb_unnamed_symbol522 + > > 90 > > cabal-bundler`___lldb_unnamed_symbol522: > > -> 0x4c12ba <+90>: xgetbv > > Unless I'm missing something, xgetvb is not available in your CPU. > > cpu0: AMD Phenom(tm) II X3 710 Processor, 2611.95 MHz, 10-04-02, patch > 01db > cpu0: > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,HWPSTATE,ITSC > > XGETBV1 is missing in the above and my cursory reading of > https://en.wikipedia.org/wiki/X86-64#AMD64 supports this conclusion. > > Somebody will have to adapt the checking code to be conditional on this > instruction presence if it's deemed important enough to support this CPU. This is in the avx512 checks in the text library again, I think it must be patch-libraries_text_cbits_measure_off_c (the simdutf one doesn't explicitly check for xgetbv but it does check for osxsave so I think wouldn't have executed the xgetbv opcode on this cpu). As -current does now have avx512 support in the kernel we probably should be able to remove that patch, but it needs testing on an avx512 machine as well as that old Phenom.
Re: CVS: cvs.openbsd.org: ports
On 2024/04/19 21:48, Solene Rapenne wrote:
> On Fri, Apr 19, 2024 at 09:41:15PM GMT, Solene Rapenne wrote:
> > On Fri, Apr 19, 2024 at 07:07:22AM GMT, Stuart Henderson wrote:
> > > CVSROOT: /cvs
> > > Module name: ports
> > > Changes by: st...@cvs.openbsd.org 2024/04/19 07:07:22
> > >
> > > Modified files:
> > > textproc/py-docutils: Makefile distinfo
> > > textproc/py-docutils/pkg: PLIST
> > >
> > > Log message:
> > > update to py3-docutils-0.21.1
> > >
> >
> > fail to build on amd64
> >
> > >>> Running build in textproc/py-docutils,python3 at 1713555354.66
> > ===> textproc/py-docutils,python3
> > ===> Checking files for py3-docutils-0.21.1
> > `/data/distfiles/docutils-0.21.1.tar.gz' is up to date.
> > >> (SHA256) docutils-0.21.1.tar.gz: OK
> > ===> Extracting for py3-docutils-0.21.1
> > ===> Patching for py3-docutils-0.21.1
> > ===> Compiler link: clang -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
> > /usr/bin/clang
> > ===> Compiler link: clang++ -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
> > /usr/bin/clang++
> > ===> Compiler link: cc -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
> > /usr/bin/cc
> > ===> Compiler link: c++ -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
> > /usr/bin/c++
> > ===> Generating configure for py3-docutils-0.21.1
> > ===> Configuring for py3-docutils-0.21.1
> > ===> Building for py3-docutils-0.21.1
> > * Getting build dependencies for wheel...
> >
> > Traceback (most recent call last):
> > File "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_impl.py",
> > line 321, in _call_hook
> > raise BackendUnavailable(data.get('traceback', ''))
> > pyproject_hooks._impl.BackendUnavailable: Traceback (most recent call last):
> > File
> > "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_in_process/_in_process.py",
> > line 77, in _build_backend
> > obj = import_module(mod_path)
> > File "/usr/local/lib/python3.10/importlib/__init__.py", line 126, in
> > import_module
> > return _bootstrap._gcd_import(name[level:], package, level)
> > File "", line 1050, in _gcd_import
> > File "", line 1027, in _find_and_load
> > File "", line 992, in _find_and_load_unlocked
> > File "", line 241, in
> > _call_with_frames_removed
> > File "", line 1050, in _gcd_import
> > File "", line 1027, in _find_and_load
> > File "", line 1004, in
> > _find_and_load_unlocked
> > ModuleNotFoundError: No module named 'flit_core'
> >
> > ERROR Backend 'flit_core.buildapi' is not available.
> > *** Error 1 in textproc/py-docutils
> > (/data/ports/lang/python/python.port.mk:370 'do-build': @: ; if [ -e
> > /tmp/pobj/py-docutils-0.21.1-python...)
> > *** Error 2 in textproc/py-docutils
> > (/data/ports/infrastructure/mk/bsd.port.mk:3057
> > '/tmp/pobj/py-docutils-0.21.1-python3/.build_done': @cd ...)
> > *** Error 2 in textproc/py-docutils
> > (/data/ports/infrastructure/mk/bsd.port.mk:2704 'build':
> > @lock=py3-docutils-0.21.1; export _LOCKS_HELD=...)
> > ===> Exiting textproc/py-docutils,python3 with an error
> >
>
> this diff seems to work for me
>
> ok?
>
> diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
> index 300c8d4caf4..dca2c5b5e80 100644
> --- a/textproc/py-docutils/Makefile
> +++ b/textproc/py-docutils/Makefile
> @@ -4,6 +4,7 @@ MODPY_EGG_VERSION= 0.21.1
> DISTNAME=docutils-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> CATEGORIES= textproc
> +REVISION=0
>
> HOMEPAGE=https://docutils.sourceforge.io/
>
> @@ -15,6 +16,8 @@ MODULES=lang/python
> MODPY_PI=Yes
> MODPY_PYBUILD= setuptools
>
> +BUILD_DEPENDS= devel/py-flit_core${MODPY_FLAVOR}
> +
> RUN_DEPENDS= textproc/py-pygments${MODPY_FLAVOR}
>
> FLAVORS= python3
>
Thanks, I've fixed it this way:
-MODPY_PYBUILD= setuptools
+MODPY_PYBUILD= flit_core
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/20 03:42:43 Modified files: textproc/py-docutils: Makefile Log message: docutils now uses flit_core.not setuptools, found by solene@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/19 07:07:46 Modified files: games/angband : Makefile Added files: games/angband/patches: patch-lib_help_version_txt Log message: patch a .txt file used as input to sphinx, there's a utf8 problem which breaks with newer sphinx
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/19 07:07:22 Modified files: textproc/py-docutils: Makefile distinfo textproc/py-docutils/pkg: PLIST Log message: update to py3-docutils-0.21.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/19 07:07:09 Modified files: textproc/py-sphinx: Makefile distinfo textproc/py-sphinx/pkg: PLIST Log message: update to py3-sphinx-7.3.6
Re: OpenBSD-7.5 (release) ioquake3 issue
On 2024/04/19 01:46, sda wrote: > Dwarf Error: wrong version in compilation unit header (is 4, should be > 2) [in module /usr/libexec/ld.so] That's because of the ancient gdb that's in base. There's a slightly less old one in ports. See "Debug Packages, Debuggers and Backtraces" in https://www.openbsd.org/faq/ports/ports.html > Program received signal SIGILL, Illegal instruction. > 0x08c46184408b in ?? () > (gdb) > core dumped. (size 160Mb) Most likely this is due to the 'indirect branch tracking' cpu feature being triggered. Building from ports with USE_NOBTCFI=Yes will likely work around it, the proper fix would be to add 'endbr64' instructiond at the location of jump targets in assembly code. See if the above info on gdb will get you a backtrace.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/19 00:54:04 Modified files: net/icinga/core2: Makefile Log message: undo inadvertent change to homepage when ../Makefile.inc changed to use ?=
Re: [s...@spacehopper.org: Re: [NEW]: misc/openhab - open Home Automation Bus (openHAB)]
I've tweaked DESCR/README slightly for openhab-addons. This has been sitting on ports@ for quite a while, as is usual for a java port there are some things which sit a bit awkwardly compared to some other ports but I think it's basically alright. Any oks to import? --- openhab: The open Home Automation Bus (openHAB) project aims at providing a universal integration platform for all things around home automation. It is a pure Java solution, fully based on OSGi. It is designed to be vendor-neutral as well as hardware/protocol-agnostic. openHAB brings together different bus systems, hardware devices, and interface protocols by dedicated bindings. These bindings send and receive commands and status updates on the openHAB event bus. This concept allows designing user interfaces with a unique look, but with the possibility to operate devices based on a big number of different technologies. Besides the user interfaces, it also brings the power of automation logic across different system boundaries. --- openhab-addons: Addons for the open Home Automation Bus (openHAB) project. This package provides the addons in package form, avoiding the need for openHAB to have outgoing network access in some cases. openhab.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/18 15:24:22 Modified files: net/icinga : Makefile Added files: net/icinga/icingadb: Makefile distinfo modules.inc net/icinga/icingadb/pkg: DESCR PLIST README icingadb.rc net/icinga/icingadb-web: Makefile distinfo net/icinga/icingadb-web/pkg: DESCR PLIST README Log message: Add icingadb-related subports, icingadb provides a configuration and state database with communications with a main icinga daemon, and icingadb-web presents a user interface using that as a backend (as an alternative or an addition to the usual "monitoring" backend in icingaweb2). >From Alvar Penning, I modified things slightly to follow the upstream repo name for icingadb-web and make them a little more similar to the existing ports.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/18 15:20:31 Modified files: www/py-responses: Makefile distinfo www/py-responses/pkg: PLIST Log message: update to py3-responses-0.25.0, ok daniel@, tweak/ok kmos@
Re: converters/k2pdfopt: unbreak/update to 2.55
On 2024/04/18 18:30, Caspar Schutijser wrote:
> On Thu, Apr 18, 2024 at 09:55:20AM -0600, Anthony J. Bentley wrote:
> > Stuart Henderson writes:
> > > Perhaps consider replacing pre-patch with this which I think is a little
> > > clearer:
> > >
> > > FIX_CRLF_FILES = `find . -type f`
> >
> > Can this be tweaked to limit it to text files, without making it too
> > complicated?
> >
> > I only see a single binary file in the distfile, but still...
>
> I see this message now after I already committed the diff. I think
> that makes sense, yes. Limiting it to .txt, .c and .h files (the files
> we're patching) also works.
>
> Comments or OK?
Makes sense, I just suggested the FIX_CRLF_FILES equivalent of what
was there before but this is neater. OK
> Caspar
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/converters/k2pdfopt/Makefile,v
> diff -u -p -r1.13 Makefile
> --- Makefile 18 Apr 2024 16:15:44 - 1.13
> +++ Makefile 18 Apr 2024 16:28:35 -
> @@ -38,7 +38,7 @@ RUN_DEPENDS += print/ghostscript/gnu
>
> WRKDIST =${WRKDIR}/k2pdfopt_v${V}
>
> -FIX_CRLF_FILES = `find . -type f`
> +FIX_CRLF_FILES = `find . -type f \( -name '*.txt' -o -name '*.[ch]' \)`
>
> post-install:
> ${INSTALL_MAN} ${WRKDIR}/debian/k2pdfopt.1 ${PREFIX}/man/man1
>
Re: devel/ipython - missing RDEP
On 2024/04/18 21:27, Bjorn Ketelaars wrote:
> jupyter-notebook fails to run notebooks with the following error:
>
..
> File
> "/usr/local/lib/python3.10/site-packages/IPython/core/guarded_eval.py", line
> 35, in
> from typing_extensions import Self, LiteralString
> ModuleNotFoundError: No module named 'typing_extensions'
>
> I believe this is caused by a missing RDEP in devel/ipython, which
> recently received an update. With the diff below jupyer-notebook is
> happy again.
right, typing_extensions is needed until python 3.12.
OK.
>
>
> diff --git Makefile Makefile
> index 18f85e7a7f5..432c6ddaa5a 100644
> --- Makefile
> +++ Makefile
> @@ -1,6 +1,7 @@
> COMMENT =enhanced interactive Python shell
>
> MODPY_EGG_VERSION = 8.23.0
> +REVISION = 0
> DISTNAME = ipython-${MODPY_EGG_VERSION}
> PKGNAME =ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
>
> @@ -32,6 +33,7 @@ RUN_DEPENDS =
> databases/py-pickleshare${MODPY_FLAVOR} \
>
> devel/py-prompt_toolkit${MODPY_FLAVOR}>=3.0.41v1,<3.1.0v1 \
> devel/py-stack_data${MODPY_FLAVOR} \
> devel/py-traitlets${MODPY_FLAVOR}>=5.13.0 \
> + devel/py-typing-extensions${MODPY_FLAVOR} \
> graphics/py-matplotlib-inline${MODPY_FLAVOR} \
> textproc/py-pygments${MODPY_FLAVOR}>=2.4.0
>
>
Re: converters/k2pdfopt: unbreak/update to 2.55
On 2024/04/18 17:13, Caspar Schutijser wrote: > On Wed, Apr 17, 2024 at 10:59:07PM +0200, Caspar Schutijser wrote: > > Hi, > > > > At the end of the email is a diff that unbreaks and updates > > converters/k2pdfopt to 2.55. > > Hi, > > I spent some more time on it today and I have a new diff. Changes > compared to the last diff: > - using mupdf now works; > - ship a manual page, borrowed from Debian; > - sort dependencies in LIB_DEPENDS (I know it causes churn, but this > is already a noisy update anyway); > - improve comments in patches/patch-CMakeLists_txt; > - add another comment in patches/patch-k2pdfoptlib_k2pdfopt_h. > > Feedback still welcome. I've run some test files through it and they're working fine, looking at the Makefile after patching it looks good. Perhaps consider replacing pre-patch with this which I think is a little clearer: FIX_CRLF_FILES = `find . -type f` (when FIX_CRLF_FILES was added, this port was already marked BROKEN, so it was missed in the sweep). OK
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/18 09:23:44 Modified files: editors/vim: Makefile distinfo editors/vim/patches: patch-runtime_filetype_vim editors/vim/pkg: PLIST-main Log message: update to vim-9.1.346
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org 2024/04/18 08:43:37
Modified files:
cad/opencascade: Makefile distinfo
cad/opencascade/pkg: PLIST
Log message:
update to opencascade-7.8.1, from Johannes Thyssen Tishman (maintainer)
tweak from me to use ${V} in PLIST (+SUBST_VARS)
Re: [update] cad/opencascade 7.8.0 -> 7.8.1
On 2024/04/18 13:14, Johannes Thyssen Tishman wrote:
> Straightforward maintenance update for cad/opencascade to version 7.8.1.
> Both its consumers cad/{kicad,prusaslicer} build and run fine.
i'm building to test it now, with a slight tweak to reduce PLIST churn.
Index: Makefile
===
RCS file: /cvs/ports/cad/opencascade/Makefile,v
diff -u -p -r1.3 Makefile
--- Makefile10 Feb 2024 15:39:40 - 1.3
+++ Makefile18 Apr 2024 13:53:19 -
@@ -1,7 +1,7 @@
COMMENT = platform for 3D CAD, CAM, and CAE
DPB_PROPERTIES = parallel
-V =7.8.0
+V =7.8.1
DISTNAME = opencascade-${V}
.for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF \
@@ -73,7 +73,7 @@ COMP=clang
COMP=gcc
.endif
-SUBST_VARS += BITS COMP
+SUBST_VARS += BITS COMP V
# fix bash and make installed script names less generic
pre-configure:
Index: distinfo
===
RCS file: /cvs/ports/cad/opencascade/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo10 Feb 2024 15:39:40 - 1.2
+++ distinfo18 Apr 2024 13:53:19 -
@@ -1,2 +1,2 @@
-SHA256 (opencascade-7.8.0.tar.gz) =
ucjwqdUjrBpgZpf5X8Odis8RQNNyhWG4AQpgRDG06c8=
-SIZE (opencascade-7.8.0.tar.gz) = 48431454
+SHA256 (opencascade-7.8.1.tar.gz) =
M/K9tn4/auRp8/qBbPujRSmiOpy3Nr+YoysgPYUxxSM=
+SIZE (opencascade-7.8.1.tar.gz) = 48427425
Index: pkg/PLIST
===
RCS file: /cvs/ports/cad/opencascade/pkg/PLIST,v
diff -u -p -r1.3 PLIST
--- pkg/PLIST 10 Feb 2024 15:39:40 - 1.3
+++ pkg/PLIST 18 Apr 2024 13:53:19 -
@@ -1,9 +1,9 @@
@conflict oce-*
@pkgpath cad/oce
bin/DRAWEXE
-@bin bin/DRAWEXE-7.8.0
+@bin bin/DRAWEXE-${V}
bin/ExpToCasExe
-@bin bin/ExpToCasExe-7.8.0
+@bin bin/ExpToCasExe-${V}
bin/occt_custom.sh
bin/occt_custom_${COMP}_${BITS}.sh
bin/occt_draw.sh
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/18 07:37:56 Modified files: graphics/openvdb: Makefile distinfo graphics/openvdb/pkg: PLIST Log message: update to openvdb-11.0.0, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/18 07:27:51 Modified files: security/sslscan: Makefile security/sslscan/pkg: DESCR Log message: fix outdated DESCR, spotted by florian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/18 06:33:31 Modified files: devel/py-hatchling: Makefile distinfo Log message: update to py3-hatchling-1.24.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/18 06:33:27 Modified files: devel/py-regex : Makefile distinfo Log message: update to py3-regex-2024.4.16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/18 06:33:25 Modified files: devel/py-virtualenv: Makefile distinfo Log message: update to py3-virtualenv-20.25.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/18 06:33:23 Modified files: textproc/yq: Makefile distinfo textproc/yq/pkg: PLIST Log message: update to yq-3.4.1
Re: [Update] devel/github-backup
OK sthen
On 2024/04/18 10:43, Laurence Tratt wrote:
> A mostly-trivial update to devel/github-backup, though explicitly disabling
> tests since, to quote the readme, "This project currently contains no unit
> tests.", causing `make test` to error.
>
>
> Laurie
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/github-backup/Makefile,v
> diff -u -p -u -r1.15 Makefile
> --- Makefile 15 Aug 2023 10:21:13 - 1.15
> +++ Makefile 18 Apr 2024 09:23:27 -
> @@ -1,6 +1,6 @@
> COMMENT = backup a github user or organization
>
> -MODPY_EGG_VERSION = 0.43.1
> +MODPY_EGG_VERSION = 0.45.1
> PKGNAME =github-backup-${MODPY_EGG_VERSION}
>
> GH_ACCOUNT = josegonzalez
> @@ -16,5 +16,7 @@ PERMIT_PACKAGE =Yes
>
> MODULES =lang/python
> MODPY_PYBUILD = setuptools
> +
> +NO_TEST =Yes
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/github-backup/distinfo,v
> diff -u -p -u -r1.6 distinfo
> --- distinfo 15 Aug 2023 10:21:13 - 1.6
> +++ distinfo 18 Apr 2024 09:23:27 -
> @@ -1,2 +1,2 @@
> -SHA256 (python-github-backup-0.43.1.tar.gz) =
> nbAzjAbxbMXWyCqawpkyvS8SMKQleSa69+DsbSSNXow=
> -SIZE (python-github-backup-0.43.1.tar.gz) = 26723
> +SHA256 (python-github-backup-0.45.1.tar.gz) =
> bw6n21XPs/wcwHYNi3K9u4uBvZ4I90HfEMBNVLk8fwU=
> +SIZE (python-github-backup-0.45.1.tar.gz) = 35472
>
Re: [NEW] Icinga DB and Icinga DB Web
On 2024/04/11 23:04, Alvar Penning wrote:
> Hi again,
>
> For the record, I have been running the two ports without any problems
> since my last mail.
>
> Today both Icinga DB and Icinga DB Web have been updated and I have
> updated my ports as well. Please feel free to check out the attached
> updated ports.
>
> - https://github.com/Icinga/icingadb/releases/tag/v1.2.0
> - https://github.com/Icinga/icingadb-web/releases/tag/v1.1.2
>
> Please note that the new Icinga DB Web release requires an updated
> icinga-php-library version, which I just sent in another mail.
>
> Best,
> Alvar
I've rearranged things slightly (in particular used upstream's
icingadb-web name). I think I'm pretty happy with this, though I'd
kind of like to take maintainer myself to keep all the icinga ports
under single maintainership if you don't mind.
Index: Makefile
===
RCS file: /cvs/ports/net/icinga/Makefile,v
diff -u -p -r1.11 Makefile
--- Makefile11 Mar 2022 19:46:05 - 1.11
+++ Makefile17 Apr 2024 23:28:58 -
@@ -2,6 +2,8 @@
SUBDIR += core2
SUBDIR += icinga-php-library
SUBDIR += icinga-php-thirdparty
+ SUBDIR += icingadb
+ SUBDIR += icingadb-web
SUBDIR += web2
SUBDIR += web2-module-director
SUBDIR += web2-module-incubator
Index: icingadb/Makefile
===
RCS file: icingadb/Makefile
diff -N icingadb/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ icingadb/Makefile 17 Apr 2024 23:28:58 -
@@ -0,0 +1,30 @@
+COMMENT= configuration and state database for Icinga
+
+GH_PROJECT=icingadb
+GH_TAGNAME=v1.2.0
+
+MODGO_MODNAME= github.com/icinga/icingadb
+MODGO_VERSION= ${GH_TAGNAME}
+
+WANTLIB += c pthread
+
+HOMEPAGE= https://icinga.com/docs/icinga-db/
+MAINTAINER=Alvar Penning
+
+# GPLv2
+PERMIT_PACKAGE=Yes
+
+MODULES= lang/go
+
+.include "modules.inc"
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icingadb/markdown
+ ${INSTALL_DATA} ${WRKSRC}/{AUTHORS,LICENSE,*.md}
${PREFIX}/share/doc/icingadb
+ cp -a ${WRKSRC}/doc ${PREFIX}/share/doc/icingadb/
+
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/icingadb/schema
+ ${INSTALL_DATA} ${WRKSRC}/config.example.yml
${PREFIX}/share/examples/icingadb
+ cp -a ${WRKSRC}/schema ${PREFIX}/share/examples/icingadb/
+
+.include
Index: icingadb/distinfo
===
RCS file: icingadb/distinfo
diff -N icingadb/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -
+++ icingadb/distinfo 17 Apr 2024 23:28:58 -
@@ -0,0 +1,230 @@
+SHA256 (go_modules/filippo.io/edwards25519/@v/v1.1.0.mod) =
CZVW/E1+b1yxNe/di2u0wJMuOOoFjFP8X6XOKFVy+2E=
+SHA256 (go_modules/filippo.io/edwards25519/@v/v1.1.0.zip) =
msQ6aG0G/evXGfevOGbIfrBpMCJy37ExAHrfRxwwi2U=
+SHA256 (go_modules/github.com/!vivid!cortex/ewma/@v/v1.2.0.mod) =
ILNcJxBBj+a8SPgF/mQlwJXr0GKZrGH8kQfZtR18EeY=
+SHA256 (go_modules/github.com/!vivid!cortex/ewma/@v/v1.2.0.zip) =
+s/u7C2sRHIR5zPtbxkOkGioqJ13DqQLHWlV+mz/Ns8=
+SHA256
(go_modules/github.com/acarl005/stripansi/@v/v0.0.0-20180116102854-5a71ef0e047d.mod)
= 9reCOkmoAi4gnOYzdGnzgODUVIrJ7d3FAsk+nSGFU5w=
+SHA256
(go_modules/github.com/acarl005/stripansi/@v/v0.0.0-20180116102854-5a71ef0e047d.zip)
= UWmFilT28G8wicRdsjMpD7rx68LJd2ZJcFts2dxYpAw=
+SHA256 (go_modules/github.com/bsm/ginkgo/v2/@v/v2.12.0.mod) =
4Z6a5I0biaA6+Y7wguQ6rEUN2JoisvR4LFLxJt5YOXU=
+SHA256 (go_modules/github.com/bsm/ginkgo/v2/@v/v2.12.0.zip) =
7nNRkO2kuXft2TSEvAPJ3KKu7esxJBwjMDs3fe7FafI=
+SHA256 (go_modules/github.com/bsm/gomega/@v/v1.27.10.mod) =
7Zm/GRmWBtSgMPrKlBAU6E0ClSg9yBC4CZQQ/c5YDJo=
+SHA256 (go_modules/github.com/bsm/gomega/@v/v1.27.10.zip) =
MwsjBrfLwXTcVqjrAZRuud2FRHjSkvAdN+uGshRMFOw=
+SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.mod) =
oJD46q9ZzCrfFjKZ6+/nl+Hco/at0sjoimo7kLpTiwI=
+SHA256 (go_modules/github.com/cespare/xxhash/v2/@v/v2.2.0.zip) =
/BgM2wwA+/+9Obd0pyzbXwwyrOJTcNUTUZWRiow/vSU=
+SHA256 (go_modules/github.com/creasty/defaults/@v/v1.7.0.mod) =
x/35kvVZVN5fIGcB2Ee776hkDG8C6367XHwxQAcNkc4=
+SHA256 (go_modules/github.com/creasty/defaults/@v/v1.7.0.zip) =
wsbXirL2DtjxJRQAX7tbs37PfBRBeESBk6zK1OEwV84=
+SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.mod) =
vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw=
+SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) =
a0SoQ5UfNxtwEMdU7MPKvv6BXVztHFuUCfstaX6KiQ0=
+SHA256
(go_modules/github.com/dgryski/go-rendezvous/@v/v0.0.0-20200823014737-9f7001d12a5f.mod)
= hd5DSrBs56RHCmR6eybbiMa1TsYIDJSCoSq8JtK3G68=
+SHA256
(go_modules/github.com/dgryski/go-rendezvous/@v/v0.0.0-20200823014737-9f7001d12a5f.zip)
= 0iIli2B9X8rPCehAaWB9jxj7pIslrRkex404DQeOaU8=
+SHA256 (go_modules/github.com/fatih/color/@v/v1.10.0.mod) =
U5/OfPScTcYTXzAK1HE3D9DhXf849csMxDLUExNj64s=
+SHA256 (go_modules/github.com/fatih/color/@v/v1.13.0.mod) =
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 17:28:00 ports/net/icinga/icingadb/pkg Update of /cvs/ports/net/icinga/icingadb/pkg In directory cvs.openbsd.org:/tmp/cvs-serv36237/icingadb/pkg Log Message: Directory /cvs/ports/net/icinga/icingadb/pkg added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 17:27:57 ports/net/icinga/icingadb-web/pkg Update of /cvs/ports/net/icinga/icingadb-web/pkg In directory cvs.openbsd.org:/tmp/cvs-serv57438/icingadb-web/pkg Log Message: Directory /cvs/ports/net/icinga/icingadb-web/pkg added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 17:27:53 ports/net/icinga/icingadb Update of /cvs/ports/net/icinga/icingadb In directory cvs.openbsd.org:/tmp/cvs-serv69451/icingadb Log Message: Directory /cvs/ports/net/icinga/icingadb added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 17:27:54 ports/net/icinga/icingadb-web Update of /cvs/ports/net/icinga/icingadb-web In directory cvs.openbsd.org:/tmp/cvs-serv60213/icingadb-web Log Message: Directory /cvs/ports/net/icinga/icingadb-web added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 16:06:32 Modified files: devel/py-hatchling: distinfo Log message: fix distinfo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 13:15:05 Modified files: infrastructure/db: user.list Log message: reserve 898 for _icingadb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 13:13:16 Modified files: net/icinga : Makefile.inc Log message: make HOMEPAGE conditional, part of a diff from Alvar Penning
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 13:07:24 Modified files: mail/rspamd: Makefile distinfo Log message: switch DIST_TUPLE back to GH_* so that portroach works
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 13:06:31 Modified files: mail/rspamd: Makefile Log message: use system fmt, now that it's new enough. from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 13:05:23 Modified files: graphics/openimageio: Makefile graphics/openimageio/pkg: PLIST Log message: regen openimageio plist for new fmt, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 13:05:05 Modified files: emulators/dolphin: Makefile distinfo Log message: update to dolphin-5.0.0.20230924, from Brad, fixes with new fmt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 13:04:43 Modified files: devel/fmt : Makefile distinfo devel/fmt/patches: patch-test_gtest-extra-test_cc devel/fmt/pkg : PLIST Added files: devel/fmt/patches: patch-src_os_cc Removed files: devel/fmt/patches: patch-CMakeLists_txt Log message: update to fmt-10.2.1, from Brad fixes for a couple of ports to follow
Re: NEW: www/internetarchive
On 2024/04/17 12:14, Anthony J. Bentley wrote:
> Hi,
>
> > The internetarchive package provides a command-line tool named 'ia',
> > as well as a Python module for programmatic access to Archive.org.
> >
> >
> > Would have been fun to put it under archivers/, but I decided
> > against it.
> >
> > ok?
>
> Updated RUN_DEPENDS.
Generally python ports aren't using PKG_ARCH=*, I'd prefer to keep it
like that.
tests/cli/test_ia_download.py tests fail if ia isn't on the path so
probably wants either a self-TEST_DEPENDS or adjusting the path to
include the newly built files (TEST_ENV = PATH=${WRKINST}${PREFIX}/bin
though this only works after 'make fake').
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 12:06:08 Modified files: security/clamav: Tag: OPENBSD_7_5 Makefile distinfo security/clamav/patches: Tag: OPENBSD_7_5 patch-etc_clamd_conf_sample Log message: update to clamav-1.3.1 CVE-2024-20380: Fixed a possible crash in the HTML file parser that could cause a denial-of-service (DoS) condition, affecting 1.3.0 only
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 12:05:46 Modified files: security/clamav: Makefile distinfo security/clamav/patches: patch-etc_clamd_conf_sample Log message: update to clamav-1.3.1 CVE-2024-20380: Fixed a possible crash in the HTML file parser that could cause a denial-of-service (DoS) condition, affecting 1.3.0 only
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/17 11:50:57 Modified files: net/isc-bind : Tag: OPENBSD_7_5 Makefile distinfo net/isc-bind/patches: Tag: OPENBSD_7_5 patch-bin_dig_dig_c patch-lib_isc_netmgr_netmgr_c Log message: update to isc-bind-9.18.26
