[maintainer update] sysutils/hcloud 1.42.0 -> 1.43.1
Hi,
Is anyone besides me using the hetzner cloud cli tool?
Changelogs:
https://github.com/hetznercloud/cli/releases/tag/v1.43.0
https://github.com/hetznercloud/cli/releases/tag/v1.43.1
port checks + test target pass.
- Stefan
Index: sysutils/hcloud/Makefile
===
RCS file: /cvs/ports/sysutils/hcloud/Makefile,v
diff -u -p -u -p -r1.17 Makefile
--- sysutils/hcloud/Makefile21 Feb 2024 06:20:48 - 1.17
+++ sysutils/hcloud/Makefile6 May 2024 05:43:54 -
@@ -1,5 +1,5 @@
COMMENT = command-line interface for Hetzner Cloud
-V =1.42.0
+V =1.43.1
MODGO_MODNAME =github.com/hetznercloud/cli
MODGO_VERSION =v${V}
Index: sysutils/hcloud/distinfo
===
RCS file: /cvs/ports/sysutils/hcloud/distinfo,v
diff -u -p -u -p -r1.14 distinfo
--- sysutils/hcloud/distinfo21 Feb 2024 06:20:48 - 1.14
+++ sysutils/hcloud/distinfo6 May 2024 05:43:54 -
@@ -1,7 +1,7 @@
SHA256 (go_modules/github.com/!vivid!cortex/ewma/@v/v1.2.0.mod) =
ILNcJxBBj+a8SPgF/mQlwJXr0GKZrGH8kQfZtR18EeY=
SHA256 (go_modules/github.com/!vivid!cortex/ewma/@v/v1.2.0.zip) =
+s/u7C2sRHIR5zPtbxkOkGioqJ13DqQLHWlV+mz/Ns8=
-SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.mod) =
17OszAg8LYhxB+e5mY0rfap993NS0WnmnW+75plfuL0=
-SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.zip) =
jzMPNcpCm2acOXzy5rWLjNaJT7bWQ39wmZMdLRQAuQk=
+SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.4.0.mod) =
17OszAg8LYhxB+e5mY0rfap993NS0WnmnW+75plfuL0=
+SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.4.0.zip) =
7x6m/q0h5fzJ4VMhh4iMjHxPPrvbAFh6tnoZJFIGymY=
SHA256
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.mod)
= ftH6kO7vq7UGWGCrf2fdM/5ysTVwVCejb0515qgQBls=
SHA256
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.zip)
= tiQ310pSMImvRroBFezhzhG8peMh/h4dTJduzKbueKo=
SHA256 (go_modules/github.com/beorn7/perks/@v/v1.0.1.mod) =
yHCz/lC2lE+rCVsGII2ciJh2PpFzyx7tMljD1YMJumY=
@@ -41,7 +41,6 @@ SHA256 (go_modules/github.com/goccy/go-y
SHA256 (go_modules/github.com/goccy/go-yaml/@v/v1.11.3.zip) =
sQ7xaCrXMisnASAAdBrdFyvGACGzB0nmTQmqfn4700M=
SHA256 (go_modules/github.com/golang/mock/@v/v1.6.0.mod) =
v7apfudscqVtouisXf2SYWb3k9/q+7+4DLM+agYDAag=
SHA256 (go_modules/github.com/golang/mock/@v/v1.6.0.zip) =
+iWRa1RvkNpJQY9Dbjph5MXa6JjPPIKwAHtab6t0Jhs=
-SHA256 (go_modules/github.com/golang/protobuf/@v/v1.2.0.mod) =
wKIDG/J3CHdJ2MzEMkSfaxN1eH6shkHdL5MAdCMar7Q=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.0.mod) =
c4y7HelrZ6YjisO4CBzYsb+w2uvPbJu+jL221zuuzRk=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.3.mod) =
fI52EFJ6/Xckx+i36EPxMrDbYejJ3UncWJ1DDokpvMQ=
SHA256 (go_modules/github.com/golang/protobuf/@v/v1.5.3.zip) =
k72m6I1KCkk6mLSB3mehAACnVdFfFqgAtJprltG9b4E=
@@ -49,16 +48,16 @@ SHA256 (go_modules/github.com/google/go-
SHA256 (go_modules/github.com/google/go-cmp/@v/v0.5.9.mod) =
58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0=
SHA256 (go_modules/github.com/google/go-cmp/@v/v0.6.0.mod) =
58dmnUod1Ym6PgJLon9D8pPbYR/gdc4g17iENw1j/r0=
SHA256 (go_modules/github.com/google/go-cmp/@v/v0.6.0.zip) =
S06b9sSCEQgGUbSR37SNaLc2xmowW8+UYFYG4bouqko=
-SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.5.6.mod) =
U6yrsr8kHxtWra3zhHTdIdO9sC/T7xbMTI3t1MCAHTk=
-SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.5.6.zip) =
yaVtNzRFwrpqtNuM6Mg4+gqfNzREEbgNVm7G8DrYsdI=
-SHA256 (go_modules/github.com/hetznercloud/hcloud-go/v2/@v/v2.6.0.mod) =
ft0ZdUGUm8HoXwOnBjYGZAm58OFu2xlhGTlOYajKWGA=
-SHA256 (go_modules/github.com/hetznercloud/hcloud-go/v2/@v/v2.6.0.zip) =
dRgolglIBmxn5mgmR6xo7TFBhl1IqeDoDGRE4OAPVaE=
+SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.7.1.mod) =
U6yrsr8kHxtWra3zhHTdIdO9sC/T7xbMTI3t1MCAHTk=
+SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.7.1.zip) =
MOO5DvYGYROE8/CPV64Gt2jBy9Uo7VUjxHEDhAyq3Ls=
+SHA256 (go_modules/github.com/hetznercloud/hcloud-go/v2/@v/v2.7.2.mod) =
DDndFm2NZawdAECRNB5giqWol2/PCxSqVtVemjJ4sv8=
+SHA256 (go_modules/github.com/hetznercloud/hcloud-go/v2/@v/v2.7.2.zip) =
JFuH60eVHFOkaZvX35gz0YmNX9pQ4Ys4hASbH2HPJYk=
SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.1.0.mod) =
HBsVkRqooL1c0PZnDsI9EIZJbzYV/fUzBq/ytHbOm+E=
SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.1.0.zip) =
UmZ03mJNfbEIz+dlPvEQzN/Ze8hQJiVCJIFVZ5KO0kM=
SHA256
(go_modules/github.com/jessevdk/go-flags/@v/v1.4.1-0.20181029123624-5de817a9aa20.mod)
= n/9I81DbxrsGZZTpRJbe+hlei1UgbSYcpbL5ifZ4Ki0=
SHA256
(go_modules/github.com/jessevdk/go-flags/@v/v1.4.1-0.20181029123624-5de817a9aa20.zip)
= mGXGOBfZ/cyky2L5Kdmyu9hS3jXasawE5CS3vyQle1o=
-SHA256 (go_modules/github.com/jmattheis/goverter/@v/v1.3.0.mod) =
hvxDHo1hO1R7mibht4DtCGA5NAIvM9VVMaIibxwBN84=
-SHA256 (go_modules/github.c
Re: vbam: enable wxWidgets/visualboyadvance-m
Martijn van Duren writes: > Back in 2018 Jasper explicitly disabled wxWidgets on vbam so it wouldn't > accidentally get picked up. I reckon it would be worth it to enable it > explicitly, since it would build the visualboyadvance-m binary. > > Not only brings it some menu options which allows you to change things > at runtime, it also brings in some features I couldn't find in vbam: > most notably the link (network) option. Without it battling your > friends, or completing your pokedex will be impossible. :-) I agree, we should provide the wx frontend since it has extra features. > I placed visualboyadvance-m inside the vbam package for quick testing, > but considering it pulls in extra dependencies and is its own thing > it might be cleaner to put it in its own subpackage. I agree, we also provide separate packages in similar cases like mgba and mgba-qt. The hard part :) is what to name the wx package. We shouldn't call it "visualboyadvance-m" after the executable, because nobody looking at the package names will know the difference between the "vbam" and "visualboyadvance-m" packages. So maybe vbam-wxwidgets? > +@tag update-desktop-database > +@tag gtk-update-icon-cache %D/share/icons/hicolor Needs additional RUN_DEPENDS.
Re: [maintainer-update] www/luakit to 2.3.6
Stefan Hagen wrote (2024-02-23 07:51 CET):
> luakit now works with libsoup3 and webkitgtk4.1. And some bugs have
> been fixed.
>
> Changes: https://luakit.github.io/news/
>
> The test target runs fine on amd64.
> portcheck/p-l-d-check are happy.
>
> OK?
*ping*
The test target is also happy.
- Stefan
Index: www/luakit/Makefile
===
RCS file: /cvs/ports/www/luakit/Makefile,v
diff -u -p -u -p -r1.44 Makefile
--- www/luakit/Makefile 20 Apr 2024 14:42:27 - 1.44
+++ www/luakit/Makefile 6 May 2024 06:01:57 -
@@ -1,8 +1,7 @@
COMMENT = fast, small, webkit based browser written in lua
-V =2.3.3
+V =2.3.6
DISTNAME = luakit-${V}
-REVISION = 3
EPOCH =1
@@ -21,10 +20,10 @@ USE_GMAKE = Yes
COMPILER = base-clang ports-gcc
-WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB = atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
-WANTLIB += intl javascriptcoregtk-4.0 pango-1.0 pangocairo-1.0 pthread
-WANTLIB += soup-2.4 sqlite3 webkit2gtk-4.0
+WANTLIB += intl javascriptcoregtk-4.1 pango-1.0 pangocairo-1.0 pthread
+WANTLIB += soup-3.0 sqlite3 webkit2gtk-4.1
# luajit archs
.if ${MACHINE_ARCH} == "arm" \
@@ -52,7 +51,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
net/luasocket \
textproc/lua-markdown
-LIB_DEPENDS += www/webkitgtk4
+LIB_DEPENDS += www/webkitgtk4,webkitgtk41
TEST_DEPENDS = devel/luassert \
devel/luacheck
Index: www/luakit/distinfo
===
RCS file: /cvs/ports/www/luakit/distinfo,v
diff -u -p -u -p -r1.14 distinfo
--- www/luakit/distinfo 9 Nov 2022 18:18:35 - 1.14
+++ www/luakit/distinfo 6 May 2024 06:01:57 -
@@ -1,2 +1,2 @@
-SHA256 (luakit-2.3.3.tar.gz) = jmVx8REZsx56ND23sD9o2CPx/Rdf3/SHDUCir9nnMtU=
-SIZE (luakit-2.3.3.tar.gz) = 507343
+SHA256 (luakit-2.3.6.tar.gz) = ggL8UVx+ZN3AeUtWIxZ7Ny9pa851fm92fF4Dv74r66A=
+SIZE (luakit-2.3.6.tar.gz) = 508466
NEW: x11/kde-plasma ports
Here are the last ports that need to be imported to activate KDE6. - print-manager: Moved from KDE Gear x11/kde-applications/print-manager. This needs to be re-versioned to the lower 6.0 so I added EPOCH and "@pkgpath x11/kde-applications/print-manager". - plasma-activities: Moved from Frameworks (Not in devel/kf6 instead they moved to Plasma). No conflicts with kf5. - plasma-activities-stats: Moved from Frameworks (Not in devel/kf6 instead they moved to Plasma). No conflicts with kf5. - libplasma: Moved from Frameworks (Not in devel/kf6 instead they moved to Plasma). No conflicts with kf5. - kwayland: Moved from Frameworks (Not in devel/kf6 instead they moved to Plasma). No conflicts with kf5. - plasma5support (NEW) - kglobalacceld (NEW) - ocean-sound-theme (NEW) All attached ports are marked UNLINKED=kf6 so you need BUILD_UNLINKED=kf6 in /etc/mk.conf OK to import with UNLINKED=kf6? Rafael kde-plasma-kf6.tar.gz Description: application/tar-gz
UPDATE: Dolphin 20240505
Here is an update to Dolphin 20240505.
Upstream took an interest in finding a way of integrating the one
local patch we had left and fixing the need for specifying library
paths by picking up a few more paths via pkg-config when possible.
I took a first stab at trying to enable the Vulkan bits. Not 100%
sure about glslang and shaderc. Anyone with Vulkan hw could please
test this. Also the dependenceis need a double checking.
Index: Makefile
===
RCS file: /cvs/ports/emulators/dolphin/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile3 May 2024 06:50:46 - 1.22
+++ Makefile6 May 2024 01:28:27 -
@@ -5,9 +5,9 @@ ONLY_FOR_ARCHS =aarch64 amd64
COMMENT-main = Nintendo GameCube and Wii emulator with GUI
COMMENT-nogui =Nintendo GameCube and Wii emulator
-PKGNAME = dolphin-5.0.0.20240421
+PKGNAME = dolphin-5.0.0.20240505
DIST_TUPLE += github dolphin-emu dolphin \
- b6f0e8876e40a41941f0fb6cef89cf49c91edb56 . # GPLv2
+ 2c913674295e08bca0e2cb1726b778fb61bf6bd1 . # GPLv2
# Externals/
DIST_TUPLE += github dolphin-emu ext-win-qt \
@@ -81,14 +81,14 @@ MULTI_PACKAGES =-main -nogui
# GPLv2+
PERMIT_PACKAGE = Yes
-cWANTLIB = EGL GL GLU ICE SDL2 SM X11 Xext Xi Xrandr avcodec \
- avformat avutil bz2 c curl fmt hidapi-libusb iconv \
- lz4 lzma lzo2 m mbedcrypto mbedtls mbedx509 miniupnpc \
- minizip pthread pugixml sfml-network sfml-system \
- speexdsp spng swscale swresample usb-1.0 xxhash \
- zstd ${COMPILER_LIBCXX}
-# sndio library is dlopen'd
-cWANTLIB +=sndio
+cWANTLIB = EGL GL GLU SDL2 X11 Xi Xrandr avcodec avformat avutil \
+ bz2 c curl fmt hidapi-libusb iconv lz4 lzma lzo2 m \
+ mbedcrypto mbedtls mbedx509 miniupnpc minizip pthread \
+ pugixml sfml-network sfml-system speexdsp spng swscale \
+ swresample usb-1.0 xxhash zstd \
+ ${COMPILER_LIBCXX}
+# sndio / Vulkan libraries are dlopen'd
+cWANTLIB +=sndio vulkan
WANTLIB-main = ${cWANTLIB} Qt6Core Qt6Gui Qt6Widgets
WANTLIB-nogui =${cWANTLIB}
@@ -96,6 +96,9 @@ WANTLIB-nogui = ${cWANTLIB}
MODULES = devel/cmake
BUILD_DEPENDS =devel/gettext,-tools \
+ graphics/glslang \
+ graphics/shaderc \
+ graphics/vulkan-loader \
x11/qt6/qtsvg
LIB_DEPENDS-nogui =archivers/lz4 \
archivers/lzo2 \
@@ -117,9 +120,10 @@ LIB_DEPENDS-nogui =archivers/lz4 \
LIB_DEPENDS-main = ${LIB_DEPENDS-nogui} \
x11/qt6/qtbase
RUN_DEPENDS-main = ${RUN_DEPENDS-nogui} \
+ ${BASE_PKGPATH},-nogui \
devel/desktop-file-utils \
- emulators/dolphin,-nogui \
x11/gtk+4,-guic
+RUN_DEPENDS-nogui =graphics/vulkan-loader
COMPILER = base-clang
@@ -128,14 +132,11 @@ CONFIGURE_ARGS += -DENABLE_ALSA=OFF \
-DENABLE_LLVM=OFF \
-DENABLE_LTO=ON \
-DENABLE_TESTS=OFF \
- -DENABLE_VULKAN=OFF \
-DUSE_DISCORD_PRESENCE=OFF \
-DUSE_SANITIZERS=OFF \
-DUSE_SYSTEM_ENET=OFF \
-DUSE_SYSTEM_LIBMGBA=OFF \
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-
-MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
FIX_CRLF_FILES = Externals/soundtouch/SoundTouch.cpp \
Externals/soundtouch/SoundTouch.h
Index: distinfo
===
RCS file: /cvs/ports/emulators/dolphin/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo3 May 2024 06:50:46 - 1.6
+++ distinfo6 May 2024 01:28:27 -
@@ -4,7 +4,7 @@ SHA256 (KhronosGroup-SPIRV-Cross-0640756
SHA256
(RetroAchievements-rcheevos-bfa0d3138865ae2a649a0beadfa4206408a14690.tar.gz) =
gHG2G+GU7S+Xr6Z0JU7h3uyOR3aQrV5oF/kY2gKUSzc=
SHA256 (bylaws-libadrenotools-deec5f75ee1a8ccbe32c8780b1d17284fc87b0f1.tar.gz)
= o6augsMi1ZiwdoJ9EIZTT0f5/s7Xs2eDiQFTy6+e2YA=
SHA256 (curl-curl-5379dbc248045ba46e89d76ffc4be4380d854728.tar.gz) =
bvVz/TmIBJzA60tqxaAkvj76RRP1AxHbvcRvFSPtzGI=
-SHA256 (dolphin-emu-dolphin-b6f0e8876e40a41941f0fb6cef89cf49c91edb56.tar.gz) =
205WTI1m1d+HP6Mgau1DZDLWWLiDcEL7ySyrwYqGCec=
+SHA256 (dolphin-emu-dolphin-2c913674295e08bca0e2cb1726b778fb61bf6bd1.tar.gz) =
osps83FF2G3L0eU+OIBe6DH5K8snEZkC1
Re: [update] editors/vis 0.8 -> 0.9
> > May I ask how are you running the tests? Just 'make test' from the ports
> > directory as usual? Additionally, does the processes started by the
> > test.sh script not inherit the shell it is executed with?
>
> Yes, "make test" from the ports dir. Might have been "make
> FETCH_PACKAGES=-Dsnap test".
>
> I just tried again with your new patch:
> make clean
> make
> make install (give doas my password)
> make test
> Same result, as far as I can tell. I attached vis-0.9/test.log from
> my WRKOBJDIR.
>
> My /usr/ports is managed by got, and is currently at commit 419d15f5,
> from May 3 at 16:00 UTC.
>
> > $ cat /usr/ports/pobj/vis-0.9/vis-0.9/test/sam/test.sh | head -1
> > #!/bin/sh
>
> Yes (but my WRKOBJDIR is /home/pobj):
> $ cat /home/pobj/vis-0.9/vis-0.9/test/sam/test.sh | head -1
> #!/bin/sh
A bit more info:
I get the same result on my laptop. (The bug I mentioned in my
previous email was a broken version of dwz; pkg_add -u dwz fixed
it.)
If I print the value of SHELL in sam/test.sh, or in the test rule
of vis's top-level make-file, I see an empty string.
That is: I edit /usr/ports/pobj/vis-0.9/vis-0.9/test/Makefile so it begins with:
test:
sh -c 'echo shell _$${SHELL}_'
@$(MAKE) -C core
@$(MAKE) -C lua
@$(MAKE) -C vis
@$(MAKE) -C sam
@$(MAKE) -C vim
and then when I run "make test" under /usr/ports/editors/vis the beginning of
the output is:
$ make test
===> Regression tests for vis-0.9
[ -e test/Makefile ] || gmake test-update
gmake[1]: Entering directory '/usr/ports/pobj/vis-0.9/vis-0.9/test'
sh -c 'echo shell _${SHELL}_'
shell __
(As far as I can tell, putting #!/bin/sh at the start of a script
doesn't affect the value of SHELL when the script is run.)
make show=SHELL still shows /bin/sh on this machine.
--
James
Re: update games/openrct2
On Sun, May 05, 2024 at 08:29:17PM GMT, Brian Callahan wrote:
> On 5/5/2024 3:54 PM, Solene Rapenne wrote:
> > new version was released 54 minutes ago, here is the update
> >
>
> You're going to have to give me more than 54 minutes to look at all this!
>
> > I had to update all distfiles, games starts with GOG files
> >
>
> Not unusual; this one in my experience was a bit of a pain to update...
> but glad to see it looked (relatively) painless for you.
>
> > however, I have an issue when trying to start a game, it
> > complains that musics are missing from the scenario. I am
> > not sure if it is a bug, a packaging issue or something wrong
> > on my side (or gog side?), testing would be appreciated :)
> >
>
> Not sure why the music isn't working right. I'll have to find my copies
> of the games and let you know. Is it just RCT2 you're using or RCT1 as well?
>
> ~Brian
game works fine with this diff, the music files were not put at the right
place.
ok?
diff --git a/games/openrct2/Makefile b/games/openrct2/Makefile
index 12b8dae5e7e..e840dd10af2 100644
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@@ -1,12 +1,12 @@
# "#error Unknown endianess!" in src/openrct2/common.h
NOT_FOR_ARCHS =${BE_ARCHS}
-V =0.4.5
-TITLE_V = 0.4.0
-OBJECTS_V =1.3.11
-OPENSFX_V =1.0.3
-OPENMSX_V =1.3.0
-REPLAYS_V =0.0.78
+V =0.4.11
+TITLE_V = 0.4.6
+OBJECTS_V =1.4.4
+OPENSFX_V =1.0.5
+OPENMSX_V =1.5
+REPLAYS_V =0.0.79
COMMENT = open source re-implementation of RollerCoaster Tycoon 2
DISTFILES =openrct2-${V}{v${V}}.tar.gz
DISTFILES.a = title-sequences-${TITLE_V}{title-sequences}.zip
@@ -68,6 +68,7 @@ CONFIGURE_ARGS = -DDOWNLOAD_OBJECTS=OFF \
-DDOWNLOAD_OPENSFX=OFF \
-DDOWNLOAD_REPLAYS=OFF \
-DDOWNLOAD_TITLE_SEQUENCES=OFF \
+ -DDISABLE_DISCORD_RPC=ON \
-DOPENRCT2_BRANCH=master \
-DOPENRCT2_COMMIT_SHA1_SHORT="76ca840"
@@ -85,9 +86,9 @@ post-extract:
unzip -q ${FULLDISTDIR}/objects-${OBJECTS_V}.zip -d \
${WRKSRC}/data/object
unzip -q ${FULLDISTDIR}/opensfx-${OPENSFX_V}.zip -d \
- ${WRKSRC}/data/assetpack
+ ${WRKSRC}/data/object
unzip -q ${FULLDISTDIR}/openmsx-${OPENMSX_V}.zip -d \
- ${WRKSRC}/data/assetpack
+ ${WRKSRC}/data/object
unzip -q ${FULLDISTDIR}/replays-${REPLAYS_V}.zip -d \
${WRKSRC}/testdata/replays
diff --git a/games/openrct2/distinfo b/games/openrct2/distinfo
index 2e493b7bd44..48913bb60a4 100644
--- a/games/openrct2/distinfo
+++ b/games/openrct2/distinfo
@@ -1,12 +1,12 @@
-SHA256 (openrct2/objects-1.3.11.zip) =
v4XYjk+xHKLlkVVnOQiYdH3CRZs8egV73DK4KckXgLQ=
-SHA256 (openrct2/openmsx-1.3.0.zip) =
s0I/V0qWlHnVHfpU8E7b4lV/N4EkCam15eUuWfcfT7g=
-SHA256 (openrct2/openrct2-0.4.5.tar.gz) =
654g3A3L8QsCtfM0oCmYOgorQ9kx+VogiKZOiyZXurE=
-SHA256 (openrct2/opensfx-1.0.3.zip) =
cL4bb/jMJK2AMaLgzdRFtd08UsiGqOX3BAH3UVLkrmw=
-SHA256 (openrct2/replays-0.0.78.zip) =
pr39zH2RbOBglhxf576vQ2efv62YOM/b0GdheuCsDd8=
-SHA256 (openrct2/title-sequences-0.4.0.zip) =
bnx7VUcXByv8esuW/QEB3I5/DqDqMWNnoFwukpUMkCk=
-SIZE (openrct2/objects-1.3.11.zip) = 4705861
-SIZE (openrct2/openmsx-1.3.0.zip) = 36477799
-SIZE (openrct2/openrct2-0.4.5.tar.gz) = 16809101
-SIZE (openrct2/opensfx-1.0.3.zip) = 3820122
-SIZE (openrct2/replays-0.0.78.zip) = 1829988
-SIZE (openrct2/title-sequences-0.4.0.zip) = 7945853
+SHA256 (openrct2/objects-1.4.4.zip) =
2gF7kKOHBknLT/IuFO38dGJZrwSJZzEdETPPTINq5aA=
+SHA256 (openrct2/openmsx-1.5.zip) =
w/rEyqkDmKK0xbsy4N0PRAcwhv4WEh09xJs8oSBHQGg=
+SHA256 (openrct2/openrct2-0.4.11.tar.gz) =
1iEdyWUbQzFcXSLjCqQeWCu4YdJUG4K7Zd6PT5Xwze8=
+SHA256 (openrct2/opensfx-1.0.5.zip) =
qVIUi+FkwSjk/TrqloIuXwUe3ZoLHyyE3n92KM47Lhg=
+SHA256 (openrct2/replays-0.0.79.zip) =
BF2h34aX4tM/8zs0AI8i52mCgKpGOa/Rsfw8WQ1emVY=
+SHA256 (openrct2/title-sequences-0.4.6.zip) =
JKGJza8fePttbK7ejxqzzt+KufgZzSJgoJsszkxxDZg=
+SIZE (openrct2/objects-1.4.4.zip) = 5392108
+SIZE (openrct2/openmsx-1.5.zip) = 40548101
+SIZE (openrct2/openrct2-0.4.11.tar.gz) = 21842033
+SIZE (openrct2/opensfx-1.0.5.zip) = 4012384
+SIZE (openrct2/replays-0.0.79.zip) = 1934633
+SIZE (openrct2/title-sequences-0.4.6.zip) = 2547725
diff --git a/games/openrct2/patches/patch-CMakeLists_txt
b/games/openrct2/patches/patch-CMakeLists_txt
deleted file mode 100644
index 767961e3860..000
--- a/games/openrct2/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Don't download anything.
-Don't try to execute git.
-Remove -Werror.
-
-Index: CMakeLists.txt
CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -160,12 +160,6 @@ if (MACOS_USE_DEPENDENCIES)
- endif ()
- endif ()
-
--# If OS is Linux, import OpenSoundEffects and OpenMusic
--if(UNIX AND NOT APPLE)
--set(DOWNLOAD_OPENMSX ON)
--set(DOWNLOAD_OPENSF
Re: update games/openrct2
On 5/5/2024 3:54 PM, Solene Rapenne wrote: > new version was released 54 minutes ago, here is the update > You're going to have to give me more than 54 minutes to look at all this! > I had to update all distfiles, games starts with GOG files > Not unusual; this one in my experience was a bit of a pain to update... but glad to see it looked (relatively) painless for you. > however, I have an issue when trying to start a game, it > complains that musics are missing from the scenario. I am > not sure if it is a bug, a packaging issue or something wrong > on my side (or gog side?), testing would be appreciated :) > Not sure why the music isn't working right. I'll have to find my copies of the games and let you know. Is it just RCT2 you're using or RCT1 as well? ~Brian
update games/openrct2
new version was released 54 minutes ago, here is the update
I had to update all distfiles, games starts with GOG files
however, I have an issue when trying to start a game, it
complains that musics are missing from the scenario. I am
not sure if it is a bug, a packaging issue or something wrong
on my side (or gog side?), testing would be appreciated :)
diff --git a/games/openrct2/Makefile b/games/openrct2/Makefile
index 12b8dae5e7e..5806b6a87a5 100644
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@@ -1,12 +1,12 @@
# "#error Unknown endianess!" in src/openrct2/common.h
NOT_FOR_ARCHS =${BE_ARCHS}
-V =0.4.5
-TITLE_V = 0.4.0
-OBJECTS_V =1.3.11
-OPENSFX_V =1.0.3
-OPENMSX_V =1.3.0
-REPLAYS_V =0.0.78
+V =0.4.11
+TITLE_V = 0.4.6
+OBJECTS_V =1.4.4
+OPENSFX_V =1.0.5
+OPENMSX_V =1.5
+REPLAYS_V =0.0.79
COMMENT = open source re-implementation of RollerCoaster Tycoon 2
DISTFILES =openrct2-${V}{v${V}}.tar.gz
DISTFILES.a = title-sequences-${TITLE_V}{title-sequences}.zip
diff --git a/games/openrct2/distinfo b/games/openrct2/distinfo
index 2e493b7bd44..48913bb60a4 100644
--- a/games/openrct2/distinfo
+++ b/games/openrct2/distinfo
@@ -1,12 +1,12 @@
-SHA256 (openrct2/objects-1.3.11.zip) =
v4XYjk+xHKLlkVVnOQiYdH3CRZs8egV73DK4KckXgLQ=
-SHA256 (openrct2/openmsx-1.3.0.zip) =
s0I/V0qWlHnVHfpU8E7b4lV/N4EkCam15eUuWfcfT7g=
-SHA256 (openrct2/openrct2-0.4.5.tar.gz) =
654g3A3L8QsCtfM0oCmYOgorQ9kx+VogiKZOiyZXurE=
-SHA256 (openrct2/opensfx-1.0.3.zip) =
cL4bb/jMJK2AMaLgzdRFtd08UsiGqOX3BAH3UVLkrmw=
-SHA256 (openrct2/replays-0.0.78.zip) =
pr39zH2RbOBglhxf576vQ2efv62YOM/b0GdheuCsDd8=
-SHA256 (openrct2/title-sequences-0.4.0.zip) =
bnx7VUcXByv8esuW/QEB3I5/DqDqMWNnoFwukpUMkCk=
-SIZE (openrct2/objects-1.3.11.zip) = 4705861
-SIZE (openrct2/openmsx-1.3.0.zip) = 36477799
-SIZE (openrct2/openrct2-0.4.5.tar.gz) = 16809101
-SIZE (openrct2/opensfx-1.0.3.zip) = 3820122
-SIZE (openrct2/replays-0.0.78.zip) = 1829988
-SIZE (openrct2/title-sequences-0.4.0.zip) = 7945853
+SHA256 (openrct2/objects-1.4.4.zip) =
2gF7kKOHBknLT/IuFO38dGJZrwSJZzEdETPPTINq5aA=
+SHA256 (openrct2/openmsx-1.5.zip) =
w/rEyqkDmKK0xbsy4N0PRAcwhv4WEh09xJs8oSBHQGg=
+SHA256 (openrct2/openrct2-0.4.11.tar.gz) =
1iEdyWUbQzFcXSLjCqQeWCu4YdJUG4K7Zd6PT5Xwze8=
+SHA256 (openrct2/opensfx-1.0.5.zip) =
qVIUi+FkwSjk/TrqloIuXwUe3ZoLHyyE3n92KM47Lhg=
+SHA256 (openrct2/replays-0.0.79.zip) =
BF2h34aX4tM/8zs0AI8i52mCgKpGOa/Rsfw8WQ1emVY=
+SHA256 (openrct2/title-sequences-0.4.6.zip) =
JKGJza8fePttbK7ejxqzzt+KufgZzSJgoJsszkxxDZg=
+SIZE (openrct2/objects-1.4.4.zip) = 5392108
+SIZE (openrct2/openmsx-1.5.zip) = 40548101
+SIZE (openrct2/openrct2-0.4.11.tar.gz) = 21842033
+SIZE (openrct2/opensfx-1.0.5.zip) = 4012384
+SIZE (openrct2/replays-0.0.79.zip) = 1934633
+SIZE (openrct2/title-sequences-0.4.6.zip) = 2547725
diff --git a/games/openrct2/patches/patch-CMakeLists_txt
b/games/openrct2/patches/patch-CMakeLists_txt
deleted file mode 100644
index 767961e3860..000
--- a/games/openrct2/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Don't download anything.
-Don't try to execute git.
-Remove -Werror.
-
-Index: CMakeLists.txt
CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -160,12 +160,6 @@ if (MACOS_USE_DEPENDENCIES)
- endif ()
- endif ()
-
--# If OS is Linux, import OpenSoundEffects and OpenMusic
--if(UNIX AND NOT APPLE)
--set(DOWNLOAD_OPENMSX ON)
--set(DOWNLOAD_OPENSFX ON)
--endif()
--
- # LIST of supported flags, use SET_CHECK_CXX_FLAGS() to apply to target.
- # Use ADD_CHECK_CXX_COMPILER_FLAG() to add to list.
- set(SUPPORTED_CHECK_CXX_COMPILER_FLAGS "")
-@@ -184,25 +178,6 @@ execute_process(
- ERROR_QUIET
- )
-
--# Define current git branch
--execute_process(
--COMMAND git rev-parse --abbrev-ref HEAD
--WORKING_DIRECTORY ${ROOT_DIR}
--OUTPUT_VARIABLE OPENRCT2_BRANCH
--OUTPUT_STRIP_TRAILING_WHITESPACE
--ERROR_QUIET
--)
--
--# Define short commit hash
--execute_process(
--COMMAND git rev-parse --short HEAD
--WORKING_DIRECTORY ${ROOT_DIR}
--OUTPUT_VARIABLE OPENRCT2_COMMIT_SHA1_SHORT
--OUTPUT_STRIP_TRAILING_WHITESPACE
--ERROR_QUIET
--)
--
--
- if (NOT DISABLE_DISCORD_RPC)
- if (UNIX AND NOT APPLE)
- find_package(DiscordRPC)
-@@ -332,7 +307,7 @@ else ()
-
- # Compiler flags
- set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use
value in range 0–3.")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing -Werror -Wundef
-Wmissing-declarations -Winit-self -Wall -Wextra -Wshadow")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing -Wundef
-Wmissing-declarations -Winit-self -Wall -Wextra -Wshadow")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas
-Wno-missing-braces -Wno-comment -Wnonnull -Wno-unused-parameter
-Wno-attributes")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG=${DEBUG_LEVEL}")
-
diff --git a/games/openrct2/patches/patch-src
Update nmap to 7.92
Attached patch updates nmap from 7.91 to 7.92; the last version to be compatible with the original compliant license. patch-nmap Description: Binary data
Re: [update] editors/vis 0.8 -> 0.9
On Sun, May 05, 2024 at 11:48:47AM GMT, Johannes Thyssen Tishman wrote:
> 2024-05-03T19:20:24Z "Johannes Thyssen Tishman" :
> > 2024-05-03T19:06:51Z James Cook :
> >
> > > As far as I can tell, the problem is that SHELL is /sbin/nologin
> > > for user _pbuild. (I have PORTS_PRIVSEP=Yes in /etc/mk.conf.)
> >
> > Hmm weird, I also use PORTS_PRIVSEP and had no issues with the tests.
> > I'll have to take another look at it this weekend.
> >
> > I'll send a revision anyways because I missed that we can probably
> > drop the post-extract rule by specifying the subdir with DIST_TUPLE.
>
> @James, I was able to reproduce the error you've found by running the
> commands you provided with and without SHELL. However, tests are still
> passing for me (see attached test.log). I would expect that SHELL is set
> by the building environment no? E.g.:
>
> $ make show=SHELL
> /bin/sh
I see this too:
$ make show=SHELL
/bin/sh
> May I ask how are you running the tests? Just 'make test' from the ports
> directory as usual? Additionally, does the processes started by the
> test.sh script not inherit the shell it is executed with?
Yes, "make test" from the ports dir. Might have been "make
FETCH_PACKAGES=-Dsnap test".
I just tried again with your new patch:
make clean
make
make install (give doas my password)
make test
Same result, as far as I can tell. I attached vis-0.9/test.log from
my WRKOBJDIR.
My /usr/ports is managed by got, and is currently at commit 419d15f5,
from May 3 at 16:00 UTC.
> $ cat /usr/ports/pobj/vis-0.9/vis-0.9/test/sam/test.sh | head -1
> #!/bin/sh
Yes (but my WRKOBJDIR is /home/pobj):
$ cat /home/pobj/vis-0.9/vis-0.9/test/sam/test.sh | head -1
#!/bin/sh
> For more context, here is what I have in my /etc/mk.conf:
>
> $ cat /etc/mk.conf
> PORTS_PRIVSEP=yes
> SUDO=doas
> PORTSDIR_PATH=${PORTSDIR}/mystuff:${PORTSDIR}/wip:${PORTSDIR}
> USE_CCACHE=yes
> FETCH_PACKAGES=no
$ cat /etc/mk.conf
PORTS_PRIVSEP=Yes
WRKOBJDIR=/home/pobj
I just tried to reproduce on another computer (laptop) but it's
running into some weird "Abort trap (core dump)" error on "make
install" that I don't have time to debug right now.
> Extracting debug info from
/usr/ports/pobj/vis-0.9/fake-amd64/usr/local/bin/vis-digraph
Abort trap (core dumped)
I noticed the same error when "make FETCH_PACKAGES=-Dsnap
test" tried to install gettext from source. I installed gettext-runtime,
gettext-tools with pkg_add instead and crossed my fingers; probably
that's somehow related.
For the next few days I will only have that laptop but if I find
time I will try to see if I can reproduce, and dig deeper if so.
--
James
[ -e test/Makefile ] || gmake test-update
gmake[1]: Entering directory '/home/pobj/vis-0.9/vis-0.9/test'
gmake[2]: Entering directory '/home/pobj/vis-0.9/vis-0.9/test/core'
Generating ccan configuration header
ccan-config.c(/tmp/ccan-config-213e92.o:(connect_args)): warning: strcpy() is
almost always misused, please use strlcpy()
ccan-config.c(/tmp/ccan-config-213e92.o:(run_test)): warning: sprintf() is
often misused, please use snprintf()
Compiling buffer-test binary
Compiling map-test binary
Compiling array-test binary
Compiling text-test binary
ok 1 - Initialization
ok 2 - Insert zero length data
ok 3 - Insert string at invalid position
ok 4 - Insert empty string
ok 5 - Insert string at start
ok 6 - Insert string in middle
ok 7 - Insert string at end
ok 8 - Put empty string
ok 9 - Put string
ok 10 - Prepend string
ok 11 - Append string
ok 12 - Release
ok 13 - Insert zero length data
ok 14 - Insert data at start
ok 15 - Insert data in middle
ok 16 - Insert data at end
ok 17 - Clear
ok 18 - Put zero length data
ok 19 - Put data
ok 20 - Prepend data
ok 21 - Append data
ok 22 - Grow
ok 23 - Move
ok 24 - Modify after move
ok 25 - Set formatted
ok 26 - Set formatted overwrite
ok 27 - Set formatted empty string
ok 28 - Append formatted
ok 29 - Append formatted empty string
1..29
ok 1 - Creation
ok 2 - First on empty map
ok 3 - Empty prefix map
ok 4 - Get non-existing key
ok 5 - Contains non-existing key
ok 6 - Closest non-existing key
ok 7 - Put NULL value
ok 8 - Put 1
ok 9 - First on map with 1 value
ok 10 - First on prefix map
ok 11 - Contains existing key
ok 12 - Closest match existing key
ok 13 - Put duplicate
ok 14 - Put 2
ok 15 - Put 3
ok 16 - First on prefix map with multiple suffixes
ok 17 - Copy
ok 18 - Not empty after copying
ok 19 - Compare map content
ok 20 - Compare map content
ok 21 - Compare map content
ok 22 - Compare map content
ok 23 - Compare map content
ok 24 - Compare map content
ok 25 - Iterate stop condition
ok 26 - Closest ambigious
ok 27 - Iterate map
ok 28 - Ordered iteration
ok 29 - Iterate sub map
ok 30 - Ordered sub map iteration
ok 31 - Empty map for non-existing prefix
ok 32 - Delete non-existing key
ok 33 - Delete existing key
ok 34 - Closest unambigious
Re: update games/openttd
Am Sat, 4 May 2024 13:29:18 +0200 schrieb Solene Rapenne : > a simple bugfix release > https://cdn.openttd.org/openttd-releases/14.1/changelog.txt > > the removed patch is now present upstream > > tested on amd64, worked fine > > ok? I've basically came up with the same diff. Thank you, I'm fine with it! > diff --git a/games/openttd/Makefile b/games/openttd/Makefile > index 93bc2f773e3..196d46e20b1 100644 > --- a/games/openttd/Makefile > +++ b/games/openttd/Makefile > @@ -1,6 +1,6 @@ > COMMENT= open source clone of the game Transport Tycoon Deluxe > > -V = 14.0 > +V = 14.1 > DISTNAME = openttd-$V-source > PKGNAME =openttd-$V > > diff --git a/games/openttd/distinfo b/games/openttd/distinfo > index 6280a398312..5b5c852a3ae 100644 > --- a/games/openttd/distinfo > +++ b/games/openttd/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (openttd/openttd-14.0-source.tar.xz) = > lvdquFiBal4wA4reBpLm6/NQufcL8Zx7SN2oRciEGLE= -SIZE > (openttd/openttd-14.0-source.tar.xz) = 7997536 +SHA256 > (openttd/openttd-14.1-source.tar.xz) = > LBTI8B9EFIxPLIjBaaMKvNsALrEoqSua23a6p2sBNJQ= +SIZE > (openttd/openttd-14.1-source.tar.xz) = 8015032 diff --git > a/games/openttd/patches/patch-src_core_random_func_cpp > b/games/openttd/patches/patch-src_core_random_func_cpp deleted file > mode 100644 index 5b1654c5db0..000 --- > a/games/openttd/patches/patch-src_core_random_func_cpp +++ /dev/null > @@ -1,12 +0,0 @@ -Index: src/core/random_func.cpp > src/core/random_func.cpp.orig > -+++ src/core/random_func.cpp > -@@ -113,7 +113,7 @@ void RandomBytesWithFallback(std::span > buf) > - #if defined(_WIN32) > - auto res = BCryptGenRandom(nullptr, > static_cast(buf.data()), static_cast(buf.size()), > BCRYPT_USE_SYSTEM_PREFERRED_RNG); > - if (res >= 0) return; > --#elif defined(__APPLE__) || defined(__NetBSD__) || > defined(__FreeBSD__) -+#elif defined(__APPLE__) || > defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) > - arc4random_buf(buf.data(), buf.size()); > - return; > - #elif defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) > && (__GLIBC_MINOR__ >= 25))) > -- greetings, Florian Viehweger
Re: [update] editors/vis 0.8 -> 0.9
2024-05-03T19:20:24Z "Johannes Thyssen Tishman" :
> 2024-05-03T19:06:51Z James Cook :
>
> > As far as I can tell, the problem is that SHELL is /sbin/nologin
> > for user _pbuild. (I have PORTS_PRIVSEP=Yes in /etc/mk.conf.)
>
> Hmm weird, I also use PORTS_PRIVSEP and had no issues with the tests.
> I'll have to take another look at it this weekend.
>
> I'll send a revision anyways because I missed that we can probably
> drop the post-extract rule by specifying the subdir with DIST_TUPLE.
@James, I was able to reproduce the error you've found by running the
commands you provided with and without SHELL. However, tests are still
passing for me (see attached test.log). I would expect that SHELL is set
by the building environment no? E.g.:
$ make show=SHELL
/bin/sh
May I ask how are you running the tests? Just 'make test' from the ports
directory as usual? Additionally, does the processes started by the
test.sh script not inherit the shell it is executed with?
$ cat /usr/ports/pobj/vis-0.9/vis-0.9/test/sam/test.sh | head -1
#!/bin/sh
For more context, here is what I have in my /etc/mk.conf:
$ cat /etc/mk.conf
PORTS_PRIVSEP=yes
SUDO=doas
PORTSDIR_PATH=${PORTSDIR}/mystuff:${PORTSDIR}/wip:${PORTSDIR}
USE_CCACHE=yes
FETCH_PACKAGES=no
Below is an updated diff with the changes I mentioned earlier (removal
of the post-extract rule).
Index: Makefile
===
RCS file: /cvs/ports/editors/vis/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile5 Oct 2023 12:10:41 - 1.18
+++ Makefile5 May 2024 11:35:48 -
@@ -1,8 +1,7 @@
COMMENT = vi-like editor with sam-style structural regex support
-V =0.8
+V =0.9
DISTNAME = vis-${V}
-REVISION = 1
TEST_V = 0.5
TEST_DISTNAME =vis-test-${TEST_V}
@@ -18,9 +17,8 @@ PERMIT_PACKAGE = Yes
WANTLIB += c curses iconv intl m termkey tre ${MODLUA_WANTLIB}
-SITES =${HOMEPAGE}/releases/download/v${V}/
-SITES.test = ${HOMEPAGE}-test/releases/download/v${TEST_V}/
-DISTFILES.test = ${TEST_DISTNAME}${EXTRACT_SUFX}
+DIST_TUPLE += github martanne vis v${V} .
+DIST_TUPLE += github martanne vis-test v${TEST_V} test
MODULES = lang/lua
MODLUA_VERSION = 5.3
@@ -41,10 +39,6 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES}
# for test/core/Makefile
USE_GMAKE =Yes
-
-post-extract:
- rmdir ${WRKSRC}/test
- mv ${WRKDIR}/${TEST_DISTNAME}/ ${WRKSRC}/test
post-install:
cd ${PREFIX} && \
Index: distinfo
===
RCS file: /cvs/ports/editors/vis/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo5 Nov 2022 13:03:00 - 1.5
+++ distinfo5 May 2024 11:35:48 -
@@ -1,4 +1,4 @@
-SHA256 (vis-0.8.tar.gz) = YbENQPFcTbLOFums8pHbt2LaTLzPDPKoCyjZrJmKOb0=
-SHA256 (vis-test-0.5.tar.gz) = AJitkz7B+Hu6Sy2p+oTgDKtWEuw2I2IsHlADokWux9E=
-SIZE (vis-0.8.tar.gz) = 404496
-SIZE (vis-test-0.5.tar.gz) = 99314
+SHA256 (martanne-vis-test-v0.5.tar.gz) =
AJitkz7B+Hu6Sy2p+oTgDKtWEuw2I2IsHlADokWux9E=
+SHA256 (martanne-vis-v0.9.tar.gz) =
vTf/ulU15mXB6IPCW6X04zB1abbTksYPPH1d7dLvz8o=
+SIZE (martanne-vis-test-v0.5.tar.gz) = 99314
+SIZE (martanne-vis-v0.9.tar.gz) = 456713
Index: patches/patch-configure
===
RCS file: /cvs/ports/editors/vis/patches/patch-configure,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure
--- patches/patch-configure 5 Oct 2023 12:10:41 - 1.7
+++ patches/patch-configure 5 May 2024 11:35:48 -
@@ -11,11 +11,11 @@ Index: configure
tryflag CFLAGS -ffunction-sections
tryflag CFLAGS -fdata-sections
tryldflag LDFLAGS_AUTO -Wl,--gc-sections
-@@ -443,7 +442,7 @@ int main(int argc, char *argv[]) {
+@@ -444,7 +443,7 @@ int main(int argc, char *argv[]) {
}
EOF
-- for liblua in lua lua5.4 lua5.3 lua5.2 lua-5.3 lua-5.2 lua54 lua53
lua52; do
+- for liblua in lua lua5.4 lua5.3 lua5.2 lua-5.4 lua-5.3 lua-5.2 lua54
lua53 lua52; do
+ for liblua in $LUA_VER; do
printf " checking for %s... " "$liblua"
Index: patches/patch-man_vis_1
===
RCS file: /cvs/ports/editors/vis/patches/patch-man_vis_1,v
retrieving revision 1.1
diff -u -p -r1.1 patch-man_vis_1
--- patches/patch-man_vis_1 20 Nov 2022 12:06:58 - 1.1
+++ patches/patch-man_vis_1 5 May 2024 11:35:48 -
@@ -3,7 +3,7 @@ Point at correct manual
Index: man/vis.1
--- man/vis.1.orig
+++ man/vis.1
-@@ -260,7 +260,7 @@ currently defers regular expression matching to the un
+@@ -265,7 +265,7 @@ currently defers regular expression matching to the un
It uses what POSIX refers to as
.Dq Extended Regular Expressions
as described in
Index: p
Re: NEW: kf6-kio-extras, kf6-ksanecore, kf6-libkcddb, kf6-libkcompactdisc, kf6-libkdcraw, kf6-libkexiv2 and incidenceeditor
On Sat Apr 27, 2024 at 09:13:48AM GMT, Landry Breuil wrote: > Le Fri, Apr 26, 2024 at 07:25:31AM +0200, Rafael Sadowski a écrit : > > Now that part of the KDE6 ecosystem is in-tree we can easily build and > > import new KDE6 ports. All attached ports are marked UNLONKED=kf6 so you > > need BUILD_UNLINKED=kf6 in /etc/mk.conf and the following diff. > > > > As described in the KDE release notes instructions, we need these ports > > as Kf6 and Kf5. I would therefore like to import all ports with the > > prefix kf6. > > > > https://community.kde.org/KDE_Gear/24.02_Release_notes > > > > incidenceeditor is an exception, this is a completely new port without > > kf6-*. The only one that otherwise has to be imported. A new Pim6 > > dependnecy. > > there's @conflict kdepimlibs-<=4 in incidenceeditor/pkg/PLIST and i dont > see which file would conflict, copypaste error ? Merci Landry ... yes it's a leftover form the copypaste error. I'll fix it. Thanks > > kcddb has an unneeded dependency/@tag about update-desktop-databases Hmm "MODKDE5_DESKTOP_FILE = yes" includes the dependency. > > kio-extras/ksanecore have subdirs containing an extra copy of the port, > oversight ? yes copewaste error. Removed > > > One more idea, we could also commit the following diff with: No > > MODKDE_VERSION change and MODKDE_KF5 = yes as default. This should not > > result in any changes. > > i totally dont understand that sentence relating to the diff you > attached. what is the reasoning of the Makefile.inc diff ? should that > diff contain other things (eg MODKDE_KF5=yes and no MODKDE_VERSION > change ?) Me neither. I think I was not fully concentrated. The final kde-applications.port.mk/Makefile.inc will come with the big-diff. > > is this diff related to/required for the new ports you sent in that mail ? Yes, "we" (people who want to build the ports attached) need the diff. I'll not commit it because it includes the version bump. I only ask for an OK for the import of the new kf6 packages. New tarball attached. > > Landry > kde-applications-kf6p0.tar.gz Description: application/tar-gz
