CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/01/01 23:11:53 Modified files: misc/remind: Makefile distinfo misc/remind/pkg: PLIST Log message: Update remind to 4.2.2 Changes: https://dianne.skoll.ca/pipermail/remind-fans/2023/004425.html >From Martin Ziemer (maintainer). Thank you!
[maintainer update] remind 4.2.1 -> 4.2.2
This patch updated remind from 4.2.1 to 4.2.2. Tested on amd64. Index: Makefile === RCS file: /cvs/ports/misc/remind/Makefile,v retrieving revision 1.62 diff -u -p -r1.62 Makefile --- Makefile16 Dec 2022 10:35:42 - 1.62 +++ Makefile2 Jan 2023 05:55:36 - @@ -1,7 +1,7 @@ COMMENT= scripting language for reminders, with a Tk front end -DISTNAME= remind-04.02.01 -PKGNAME= remind-4.2.1 +DISTNAME= remind-04.02.02 +PKGNAME= remind-4.2.2 CATEGORIES=misc Index: distinfo === RCS file: /cvs/ports/misc/remind/distinfo,v retrieving revision 1.32 diff -u -p -r1.32 distinfo --- distinfo16 Dec 2022 10:35:42 - 1.32 +++ distinfo2 Jan 2023 05:55:36 - @@ -1,2 +1,2 @@ -SHA256 (remind-04.02.01.tar.gz) = RknG1SyKKYSMLWihR2GM8MVROJx0E0E1gD+vSLv6uk0= -SIZE (remind-04.02.01.tar.gz) = 487960 +SHA256 (remind-04.02.02.tar.gz) = 1VcfJg+D/BUtIYHJLGa402j9Fmx/wcD8f4FXj1nnIYw= +SIZE (remind-04.02.02.tar.gz) = 492738 Index: pkg/PLIST === RCS file: /cvs/ports/misc/remind/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 25 Oct 2022 19:09:06 - 1.12 +++ pkg/PLIST 2 Jan 2023 05:55:36 - @@ -26,6 +26,7 @@ share/remind/ share/remind/ansitext.rem share/remind/holidays/ share/remind/holidays/ca.rem +share/remind/holidays/fr.rem share/remind/holidays/jewish.rem share/remind/holidays/us.rem share/remind/lang/ @@ -43,5 +44,6 @@ share/remind/lang/no.rem share/remind/lang/pl.rem share/remind/lang/pt.rem share/remind/lang/ro.rem +share/remind/seasons.rem share/remind/site/ share/remind/site/README
hlsteam - new attempt at hashlink steam middleware library
Hi, This is an updated version of my original submission a year ago [1]. I'm keeping it shorter this time - this does the same as the recently committed libcsteamworks [2] for hashlink. This replaces the stub library that is part of steamworks-nosteam. Net benefit is improved support and maintainability of keeping the following indie games runnable on OpenBSD: Dead Cells, Northgard, Dice Tribes: Ambitions, Nuclear Blaze, Evoland Legendary Edition, Voidrun, possibly future titles. ok to import? [1] https://marc.info/?l=openbsd-ports=163554939711525=2 [2] https://marc.info/?l=openbsd-ports=166753024405818=2 hlsteam.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ai...@cvs.openbsd.org 2023/01/01 16:04:55 Modified files: www/vaultwarden-web: Makefile distinfo www/vaultwarden-web/pkg: PLIST Log message: www/vaultwarden-web: update to 2022.12.0 patch and tested by bket@ ok aisha@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ai...@cvs.openbsd.org 2023/01/01 16:03:29 Modified files: security/vaultwarden: Makefile crates.inc distinfo security/vaultwarden/pkg: PLIST Log message: security/vaultwarden: update to 1.27.0 patch and tested by bket@ ok aisha@
Re: [update][proposal] sysutils/nnn add nerd font flavor
On 2023/01/01 20:29:28 +, Stuart Henderson wrote:
> I think I'd add something to DESCR like "Requires a terminal configured to
> use a font from one of the *-nerd-fonts packages, e.g. noto-nerd-fonts or
> others."
I like it, shamelessly stolen :)
Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile24 Nov 2022 10:25:40 - 1.22
+++ Makefile1 Jan 2023 19:12:45 -
@@ -3,6 +3,7 @@ COMMENT = the missing terminal file bro
V =4.7
DISTNAME = nnn-v${V}
PKGNAME = nnn-${V}
+REVISION = 0
CATEGORIES = sysutils
@@ -26,6 +27,13 @@ RUN_DEPENDS =textproc/gsed
MAKE_FLAGS = CFLAGS_OPTIMIZATION=
FAKE_FLAGS = MANPREFIX="$(PREFIX)/man" \
PREFIX="${PREFIX}"
+
+FLAVORS = nerd
+FLAVOR ?=
+
+.if ${FLAVOR:Mnerd}
+MAKE_FLAGS += O_NERD=1
+.endif
USE_GMAKE =Yes
NO_TEST = Yes
Index: pkg/DESCR
===
RCS file: /home/cvs/ports/sysutils/nnn/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 7 May 2018 18:29:00 - 1.1.1.1
+++ pkg/DESCR 1 Jan 2023 22:58:42 -
@@ -18,3 +18,8 @@ Cool things you can do with nnn:
- pin a directory you may need to revisit and jump to it anytime
- lock the current terminal after a specified idle time
- change directory on exit
+
+Flavor: nerd
+build with support for Nerd Fonts, requires a terminal emulator
+configured to use a font from one of the *-nerd-fonts packages,
+e.g. noto-nerd-fonts or others.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2023/01/01 15:54:52 Removed files: audio/ocp/patches: patch-filesel_Makefile patch-filesel_cdfs_Makefile Log message: ocp: remove now unnecessary filesel patches.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/01/01 14:02:07 Modified files: mail/alpine: Makefile distinfo mail/alpine/patches: patch-alpine_pine-use_c patch-configure patch-imap_src_osdep_unix_Makefile patch-imap_src_osdep_unix_ssl_unix_c patch-pico_osdep_terminal_c patch-pith_conf_c mail/alpine/pkg: PLIST-c-client Log message: Update to alpine 2.26
Re: [update][proposal] sysutils/nnn add nerd font flavor
I think I'd add something to DESCR like "Requires a terminal configured to
use a font from one of the *-nerd-fonts packages, e.g. noto-nerd-fonts or
others."
--
Sent from a phone, apologies for poor formatting.
On 1 January 2023 19:26:20 Omar Polo wrote:
On 2022/12/28 17:27:23 +0100, Joel Carnat wrote:
Here is a patch for the corrected Makefile and modified DESCR files.
I can look at fonts/msttcorefonts and do the same thing for the Nerd Fonts.
But there are 53 fonts, without a popularity note. Uncompressed, they take
about 4GB. I only use one font and would probably not install such a huge
package. I don't know about others. Maybe using FULLPKGNAME like with
x11/windowmaker-lang would be the way to go so that one font is one package
and people install the one(s) they want.
What do you think?
almost forgot about nnn after importing the fonts.
here's Joel' diff without the part about manually downloading the
fonts. is it enough (pkg_info -Q nerd should find the fonts) or the
wording needs to be improved?
Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 24 Nov 2022 10:25:40 - 1.22
+++ Makefile 1 Jan 2023 19:12:45 -
@@ -3,6 +3,7 @@ COMMENT = the missing terminal file bro
V = 4.7
DISTNAME = nnn-v${V}
PKGNAME = nnn-${V}
+REVISION = 0
CATEGORIES = sysutils
@@ -26,6 +27,13 @@ RUN_DEPENDS = textproc/gsed
MAKE_FLAGS = CFLAGS_OPTIMIZATION=
FAKE_FLAGS = MANPREFIX="$(PREFIX)/man" \
PREFIX="${PREFIX}"
+
+FLAVORS = nerd
+FLAVOR ?=
+
+.if ${FLAVOR:Mnerd}
+MAKE_FLAGS += O_NERD=1
+.endif
USE_GMAKE = Yes
NO_TEST = Yes
Index: pkg/DESCR
===
RCS file: /home/cvs/ports/sysutils/nnn/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 7 May 2018 18:29:00 - 1.1.1.1
+++ pkg/DESCR 1 Jan 2023 19:17:12 -
@@ -18,3 +18,6 @@ Cool things you can do with nnn:
- pin a directory you may need to revisit and jump to it anytime
- lock the current terminal after a specified idle time
- change directory on exit
+
+Flavors:
+ nerd- build with support for Nerd Fonts to display glyphs.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/01/01 13:24:04 Modified files: net/tut: Makefile distinfo modules.inc Log message: update net/tut to 1.0.34 1.0.32: - tut now gets the number of chars, poll options and length of each option from the instance. char-limit is removed from the config. - URLs now has a fixed length set by the instance, so char count should be correct when composing toots. - the API now uses WebSocket stream instead of streaming over https. Should make tut play nicer with GoToSocial 1.0.33: - make GoToSocial work again 1.0.34: - downgrade tview so the current item in the timeline doesn't get out of the view
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/01/01 13:07:33 Modified files: sysutils/llama : Makefile distinfo modules.inc Log message: update sysutils/llama to 1.4.0 adds a few keybindings (page up/down, home and end) and a --version/-v flag. ok gonzalo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/01/01 12:29:09 Modified files: sysutils/bupstash: Makefile distinfo Log message: Pull two upstream fixes --ignore-permission-errors didn't work in all cases, so I fixed one. Testing my PR on top of 0.12.0 as well and not just master revealed another bug, which lead to truncated filenames. This is fixed in master already. Do not wait for another release and apply both now, so backups no longer abort or corrupt in those use cases. All 57 (58 with this diff) bats(1) tests pass on amd64. OK bket
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/01/01 12:26:56 Modified files: sysutils/bupstash: Makefile Log message: Run cli tests `make test' only runs unit tests at the moment, but the bats(1) suite (for which the unused TEST_DEPENDS is already there) covers more and will gain a new test for a new fix soon, so actually run cli tests. No package change. OK bket
Re: [update][proposal] sysutils/nnn add nerd font flavor
On 2022/12/28 17:27:23 +0100, Joel Carnat wrote:
> Here is a patch for the corrected Makefile and modified DESCR files.
>
> I can look at fonts/msttcorefonts and do the same thing for the Nerd Fonts.
> But there are 53 fonts, without a popularity note. Uncompressed, they take
> about 4GB. I only use one font and would probably not install such a huge
> package. I don't know about others. Maybe using FULLPKGNAME like with
> x11/windowmaker-lang would be the way to go so that one font is one package
> and people install the one(s) they want.
>
> What do you think?
almost forgot about nnn after importing the fonts.
here's Joel' diff without the part about manually downloading the
fonts. is it enough (pkg_info -Q nerd should find the fonts) or the
wording needs to be improved?
Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile24 Nov 2022 10:25:40 - 1.22
+++ Makefile1 Jan 2023 19:12:45 -
@@ -3,6 +3,7 @@ COMMENT = the missing terminal file bro
V =4.7
DISTNAME = nnn-v${V}
PKGNAME = nnn-${V}
+REVISION = 0
CATEGORIES = sysutils
@@ -26,6 +27,13 @@ RUN_DEPENDS =textproc/gsed
MAKE_FLAGS = CFLAGS_OPTIMIZATION=
FAKE_FLAGS = MANPREFIX="$(PREFIX)/man" \
PREFIX="${PREFIX}"
+
+FLAVORS = nerd
+FLAVOR ?=
+
+.if ${FLAVOR:Mnerd}
+MAKE_FLAGS += O_NERD=1
+.endif
USE_GMAKE =Yes
NO_TEST = Yes
Index: pkg/DESCR
===
RCS file: /home/cvs/ports/sysutils/nnn/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 7 May 2018 18:29:00 - 1.1.1.1
+++ pkg/DESCR 1 Jan 2023 19:17:12 -
@@ -18,3 +18,6 @@ Cool things you can do with nnn:
- pin a directory you may need to revisit and jump to it anytime
- lock the current terminal after a specified idle time
- change directory on exit
+
+Flavors:
+ nerd- build with support for Nerd Fonts to display glyphs.
Re: [MAINTAINER UPDATE] archivers/zpaqfranz-56.4
On 2022/12/31 01:34:25 +0100, tux0r wrote: > A new version has dropped five hours ago. Patch attached. committed, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/01/01 12:02:32 Modified files: archivers/zpaqfranz: Makefile distinfo Log message: update archivers/zpaqfranz to 56.4; from MAINTAINER, thanks!
Re: UPDATE: graphics/libraw and friends
On Sat Dec 24, 2022 at 01:44:06PM +0100, Rafael Sadowski wrote:
> Please find below a Christmas diff to update libraw. As usually upstream
> has broken ABI.
>
> - Update libraw to 0.21.0
> - Changelog: https://www.libraw.org/news/libraw-0-21-release
> - fix gegl04, gthumb, krita and libkdcraw with patches from upstream.
>Maintainer CC'ed.
> - Rename swap24 and swap32 to unbreak the build
>
> OK, Comments?
Any comments, any concerns?
>
> Rafael
>
>
> Index: graphics/gegl04/Makefile
> ===
> RCS file: /cvs/ports/graphics/gegl04/Makefile,v
> retrieving revision 1.36
> diff -u -p -u -p -r1.36 Makefile
> --- graphics/gegl04/Makefile 14 Nov 2022 08:03:34 - 1.36
> +++ graphics/gegl04/Makefile 24 Dec 2022 12:34:05 -
> @@ -4,6 +4,7 @@ V=0.4.40
> DISTNAME=gegl-${V}
> PKGNAME= gegl04-${V}
> EXTRACT_SUFX=.tar.xz
> +REVISION=0
>
> SHARED_LIBS += gegl-0.4 0.5 # 0.439.1
>
> Index: graphics/gegl04/patches/patch-operations_external_raw-load_c
> ===
> RCS file: graphics/gegl04/patches/patch-operations_external_raw-load_c
> diff -N graphics/gegl04/patches/patch-operations_external_raw-load_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ graphics/gegl04/patches/patch-operations_external_raw-load_c 24 Dec
> 2022 12:34:05 -
> @@ -0,0 +1,17 @@
> +https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/133
> +Index: operations/external/raw-load.c
> +--- operations/external/raw-load.c.orig
> operations/external/raw-load.c
> +@@ -114,8 +114,12 @@ prepare (GeglOperation *operation)
> + g_warning ("raw-load: Error Initializing raw library");
> + else
> + {
> ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
> ++ p->LibRaw->rawparams.shot_select = o->image_num;
> ++#else
> + p->LibRaw->params.shot_select = o->image_num;
> +
> ++#endif
> + p->LibRaw->params.aber[0] = 1.0;
> + p->LibRaw->params.aber[2] = 1.0;
> + //p->LibRaw->params.gamm[0] = 1.0 / 2.4;
> Index: graphics/gthumb/Makefile
> ===
> RCS file: /cvs/ports/graphics/gthumb/Makefile,v
> retrieving revision 1.129
> diff -u -p -u -p -r1.129 Makefile
> --- graphics/gthumb/Makefile 4 Nov 2022 09:14:23 - 1.129
> +++ graphics/gthumb/Makefile 24 Dec 2022 12:34:05 -
> @@ -2,7 +2,7 @@ COMMENT= image viewer and browser for GN
>
> GNOME_PROJECT= gthumb
> GNOME_VERSION= 3.12.2
> -REVISION=1
> +REVISION=2
>
> CATEGORIES= graphics
>
> Index:
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
> ===
> RCS file:
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
> diff -N
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
> 24 Dec 2022 12:34:05 -
> @@ -0,0 +1,13 @@
> +https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec
> +Index: extensions/raw_files/gth-metadata-provider-raw.c
> +--- extensions/raw_files/gth-metadata-provider-raw.c.orig
> extensions/raw_files/gth-metadata-provider-raw.c
> +@@ -62,7 +62,7 @@ gth_metadata_provider_raw_read (GthMetadataProvider *s
> + if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data)))
> + return;
> +
> +-raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK |
> LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
> ++raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS);
> + if (raw_data == NULL)
> + goto fatal_error;
> +
> Index:
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
> ===
> RCS file:
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
> diff -N
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
> 24 Dec 2022 12:34:05 -
> @@ -0,0 +1,18 @@
> +https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec
> +Index: extensions/raw_files/gth-metadata-provider-raw.h
> +--- extensions/raw_files/gth-metadata-provider-raw.h.orig
> extensions/raw_files/gth-metadata-provider-raw.h
> +@@ -25,6 +25,13 @@
> + #include
> + #include
> + #include
> ++#include
> ++
> ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
> ++#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_DATAERR_CALLBACK)
> ++#else
> ++#define
sysutils/bupstash: pull two upstream fixes
--ignore-permission-errors didn't work in all cases, so I fixed one.
Testing my PR on top of 0.12.0 as well and not just master revealed
another bug, which lead to truncated filenames.
This is fixed in master already.
Do not wait for another release and apply both now, so backups no longer
abort or corrupt in those use cases.
Works as expected together with the cli-tests diff I just sent.
All 57 (58 with this diff) tests pass on amd64.
Feedback? Objection? OK?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/bupstash/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile8 Nov 2022 16:14:42 - 1.13
+++ Makefile1 Jan 2023 18:42:41 -
@@ -2,7 +2,7 @@ COMMENT = encrypted and deduplicated ba
V =0.12.0
DISTNAME = bupstash-v${V}
-PKGNAME = bupstash-${V}
+PKGNAME = bupstash-${V}pl1
CATEGORIES = sysutils
@@ -15,9 +15,22 @@ PERMIT_PACKAGE = Yes
WANTLIB = ${MODCARGO_WANTLIB} m sodium
+MODCARGO_DIST_SUBDIR = cargo
+DIST_SUBDIR = bupstash
MASTER_SITES =
https://github.com/andrewchambers/bupstash/releases/download/v${V}/
DISTFILES =${DISTNAME}-man${EXTRACT_SUFX} \
${DISTNAME}-src+deps${EXTRACT_SUFX}
+
+MASTER_SITES0 =https://github.com/andrewchambers/bupstash/
+PATCH_DIST_STRIP = -p1
+# backport "Fix index paths during put of paths in '/'." fix for
+# "Paths broken when adding multiple subdirs of /"
+# https://github.com/andrewchambers/bupstash/issues/359
+PATCHFILES += trim-{commit/}a73fd83.patch:0
+# pending "Honour --ignore-permission-errors for all path elements"
+# https://github.com/andrewchambers/bupstash/pull/363
+PATCHFILES += ignore-eacces-{commit/}8bf5bd1.patch:0
+PATCHFILES += ignore-eacces-test-{commit/}290768c.patch:0
MODULES = devel/cargo
MODCARGO_RUSTFLAGS = -C debuginfo=0
Index: distinfo
===
RCS file: /cvs/ports/sysutils/bupstash/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo8 Nov 2022 16:14:42 - 1.10
+++ distinfo1 Jan 2023 18:42:44 -
@@ -1,4 +1,10 @@
-SHA256 (bupstash-v0.12.0-man.tar.gz) =
v/5Knnx58DrwJVY4rPoT+5907V1viYeVTbHTFk9DFik=
-SHA256 (bupstash-v0.12.0-src+deps.tar.gz) =
4wVMA7DVe6cYvSyrjCTfExUzad6jEeWlldWGrSSGV5M=
-SIZE (bupstash-v0.12.0-man.tar.gz) = 21237
-SIZE (bupstash-v0.12.0-src+deps.tar.gz) = 15987395
+SHA256 (bupstash/bupstash-v0.12.0-man.tar.gz) =
v/5Knnx58DrwJVY4rPoT+5907V1viYeVTbHTFk9DFik=
+SHA256 (bupstash/bupstash-v0.12.0-src+deps.tar.gz) =
4wVMA7DVe6cYvSyrjCTfExUzad6jEeWlldWGrSSGV5M=
+SHA256 (bupstash/ignore-eacces-8bf5bd1.patch) =
KyfE75X2ZiDJh/gLsvoON4FxAvNxBvNtaJd8/fYBqGo=
+SHA256 (bupstash/ignore-eacces-test-290768c.patch) =
yUlAOZYXXfFLtWXsLJWqfAN2igxY7J49q+0vjR6pfBg=
+SHA256 (bupstash/trim-a73fd83.patch) =
Df+WDuKqZb+OvfhnEH18KS0x7VJL/KfflBrMkJK4lLU=
+SIZE (bupstash/bupstash-v0.12.0-man.tar.gz) = 21237
+SIZE (bupstash/bupstash-v0.12.0-src+deps.tar.gz) = 15987395
+SIZE (bupstash/ignore-eacces-8bf5bd1.patch) = 1823
+SIZE (bupstash/ignore-eacces-test-290768c.patch) = 1526
+SIZE (bupstash/trim-a73fd83.patch) = 1565
sysutils/bupstash: enable cli tests
No package change.
`make test' only runs unit tests at the moment, but the bats(1) suite
covers more and will gain a new test for a new fix soon, so I'd like to
see those results in our port as well.
OK?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/bupstash/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile8 Nov 2022 16:14:42 - 1.13
+++ Makefile1 Jan 2023 17:12:18 -
@@ -19,15 +19,34 @@ MASTER_SITES = https://github.com/andre
DISTFILES =${DISTNAME}-man${EXTRACT_SUFX} \
${DISTNAME}-src+deps${EXTRACT_SUFX}
-MODULES = devel/cargo
+MODULES = devel/cargo \
+ lang/python
+
MODCARGO_RUSTFLAGS = -C debuginfo=0
+MODPY_RUNDEP = No
+MODPY_BUILDDEP = No
+MODPY_ADJ_FILES = cli-tests/mk-random-dir.py
+
LIB_DEPENDS = security/libsodium
-TEST_DEPENDS = devel/bats
+TEST_DEPENDS = devel/bats \
+ sysutils/coreutils \
+ sysutils/truncate \
+ textproc/gdiff \
+ textproc/jq
SEPARATE_BUILD = Yes
WRKDIST = ${WRKDIR}
+
+do-test:
+ ${MODCARGO_TEST_TARGET}
+ # GNU `head -c', `cmp --silent', `truncate'
+.for prog in head cmp truncate
+ ln -sf /usr/local/bin/g${prog} ${WRKDIR}/bin/${prog}
+.endfor
+ env PATH=${WRKBUILD}/target/release:${PORTPATH} \
+ bats --timing ${WRKSRC}/cli-tests/
post-install:
.for m in 1 7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2023/01/01 09:38:27 Modified files: net/dbip : Makefile.inc net/dbip/asn : distinfo net/dbip/city : distinfo net/dbip/country: distinfo Log message: Update dbip to 2023.01.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/01/01 09:36:12 Modified files: x11/xfce4 : xfce4.port.mk x11/xfce4/orage: Makefile x11/xfce4/xfce4-mixer: Makefile x11/xfce4/xfce4-taskmanager: Makefile x11/xfce4/xfce4-wavelan: Makefile Log message: Pass debug configure flags only if DEBUG is set xfc4-wavelan spams ~/.xsession with state changes which stems from the xfce DBG macro which gets defined when the DEBUG macro is set, which comes from --enable-debug that is currently passed for every port using XFCE_COMMIT. Feedback OK landry
Re: xfce4: pass --enable-debug only when DEBUG is set
Le Sun, Jan 01, 2023 at 10:40:12AM +, Klemens Nanni a écrit : > 01.01.2023 12:41, Landry Breuil пишет: > > Le Sat, Dec 31, 2022 at 12:22:47PM +, Klemens Nanni a écrit : > >> xfc4-wavelan spams ~/.xsession with state changes which stems from the > >> xfce DBG macro which gets defined when the DEBUG macro is set, which > >> comes from --enable-debug that is currently passed for every port using > >> XFCE_COMMIT. > >> > >> landry pointed out the XFCE_COMMIT/--enable-debug connection and > >> suggested a DEBUG test -- I failed to look at xfce4.port.mk in the first > >> place. > >> > >> Only four ports use a commit, so bumping them is easy to pick up > >> potential object changes. > >> > >> Feeback? Objection? OK? > > > > I've had a second look at what --enable-maintainer-mode does and it's > > still a bit fuzzy to me, but orage port builds fine without it. So i'd > > completely move the CONFIGURE_ARGS line adding --enable-maintainer-mode > > --enable-debug to the .if defined(DEBUG) block outside of the .if > > defined(XFCE_COMMIT) block, this way all ports can be built with debug > > macros enable via make DEBUG=-g. > > Sure. > > > Dunno if it's a good idea though to link that behaviour it to the ports > > framework DEBUG variable, but we cant add --enable-debug to > > DEBUG_CONFIGURE_ARGS since it'd enable debug macros globally & > > inconditionally. > > Quite a few ports already use DEBUG as condition, I'm not aware of any > other mechanism. Right, then it makes sense to align with others for consistency. > And yes, DEBUG_CONFIGURE_ARGS is out of question, as you explained. > > > i had another look at --enable-debug in aclocal.m4 which is used in all > > xfce projects, from > > https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/blob/master/m4macros/xdt-features.m4#L61: > > - it also enables some -W flags too, some might lead to build failures > > - the DBG macros are enabled for yes/full in the enable-debug values (eg > > no|minimum|yes|full, minimum being the > > default) > > So a minimal fix would be to keep the logic as is and pass =minimum, but > I don't think that's appropiate. > > OK? Definitely, thanks !
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/01/01 07:58:11 Modified files: games/libgdx : Makefile.inc games/libgdx/1.9.11: Makefile distinfo games/libgdx/1.9.11/patches: patch-extensions_gdx-controllers_pom_xml games/libgdx/1.9.11/pkg: PLIST games/libgdx/1.9.9: Makefile distinfo games/libgdx/1.9.9/patches: patch-extensions_gdx-controllers_pom_xml games/libgdx/1.9.9/pkg: PLIST Log message: Start building gdx-controllers-lwjgl3, too. \nThis allows running a game called Space Haven, likely also more lwjgl3-based games.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/01/01 04:52:44 Modified files: x11/wxWidgets : Makefile Log message: Fix indent to shorten future diff.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2023/01/01 03:49:19 Modified files: net/oicb : Makefile distinfo Log message: Update oicb to 1.3.1. This is a happy-new-year-openbsd edition, featuring op@ as Ded Moroz: * new feature: ring a terminal bell when mentioned on public chat, or when a private message is received.
Re: xfce4: pass --enable-debug only when DEBUG is set
01.01.2023 12:41, Landry Breuil пишет:
> Le Sat, Dec 31, 2022 at 12:22:47PM +, Klemens Nanni a écrit :
>> xfc4-wavelan spams ~/.xsession with state changes which stems from the
>> xfce DBG macro which gets defined when the DEBUG macro is set, which
>> comes from --enable-debug that is currently passed for every port using
>> XFCE_COMMIT.
>>
>> landry pointed out the XFCE_COMMIT/--enable-debug connection and
>> suggested a DEBUG test -- I failed to look at xfce4.port.mk in the first
>> place.
>>
>> Only four ports use a commit, so bumping them is easy to pick up
>> potential object changes.
>>
>> Feeback? Objection? OK?
>
> I've had a second look at what --enable-maintainer-mode does and it's
> still a bit fuzzy to me, but orage port builds fine without it. So i'd
> completely move the CONFIGURE_ARGS line adding --enable-maintainer-mode
> --enable-debug to the .if defined(DEBUG) block outside of the .if
> defined(XFCE_COMMIT) block, this way all ports can be built with debug
> macros enable via make DEBUG=-g.
Sure.
> Dunno if it's a good idea though to link that behaviour it to the ports
> framework DEBUG variable, but we cant add --enable-debug to
> DEBUG_CONFIGURE_ARGS since it'd enable debug macros globally &
> inconditionally.
Quite a few ports already use DEBUG as condition, I'm not aware of any
other mechanism.
And yes, DEBUG_CONFIGURE_ARGS is out of question, as you explained.
> i had another look at --enable-debug in aclocal.m4 which is used in all
> xfce projects, from
> https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/blob/master/m4macros/xdt-features.m4#L61:
> - it also enables some -W flags too, some might lead to build failures
> - the DBG macros are enabled for yes/full in the enable-debug values (eg
> no|minimum|yes|full, minimum being the
> default)
So a minimal fix would be to keep the logic as is and pass =minimum, but
I don't think that's appropiate.
OK?
Index: xfce4.port.mk
===
RCS file: /cvs/ports/x11/xfce4/xfce4.port.mk,v
retrieving revision 1.37
diff -u -p -r1.37 xfce4.port.mk
--- xfce4.port.mk 15 Dec 2022 14:43:16 - 1.37
+++ xfce4.port.mk 1 Jan 2023 10:36:11 -
@@ -79,7 +79,6 @@ PORTROACH+= limitw:1,even
.if defined(XFCE_COMMIT)
DISTNAME = ${DISTNAME_GIT}
MASTER_SITES = ${MASTER_SITES_GIT}
-CONFIGURE_ARGS += --enable-maintainer-mode --enable-debug
AUTOMAKE_VERSION = 1.14
AUTOCONF_VERSION = 2.69
MODXFCE4_gen = cd ${WRKSRC} && env NOCONFIGURE=yes \
@@ -89,6 +88,10 @@ BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPEN
${MODGNU_AUTOMAKE_DEPENDS} \
x11/xfce4/xfce4-dev-tools
+.endif
+
+.if defined(DEBUG)
+CONFIGURE_ARGS += --enable-maintainer-mode --enable-debug
.endif
# remove useless .la file
Index: orage/Makefile
===
RCS file: /cvs/ports/x11/xfce4/orage/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- orage/Makefile 25 Dec 2022 07:16:37 - 1.66
+++ orage/Makefile 31 Dec 2022 12:15:16 -
@@ -3,6 +3,7 @@ COMMENT=Xfce4 calendar
XFCE_VERSION= 4.17.0pre0
XFCE_COMMIT= cf27a483c40188bb
XFCE_GOODIE= orage
+REVISION= 0
# GPLv2
PERMIT_PACKAGE=Yes
Index: xfce4-mixer/Makefile
===
RCS file: /cvs/ports/x11/xfce4/xfce4-mixer/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- xfce4-mixer/Makefile21 Dec 2022 09:15:26 - 1.62
+++ xfce4-mixer/Makefile31 Dec 2022 12:14:17 -
@@ -3,6 +3,7 @@ COMMENT=Xfce4 volume mixer
XFCE_GOODIE= xfce4-mixer
XFCE_VERSION= 4.18.0pre0
XFCE_COMMIT= a71951036481ca08a670ad8bf3cd107d37bfb774
+REVISION= 0
# GPLv2
PERMIT_PACKAGE=Yes
Index: xfce4-taskmanager/Makefile
===
RCS file: /cvs/ports/x11/xfce4/xfce4-taskmanager/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- xfce4-taskmanager/Makefile 27 Dec 2022 09:14:37 - 1.41
+++ xfce4-taskmanager/Makefile 31 Dec 2022 12:15:24 -
@@ -3,7 +3,7 @@ COMMENT=Xfce4 task manager and system m
XFCE_VERSION= 1.5.5
XFCE_COMMIT= c4564879
XFCE_GOODIE= xfce4-taskmanager
-REVISION= 0
+REVISION= 1
# GPLv2
PERMIT_PACKAGE=Yes
Index: xfce4-wavelan/Makefile
===
RCS file: /cvs/ports/x11/xfce4/xfce4-wavelan/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- xfce4-wavelan/Makefile 23 Dec 2022 08:03:10 - 1.53
+++ xfce4-wavelan/Makefile 31 Dec 2022 12:15:04 -
@@ -3,7 +3,7 @@ COMMENT=Xfce4 wireless interface monito
XFCE_VERSION= 0.6.3
XFCE_PLUGIN= wavelan
XFCE_COMMIT= 56657a9cc08ce4da022db9233dcf3241aaf13794
-REVISION= 4
+REVISION= 5
# BSD
Re: UPDATE: navidrome-0.48.0 and take MAINTAINER
On Fri, 30 Dec 2022, Edd Barrett wrote: > Hi, > > This updates us to the latest navidrome. > > Since abieber@ dropped MAINTAINER, I'll take it. > > Working great here on amd64. > > Comments? OK? Yep, also builds and works great for me on amd64. ok paco@ -- Paco Esteban. 0x5818130B8A6DBC03
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2023/01/01 03:04:23 Modified files: net/miniflux : Makefile distinfo modules.inc Log message: update net/miniflux to 2.0.41 ok abieber@
[NEW] audio/alsa-lib-1.2.8
Hello, to acclerate alsa-utils and alsa-plugin ports development, post alsa-lib ports first. (I sent pull-request of alsa-utils for *BSD; https://github.com/alsa-project/alsa-utils/pull/186 if there is no enough time for us, use same diff in ports until they are merged) -- SASANO Takayoshi (JG1UAA) alsa-lib.tgz Description: Binary data
Re: xfce4: pass --enable-debug only when DEBUG is set
Le Sat, Dec 31, 2022 at 12:22:47PM +, Klemens Nanni a écrit : > xfc4-wavelan spams ~/.xsession with state changes which stems from the > xfce DBG macro which gets defined when the DEBUG macro is set, which > comes from --enable-debug that is currently passed for every port using > XFCE_COMMIT. > > landry pointed out the XFCE_COMMIT/--enable-debug connection and > suggested a DEBUG test -- I failed to look at xfce4.port.mk in the first > place. > > Only four ports use a commit, so bumping them is easy to pick up > potential object changes. > > Feeback? Objection? OK? I've had a second look at what --enable-maintainer-mode does and it's still a bit fuzzy to me, but orage port builds fine without it. So i'd completely move the CONFIGURE_ARGS line adding --enable-maintainer-mode --enable-debug to the .if defined(DEBUG) block outside of the .if defined(XFCE_COMMIT) block, this way all ports can be built with debug macros enable via make DEBUG=-g. Dunno if it's a good idea though to link that behaviour it to the ports framework DEBUG variable, but we cant add --enable-debug to DEBUG_CONFIGURE_ARGS since it'd enable debug macros globally & inconditionally. i had another look at --enable-debug in aclocal.m4 which is used in all xfce projects, from https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/blob/master/m4macros/xdt-features.m4#L61: - it also enables some -W flags too, some might lead to build failures - the DBG macros are enabled for yes/full in the enable-debug values (eg no|minimum|yes|full, minimum being the default) Landry
Re: aarch64 bulk build report
On 2022 Dec 31 (Sat) at 14:22:24 -0700 (-0700), phess...@openbsd.org wrote: :http://build-failures.rhaalovely.net/aarch64/2022-12-29/devel/quirks.log actually built, not a real error :http://build-failures.rhaalovely.net/aarch64/2022-12-29/games/naev,-data.log Run-time dependency libenet found: NO (tried pkgconfig and cmake) Looking for a fallback subproject for the dependency libenet ../../../obj/ports/naev-0.10.0/naev-0.10.0/meson.build:95:3: ERROR: Automatic wrap-based subproject downloading is disabled A full log can be found at /usr/obj/ports/naev-0.10.0/build-aarch64/meson-logs/meson-log.txt WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated. seems to be a missing dependency :http://build-failures.rhaalovely.net/aarch64/2022-12-29/sysutils/py-filelock,python3.log * Getting build dependencies for wheel... ERROR Missing dependencies: hatch-vcs>=0.3 missing dependency :http://build-failures.rhaalovely.net/aarch64/2022-12-29/textproc/catfish.log ===> Faking installation for catfish-4.16.4p3 Traceback (most recent call last): File "/usr/obj/ports/catfish-4.16.4/catfish-4.16.4/./setup.py", line 260, in DistUtilsExtra.auto.setup( File "/usr/local/lib/python3.10/site-packages/DistUtilsExtra/auto.py", line 98, in setup __requires(attrs, src_all) File "/usr/local/lib/python3.10/site-packages/DistUtilsExtra/auto.py", line 471, in __requires __add_imports(imports, s, attrs) File "/usr/local/lib/python3.10/site-packages/DistUtilsExtra/auto.py", line 405, in __add_imports if alias.name and __external_mod(cur_module, alias.name, attrs): File "/usr/local/lib/python3.10/site-packages/DistUtilsExtra/auto.py", line 377, in __external_mod return 'dist-packages' in mod.__file__ or 'site-packages' in mod.__file__ or \ TypeError: argument of type 'NoneType' is not iterable : :recurrent failures :new failures :+++ ls-failuresSat Dec 31 14:22:24 2022 :+failures/devel/quirks.log :+failures/games/naev,-data.log :+failures/sysutils/py-filelock,python3.log :+failures/textproc/catfish.log :resolved failures :--- ../old/aarch64/last//ls-failures Tue Dec 27 09:44:25 2022 : -- Pity the meek, for they shall inherit the earth. -- Don Marquis
