Re: [UPDATE] lang/node 18.12.1
I can compile and run a brief interactive test session with the
interactive node interpreter. Noticed a two things, guess they might be
known already about the port (?):
- Build log shows a bunch of '-O3', not everywhere, but looks like
CFLAGS/CXXFLAGS aren't honored consistently.
- I'm getting some odd messages from `make port-lib-depends-check`:
node-18.12.1v0(lang/node):
Bogus WANTLIB: crypto.12 (/usr/local/bin/node) (NOT REACHABLE)
Missing: intl.7 from gettext-runtime-0.21.1
(/usr/local/lib/node_modules/node-pledge/build/node_gyp_bins/python3)
Missing: python3.10.0 from python-3.10.9p0
(/usr/local/lib/node_modules/node-pledge/build/node_gyp_bins/python3)
Bogus WANTLIB: ssl.12 (/usr/local/bin/node) (NOT REACHABLE)
Missing: util.16
(/usr/local/lib/node_modules/node-pledge/build/node_gyp_bins/python3) (system
lib)
WANTLIB += intl python3.10 util
Looks to me like the libraries in the last line should be added. Not
sure why lib/eopenssl30/{crypto,ssl} aren't found by
port-lib-depends-check...
On Tue, Dec 27, 2022 at 05:10:12PM +0100, Volker Schlecht wrote:
> bump
>
> On 12/20/22 19:15, Volker Schlecht wrote:
> > bump once more in the hope of finding someone to eventually commit ;-)
> >
> > On 12/17/22 09:55, Volker Schlecht wrote:
> > > bump
> > >
> > > On 12/10/22 15:24, Volker Schlecht wrote:
> > > > If it works, it works ...
> > > >
> > > > Here's the diff with Barry's i386 change included.
> > > > So we have positives on amd64, i386 and riscv64 now.
> > > >
> > > > > (By the way, the patch from my previous email worked for me on both
> > > > > amd64 and i386.)
> > > >
>
Re: [UPDATE] lang/node 18.12.1
On 12/27/22 11:10, Volker Schlecht wrote: > bump > > On 12/20/22 19:15, Volker Schlecht wrote: >> bump once more in the hope of finding someone to eventually commit ;-) >> working fine for me. ok aisha going to commit this tomorrow if no one has any objections. I don't know if we have testers for this on the more esoteric archs and if should wait for them? >> On 12/17/22 09:55, Volker Schlecht wrote: >>> bump >>> >>> On 12/10/22 15:24, Volker Schlecht wrote: If it works, it works ... Here's the diff with Barry's i386 change included. So we have positives on amd64, i386 and riscv64 now. > (By the way, the patch from my previous email worked for me on both > amd64 and i386.) >
Re: [Update] Build benchmarks/tsung with erlang25
Forgot a REVISION bump there.
On 12/28/22 11:55, Volker Schlecht wrote:
Attached is a proposal to build benchmarks/tsung with erlang25.
I pulled in an upstream patch to fix an already failing testcase that
was already reported by gnezdo@:
https://github.com/processone/tsung/issues/385
The only remaining failing testcase has apparently been failing already
in previous versions.
benchmarks/tsung is the only remaining non-broken port that depends on
erlang21, so if we could get tsung updated, we could possibly drop
erlang/21 from ports ... it won't build databases/riak anyway.Index: Makefile
===
RCS file: /cvs/ports/benchmarks/tsung/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 13 Nov 2022 15:27:39 - 1.18
+++ Makefile 28 Dec 2022 22:28:17 -
@@ -2,7 +2,7 @@ COMMENT= multi-protocol distributed load
V= 1.7.0
DISTNAME= tsung-$V
-REVISION= 3
+REVISION= 4
CATEGORIES= benchmarks net
@@ -15,7 +15,7 @@ MASTER_SITES= http://tsung.erlang-proje
MODULES= lang/erlang \
lang/python
-MODERL_VERSION= 21
+MODERL_VERSION= 25
MODPY_BUILDDEP= No
RUN_DEPENDS= graphics/py-matplotlib${MODPY_FLAVOR} \
Index: patches/patch-src_test_ts_test_utils_erl
===
RCS file: patches/patch-src_test_ts_test_utils_erl
diff -N patches/patch-src_test_ts_test_utils_erl
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_test_ts_test_utils_erl 28 Dec 2022 22:28:17 -
@@ -0,0 +1,14 @@
+Pull in an upstream fix for a failing testcase with erlang >= 21
+https://github.com/processone/tsung/commit/e53a59d16df5a2d3781ef9d4f0171ad0ca5bc931
+Index: src/test/ts_test_utils.erl
+--- src/test/ts_test_utils.erl.orig
src/test/ts_test_utils.erl
+@@ -48,7 +48,7 @@ mkey1search_string_test()->
+ ?assertEqual(["bar","caps"],ts_utils:mkey1search(Data,"foo")).
+
+ datestr_test()->
+-?assertEqual(["2013","10","17",45,"19","41"],ts_utils:datestr({{2013,10,17},{19,41,29}})).
++?assertEqual("20131017-1941",lists:flatten(ts_utils:datestr({{2013,10,17},{19,41,29}}))).
+
+ export_text_test()->
+ ?assertEqual("foo",ts_utils:export_text("foo")).
Re: [update] x11/polybar 3.6.3
Your BUILD_DEPENDS line looks off with the commented backslash.
Ugh. Yes, a leftover from me building it with i3-gaps installed and
running instead of i3. Fix attached.
Also, in your post-install, the rm shouldn’t be needed if you can override the
installation directory
with FAKE_FLAGS so that it’ll be installed into the correct location right away.
As far as I can tell:
https://github.com/polybar/polybar/blob/edf37385cb2e0e4d3c848d188473e48df618ed1a/doc/CMakeLists.txt#L64
This installs the example config into ${CMAKE_INSTALL_DOCDIR}/examples.
Since I don't want to override CMAKE_INSTALL_DOCDIR, I figured I could
either patch doc/CMakeLists.txt or do a bit of post-install juggling.
Is there a way to handle this with FAKE_FLAGS?Index: Makefile
===
RCS file: /cvs/ports/x11/polybar/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 13 Nov 2022 15:30:23 - 1.25
+++ Makefile 28 Dec 2022 20:50:35 -
@@ -1,8 +1,7 @@
COMMENT = fast and easy-to-use status bar
-V = 3.5.7
+V = 3.6.3
DISTNAME = polybar-$V
CATEGORIES = x11
-REVISION = 3
HOMEPAGE = https://polybar.github.io/
MAINTAINER = Jasper Lievisse Adriaanse
@@ -13,7 +12,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} lib/inotify/inotify
WANTLIB += c cairo curl fontconfig freetype intl m mpdclient
WANTLIB += pulse xcb xcb-composite xcb-cursor xcb-ewmh xcb-icccm
-WANTLIB += xcb-image xcb-randr xcb-util xcb-xkb xcb-xrm z jsoncpp
+WANTLIB += xcb-image xcb-randr xcb-util xcb-xkb xcb-xrm z jsoncpp uv
MASTER_SITES = https://github.com/polybar/polybar/releases/download/$V/
EXTRACT_SUFX = .tar.gz
@@ -35,7 +34,9 @@ LIB_DEPENDS = audio/libmpdclient \
devel/jsoncpp \
devel/libinotify \
graphics/cairo \
- net/curl
+ net/curl \
+ devel/libuv
+
RUN_DEPENDS = x11/py-xcbgen${MODPY_FLAVOR} \
fonts/siji \
@@ -50,13 +51,9 @@ NO_TEST = Yes
WRKDIST = ${WRKDIR}/polybar-$V
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/cmake/02-opts.cmake \
- ${WRKSRC}/doc/CMakeLists.txt \
- ${WRKSRC}/lib/i3ipcpp/CMakeLists.txt
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/polybar
- ${INSTALL_DATA} ${WRKSRC}/config ${PREFIX}/share/examples/polybar
+ ${INSTALL_DATA} ${WRKSRC}/doc/config.ini ${PREFIX}/share/examples/polybar
+ rm -r ${PREFIX}/share/doc/polybar/examples/
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/polybar/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 27 Oct 2021 14:55:04 - 1.8
+++ distinfo 28 Dec 2022 20:50:35 -
@@ -1,2 +1,2 @@
-SHA256 (polybar-3.5.7.tar.gz) = cyEObXQhesuVOyU5kLQwI0O3tqeHD+HamhhV2qRBI9s=
-SIZE (polybar-3.5.7.tar.gz) = 411318
+SHA256 (polybar-3.6.3.tar.gz) = 8ldYVzVnII/HtvTUEVphF6hzicvMCUz2BdB5d1vpX6U=
+SIZE (polybar-3.6.3.tar.gz) = 439838
Index: patches/patch-cmake_03-libs_cmake
===
RCS file: patches/patch-cmake_03-libs_cmake
diff -N patches/patch-cmake_03-libs_cmake
--- patches/patch-cmake_03-libs_cmake 11 Mar 2022 20:16:56 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-Detect libinotify using pkg-config.
-
-Index: cmake/03-libs.cmake
cmake/03-libs.cmake.orig
-+++ cmake/03-libs.cmake
-@@ -25,6 +25,6 @@ querylib(WITH_XRM "pkg-config" xcb-xrm libs dirs)
- querylib(WITH_XCURSOR "pkg-config" xcb-cursor libs dirs)
-
- # FreeBSD Support
--if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
- querylib(TRUE "pkg-config" libinotify libs dirs)
- endif()
Index: patches/patch-cmake_libpoly_cmake
===
RCS file: patches/patch-cmake_libpoly_cmake
diff -N patches/patch-cmake_libpoly_cmake
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmake_libpoly_cmake 28 Dec 2022 20:50:35 -
@@ -0,0 +1,13 @@
+Index: cmake/libpoly.cmake
+--- cmake/libpoly.cmake.orig
cmake/libpoly.cmake
+@@ -100,7 +100,7 @@ endif()
+ find_package(Xcb ${XRANDR_VERSION} REQUIRED COMPONENTS RANDR)
+ find_package(Xcb REQUIRED COMPONENTS ${XORG_EXTENSIONS})
+
+-# FreeBSD Support
+-if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++# FreeBSD and OpenBSD Support
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+ find_package(LibInotify REQUIRED)
+ endif()
Index: patches/patch-include_modules_cpu_hpp
===
RCS file: /cvs/ports/x11/polybar/patches/patch-include_modules_cpu_hpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-include_modules_cpu_hpp
--- patches/patch-include_modules_cpu_hpp 11 Mar 2022 20:16:56 - 1.3
+++ patches/patch-include_modules_cpu_hpp 28 Dec 2022 20:50:35 -
@@ -1,7 +1,7 @@
Index: include/modules/cpu.hpp
--- include/modules/cpu.hpp.orig
+++ include/modules/cpu.hpp
-@@ -9,7 +9,13 @@ nam
new: misc/lchat
Hi, This port contains the suckless tool lchat: lchat (line chat) is a line oriented front end for ii-like chat programs. It handles the input from keyboard and output file in parallel. Thus, you are able to type messages while new chat lines are arriving. Its main focus is on usability and simplicity. ok? bye, Jan lchat.tar.gz Description: application/tar-gz
Re: [update] x11/polybar 3.6.3
> On 28 Dec 2022, at 15:02, Volker Schlecht wrote: > > Got it - fixed diff attached. > > On 12/28/22 14:30, Stuart Henderson wrote: >> On 2022/12/28 14:27, Volker Schlecht wrote: >>> Cc: Maintainer >>> >>> This updates x11/polybar to 3.6.3 (latest) >>> https://github.com/polybar/polybar/releases/tag/3.6.3 >>> >>> Other changes: >>> >>> * Add devel/libuv to LIB_DEPENDS >>> * Drop pre-configure step, because it substitutes into files that aren't >>> patched anymore (the respective patches are in the attic) >>> * Drop post-install step, because an example config.ini is installed >>> automatically now >> +share/doc/polybar/examples/ >> +share/doc/polybar/examples/config.ini >> .. >> -share/examples/polybar/ >> -share/examples/polybar/config >> Please keep this in the normal location for OpenBSD packages i.e. under >> share/examples > Your BUILD_DEPENDS line looks off with the commented backslash. Also, in your post-install, the rm shouldn’t be needed if you can override the installation directory with FAKE_FLAGS so that it’ll be installed into the correct location right away.
[new] age-plugin-yubikey
With the update to age 1.1.x, and free time galore, I couldn't resist playing with age-plugin-yubikey, which to my surprise worked smoothly with my Yubikey 5, once I re-enabled API access to the serial number. I'm not sure if that was something I removed myself or whether my Yubi5 came with that setting, so I'm not sure if that's worth mentioning in the port. If ```ykman list --serials``` shows your key's serial number, everything should just work, if not you may need to use ykpersonalize to set option serial-api-visible first. age-plugin-yubikey.tar.gz Description: application/gzip
[Update] cad/coil64 v2.1.25 -> v2.1.26
Hello ports, Here is a minor update to cad/coil64 bringing us to v2.1.26. Changes include: · Improved data rounding. · Added initial options to close-winding one-layer coil calculation. · Added Estonian language translation Fix up the COMMENT while here. Compiles and appears to run fine on amd64. ok? -- Tracey Emery Index: Makefile === RCS file: /home/cvs/ports/cad/coil64/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile8 Nov 2022 17:04:23 - 1.3 +++ Makefile28 Dec 2022 16:31:06 - @@ -1,8 +1,8 @@ -COMMENT = an inductance coil calculator +COMMENT = inductance coil calculator GH_ACCOUNT = radioacoustick GH_PROJECT = Coil64 -GH_TAGNAME = v2.1.25 +GH_TAGNAME = v2.1.26 CATEGORIES = cad Index: distinfo === RCS file: /home/cvs/ports/cad/coil64/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo8 Nov 2022 17:04:23 - 1.2 +++ distinfo28 Dec 2022 16:27:34 - @@ -1,2 +1,2 @@ -SHA256 (Coil64-2.1.25.tar.gz) = d//08esnnd1hyd3aDyApKlJfkeum1TvAx3NBN3yCkwo= -SIZE (Coil64-2.1.25.tar.gz) = 2131816 +SHA256 (Coil64-2.1.26.tar.gz) = 3xuaAixmFRaNXQiCDuCUbn4HmRN5OcAQY0sRT8SLOCg= +SIZE (Coil64-2.1.26.tar.gz) = 2168358
Re: [update][proposal] sysutils/nnn add nerd font flavor
Le 28/12/2022 à 14:57, Martin Ziemer a écrit :
Am Wed, Dec 28, 2022 at 01:23:09PM + schrieb Stuart Henderson:
On 2022/12/28 13:07, Joel Carnat wrote:
When using one of the Nerd Fonts in the terminal, you can get glyphs (icons)
rendered. The attached patch enables a flavor for sysutils/nnn that will
render mime types icons next to file listing. An example can be seen there:
https://i.imgur.com/kOld6HT.gif
Tested on OpenBSD/7.2-CURRENT/amd64, using xterm(1) and xfce4-terminal(1).
Works here too. (Just xterm)
Please add a note to DESCR describing the flavour and the requirement
for the additional fonts.
It would probably be better to provide ports for some of the more popular
of these fonts too, rather than having to tell people to go to a website
and download them..
This sounds like the best way to do it.
V = 4.7
DISTNAME =nnn-v${V}
PKGNAME = nnn-${V}
+REVISION = 1
not really important but some people will complain ;) this normally
starts at 0
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?
Regards,
Joel C.Index: Makefile
===
RCS file: /cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile 24 Nov 2022 10:25:40 - 1.22
+++ Makefile 28 Dec 2022 16:03:25 -
@@ -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: /cvs/ports/sysutils/nnn/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 7 May 2018 18:29:00 - 1.1.1.1
+++ pkg/DESCR 28 Dec 2022 16:03:25 -
@@ -18,3 +18,10 @@ 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.
+ Nerd Fonts can be browsed and downloaded from the author's
+ website https://www.nerdfonts.com/font-downloads.
+ The font(s) must be installed in $HOME/.local/share/fonts/
+ or in /usr/local/share/fonts/.
Re: MODGO_VERSION in modules.inc (was Re: [Maintainer Update] security/age 1.1.1)
On 12/28/22 17:14, Daniel Jakots wrote: I personally do `make modgo-gen-modules > modules.inc` in which case I'm not sure it's going to help much. Are you people doing things differently to update a go port? I do the same, but I'd definitely have stumbled over such a comment when reviewing the diff ...
MODGO_VERSION in modules.inc (was Re: [Maintainer Update] security/age 1.1.1)
On Wed, 28 Dec 2022 13:15:11 +, Stuart Henderson
wrote:
> On 2022/12/28 13:13, Theo Buehler wrote:
> > On Wed, Dec 28, 2022 at 12:52:50PM +0100, Volker Schlecht wrote:
> > > Updates security/age to version 1.1.1
> > > https://github.com/FiloSottile/age/releases/tag/v1.1.1
> > >
> > > Tested on amd64.
> >
> > Committed without MODGO_VERSION in modules.inc. Thanks
>
> should we do something like this?
>
> Index: modgo-gen-modules-helper
> ===
> RCS file: /cvs/ports/infrastructure/bin/modgo-gen-modules-helper,v
> retrieving revision 1.3
> diff -u -p -r1.3 modgo-gen-modules-helper
> --- modgo-gen-modules-helper 3 Jul 2021 02:37:46 -
> 1.3 +++ modgo-gen-modules-helper 28 Dec 2022 13:14:15 -
> @@ -44,6 +44,6 @@ my $portinfo = $port->get_dist_info($mod
> $port->set_other( MODGO_MODULES => "\\\n" . join(" \\\n",
> @{$portinfo->{Dist}})) if $portinfo->{Dist}; $port->set_other(
> MODGO_MODFILES => "\\\n" . join(" \\\n", @{$portinfo->{Mods}})) if
> $portinfo->{Mods}; -say "MODGO_VERSION =\t$portinfo->{Version}\n";
> +say "MODGO_VERSION =\t$portinfo->{Version} # add this to Makefile,
> not modules.inc\n"; say "MODGO_MODULES =\t$port->{'MODGO_MODULES'}\n"
> if defined($port->{'MODGO_MODULES'}); say "MODGO_MODFILES
> =\t$port->{'MODGO_MODFILES'}\n" if defined($port->{'MODGO_MODFILES'});
>
I personally do `make modgo-gen-modules > modules.inc` in which case
I'm not sure it's going to help much. Are you people doing things
differently to update a go port?
Re: [update] x11/polybar 3.6.3
Got it - fixed diff attached.
On 12/28/22 14:30, Stuart Henderson wrote:
On 2022/12/28 14:27, Volker Schlecht wrote:
Cc: Maintainer
This updates x11/polybar to 3.6.3 (latest)
https://github.com/polybar/polybar/releases/tag/3.6.3
Other changes:
* Add devel/libuv to LIB_DEPENDS
* Drop pre-configure step, because it substitutes into files that aren't
patched anymore (the respective patches are in the attic)
* Drop post-install step, because an example config.ini is installed
automatically now
+share/doc/polybar/examples/
+share/doc/polybar/examples/config.ini
..
-share/examples/polybar/
-share/examples/polybar/config
Please keep this in the normal location for OpenBSD packages i.e. under
share/examples
Index: Makefile
===
RCS file: /cvs/ports/x11/polybar/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 13 Nov 2022 15:30:23 - 1.25
+++ Makefile 28 Dec 2022 14:01:14 -
@@ -1,8 +1,7 @@
COMMENT = fast and easy-to-use status bar
-V = 3.5.7
+V = 3.6.3
DISTNAME = polybar-$V
CATEGORIES = x11
-REVISION = 3
HOMEPAGE = https://polybar.github.io/
MAINTAINER = Jasper Lievisse Adriaanse
@@ -13,7 +12,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} lib/inotify/inotify
WANTLIB += c cairo curl fontconfig freetype intl m mpdclient
WANTLIB += pulse xcb xcb-composite xcb-cursor xcb-ewmh xcb-icccm
-WANTLIB += xcb-image xcb-randr xcb-util xcb-xkb xcb-xrm z jsoncpp
+WANTLIB += xcb-image xcb-randr xcb-util xcb-xkb xcb-xrm z jsoncpp uv
MASTER_SITES = https://github.com/polybar/polybar/releases/download/$V/
EXTRACT_SUFX = .tar.gz
@@ -27,7 +26,7 @@ MODULES = devel/cmake \
DEBUG_PACKAGES =${BUILD_PACKAGES}
BUILD_DEPENDS = ${RUN_DEPENDS} \
- textproc/py-sphinx${MODPY_FLAVOR}>=4.0.2 \
+ textproc/py-sphinx${MODPY_FLAVOR}>=4.0.2 #\
x11/i3
LIB_DEPENDS = audio/libmpdclient \
@@ -35,7 +34,9 @@ LIB_DEPENDS = audio/libmpdclient \
devel/jsoncpp \
devel/libinotify \
graphics/cairo \
- net/curl
+ net/curl \
+ devel/libuv
+
RUN_DEPENDS = x11/py-xcbgen${MODPY_FLAVOR} \
fonts/siji \
@@ -50,13 +51,9 @@ NO_TEST = Yes
WRKDIST = ${WRKDIR}/polybar-$V
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/cmake/02-opts.cmake \
- ${WRKSRC}/doc/CMakeLists.txt \
- ${WRKSRC}/lib/i3ipcpp/CMakeLists.txt
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/polybar
- ${INSTALL_DATA} ${WRKSRC}/config ${PREFIX}/share/examples/polybar
+ ${INSTALL_DATA} ${WRKSRC}/doc/config.ini ${PREFIX}/share/examples/polybar
+ rm -r ${PREFIX}/share/doc/polybar/examples/
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/polybar/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 27 Oct 2021 14:55:04 - 1.8
+++ distinfo 28 Dec 2022 14:01:14 -
@@ -1,2 +1,2 @@
-SHA256 (polybar-3.5.7.tar.gz) = cyEObXQhesuVOyU5kLQwI0O3tqeHD+HamhhV2qRBI9s=
-SIZE (polybar-3.5.7.tar.gz) = 411318
+SHA256 (polybar-3.6.3.tar.gz) = 8ldYVzVnII/HtvTUEVphF6hzicvMCUz2BdB5d1vpX6U=
+SIZE (polybar-3.6.3.tar.gz) = 439838
Index: patches/patch-cmake_03-libs_cmake
===
RCS file: patches/patch-cmake_03-libs_cmake
diff -N patches/patch-cmake_03-libs_cmake
--- patches/patch-cmake_03-libs_cmake 11 Mar 2022 20:16:56 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-Detect libinotify using pkg-config.
-
-Index: cmake/03-libs.cmake
cmake/03-libs.cmake.orig
-+++ cmake/03-libs.cmake
-@@ -25,6 +25,6 @@ querylib(WITH_XRM "pkg-config" xcb-xrm libs dirs)
- querylib(WITH_XCURSOR "pkg-config" xcb-cursor libs dirs)
-
- # FreeBSD Support
--if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
- querylib(TRUE "pkg-config" libinotify libs dirs)
- endif()
Index: patches/patch-cmake_libpoly_cmake
===
RCS file: patches/patch-cmake_libpoly_cmake
diff -N patches/patch-cmake_libpoly_cmake
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmake_libpoly_cmake 28 Dec 2022 14:01:14 -
@@ -0,0 +1,13 @@
+Index: cmake/libpoly.cmake
+--- cmake/libpoly.cmake.orig
cmake/libpoly.cmake
+@@ -100,7 +100,7 @@ endif()
+ find_package(Xcb ${XRANDR_VERSION} REQUIRED COMPONENTS RANDR)
+ find_package(Xcb REQUIRED COMPONENTS ${XORG_EXTENSIONS})
+
+-# FreeBSD Support
+-if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++# FreeBSD and OpenBSD Support
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+ find_package(LibInotify REQUIRED)
+ endif()
Index: patches/patch-include_modules_cpu_hpp
===
RCS file: /cvs/ports/x11/polybar/patches/patch-include_modules_cpu_hpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-include_modules_cpu_hpp
--- patches/patch-include_modules_cpu_hpp 11 Mar 2022
Re: [update][proposal] sysutils/nnn add nerd font flavor
Am Wed, Dec 28, 2022 at 01:23:09PM + schrieb Stuart Henderson:
> On 2022/12/28 13:07, Joel Carnat wrote:
> > When using one of the Nerd Fonts in the terminal, you can get glyphs (icons)
> > rendered. The attached patch enables a flavor for sysutils/nnn that will
> > render mime types icons next to file listing. An example can be seen there:
> > https://i.imgur.com/kOld6HT.gif
> >
> > Tested on OpenBSD/7.2-CURRENT/amd64, using xterm(1) and xfce4-terminal(1).
Works here too. (Just xterm)
> Please add a note to DESCR describing the flavour and the requirement
> for the additional fonts.
>
> It would probably be better to provide ports for some of the more popular
> of these fonts too, rather than having to tell people to go to a website
> and download them..
This sounds like the best way to do it.
> > V =4.7
> > DISTNAME = nnn-v${V}
> > PKGNAME = nnn-${V}
> > +REVISION = 1
> not really important but some people will complain ;) this normally
> starts at 0
Re: [update] x11/polybar 3.6.3
On 2022/12/28 14:27, Volker Schlecht wrote: > Cc: Maintainer > > This updates x11/polybar to 3.6.3 (latest) > https://github.com/polybar/polybar/releases/tag/3.6.3 > > Other changes: > > * Add devel/libuv to LIB_DEPENDS > * Drop pre-configure step, because it substitutes into files that aren't > patched anymore (the respective patches are in the attic) > * Drop post-install step, because an example config.ini is installed > automatically now +share/doc/polybar/examples/ +share/doc/polybar/examples/config.ini .. -share/examples/polybar/ -share/examples/polybar/config Please keep this in the normal location for OpenBSD packages i.e. under share/examples
[update] x11/polybar 3.6.3
Cc: Maintainer
This updates x11/polybar to 3.6.3 (latest)
https://github.com/polybar/polybar/releases/tag/3.6.3
Other changes:
* Add devel/libuv to LIB_DEPENDS
* Drop pre-configure step, because it substitutes into files that aren't
patched anymore (the respective patches are in the attic)
* Drop post-install step, because an example config.ini is installed
automatically now
* Drop patch-cmake_03-libs_cmake because the file doesn't exist anymore.
Replaced by an equivalent patch_cmake_libpoly_cmake
* Drop patch-src_utils_file_cpp, because the problematic code has been
removed upstreamIndex: Makefile
===
RCS file: /cvs/ports/x11/polybar/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 13 Nov 2022 15:30:23 - 1.25
+++ Makefile 28 Dec 2022 13:19:31 -
@@ -1,8 +1,7 @@
COMMENT = fast and easy-to-use status bar
-V = 3.5.7
+V = 3.6.3
DISTNAME = polybar-$V
CATEGORIES = x11
-REVISION = 3
HOMEPAGE = https://polybar.github.io/
MAINTAINER = Jasper Lievisse Adriaanse
@@ -13,7 +12,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} lib/inotify/inotify
WANTLIB += c cairo curl fontconfig freetype intl m mpdclient
WANTLIB += pulse xcb xcb-composite xcb-cursor xcb-ewmh xcb-icccm
-WANTLIB += xcb-image xcb-randr xcb-util xcb-xkb xcb-xrm z jsoncpp
+WANTLIB += xcb-image xcb-randr xcb-util xcb-xkb xcb-xrm z jsoncpp uv
MASTER_SITES = https://github.com/polybar/polybar/releases/download/$V/
EXTRACT_SUFX = .tar.gz
@@ -35,7 +34,9 @@ LIB_DEPENDS = audio/libmpdclient \
devel/jsoncpp \
devel/libinotify \
graphics/cairo \
- net/curl
+ net/curl \
+ devel/libuv
+
RUN_DEPENDS = x11/py-xcbgen${MODPY_FLAVOR} \
fonts/siji \
@@ -49,14 +50,5 @@ CONFIGURE_ARGS = -DENABLE_CCACHE=OFF \
NO_TEST = Yes
WRKDIST = ${WRKDIR}/polybar-$V
-
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/cmake/02-opts.cmake \
- ${WRKSRC}/doc/CMakeLists.txt \
- ${WRKSRC}/lib/i3ipcpp/CMakeLists.txt
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/polybar
- ${INSTALL_DATA} ${WRKSRC}/config ${PREFIX}/share/examples/polybar
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/polybar/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 27 Oct 2021 14:55:04 - 1.8
+++ distinfo 28 Dec 2022 13:19:31 -
@@ -1,2 +1,2 @@
-SHA256 (polybar-3.5.7.tar.gz) = cyEObXQhesuVOyU5kLQwI0O3tqeHD+HamhhV2qRBI9s=
-SIZE (polybar-3.5.7.tar.gz) = 411318
+SHA256 (polybar-3.6.3.tar.gz) = 8ldYVzVnII/HtvTUEVphF6hzicvMCUz2BdB5d1vpX6U=
+SIZE (polybar-3.6.3.tar.gz) = 439838
Index: patches/patch-cmake_03-libs_cmake
===
RCS file: patches/patch-cmake_03-libs_cmake
diff -N patches/patch-cmake_03-libs_cmake
--- patches/patch-cmake_03-libs_cmake 11 Mar 2022 20:16:56 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-Detect libinotify using pkg-config.
-
-Index: cmake/03-libs.cmake
cmake/03-libs.cmake.orig
-+++ cmake/03-libs.cmake
-@@ -25,6 +25,6 @@ querylib(WITH_XRM "pkg-config" xcb-xrm libs dirs)
- querylib(WITH_XCURSOR "pkg-config" xcb-cursor libs dirs)
-
- # FreeBSD Support
--if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
- querylib(TRUE "pkg-config" libinotify libs dirs)
- endif()
Index: patches/patch-cmake_libpoly_cmake
===
RCS file: patches/patch-cmake_libpoly_cmake
diff -N patches/patch-cmake_libpoly_cmake
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmake_libpoly_cmake 28 Dec 2022 13:19:31 -
@@ -0,0 +1,13 @@
+Index: cmake/libpoly.cmake
+--- cmake/libpoly.cmake.orig
cmake/libpoly.cmake
+@@ -100,7 +100,7 @@ endif()
+ find_package(Xcb ${XRANDR_VERSION} REQUIRED COMPONENTS RANDR)
+ find_package(Xcb REQUIRED COMPONENTS ${XORG_EXTENSIONS})
+
+-# FreeBSD Support
+-if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++# FreeBSD and OpenBSD Support
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+ find_package(LibInotify REQUIRED)
+ endif()
Index: patches/patch-include_modules_cpu_hpp
===
RCS file: /cvs/ports/x11/polybar/patches/patch-include_modules_cpu_hpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-include_modules_cpu_hpp
--- patches/patch-include_modules_cpu_hpp 11 Mar 2022 20:16:56 - 1.3
+++ patches/patch-include_modules_cpu_hpp 28 Dec 2022 13:19:31 -
@@ -1,7 +1,7 @@
Index: include/modules/cpu.hpp
--- include/modules/cpu.hpp.orig
+++ include/modules/cpu.hpp
-@@ -9,7 +9,13 @@ namespace modules {
+@@ -10,7 +10,13 @@ namespace modules {
struct cpu_time {
unsigned long long user;
unsigned long long nice;
Index: patches/patch-src_modules_cpu_cpp
===
Re: [update][proposal] sysutils/nnn add nerd font flavor
On 2022/12/28 13:07, Joel Carnat wrote:
> Hello,
>
> When using one of the Nerd Fonts in the terminal, you can get glyphs (icons)
> rendered. The attached patch enables a flavor for sysutils/nnn that will
> render mime types icons next to file listing. An example can be seen there:
> https://i.imgur.com/kOld6HT.gif
>
> Tested on OpenBSD/7.2-CURRENT/amd64, using xterm(1) and xfce4-terminal(1).
>
> Regards,
> Joel C.
Please add a note to DESCR describing the flavour and the requirement
for the additional fonts.
It would probably be better to provide ports for some of the more popular
of these fonts too, rather than having to tell people to go to a website
and download them..
> V = 4.7
> DISTNAME = nnn-v${V}
> PKGNAME =nnn-${V}
> +REVISION = 1
not really important but some people will complain ;) this normally
starts at 0
Re: [Maintainer Update] security/age 1.1.1
On Wed, Dec 28, 2022 at 01:15:11PM +, Stuart Henderson wrote:
> On 2022/12/28 13:13, Theo Buehler wrote:
> > On Wed, Dec 28, 2022 at 12:52:50PM +0100, Volker Schlecht wrote:
> > > Updates security/age to version 1.1.1
> > > https://github.com/FiloSottile/age/releases/tag/v1.1.1
> > >
> > > Tested on amd64.
> >
> > Committed without MODGO_VERSION in modules.inc. Thanks
>
> should we do something like this?
Yes, I think that would help. Thanks.
>
> Index: modgo-gen-modules-helper
> ===
> RCS file: /cvs/ports/infrastructure/bin/modgo-gen-modules-helper,v
> retrieving revision 1.3
> diff -u -p -r1.3 modgo-gen-modules-helper
> --- modgo-gen-modules-helper 3 Jul 2021 02:37:46 - 1.3
> +++ modgo-gen-modules-helper 28 Dec 2022 13:14:15 -
> @@ -44,6 +44,6 @@ my $portinfo = $port->get_dist_info($mod
> $port->set_other( MODGO_MODULES => "\\\n" . join(" \\\n",
> @{$portinfo->{Dist}})) if $portinfo->{Dist};
> $port->set_other( MODGO_MODFILES => "\\\n" . join(" \\\n",
> @{$portinfo->{Mods}})) if $portinfo->{Mods};
>
> -say "MODGO_VERSION =\t$portinfo->{Version}\n";
> +say "MODGO_VERSION =\t$portinfo->{Version} # add this to Makefile, not
> modules.inc\n";
> say "MODGO_MODULES =\t$port->{'MODGO_MODULES'}\n" if
> defined($port->{'MODGO_MODULES'});
> say "MODGO_MODFILES =\t$port->{'MODGO_MODFILES'}\n" if
> defined($port->{'MODGO_MODFILES'});
>
Re: [Maintainer Update] security/age 1.1.1
On 2022/12/28 13:13, Theo Buehler wrote:
> On Wed, Dec 28, 2022 at 12:52:50PM +0100, Volker Schlecht wrote:
> > Updates security/age to version 1.1.1
> > https://github.com/FiloSottile/age/releases/tag/v1.1.1
> >
> > Tested on amd64.
>
> Committed without MODGO_VERSION in modules.inc. Thanks
should we do something like this?
Index: modgo-gen-modules-helper
===
RCS file: /cvs/ports/infrastructure/bin/modgo-gen-modules-helper,v
retrieving revision 1.3
diff -u -p -r1.3 modgo-gen-modules-helper
--- modgo-gen-modules-helper3 Jul 2021 02:37:46 - 1.3
+++ modgo-gen-modules-helper28 Dec 2022 13:14:15 -
@@ -44,6 +44,6 @@ my $portinfo = $port->get_dist_info($mod
$port->set_other( MODGO_MODULES => "\\\n" . join(" \\\n",
@{$portinfo->{Dist}})) if $portinfo->{Dist};
$port->set_other( MODGO_MODFILES => "\\\n" . join(" \\\n",
@{$portinfo->{Mods}})) if $portinfo->{Mods};
-say "MODGO_VERSION =\t$portinfo->{Version}\n";
+say "MODGO_VERSION =\t$portinfo->{Version} # add this to Makefile, not
modules.inc\n";
say "MODGO_MODULES =\t$port->{'MODGO_MODULES'}\n" if
defined($port->{'MODGO_MODULES'});
say "MODGO_MODFILES =\t$port->{'MODGO_MODFILES'}\n" if
defined($port->{'MODGO_MODFILES'});
Re: [Maintainer Update] security/age 1.1.1
On Wed, Dec 28, 2022 at 12:52:50PM +0100, Volker Schlecht wrote: > Updates security/age to version 1.1.1 > https://github.com/FiloSottile/age/releases/tag/v1.1.1 > > Tested on amd64. Committed without MODGO_VERSION in modules.inc. Thanks
[update][proposal] sysutils/nnn add nerd font flavor
Hello,
When using one of the Nerd Fonts in the terminal, you can get glyphs (icons)
rendered. The attached patch enables a flavor for sysutils/nnn that will
render mime types icons next to file listing. An example can be seen there:
https://i.imgur.com/kOld6HT.gif
Tested on OpenBSD/7.2-CURRENT/amd64, using xterm(1) and xfce4-terminal(1).
Regards,
Joel C.Index: Makefile
===
RCS file: /cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile 24 Nov 2022 10:25:40 - 1.22
+++ Makefile 28 Dec 2022 11:59:25 -
@@ -3,6 +3,7 @@ COMMENT = the missing terminal file bro
V = 4.7
DISTNAME = nnn-v${V}
PKGNAME = nnn-${V}
+REVISION = 1
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
[Maintainer Update] security/age 1.1.1
Updates security/age to version 1.1.1
https://github.com/FiloSottile/age/releases/tag/v1.1.1
Tested on amd64.Index: Makefile
===
RCS file: /cvs/ports/security/age/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 6 Oct 2022 16:47:23 - 1.15
+++ Makefile 28 Dec 2022 11:49:43 -
@@ -1,8 +1,7 @@
COMMENT = simple, modern and secure file encryption tool
MODGO_MODNAME = filippo.io/age
-MODGO_VERSION = v1.0.0
-REVISION = 1
+MODGO_VERSION = v1.1.1
DISTNAME = age-${MODGO_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/security/age/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 6 Sep 2021 19:45:06 - 1.6
+++ distinfo 28 Dec 2022 11:49:43 -
@@ -1,30 +1,26 @@
-SHA256 (age-v1.0.0.zip) = CkARqh24d+8QMVFk031hFHYabRLJ78tSIsAoNuuuNgI=
-SHA256 (go_modules/filippo.io/edwards25519/@v/v1.0.0-rc.1.mod) = 18MvTgz5F65FgigZwzhreQaHZbYlu+JJdGHuwPjoYpw=
-SHA256 (go_modules/filippo.io/edwards25519/@v/v1.0.0-rc.1.zip) = TLfb313jSVwjCKLpcyK/w0qgvUzYS5gKOAGzHFCDBEg=
-SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod) = zWMRYSoqpNDX4DxBs6ofvC1fiVqz9hCJ+rgL/p+PVIU=
-SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.zip) = xEtF206vwycEB/3Qs1vo89QhnPQid9QkmGRK7D/sRoE=
-SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) = /vWJbRA6C85QVf216W6DCUQzR5JDeGU0dxjtzrYzNIo=
-SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip) = F65VXAvscLWD2E7HoJnbP9xbO2iMsoFPjDiNF0562hU=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210903071746-97244b99971b.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210903071746-97244b99971b.zip) = ukpt0D3sAYLUQEhOn2IV823g6FJK6TGhXOnuIRJ9cwQ=
-SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = TLqxT3cGdxsnHZlaGzzBMf5aJGqtx+5tG6bwvYlHgfo=
-SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod) = dAeU4pFPXMh+JWVsWEMiKyxlZlghIF9FYyoEd8jT95s=
-SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.zip) = rfmdXemB1H9XZ6kRe9tO2AROmGc5gNzgvu7OfdHJyJY=
-SHA256 (go_modules/golang.org/x/text/@v/v0.3.3.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI=
-SHA256 (go_modules/golang.org/x/text/@v/v0.3.3.zip) = iolto0a6+Uq08ksOOW3wt5OTyTqgXFDvB83dVhof+Nc=
-SIZE (age-v1.0.0.zip) = 89334
-SIZE (go_modules/filippo.io/edwards25519/@v/v1.0.0-rc.1.mod) = 40
-SIZE (go_modules/filippo.io/edwards25519/@v/v1.0.0-rc.1.zip) = 47154
-SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod) = 247
-SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.zip) = 1876172
-SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) = 179
-SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip) = 1587056
-SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210903071746-97244b99971b.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210903071746-97244b99971b.zip) = 1658183
-SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = 95
-SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod) = 95
-SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.zip) = 21403
-SIZE (go_modules/golang.org/x/text/@v/v0.3.3.mod) = 97
-SIZE (go_modules/golang.org/x/text/@v/v0.3.3.zip) = 8010747
+SHA256 (age-v1.1.1.zip) = IWBSEkGBQQhy0T4ND4bAT5RfSt82+6RR7fMejQnBuGk=
+SHA256 (go_modules/filippo.io/edwards25519/@v/v1.0.0.mod) = 18MvTgz5F65FgigZwzhreQaHZbYlu+JJdGHuwPjoYpw=
+SHA256 (go_modules/filippo.io/edwards25519/@v/v1.0.0.zip) = +1voKavKxjkxp6DEEKcYH6T5CffrcPc07b2nhoWSFno=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.4.0.mod) = oCSfrnXTVD+PMNcJZjAsz7P2H8Q4oOyGBzOiLff5UME=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.4.0.zip) = hodCa/q7P/WcJT8Ji4Y6K7NQPvrYDcAUNf/Oji6R6qg=
+SHA256 (go_modules/golang.org/x/net/@v/v0.3.0.mod) = PDYKM2jCXws5pktjD+dO2ZjfAOar7pP9SfVv/nWQoTE=
+SHA256 (go_modules/golang.org/x/net/@v/v0.3.0.zip) = vPEIaCQZZx7jMoRft27JaWkx+Z3LPnK+DqnX3jbzXfI=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.3.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.3.0.zip) = y98Y476fIRypYmhKwZ1B1L4kBCiY7AzGZL+NHClV04Q=
+SHA256 (go_modules/golang.org/x/term/@v/v0.3.0.mod) = HlYfdBO3S00wyi1smHTM0Tu4yU2qDmwjd7rZ6c9tvlg=
+SHA256 (go_modules/golang.org/x/term/@v/v0.3.0.zip) = HNnVjqLYYpm4VphyOOY5KlDmiNBGnMs7SkaTSfJDlQc=
+SHA256 (go_modules/golang.org/x/text/@v/v0.5.0.mod) = FZKedvzgSupMkqNUQmu0M3BoRkWk7gPy510MLrFGYwQ=
+SHA256 (go_modules/golang.org/x/te
[Update] Build benchmarks/tsung with erlang25
Attached is a proposal to build benchmarks/tsung with erlang25.
I pulled in an upstream patch to fix an already failing testcase that
was already reported by gnezdo@:
https://github.com/processone/tsung/issues/385
The only remaining failing testcase has apparently been failing already
in previous versions.
benchmarks/tsung is the only remaining non-broken port that depends on
erlang21, so if we could get tsung updated, we could possibly drop
erlang/21 from ports ... it won't build databases/riak anyway.Index: Makefile
===
RCS file: /cvs/ports/benchmarks/tsung/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 13 Nov 2022 15:27:39 - 1.18
+++ Makefile 28 Dec 2022 10:44:41 -
@@ -15,7 +15,7 @@ MASTER_SITES= http://tsung.erlang-proje
MODULES= lang/erlang \
lang/python
-MODERL_VERSION= 21
+MODERL_VERSION= 25
MODPY_BUILDDEP= No
RUN_DEPENDS= graphics/py-matplotlib${MODPY_FLAVOR} \
Index: patches/patch-src_test_ts_test_utils_erl
===
RCS file: patches/patch-src_test_ts_test_utils_erl
diff -N patches/patch-src_test_ts_test_utils_erl
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_test_ts_test_utils_erl 28 Dec 2022 10:44:41 -
@@ -0,0 +1,14 @@
+Pull in an upstream fix for a failing testcase with erlang >= 21
+https://github.com/processone/tsung/commit/e53a59d16df5a2d3781ef9d4f0171ad0ca5bc931
+Index: src/test/ts_test_utils.erl
+--- src/test/ts_test_utils.erl.orig
src/test/ts_test_utils.erl
+@@ -48,7 +48,7 @@ mkey1search_string_test()->
+ ?assertEqual(["bar","caps"],ts_utils:mkey1search(Data,"foo")).
+
+ datestr_test()->
+-?assertEqual(["2013","10","17",45,"19","41"],ts_utils:datestr({{2013,10,17},{19,41,29}})).
++?assertEqual("20131017-1941",lists:flatten(ts_utils:datestr({{2013,10,17},{19,41,29}}))).
+
+ export_text_test()->
+ ?assertEqual("foo",ts_utils:export_text("foo")).
