CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/23 06:24:09 Modified files: sysutils/ttyplot: Makefile distinfo Log message: Update to ttyplot-1.6.5 Upstream did a version bump with no apparent changes in the code
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/23 06:16:57 Modified files: games/vcmi : Makefile distinfo games/vcmi/patches: patch-CMakeLists_txt patch-client_CMT_cpp patch-lib_CThreadHelper_cpp Log message: Update to vcmi-1.5.1 ok kirby@ (maintainer)
update security/rbw
this is said to fix a login issue with official bitwarden server after a change on their side, I'm not using them so I didn't try ok? diff --git a/security/rbw/Makefile b/security/rbw/Makefile index 3d9842af89a..aeb1ec8559e 100644 --- a/security/rbw/Makefile +++ b/security/rbw/Makefile @@ -3,7 +3,7 @@ NOT_FOR_ARCHS = sparc64 COMMENT = command line BitWarden client -DISTNAME = rbw-1.10.1 +DISTNAME = rbw-1.10.2 CATEGORIES = security diff --git a/security/rbw/crates.inc b/security/rbw/crates.inc index 0247df5fa4d..1b351103f07 100644 --- a/security/rbw/crates.inc +++ b/security/rbw/crates.inc @@ -153,7 +153,7 @@ MODCARGO_CRATES += rmp 0.8.14 # MIT MODCARGO_CRATES += rmpv1.0.2 # MIT MODCARGO_CRATES += rsa 0.9.6 # MIT OR Apache-2.0 MODCARGO_CRATES += rustc-demangle 0.1.23 # MIT/Apache-2.0 -MODCARGO_CRATES += rustix 0.38.33 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +MODCARGO_CRATES += rustix 0.38.34 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT MODCARGO_CRATES += rustls 0.22.4 # Apache-2.0 OR ISC OR MIT MODCARGO_CRATES += rustls-native-certs 0.7.0 # Apache-2.0 OR ISC OR MIT MODCARGO_CRATES += rustls-pemfile 2.1.2 # Apache-2.0 OR ISC OR MIT diff --git a/security/rbw/distinfo b/security/rbw/distinfo index 2c2304bcf53..b003d7f2fac 100644 --- a/security/rbw/distinfo +++ b/security/rbw/distinfo @@ -153,7 +153,7 @@ SHA256 (cargo/rmp-0.8.14.tar.gz) = Io7XwW+jl4LDs0aOl0rsJ5XpCJFTzQjuLprvs2EzNMQ= SHA256 (cargo/rmpv-1.0.2.tar.gz) = 5UAoLxF1GVbIK8VSmn+3G4cbmY+/nPBsJBmyLhtDUN8= SHA256 (cargo/rsa-0.9.6.tar.gz) = XQ5RJPyzDnan55v+5oOidG24N4S4Yon2JRtUt5UKDfw= SHA256 (cargo/rustc-demangle-0.1.23.tar.gz) = 1ia7na534oIZk3rwRcJXwov9P2kzPFElU1B/X5eYy3Y= -SHA256 (cargo/rustix-0.38.33.tar.gz) = 48xyhYBU/P9tfeoy3yrq7mp8JCJzZtfqQpqtovJrFq0= +SHA256 (cargo/rustix-0.38.34.tar.gz) = cNxewEL3pDxKcyQSB87MmHOgbUXeuzizKfhUHYXCcw8= SHA256 (cargo/rustls-0.22.4.tar.gz) = v073NyGse815srMV2nd52PwJcYxrPS0bLZSFDrjBhDI= SHA256 (cargo/rustls-native-certs-0.7.0.tar.gz) = jx+4XvqTbELG1fwo0mKbtR5LL0uKUhHil9WZzFoJN5I= SHA256 (cargo/rustls-pemfile-2.1.2.tar.gz) = KZk6JWhneOuI1BiXQs1xPJvOlDvFQlGjNQncY8us9z0= @@ -275,7 +275,7 @@ SHA256 (cargo/x11rb-protocol-0.13.0.tar.gz) = 5j5xxLi9n/7CyWMXOk3Ey96e6Wlh1Py0Qp SHA256 (cargo/xcursor-0.3.5.tar.gz) = agzNe0pTRe380MNTVxik6f93mP/FNrtbWg4m/4RzKRE= SHA256 (cargo/xkeysym-0.2.0.tar.gz) = BUqOaLdiULJT9nHRJoy38a4InsNeGVsu+ypOmoNtBiE= SHA256 (cargo/zeroize-1.7.0.tar.gz) = UltOwULGtootEPAfe79nVVmco/gepTuEMbfdNI9f2y0= -SHA256 (rbw-1.10.1.tar.gz) = BkK8ewtopFcAl7o2iEWV6y4pYiVlwkVXuZ1Zxd3xu4c= +SHA256 (rbw-1.10.2.tar.gz) = 4OTaK5XcbxQeBZc0DlNcYSJHFrKnIg3OVBhVXRjmcsI= SIZE (cargo/addr2line-0.21.0.tar.gz) = 40807 SIZE (cargo/adler-1.0.2.tar.gz) = 12778 SIZE (cargo/aes-0.8.4.tar.gz) = 124812 @@ -431,7 +431,7 @@ SIZE (cargo/rmp-0.8.14.tar.gz) = 29687 SIZE (cargo/rmpv-1.0.2.tar.gz) = 28359 SIZE (cargo/rsa-0.9.6.tar.gz) = 80048 SIZE (cargo/rustc-demangle-0.1.23.tar.gz) = 28970 -SIZE (cargo/rustix-0.38.33.tar.gz) = 364475 +SIZE (cargo/rustix-0.38.34.tar.gz) = 365160 SIZE (cargo/rustls-0.22.4.tar.gz) = 333681 SIZE (cargo/rustls-native-certs-0.7.0.tar.gz) = 25071 SIZE (cargo/rustls-pemfile-2.1.2.tar.gz) = 25928 @@ -553,4 +553,4 @@ SIZE (cargo/x11rb-protocol-0.13.0.tar.gz) = 507838 SIZE (cargo/xcursor-0.3.5.tar.gz) = 6256 SIZE (cargo/xkeysym-0.2.0.tar.gz) = 101431 SIZE (cargo/zeroize-1.7.0.tar.gz) = 19039 -SIZE (rbw-1.10.1.tar.gz) = 104415 +SIZE (rbw-1.10.2.tar.gz) = 104488
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/21 01:47:17 Modified files: www/pipe-viewer: Makefile distinfo www/pipe-viewer/pkg: PLIST-gtk PLIST-main Log message: Update to pipe-viewer-0.5.1 maintainer timeout
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/21 01:26:34 Modified files: emulators/retroarch: Makefile distinfo emulators/retroarch/patches: patch-audio_audio_driver_c patch-gfx_common_x11_common_c patch-input_drivers_x11_input_c patch-input_input_keymaps_c patch-retroarch_cfg emulators/retroarch/pkg: PLIST Added files: emulators/retroarch/pkg: README Log message: Update to retroarch-1.18.0 Added a README file explaining how to make a playlist which is required to associate a core to a content, and how to make icons visible
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/21 01:21:31 Modified files: games/dhewm3 : Makefile distinfo Log message: Update to dhewm3-1.5.3 ok pascal@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/18 13:46:44 Modified files: editors/kakoune: Makefile distinfo editors/kakoune/patches: patch-Makefile Log message: Update to kakoune-2024.05.18 take maintainership
update games/vcmi
this is a bugfix release https://github.com/vcmi/vcmi/blob/develop/ChangeLog.md#150---151 tested on amd64, worked fine diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile index b2375cf42b4..5e0fbb7d924 100644 --- a/games/vcmi/Makefile +++ b/games/vcmi/Makefile @@ -6,7 +6,7 @@ HOMEPAGE = https://vcmi.eu/ MAINTAINER = Kirill Bychkov -DIST_TUPLE += github vcmi vcmi 1.5.0 . +DIST_TUPLE += github vcmi vcmi 1.5.1 . DIST_TUPLE += github fuzzylite fuzzylite \ 7aee562d6ca17f3cf42588ffb5116e03017c3c50 AI/FuzzyLite DIST_TUPLE += github google googletest \ diff --git a/games/vcmi/distinfo b/games/vcmi/distinfo index acddf2d0d9f..7548d805c2b 100644 --- a/games/vcmi/distinfo +++ b/games/vcmi/distinfo @@ -1,6 +1,6 @@ SHA256 (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) = cOf9r/LVFHo79ZDMgXGWbZmDzNSZQAL4IWyDskBZl0Y= SHA256 (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) = JoHejAkwsGENxSomAvrUHQ2vo9f/EDDaZXXVb8H0ykY= -SHA256 (vcmi-vcmi-1.5.0.tar.gz) = OPpIx9oxiqWp4NMxn8sk9N/feFVcIbiwufm7tM7fM/g= +SHA256 (vcmi-vcmi-1.5.1.tar.gz) = P58SAgTnZ2pBZBlw9bGp+cb4wpZ+2NqcmNyOP+wBwkk= SIZE (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) = 2194254 SIZE (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) = 864010 -SIZE (vcmi-vcmi-1.5.0.tar.gz) = 9720419 +SIZE (vcmi-vcmi-1.5.1.tar.gz) = 9726101 diff --git a/games/vcmi/patches/patch-CMakeLists_txt b/games/vcmi/patches/patch-CMakeLists_txt index 77a15a7e595..ca7c5059592 100644 --- a/games/vcmi/patches/patch-CMakeLists_txt +++ b/games/vcmi/patches/patch-CMakeLists_txt @@ -1,7 +1,7 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -508,7 +508,7 @@ endif() +@@ -510,7 +510,7 @@ endif() if(ENABLE_LAUNCHER OR ENABLE_EDITOR) # Widgets finds its own dependencies (QtGui and QtCore). diff --git a/games/vcmi/patches/patch-client_CMT_cpp b/games/vcmi/patches/patch-client_CMT_cpp index 0f64536f23f..ca96ffd9826 100644 --- a/games/vcmi/patches/patch-client_CMT_cpp +++ b/games/vcmi/patches/patch-client_CMT_cpp @@ -1,12 +1,12 @@ Index: client/CMT.cpp --- client/CMT.cpp.orig +++ client/CMT.cpp -@@ -419,7 +419,7 @@ static void mainLoop() +@@ -433,7 +433,7 @@ static void mainLoop() // destruction of locked mutexes (fails an assertion), even in third-party libraries (as well as native libs on Android) // Android - std::quick_exit is available only starting from API level 21 // Mingw, macOS and iOS - std::quick_exit is unavailable (at least in current version of CI) -#if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || (defined(__MINGW32__)) || defined(VCMI_APPLE) +#if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || (defined(__MINGW32__)) || defined(VCMI_APPLE) || defined(__OpenBSD__) - ::exit(0); + ::exit(error_code); #else - std::quick_exit(0); + std::quick_exit(error_code); diff --git a/games/vcmi/patches/patch-lib_CThreadHelper_cpp b/games/vcmi/patches/patch-lib_CThreadHelper_cpp index 1f33c2cd3a0..d71a00b5752 100644 --- a/games/vcmi/patches/patch-lib_CThreadHelper_cpp +++ b/games/vcmi/patches/patch-lib_CThreadHelper_cpp @@ -1,12 +1,11 @@ Index: lib/CThreadHelper.cpp --- lib/CThreadHelper.cpp.orig +++ lib/CThreadHelper.cpp -@@ -109,7 +109,7 @@ void setThreadName(const std::string ) - pthread_setname_np(name.c_str()); +@@ -112,7 +112,6 @@ void setThreadName(const std::string ) #elif defined(VCMI_HAIKU) rename_thread(find_thread(NULL), name.c_str()); --#elif defined(VCMI_UNIX) -+#elif defined(VCMI_UNIX) && !defined(__OpenBSD__) - prctl(PR_SET_NAME, name.c_str(), 0, 0, 0); + #elif defined(VCMI_UNIX) +- prctl(PR_SET_NAME, name.c_str(), 0, 0, 0); + #else + #error "Failed to find method to set thread name on this system. Please provide one (or disable this line if you just want code to compile)" #endif - }
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/17 09:46:34 Modified files: x11/dmenu : Makefile distinfo Log message: Update to dmenu-5.3 ok sthen@, jung@ (maintainer)
update x11/dmenu
This is a simple update for dmenu, just bug fixes
Changelog can be found here https://git.suckless.org/dmenu/
ok?
diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
index eddc26ed9d1..572e21bc498 100644
--- a/x11/dmenu/Makefile
+++ b/x11/dmenu/Makefile
@@ -1,6 +1,6 @@
COMMENT= dynamic menu for X11
-V= 5.2
+V= 5.3
DISTNAME= dmenu-${V}
CATEGORIES=x11
diff --git a/x11/dmenu/distinfo b/x11/dmenu/distinfo
index 354575e5633..3d5a2f4de2d 100644
--- a/x11/dmenu/distinfo
+++ b/x11/dmenu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dmenu-5.2.tar.gz) = 1NTKd7WRQPJyJy21N+BbuRpZFPVoAmUtxX5hp3PUN5I=
-SIZE (dmenu-5.2.tar.gz) = 16196
+SHA256 (dmenu-5.3.tar.gz) = Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8=
+SIZE (dmenu-5.3.tar.gz) = 16274
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/15 12:04:13 Modified files: www/buku : Makefile distinfo www/buku/pkg : PLIST Log message: Update to buku-4.9 LGTM sthen@
update www/buku
Changelog available https://github.com/jarun/buku/releases/tag/v4.9
works fine on amd64
I aligned a few variables to improve readability
ok?
diff --git a/www/buku/Makefile b/www/buku/Makefile
index 4b676574e3a..5c625039e65 100644
--- a/www/buku/Makefile
+++ b/www/buku/Makefile
@@ -1,10 +1,9 @@
-COMMENT = powerful command-line bookmark manager
+COMMENT = powerful command-line bookmark manager
-MODPY_EGG_VERSION =4.7.1
-DISTNAME = buku-${MODPY_EGG_VERSION}
-REVISION = 2
+MODPY_EGG_VERSION =4.9
+DISTNAME = buku-${MODPY_EGG_VERSION}
-CATEGORIES = www
+CATEGORIES = www
# GPLv3+
PERMIT_PACKAGE = Yes
diff --git a/www/buku/distinfo b/www/buku/distinfo
index 8749c014b06..3244e48f028 100644
--- a/www/buku/distinfo
+++ b/www/buku/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buku-4.7.1.tar.gz) = 5/OhAkpLkm5EgKMst5jwzjUBlh780VRCYWz+vrd3yRY=
-SIZE (buku-4.7.1.tar.gz) = 225845
+SHA256 (buku-4.9.tar.gz) = e1NxoJYcbg2dEmoodMslrzOUv6i31EG8AWyFMyDj+mw=
+SIZE (buku-4.9.tar.gz) = 249347
diff --git a/www/buku/pkg/PLIST b/www/buku/pkg/PLIST
index 522b4c846a0..a9d79e404c8 100644
--- a/www/buku/pkg/PLIST
+++ b/www/buku/pkg/PLIST
@@ -18,6 +18,8 @@
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}__init__.${M
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}forms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -28,26 +30,42 @@
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}server.${MOD
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}views.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/bukuserver/${MODPY_PYCACHE}views.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bukuserver/api.py
lib/python${MODPY_VERSION}/site-packages/bukuserver/filters.py
lib/python${MODPY_VERSION}/site-packages/bukuserver/forms.py
+lib/python${MODPY_VERSION}/site-packages/bukuserver/middleware/
+lib/python${MODPY_VERSION}/site-packages/bukuserver/middleware/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bukuserver/middleware/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/bukuserver/middleware/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/bukuserver/middleware/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bukuserver/middleware/${MODPY_PYCACHE}flask_reverse_proxy_fix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/bukuserver/middleware/${MODPY_PYCACHE}flask_reverse_proxy_fix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bukuserver/middleware/flask_reverse_proxy_fix.py
lib/python${MODPY_VERSION}/site-packages/bukuserver/response.py
lib/python${MODPY_VERSION}/site-packages/bukuserver/server.py
lib/python${MODPY_VERSION}/site-packages/bukuserver/static/
lib/python${MODPY_VERSION}/site-packages/bukuserver/static/bukuserver/
+lib/python${MODPY_VERSION}/site-packages/bukuserver/static/bukuserver/css/
+lib/python${MODPY_VERSION}/site-packages/bukuserver/static/bukuserver/css/bookmark.css
+lib/python${MODPY_VERSION}/site-packages/bukuserver/static/bukuserver/favicon.svg
lib/python${MODPY_VERSION}/site-packages/bukuserver/static/bukuserver/js/
lib/python${MODPY_VERSION}/site-packages/bukuserver/static/bukuserver/js/Chart.js
lib/python${MODPY_VERSION}/site-packages/bukuserver/static/bukuserver/js/bookmark.js
+lib/python${MODPY_VERSION}/site-packages/bukuserver/static/bukuserver/js/last_page.js
+lib/python${MODPY_VERSION}/site-packages/bukuserver/static/bukuserver/js/page_size.js
lib/python${MODPY_VERSION}/site-packages/bukuserver/templates/
lib/python${MODPY_VERSION}/site-packages/bukuserver/templates/bukuserver/
-lib/python${MODPY_VERSION}/site-packages/bukuserver/templates/bukuserver/base.html
lib/python${MODPY_VERSION}/site-packages/bukuserver/templates/bukuserver/bookmark_create.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/15 08:35:31 Modified files: games/hyperrogue: Makefile distinfo games/hyperrogue/patches: patch-Makefile Log message: Update to hyperrogue-13.0i ok bcallah@ (maintainer)
update games/hyperrogue
a new hyperrogue release, bug fix
https://github.com/zenorogue/hyperrogue/releases/tag/v13.0i
I propose to drop the hunk in the Makefile about the CXXFLAGS,
it compiles fine without on amd64 (clang), the one with gcc
seems good too, and it seems to be a moving area that I had
to manually fix it twice in a row.
ok?
diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 3b211a563a9..43713b359db 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,4 +1,4 @@
-V =13.0d
+V =13.0i
COMMENT = roguelike game in a non-Euclidean world
CATEGORIES = games x11
diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo
index fe08e61d88c..f35d0857fbc 100644
--- a/games/hyperrogue/distinfo
+++ b/games/hyperrogue/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hyperrogue-13.0d.tar.gz) = 4ApHLRReh9u3dzH+FXCHyB2N5b0rBfogkbyQGFMIDoo=
-SIZE (hyperrogue-13.0d.tar.gz) = 87765129
+SHA256 (hyperrogue-13.0i.tar.gz) = JrkL+648RBYT6Gy+AmH1wDchja+3IioP2cfTAcb/Ulg=
+SIZE (hyperrogue-13.0i.tar.gz) = 87772760
diff --git a/games/hyperrogue/patches/patch-Makefile
b/games/hyperrogue/patches/patch-Makefile
index 6d4afc867d8..aa395e2eb62 100644
--- a/games/hyperrogue/patches/patch-Makefile
+++ b/games/hyperrogue/patches/patch-Makefile
@@ -4,7 +4,7 @@ flag set for clang and ports-gcc
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -42,7 +42,6 @@ endif
+@@ -50,7 +50,6 @@ endif
## Begin customization points for each OS and TOOLCHAIN we support.
@@ -12,50 +12,15 @@ Index: Makefile
CXXFLAGS_EARLY += -DLINUX
EXE_EXTENSION :=
LDFLAGS_GL := -lGL
-@@ -51,7 +50,6 @@ ifeq (${OS},linux)
+@@ -59,7 +58,6 @@ ifeq (${OS},linux)
LDFLAGS_SDL := -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz
OBJ_EXTENSION := .o
hyper_RES :=
-endif
ifeq (${OS},mingw)
- CXXFLAGS_EARLY += -DWINDOWS -mwindows -D_A_VOLID=8
-@@ -79,29 +77,12 @@ ifeq (${OS},osx)
- hyper_RES :=
- endif
-
--ifeq (${TOOLCHAIN},clang)
-- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -fPIC
-- CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -pedantic
-- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized -Wno-char-subscripts -Wno-unknown-warning-option
-- CXXFLAGS_EARLY += -Wno-invalid-offsetof
--endif
-+CXXFLAGS_STD = -std=c++11
-+CXXFLAGS_EARLY += -fPIC
-+CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -pedantic
-+CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized -Wno-unknown-warning-option
-+CXXFLAGS_EARLY += -Wno-invalid-offsetof
-
--ifeq (${TOOLCHAIN},gcc)
-- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -fPIC
-- CXXFLAGS_EARLY += -W -Wall -Wextra -pedantic
-- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized
-- CXXFLAGS_EARLY += -Wno-invalid-offsetof
--endif
--
--ifeq (${TOOLCHAIN},mingw)
-- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -W -Wall -Wextra
-- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized
-- CXXFLAGS_EARLY += -Wno-invalid-offsetof
--endif
--
- ifeq (${FONTCONFIG},1)
- CXXFLAGS_EARLY += -DFONTCONFIG `pkg-config --cflags fontconfig`
- LDFLAGS_EARLY += `pkg-config --libs fontconfig`
-@@ -144,19 +125,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
+ CXXFLAGS_EARLY += -DWINDOWS -mwindows -D_A_VOLID=8 -I/ucrt64/include/SDL
+@@ -153,19 +151,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS}
hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES)
@@ -79,7 +44,7 @@ Index: Makefile
autohdr.h: makeh$(EXE_EXTENSION) language-data.cpp *.cpp
./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp
geometry.cpp embeddings.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp
multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp
hprint.cpp language.cpp util.cpp complex.cpp multigame.cpp arbitrile.cpp
rulegen.cpp *.cpp > autohdr.h
-@@ -165,10 +146,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
+@@ -174,10 +172,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
./langen > language-data.cpp
savepng$(OBJ_EXTENSION): savepng.cpp
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/15 04:55:09 Modified files: games/gzdoom : Makefile distinfo Added files: games/gzdoom/patches: patch-libraries_ZWidget_CMakeLists_txt Removed files: games/gzdoom/patches: patch-CMakeLists_txt Log message: Update to gzdoom-4.12.2 ok Timo Myyra (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/15 04:45:28 Modified files: games/godot4 : Makefile distinfo games/godot4/patches: patch-SConstruct patch-drivers_unix_file_access_unix_cpp patch-drivers_unix_os_unix_cpp patch-platform_linuxbsd_detect_py patch-platform_linuxbsd_os_linuxbsd_cpp patch-platform_linuxbsd_x11_display_server_x11_cpp Log message: Update to godot4-4.2.2 ok op@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/14 04:28:05 Modified files: www/badwolf: Makefile distinfo www/badwolf/patches: patch-version_sh www/badwolf/pkg: PLIST Log message: Update to badwolf-1.3.0 Diff from Stefan Moran, thanks
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/14 04:25:32 Modified files: editors/kakoune: Makefile distinfo editors/kakoune/pkg: PLIST Added files: editors/kakoune/patches: patch-Makefile Removed files: editors/kakoune/patches: patch-src_Makefile patch-src_ranges_hh Log message: Update to kakoune-2024.05.09 ok thfr@
update games/godot4
I updated godot4 to see if I could run a game, it did not but here
is the diff, not much tested
https://godotengine.org/article/maintenance-release-godot-4-2-2-and-4-1-4/
diff --git a/games/godot4/Makefile b/games/godot4/Makefile
index 9a368a86354..763163b9be1 100644
--- a/games/godot4/Makefile
+++ b/games/godot4/Makefile
@@ -3,11 +3,9 @@ BROKEN-powerpc = fails at runtime, the UI is totally
blank
COMMENT-main = 2D and 3D game engine
COMMENT-editor=2D and 3D game engine (with the editor)
-V =4.2.1pl0
-COMMIT = f77bc872114ebe77f1604db47b81016ff478ce17
+V =4.2.2
PKGNAME = godot4-${V}
-DIST_TUPLE += github godotengine godot ${COMMIT} .
-REVISION = 0
+DIST_TUPLE += github godotengine godot ${V}-stable .
CATEGORIES = games
diff --git a/games/godot4/distinfo b/games/godot4/distinfo
index f608aa4c7c3..16b2027e96d 100644
--- a/games/godot4/distinfo
+++ b/games/godot4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (godotengine-godot-f77bc872114ebe77f1604db47b81016ff478ce17.tar.gz) =
2d0derwvkQxbNOOZRKOz34rI5ca5Z6rHX4q05nqBCYg=
-SIZE (godotengine-godot-f77bc872114ebe77f1604db47b81016ff478ce17.tar.gz) =
40392981
+SHA256 (godotengine-godot-4.2.2-stable.tar.gz) =
mQt7cWZWEiNksWclCMUWyJhJfFAhbXwAxg7q9QdoXA4=
+SIZE (godotengine-godot-4.2.2-stable.tar.gz) = 39246793
diff --git a/games/godot4/patches/patch-SConstruct
b/games/godot4/patches/patch-SConstruct
index 35898c3db34..19b577b47cd 100644
--- a/games/godot4/patches/patch-SConstruct
+++ b/games/godot4/patches/patch-SConstruct
@@ -6,7 +6,7 @@ Remove architecture from the program names
Index: SConstruct
--- SConstruct.orig
+++ SConstruct
-@@ -599,7 +599,7 @@ if selected_platform in platform_list:
+@@ -596,7 +596,7 @@ if selected_platform in platform_list:
env.Append(LINKFLAGS=["/OPT:REF"])
elif env["optimize"] == "debug" or env["optimize"] == "none":
env.Append(CCFLAGS=["/Od"])
@@ -15,12 +15,11 @@ Index: SConstruct
if env["debug_symbols"]:
# Adding dwarf-4 explicitly makes stacktraces work with clang
builds,
# otherwise addr2line doesn't understand them
-@@ -823,8 +823,6 @@ if selected_platform in platform_list:
-
+@@ -821,7 +821,6 @@ if selected_platform in platform_list:
if env_base["precision"] == "double":
suffix += ".double"
--
+
-suffix += "." + env["arch"]
+ suffix += env.extra_suffix
- if not env["threads"]:
- suffix += ".nothreads"
+ sys.path.remove(tmppath)
diff --git a/games/godot4/patches/patch-drivers_unix_file_access_unix_cpp
b/games/godot4/patches/patch-drivers_unix_file_access_unix_cpp
index 4fb886bdb52..bf3925aec4f 100644
--- a/games/godot4/patches/patch-drivers_unix_file_access_unix_cpp
+++ b/games/godot4/patches/patch-drivers_unix_file_access_unix_cpp
@@ -1,7 +1,7 @@
Index: drivers/unix/file_access_unix.cpp
--- drivers/unix/file_access_unix.cpp.orig
+++ drivers/unix/file_access_unix.cpp
-@@ -395,7 +395,7 @@ Error FileAccessUnix::_set_unix_permissions(const Stri
+@@ -320,7 +320,7 @@ Error FileAccessUnix::_set_unix_permissions(const Stri
}
bool FileAccessUnix::_get_hidden_attribute(const String _file) {
@@ -10,7 +10,7 @@ Index: drivers/unix/file_access_unix.cpp
String file = fix_path(p_file);
struct stat st = {};
-@@ -409,7 +409,7 @@ bool FileAccessUnix::_get_hidden_attribute(const Strin
+@@ -334,7 +334,7 @@ bool FileAccessUnix::_get_hidden_attribute(const Strin
}
Error FileAccessUnix::_set_hidden_attribute(const String _file, bool
p_hidden) {
diff --git a/games/godot4/patches/patch-drivers_unix_os_unix_cpp
b/games/godot4/patches/patch-drivers_unix_os_unix_cpp
index d5487a598d8..fac7c473d07 100644
--- a/games/godot4/patches/patch-drivers_unix_os_unix_cpp
+++ b/games/godot4/patches/patch-drivers_unix_os_unix_cpp
@@ -4,7 +4,7 @@ fix get_executable_path(); backport of
Index: drivers/unix/os_unix.cpp
--- drivers/unix/os_unix.cpp.orig
+++ drivers/unix/os_unix.cpp
-@@ -755,12 +755,6 @@ String OS_Unix::get_executable_path() const {
+@@ -751,12 +751,6 @@ String OS_Unix::get_executable_path() const {
return OS::get_executable_path();
}
return b;
@@ -17,7 +17,7 @@ Index: drivers/unix/os_unix.cpp
#elif defined(__NetBSD__)
int mib[4] = { CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME };
char buf[MAXPATHLEN];
-@@ -803,8 +797,43 @@ String OS_Unix::get_executable_path() const {
+@@ -799,8 +793,43 @@ String OS_Unix::get_executable_path() const {
return path;
#else
diff --git a/games/godot4/patches/patch-platform_linuxbsd_detect_py
b/games/godot4/patches/patch-platform_linuxbsd_detect_py
index b496f600190..fb045481375 100644
--- a/games/godot4/patches/patch-platform_linuxbsd_detect_py
+++ b/games/godot4/patches/patch-platform_linuxbsd_detect_py
@@ -11,7 +11,7 @@ Index: platform/linuxbsd/detect.py
BoolVariable("dbus", "Use D-Bus to handle screensaver and portal
desktop
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/13 10:22:47 Modified files: games/vcmi : Makefile distinfo games/vcmi/patches: patch-CMakeLists_txt patch-client_CMT_cpp games/vcmi/pkg : PLIST Added files: games/vcmi/patches: patch-lib_CThreadHelper_cpp Removed files: games/vcmi/patches: patch-Global_h patch-lib_CStopWatch_h patch-lib_modding_CModVersion_h patch-server_CVCMIServer_cpp Log message: Update to vcmi-1.5.0 ok kirby@ (maintainer) tweaks from kirby@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/13 10:02:26 Modified files: x11/fvwm3 : Makefile distinfo x11/fvwm3/patches: patch-configure x11/fvwm3/pkg : PLIST Log message: Update to fvwm3-1.1.0 Diff from maintainer Michael
update games/dhewm3
tested on amd64, works fine. Even with a hack to play it at 120fps :) changelog https://github.com/dhewm/dhewm3/blob/master/Changelog.md#153-2024-03-29 ok? diff --git a/games/dhewm3/Makefile b/games/dhewm3/Makefile index 0777191bd40..554c02e364a 100644 --- a/games/dhewm3/Makefile +++ b/games/dhewm3/Makefile @@ -2,9 +2,7 @@ ONLY_FOR_ARCHS =amd64 i386 GH_ACCOUNT = dhewm GH_PROJECT = dhewm3 -GH_TAGNAME = 1.5.2 - -REVISION = 0 +GH_TAGNAME = 1.5.3 COMMENT = open-source version of Doom 3 diff --git a/games/dhewm3/distinfo b/games/dhewm3/distinfo index 93204be8047..73fd8608a03 100644 --- a/games/dhewm3/distinfo +++ b/games/dhewm3/distinfo @@ -1,2 +1,2 @@ -SHA256 (dhewm3-1.5.2.tar.gz) = BlLYW8xHC4U13uD8a63VeoKhg5hPegKj+hOTdDYWbrA= -SIZE (dhewm3-1.5.2.tar.gz) = 5573686 +SHA256 (dhewm3-1.5.3.tar.gz) = rtty3bq1CprC8nnM4GddO3B+6yQkZR84nCdoNUHM9Ew= +SIZE (dhewm3-1.5.3.tar.gz) = 5622507
update emulators/retroarch
this updates retroarch to latest version, I only tried on amd64
Changelog https://github.com/libretro/RetroArch/blob/master/CHANGES.md
Commit diff https://github.com/libretro/RetroArch/compare/v1.10.3...v1.18.0
I added a README file because the behavior on OpenBSD seems different
from what I've seen on other OSes, maybe a packaging issue but I'm
not sure. If I try to load a content from the UI, it says no core
are available although I have one installed. In addition, there are
no icons in the UI. Both behavior already exist with the current port
version.
The README explains how to get icons through the online updater
(something we may be able to ship through the port I guess), and
also how to create a playlist to assign a core to ROMs found in a
directory, which allows to load games fine.
diff --git a/emulators/retroarch/Makefile b/emulators/retroarch/Makefile
index 2089cf6620a..192864bfae1 100644
--- a/emulators/retroarch/Makefile
+++ b/emulators/retroarch/Makefile
@@ -4,8 +4,7 @@ PKGNAME = retroarch-${GH_TAGNAME:S/v//}
GH_ACCOUNT = libretro
GH_PROJECT = RetroArch
-GH_TAGNAME = v1.10.3
-REVISION = 3
+GH_TAGNAME = v1.18.0
# crashes when recording videos due to ffmpeg
USE_NOBTCFI-amd64 =Yes
diff --git a/emulators/retroarch/distinfo b/emulators/retroarch/distinfo
index 5d65027ae26..c937f3a6379 100644
--- a/emulators/retroarch/distinfo
+++ b/emulators/retroarch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (RetroArch-1.10.3.tar.gz) = KvRClOVfVjYmIoTWUMtf/1XJBwrDpwDU+lXB8VLcs/I=
-SIZE (RetroArch-1.10.3.tar.gz) = 43353256
+SHA256 (RetroArch-1.18.0.tar.gz) = EIejwCnudGPPra+6sNs9VY1tKrnO9B9GftjzcrtCu9Y=
+SIZE (RetroArch-1.18.0.tar.gz) = 56944954
diff --git a/emulators/retroarch/patches/patch-audio_audio_driver_c
b/emulators/retroarch/patches/patch-audio_audio_driver_c
index 9f41bfe7eae..bbf9f8398fc 100644
--- a/emulators/retroarch/patches/patch-audio_audio_driver_c
+++ b/emulators/retroarch/patches/patch-audio_audio_driver_c
@@ -1,7 +1,7 @@
Index: audio/audio_driver.c
--- audio/audio_driver.c.orig
+++ audio/audio_driver.c
-@@ -93,7 +93,7 @@ audio_driver_t *audio_drivers[] = {
+@@ -92,7 +92,7 @@ audio_driver_t *audio_drivers[] = {
#if defined(HAVE_AUDIOIO)
_audioio,
#endif
diff --git a/emulators/retroarch/patches/patch-gfx_common_x11_common_c
b/emulators/retroarch/patches/patch-gfx_common_x11_common_c
index b99d25d44c4..bd16f9cdba6 100644
--- a/emulators/retroarch/patches/patch-gfx_common_x11_common_c
+++ b/emulators/retroarch/patches/patch-gfx_common_x11_common_c
@@ -4,27 +4,27 @@ which breaks keyboard input.
Index: gfx/common/x11_common.c
--- gfx/common/x11_common.c.orig
+++ gfx/common/x11_common.c
-@@ -495,7 +495,7 @@ static enum retro_key x11_translate_keysym_to_rk(unsig
+@@ -505,7 +505,7 @@ static enum retro_key x11_translate_keysym_to_rk(unsig
return RETROK_UNKNOWN;
}
--static void x11_handle_key_event(unsigned keycode, XEvent *event, XIC ic,
bool filter)
-+static void x11_handle_key_event(XEvent *event, XIC ic, bool filter)
+-static void x11_handle_key_event(unsigned keycode, XEvent *event,
++static void x11_handle_key_event(XEvent *event,
+ XIC ic, bool filter)
{
int i;
-Status status;
-@@ -546,9 +546,7 @@ static void x11_handle_key_event(unsigned keycode, XEv
+@@ -557,9 +557,7 @@ static void x11_handle_key_event(unsigned keycode, XEv
if (keysym >= XK_A && keysym <= XK_Z)
keysym += XK_z - XK_Z;
-- /* Get the real keycode,
-- that correctly ignores international layouts as windows code does. */
+- /* Get the real keycode, that correctly ignores international layouts
+-* as windows code does. */
- key = x11_translate_keysym_to_rk(keycode);
+ key = input_keymaps_translate_keysym_to_rk(keysym);
if (state & ShiftMask)
mod |= RETROKMOD_SHIFT;
-@@ -558,10 +556,10 @@ static void x11_handle_key_event(unsigned keycode, XEv
+@@ -569,10 +567,10 @@ static void x11_handle_key_event(unsigned keycode, XEv
mod |= RETROKMOD_CTRL;
if (state & Mod1Mask)
mod |= RETROKMOD_ALT;
@@ -37,7 +37,7 @@ Index: gfx/common/x11_common.c
input_keyboard_event(down, key, chars[0], mod, RETRO_DEVICE_KEYBOARD);
-@@ -576,14 +574,9 @@ bool x11_alive(void *data)
+@@ -587,14 +585,10 @@ bool x11_alive(void *data)
{
XEvent event;
bool filter = false;
@@ -45,14 +45,14 @@ Index: gfx/common/x11_common.c
/* Can get events from older windows. Check this. */
XNextEvent(g_x11_dpy, );
--
+
- /* IMPORTANT - Get keycode before XFilterEvent
- because the event is localizated after the call */
- keycode = event.xkey.keycode;
- filter = XFilterEvent(, g_x11_win);
+ filter = XFilterEvent(, g_x11_win);
switch (event.type)
-@@ -667,7 +660,7 @@ bool x11_alive(void *data)
+@@ -677,7 +671,7 @@ bool x11_alive(void *data)
}
case KeyPress:
if
update www/pipe-viewer
This updates pipe-viewer to latest version
pipe-viewer and gtk-pipe-viewer works fine for me
Changelog: https://github.com/trizen/pipe-viewer/releases/tag/0.5.1
ok?
diff --git a/www/pipe-viewer/Makefile b/www/pipe-viewer/Makefile
index 67f2eabc89f..f93908d03fc 100644
--- a/www/pipe-viewer/Makefile
+++ b/www/pipe-viewer/Makefile
@@ -1,7 +1,7 @@
COMMENT-main = lightweight YouTube client
COMMENT-gtk = lightweight YouTube client with a GTK interface
-VERSION = 0.5.0
+VERSION = 0.5.1
DIST_TUPLE = github trizen pipe-viewer ${VERSION} .
PKGNAME-main = pipe-viewer-${VERSION}
PKGNAME-gtk = gtk-pipe-viewer-${VERSION}
diff --git a/www/pipe-viewer/distinfo b/www/pipe-viewer/distinfo
index d48160a3ca4..3b0b1135729 100644
--- a/www/pipe-viewer/distinfo
+++ b/www/pipe-viewer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (trizen-pipe-viewer-0.5.0.tar.gz) =
hpRfZEhaBVnb49bgAA9PLl9gTBOq5TVu//eRJW+7iNE=
-SIZE (trizen-pipe-viewer-0.5.0.tar.gz) = 269544
+SHA256 (trizen-pipe-viewer-0.5.1.tar.gz) =
Ygb3WYS43dPNigjiHYtkCPbG0bvzEQnWWmNC4y0VS2w=
+SIZE (trizen-pipe-viewer-0.5.1.tar.gz) = 270337
diff --git a/www/pipe-viewer/pkg/PLIST-gtk b/www/pipe-viewer/pkg/PLIST-gtk
index 0bdb1290002..99d301ce3ab 100644
--- a/www/pipe-viewer/pkg/PLIST-gtk
+++ b/www/pipe-viewer/pkg/PLIST-gtk
@@ -1,7 +1,4 @@
bin/gtk-pipe-viewer
-${P5SITE}/auto/
-${P5SITE}/auto/share/
-${P5SITE}/auto/share/dist/
${P5SITE}/auto/share/dist/WWW-PipeViewer/
${P5SITE}/auto/share/dist/WWW-PipeViewer/gtk-pipe-viewer.desktop
${P5SITE}/auto/share/dist/WWW-PipeViewer/gtk-pipe-viewer.glade
diff --git a/www/pipe-viewer/pkg/PLIST-main b/www/pipe-viewer/pkg/PLIST-main
index 95d74cc3259..580ac7e6840 100644
--- a/www/pipe-viewer/pkg/PLIST-main
+++ b/www/pipe-viewer/pkg/PLIST-main
@@ -18,6 +18,8 @@ ${P5SITE}/WWW/PipeViewer/Utils.pm
${P5SITE}/WWW/PipeViewer/VideoCategories.pm
${P5SITE}/WWW/PipeViewer/Videos.pm
${P5SITE}/WWW/PipeViewer/Worker.pm
+${P5SITE}/auto/share/dist/WWW-PipeViewer/icons/left_arrow.png
+${P5SITE}/auto/share/dist/WWW-PipeViewer/icons/right_arrow.png
@man man/man1/pipe-viewer.1
@man man/man3p/WWW::PipeViewer.3p
@man man/man3p/WWW::PipeViewer::Channels.3p
update games/gzdoom
changelog https://github.com/ZDoom/gzdoom/compare/g4.11.3...g4.12.2
tested with doom2 and brutal doom, sound + music worked fine
one patch was merged upstream
diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile
index 50b4a92f320..e4ca89b89c3 100644
--- a/games/gzdoom/Makefile
+++ b/games/gzdoom/Makefile
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS =i386 amd64
COMMENT = OpenGL engine for idTech 1 games like
doom,hexen,heretic...
-V =4.11.3
+V =4.12.2
DIST_TUPLE = github ZDoom gzdoom g${V} .
PKGNAME = gzdoom-${V}
diff --git a/games/gzdoom/distinfo b/games/gzdoom/distinfo
index 34c0a704339..926b22dec20 100644
--- a/games/gzdoom/distinfo
+++ b/games/gzdoom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ZDoom-gzdoom-g4.11.3.tar.gz) =
WUPbpQ2iD/lPH8xBUTJnLUKhWRfFcbHCt87v4Uk19dU=
-SIZE (ZDoom-gzdoom-g4.11.3.tar.gz) = 24354699
+SHA256 (ZDoom-gzdoom-g4.12.2.tar.gz) =
hkxaHsl23WBo+c2T+SxUBMZigkmWEB8UEd2yWlSvxzI=
+SIZE (ZDoom-gzdoom-g4.12.2.tar.gz) = 25910359
diff --git a/games/gzdoom/patches/patch-CMakeLists_txt
b/games/gzdoom/patches/patch-CMakeLists_txt
deleted file mode 100644
index 6d2aba4be6d..000
--- a/games/gzdoom/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: CMakeLists.txt
CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -301,7 +301,7 @@ else()
-
- if ( UNIX )
- include(CheckSymbolExists)
-- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
-+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h"
HAVE_FTS )
- if ( NOT HAVE_FTS )
- include ( FindPkgConfig )
- pkg_check_modules( MUSL_FTS musl-fts )
diff --git a/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt
b/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt
new file mode 100644
index 000..f9dd257c5a3
--- /dev/null
+++ b/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt
@@ -0,0 +1,12 @@
+Index: libraries/ZWidget/CMakeLists.txt
+--- libraries/ZWidget/CMakeLists.txt.orig
libraries/ZWidget/CMakeLists.txt
+@@ -127,7 +127,7 @@ elseif(APPLE)
+ add_link_options(-pthread)
+ else()
+ set(ZWIDGET_SOURCES ${ZWIDGET_SOURCES} ${ZWIDGET_SDL2_SOURCES})
+- set(ZWIDGET_LIBS ${CMAKE_DL_LIBS} -ldl)
++ set(ZWIDGET_LIBS ${CMAKE_DL_LIBS})
+ add_definitions(-DUNIX -D_UNIX)
+ add_link_options(-pthread)
+ endif()
Re: [update / simplify] devel/difftastic 0.58.0
On Sun, May 12, 2024 at 06:00:59PM GMT, Volker Schlecht wrote:
> With version 0.58.0 difftastic comes with its own manpage.
> I'd like to stop generating the HTML documentation and install the manpage
> instead.
>
> Fortunately now all the patches related to tree-magic-mini can be dropped as
> well.
>
> thoughts, objections, oks?
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/difftastic/Makefile,v
> diff -u -p -r1.13 Makefile
> --- Makefile 19 Mar 2024 18:29:52 - 1.13
> +++ Makefile 12 May 2024 15:56:32 -
> @@ -2,7 +2,7 @@ COMMENT = diff tool that compares files
>
> GH_ACCOUNT = Wilfred
> GH_PROJECT = difftastic
> -GH_TAGNAME = 0.56.1
> +GH_TAGNAME = 0.58.0
>
> HOMEPAGE = https://difftastic.wilfred.me.uk/
>
> @@ -14,7 +14,6 @@ CATEGORIES =devel
> PERMIT_PACKAGE = Yes
>
> MODULES =devel/cargo
> -BUILD_DEPENDS = textproc/mdbook
> COMPILER = base-clang ports-gcc
> WANTLIB += ${MODCARGO_WANTLIB} ${COMPILER_LIBCXX} m
>
> @@ -22,20 +21,8 @@ CONFIGURE_STYLE = cargo
>
> DOCDIR = ${PREFIX}/share/doc/difftastic
>
> -# Prepare directory for HTML manual
> -post-extract:
> - sed -i 's/DFT_VERSION_HERE/${GH_TAGNAME}/g' \
> - ${WRKSRC}/manual/src/introduction.md
> - sed -i '18,20d' ${WRKSRC}/manual/book.toml
> -
> -# Build and install HTML manual with mdBook
> -pre-install:
> - mkdir -p ${WRKSRC}/html_manual
> - mdbook build -d ${WRKSRC}/html_manual ${WRKSRC}/manual
> -
> post-install:
> - ${INSTALL_DATA_DIR} ${DOCDIR}
> - cp -r ${WRKSRC}/html_manual/* ${DOCDIR}
> + ${INSTALL_MAN} ${WRKSRC}/difft.1 ${PREFIX}/man/man1
>
> .include "crates.inc"
> .include
> Index: crates.inc
> ===
> RCS file: /cvs/ports/devel/difftastic/crates.inc,v
> diff -u -p -r1.10 crates.inc
> --- crates.inc19 Mar 2024 18:29:52 - 1.10
> +++ crates.inc12 May 2024 15:56:32 -
> @@ -1,138 +1,143 @@
> -MODCARGO_CRATES += ahash 0.8.9 # MIT OR Apache-2.0
> -MODCARGO_CRATES += aho-corasick1.1.2 # Unlicense OR MIT
> +MODCARGO_CRATES += ahash 0.8.11 # MIT OR Apache-2.0
> +MODCARGO_CRATES += aho-corasick1.1.3 # Unlicense OR MIT
> MODCARGO_CRATES += allocator-api2 0.2.16 # MIT OR Apache-2.0
> -MODCARGO_CRATES += assert_cmd 2.0.5 # MIT OR Apache-2.0
> +MODCARGO_CRATES += assert_cmd 2.0.8 # MIT OR Apache-2.0
> MODCARGO_CRATES += atty0.2.14 # MIT
> MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
> MODCARGO_CRATES += bitflags1.3.2 # MIT/Apache-2.0
> -MODCARGO_CRATES += bitflags2.4.2 # MIT OR Apache-2.0
> -MODCARGO_CRATES += bstr0.2.17 # MIT OR Apache-2.0
> -MODCARGO_CRATES += bstr1.6.0 # MIT OR Apache-2.0
> +MODCARGO_CRATES += bitflags2.5.0 # MIT OR Apache-2.0
> +MODCARGO_CRATES += bstr1.9.1 # MIT OR Apache-2.0
> MODCARGO_CRATES += bumpalo 3.14.0 # MIT OR Apache-2.0
> -MODCARGO_CRATES += bytecount 0.6.2 # Apache-2.0/MIT
> -MODCARGO_CRATES += cc 1.0.83 # MIT OR Apache-2.0
> +MODCARGO_CRATES += cc 1.0.90 # MIT OR Apache-2.0
> MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
> MODCARGO_CRATES += clap3.2.25 # MIT OR Apache-2.0
> MODCARGO_CRATES += clap_lex0.2.4 # MIT OR Apache-2.0
> -MODCARGO_CRATES += const_format0.2.23 # Zlib
> -MODCARGO_CRATES += const_format_proc_macros0.2.22 # Zlib
> -MODCARGO_CRATES += crossbeam-channel 0.5.8 # MIT OR Apache-2.0
> -MODCARGO_CRATES += crossbeam-deque 0.8.1 # MIT OR Apache-2.0
> -MODCARGO_CRATES += crossbeam-epoch 0.9.8 # MIT OR Apache-2.0
> -MODCARGO_CRATES += crossbeam-utils 0.8.8 # MIT OR Apache-2.0
> +MODCARGO_CRATES += const_format0.2.32 # Zlib
> +MODCARGO_CRATES += const_format_proc_macros0.2.32 # Zlib
> +MODCARGO_CRATES += crossbeam-deque 0.8.5 # MIT OR Apache-2.0
> +MODCARGO_CRATES += crossbeam-epoch 0.9.18 # MIT OR Apache-2.0
> +MODCARGO_CRATES += crossbeam-utils 0.8.19 # MIT OR Apache-2.0
> MODCARGO_CRATES += crossterm 0.27.0 # MIT
> MODCARGO_CRATES += crossterm_winapi0.9.1 # MIT
> -MODCARGO_CRATES += ctor0.1.22 # Apache-2.0 OR MIT
> -MODCARGO_CRATES += diff0.1.12 # MIT OR Apache-2.0
> +MODCARGO_CRATES += diff0.1.13 # MIT OR Apache-2.0
> MODCARGO_CRATES += difflib 0.4.0 # MIT
> MODCARGO_CRATES += doc-comment 0.3.3 # MIT
> -MODCARGO_CRATES += either 1.6.1 # MIT/Apache-2.0
> -MODCARGO_CRATES += env_logger 0.10.0 # MIT OR Apache-2.0
> -MODCARGO_CRATES += errno 0.3.5 # MIT OR Apache-2.0
> -MODCARGO_CRATES += fixedbitset 0.4.1 # MIT/Apache-2.0
> +MODCARGO_CRATES += either 1.10.0 # MIT OR Apache-2.0
> +MODCARGO_CRATES +=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/12 07:55:00 Modified files: devel/tig : Makefile distinfo Log message: Update to tig-2.5.10 ok rsadowski@
update devel/tig
changelog https://github.com/jonas/tig/releases/tag/tig-2.5.10 tested on amd64, works for me ok? diff --git a/devel/tig/Makefile b/devel/tig/Makefile index 6edd3f7ec1b..6543d3f6b29 100644 --- a/devel/tig/Makefile +++ b/devel/tig/Makefile @@ -1,6 +1,6 @@ COMMENT = ncurses Git repository browser -V =2.5.9 +V =2.5.10 DISTNAME = tig-$V CATEGORIES = devel diff --git a/devel/tig/distinfo b/devel/tig/distinfo index 3edddfb8130..55a4d295c56 100644 --- a/devel/tig/distinfo +++ b/devel/tig/distinfo @@ -1,2 +1,2 @@ -SHA256 (tig-2.5.9.tar.gz) = DLTZ494A3JKqp5luFReEW9m5oNQ2jzIG9hjYE+jbizk= -SIZE (tig-2.5.9.tar.gz) = 1183142 +SHA256 (tig-2.5.10.tar.gz) = 9lXME2b8EAWKK9UFu4jKeOZT/3UmwbgXdMRLnYQSEOM= +SIZE (tig-2.5.10.tar.gz) = 1183631
update games/vcmi
There is a new version of vcmi
https://github.com/vcmi/vcmi/blame/develop/ChangeLog.md
Controller support didn't work for me unfortunately (xbox one),
otherwise everything works fine.
Some patches were merged upstream and thus dropped,
I had to neut a prctl call because we don't have it,
I did not see any issue with that change (otherwise it won't
compile anyway).
ok?
diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile
index a274d2ee54f..075e8a1c155 100644
--- a/games/vcmi/Makefile
+++ b/games/vcmi/Makefile
@@ -6,7 +6,7 @@ HOMEPAGE = https://vcmi.eu/
MAINTAINER = Kirill Bychkov
-DIST_TUPLE += github vcmi vcmi 1.4.5 .
+DIST_TUPLE += github vcmi vcmi 1.5.0 .
DIST_TUPLE += github fuzzylite fuzzylite \
7aee562d6ca17f3cf42588ffb5116e03017c3c50 AI/FuzzyLite
DIST_TUPLE += github google googletest \
@@ -51,7 +51,7 @@ CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} \
NO_TEST = Yes
-FIX_CRLF_FILES = Global.h lib/CStopWatch.h lib/CModHandler.h
+FIX_CRLF_FILES = Global.h
post-extract:
sed -i 's,/bin/bash,${LOCALBASE}/bin/bash,' ${WRKSRC}/vcmibuilder
diff --git a/games/vcmi/distinfo b/games/vcmi/distinfo
index bef0c107ea1..acddf2d0d9f 100644
--- a/games/vcmi/distinfo
+++ b/games/vcmi/distinfo
@@ -1,6 +1,6 @@
SHA256 (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) =
cOf9r/LVFHo79ZDMgXGWbZmDzNSZQAL4IWyDskBZl0Y=
SHA256 (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) =
JoHejAkwsGENxSomAvrUHQ2vo9f/EDDaZXXVb8H0ykY=
-SHA256 (vcmi-vcmi-1.4.5.tar.gz) = EHaC3ygkgoK2rJZFmHVHGPlRHQx+AH/9vQ+lH4e7AEk=
+SHA256 (vcmi-vcmi-1.5.0.tar.gz) = OPpIx9oxiqWp4NMxn8sk9N/feFVcIbiwufm7tM7fM/g=
SIZE (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) =
2194254
SIZE (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) =
864010
-SIZE (vcmi-vcmi-1.4.5.tar.gz) = 9683419
+SIZE (vcmi-vcmi-1.5.0.tar.gz) = 9720419
diff --git a/games/vcmi/patches/patch-CMakeLists_txt
b/games/vcmi/patches/patch-CMakeLists_txt
index 9f82df512b6..77a15a7e595 100644
--- a/games/vcmi/patches/patch-CMakeLists_txt
+++ b/games/vcmi/patches/patch-CMakeLists_txt
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -468,7 +468,7 @@ endif()
+@@ -508,7 +508,7 @@ endif()
if(ENABLE_LAUNCHER OR ENABLE_EDITOR)
# Widgets finds its own dependencies (QtGui and QtCore).
diff --git a/games/vcmi/patches/patch-client_CMT_cpp
b/games/vcmi/patches/patch-client_CMT_cpp
index 2172a349b2a..0f64536f23f 100644
--- a/games/vcmi/patches/patch-client_CMT_cpp
+++ b/games/vcmi/patches/patch-client_CMT_cpp
@@ -1,7 +1,7 @@
Index: client/CMT.cpp
--- client/CMT.cpp.orig
+++ client/CMT.cpp
-@@ -511,7 +511,7 @@ static void mainLoop()
+@@ -419,7 +419,7 @@ static void mainLoop()
// destruction of locked mutexes (fails an assertion), even in
third-party libraries (as well as native libs on Android)
// Android - std::quick_exit is available only starting from API level
21
// Mingw, macOS and iOS - std::quick_exit is unavailable (at least in
current version of CI)
diff --git a/games/vcmi/patches/patch-lib_CStopWatch_h
b/games/vcmi/patches/patch-lib_CStopWatch_h
deleted file mode 100644
index f861590e4e2..000
--- a/games/vcmi/patches/patch-lib_CStopWatch_h
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: lib/CStopWatch.h
lib/CStopWatch.h.orig
-+++ lib/CStopWatch.h
-@@ -9,7 +9,7 @@
- */
- #pragma once
-
--#ifdef __FreeBSD__
-+#ifdef __OpenBSD__
- #include
- #include
- #include
-@@ -55,7 +55,7 @@ class CStopWatch (public)
- private:
- si64 clock()
- {
-- #ifdef __FreeBSD__ // TODO: enable also for Apple?
-+ #ifdef __OpenBSD__ // TODO: enable also for Apple?
- struct rusage usage;
- getrusage(RUSAGE_SELF, );
- return static_cast(usage.ru_utime.tv_sec +
usage.ru_stime.tv_sec) * 100 + usage.ru_utime.tv_usec +
usage.ru_stime.tv_usec;
diff --git a/games/vcmi/patches/patch-lib_CThreadHelper_cpp
b/games/vcmi/patches/patch-lib_CThreadHelper_cpp
new file mode 100644
index 000..1f33c2cd3a0
--- /dev/null
+++ b/games/vcmi/patches/patch-lib_CThreadHelper_cpp
@@ -0,0 +1,12 @@
+Index: lib/CThreadHelper.cpp
+--- lib/CThreadHelper.cpp.orig
lib/CThreadHelper.cpp
+@@ -109,7 +109,7 @@ void setThreadName(const std::string )
+ pthread_setname_np(name.c_str());
+ #elif defined(VCMI_HAIKU)
+ rename_thread(find_thread(NULL), name.c_str());
+-#elif defined(VCMI_UNIX)
++#elif defined(VCMI_UNIX) && !defined(__OpenBSD__)
+ prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
+ #endif
+ }
diff --git a/games/vcmi/patches/patch-lib_modding_CModVersion_h
b/games/vcmi/patches/patch-lib_modding_CModVersion_h
deleted file mode 100644
index ff95fd414b9..000
--- a/games/vcmi/patches/patch-lib_modding_CModVersion_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lib/modding/CModVersion.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/12 06:09:16 Modified files: security/keepassxc: Makefile distinfo Log message: Update to keepassxc-2.7.8 ok rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/12 04:16:31 Modified files: www/dillo : Makefile distinfo www/dillo/patches: patch-dillorc patch-dpi_https_c www/dillo/pkg : PLIST Log message: Update to dillo-3.1.0 Changelog https://github.com/dillo-browser/dillo/releases/tag/v3.1.0
update editors/kakoune
New version of kakoune available:
- gzip_man=no in MAKE_ENV didn't work anymore, I patched Makefile
- tests were not working, I reported it upstream who made a fix
- compilation didn't work due to quotes being lost, upstream made fix
I plan to commit it soon, but I'd like some feedback if possible
diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile
index 218164067da..17480e4ccb7 100644
--- a/editors/kakoune/Makefile
+++ b/editors/kakoune/Makefile
@@ -1,6 +1,6 @@
COMMENT = modal code editor with a focus on interactivity
-V =2023.08.05
+V =2024.05.09
DISTNAME = kakoune-${V}
CATEGORIES = editors
@@ -18,7 +18,7 @@ PERMIT_PACKAGE = Yes
# -std=c++2a
COMPILER = base-clang
-MAKE_ENV = CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" gzip_man=no
+MAKE_ENV = CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
FAKE_FLAGS = PREFIX="${TRUEPREFIX}"
# some tests fail without en_US.UTF-8
TEST_ENV = LC_CTYPE="en_US.UTF-8"
diff --git a/editors/kakoune/distinfo b/editors/kakoune/distinfo
index 42f8dafa9a2..079e7825106 100644
--- a/editors/kakoune/distinfo
+++ b/editors/kakoune/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kakoune-2023.08.05.tar.bz2) =
PkUVHgrd01AN4taim1qs8iZ8QrslbUSnguc977Kc2lw=
-SIZE (kakoune-2023.08.05.tar.bz2) = 568612
+SHA256 (kakoune-2024.05.09.tar.bz2) =
IZC939OvWQwFk8OFNwiJdlR1BvR71utsDiI1Db0Woik=
+SIZE (kakoune-2024.05.09.tar.bz2) = 588121
diff --git a/editors/kakoune/patches/patch-Makefile
b/editors/kakoune/patches/patch-Makefile
new file mode 100644
index 000..013516f9446
--- /dev/null
+++ b/editors/kakoune/patches/patch-Makefile
@@ -0,0 +1,56 @@
+Partial changes from 7be22f1ec28677ca0bb30316c6893ab4436734b1
+
+- escape KAK_BIN_PATH
+- test target
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -5,7 +5,7 @@ CXX = c++
+
+ debug = no
+ static = no
+-gzip_man = yes
++gzip_man = no
+ # to get format compatible with GitHub archive use "gzip -S .gz" here
+ compress_bin = bzip2
+
+@@ -13,10 +13,8 @@ compress-suffix-bzip2 = bz2
+ compress-suffix-zstd = zst
+
+ CPPFLAGS-debug-yes = -DKAK_DEBUG
+-CXXFLAGS-debug-yes = -O0 -g3
+ tag-debug-yes = .debug
+
+-CXXFLAGS-debug-no = -O3 -g3
+ tag-debug-no = .opt
+
+ CXXFLAGS-sanitize-address = -fsanitize=address
+@@ -40,7 +38,7 @@ bindir = $(DESTDIR)$(PREFIX)/bin
+ libexecdir = $(DESTDIR)$(PREFIX)/libexec/kak
+ sharedir = $(DESTDIR)$(PREFIX)/share/kak
+ docdir = $(DESTDIR)$(PREFIX)/share/doc/kak
+-mandir = $(DESTDIR)$(PREFIX)/share/man/man1
++mandir = $(DESTDIR)$(PREFIX)/man/man1
+
+ # Both Cygwin and MSYS2 have "_NT" in their uname.
+ os = $(shell uname | sed 's/.*_NT.*/Windows/')
+@@ -54,7 +52,7 @@ LDFLAGS-os-FreeBSD = -L/usr/local/lib
+
+ LIBS-os-Haiku = -lnetwork -lbe
+
+-CPPFLAGS-os-OpenBSD = -DKAK_BIN_PATH="$(bindir)/kak" -I/usr/local/include
++CPPFLAGS-os-OpenBSD = -DKAK_BIN_PATH=\"$(bindir)/kak\" -I/usr/local/include
+ LDFLAGS-os-OpenBSD = -L/usr/local/lib
+ mandir-os-OpenBSD = $(DESTDIR)$(PREFIX)/man/man1
+
+@@ -136,6 +134,9 @@ doc/kak.1.gz: doc/kak.1
+
+ check: test
+ test: src/kak
++ if [ $(os) = OpenBSD ]; then \
++ export KAKOUNE_RUNTIME=$$PWD/share/kak; \
++ fi && \
+ cd test && ./run
+
+ TAGS: tags
diff --git a/editors/kakoune/patches/patch-src_Makefile
b/editors/kakoune/patches/patch-src_Makefile
deleted file mode 100644
index 84c865e9398..000
--- a/editors/kakoune/patches/patch-src_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-Remove optimization flags for debug or release builds
-
-Index: src/Makefile
src/Makefile.orig
-+++ src/Makefile
-@@ -12,11 +12,9 @@ endif
-
- ifeq ($(debug),yes)
- CPPFLAGS += -DKAK_DEBUG
--CXXFLAGS += -O0
- suffix := .debug
- else
- ifeq ($(debug),no)
--CXXFLAGS += -O3
- suffix := .opt
- else
- $(error debug should be either yes or no)
diff --git a/editors/kakoune/patches/patch-src_ranges_hh
b/editors/kakoune/patches/patch-src_ranges_hh
deleted file mode 100644
index 5145755cd7e..000
--- a/editors/kakoune/patches/patch-src_ranges_hh
+++ /dev/null
@@ -1,66 +0,0 @@
-From 344d31f42b8ced12626d4f87a22ffa5a671668fd Mon Sep 17 00:00:00 2001
-From: Johannes Altmanninger
-Date: Tue, 9 May 2023 10:44:08 +0200
-Subject: [PATCH] Work around clang not inferring default args of template
- template args
-
-Index: src/ranges.hh
src/ranges.hh.orig
-+++ src/ranges.hh
-@@ -8,6 +8,11 @@
- #include
-
- #include "constexpr_utils.hh"
-+#if __clang_major__ >= 16
-+#include "memory.hh"
-+#include "meta.hh"
-+#include "vector.hh"
-+#endif
-
- namespace Kakoune
- {
-@@ -638,6 +643,35 @@ auto gather()
- }};
- }
-
-+#if __clang_major__ >= 16
-+
-+template {})>
-+ class Container>
-+auto gather()
-+{
-+return ViewFactory{[](auto&& range) {
-+using std::begin; using std::end;
-+using ValueType =
std::remove_cv_t>;
-+return Container(begin(range), end(range));
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/09 07:49:57 Modified files: security/rbw : Makefile crates.inc distinfo Log message: Update to rbw-1.10.1 with licenses in crates.inc this time
update security/rbw
Newer version available upstream, works for me I did not try the changes though (rbw code related) https://git.tozt.net/rbw/tree/CHANGELOG.md diff --git a/security/rbw/Makefile b/security/rbw/Makefile index 7db2268894d..3d9842af89a 100644 --- a/security/rbw/Makefile +++ b/security/rbw/Makefile @@ -3,7 +3,7 @@ NOT_FOR_ARCHS = sparc64 COMMENT = command line BitWarden client -DISTNAME = rbw-1.10.0 +DISTNAME = rbw-1.10.1 CATEGORIES = security diff --git a/security/rbw/crates.inc b/security/rbw/crates.inc index 1833e58df32..9cc0183ec77 100644 --- a/security/rbw/crates.inc +++ b/security/rbw/crates.inc @@ -30,7 +30,6 @@ MODCARGO_CRATES +=calloop-wayland-source 0.2.0 MODCARGO_CRATES += cbc 0.1.2 MODCARGO_CRATES += cc 1.0.95 MODCARGO_CRATES += cfg-if 1.0.0 -MODCARGO_CRATES += cfg_aliases 0.1.1 MODCARGO_CRATES += cipher 0.4.4 MODCARGO_CRATES += clap4.5.4 MODCARGO_CRATES += clap_builder4.5.2 @@ -109,7 +108,6 @@ MODCARGO_CRATES += memmap2 0.9.4 MODCARGO_CRATES += mime0.3.17 MODCARGO_CRATES += miniz_oxide 0.7.2 MODCARGO_CRATES += mio 0.8.11 -MODCARGO_CRATES += nix 0.28.0 MODCARGO_CRATES += num-bigint-dig 0.8.4 MODCARGO_CRATES += num-integer 0.1.46 MODCARGO_CRATES += num-iter0.1.44 @@ -155,7 +153,7 @@ MODCARGO_CRATES += rmp 0.8.14 MODCARGO_CRATES += rmpv1.0.2 MODCARGO_CRATES += rsa 0.9.6 MODCARGO_CRATES += rustc-demangle 0.1.23 -MODCARGO_CRATES += rustix 0.38.32 +MODCARGO_CRATES += rustix 0.38.33 MODCARGO_CRATES += rustls 0.22.4 MODCARGO_CRATES += rustls-native-certs 0.7.0 MODCARGO_CRATES += rustls-pemfile 2.1.2 diff --git a/security/rbw/distinfo b/security/rbw/distinfo index db00ce9f145..2c2304bcf53 100644 --- a/security/rbw/distinfo +++ b/security/rbw/distinfo @@ -30,7 +30,6 @@ SHA256 (cargo/calloop-wayland-source-0.2.0.tar.gz) = Dw6puUdsf62ChBqNuzgOLq5IDCG SHA256 (cargo/cbc-0.1.2.tar.gz) = JrUqlUOuM48nm5awuf7ZyAk3RGhQQ3OQec6FzVjyiaY= SHA256 (cargo/cc-1.0.95.tar.gz) = 0ypyW8FZr5fD5imHO7n4j7jPikhnF1923Jh4FeoHyDs= SHA256 (cargo/cfg-if-1.0.0.tar.gz) = uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0= -SHA256 (cargo/cfg_aliases-0.1.1.tar.gz) = /RbEcZM5xFMENdOOURkEQ40HzOeVCvo3GKhKw2wQ6J4= SHA256 (cargo/cipher-0.4.4.tar.gz) = dz87mvZER9LOmFAzDEc1FQFKojXmp4OwLbgf855KPa0= SHA256 (cargo/clap-4.5.4.tar.gz) = kLwGameSN4KqhRXbrqFpRsW8xa3b1mi7gK9ojlPlSKA= SHA256 (cargo/clap_builder-4.5.2.tar.gz) = rhKeLnZq4OwDSE5gmVQRnxI8wf5lAzfhVdA7Ai8k97Q= @@ -109,7 +108,6 @@ SHA256 (cargo/memmap2-0.9.4.tar.gz) = /nUUIuSoyqQX4Tw+pmRSIV19Y+GeYE9JgEYSEvOuEy SHA256 (cargo/mime-0.3.17.tar.gz) = aHe7UUCB7ip/9e+d4ygfFKTdS86sTAk4gHSmtd+KE5o= SHA256 (cargo/miniz_oxide-0.7.2.tar.gz) = nYEfPhXyhWi+NAfI5/22UUwc2jyzBoPxW2oaHcTqFKc= SHA256 (cargo/mio-0.8.11.tar.gz) = pKZQVDygapJOizcdsnOydWaF+q4w+Eh9obVlBaj3iww= -SHA256 (cargo/nix-0.28.0.tar.gz) = qyFWxPzi+N9sSZzBx2PkOUt0glJb8qlwHJ150hX1GeQ= SHA256 (cargo/num-bigint-dig-0.8.4.tar.gz) = 3IQZWCDykcdpcwTzy9rdHLcZnA78kX/16v1xIlwTYVE= SHA256 (cargo/num-integer-0.1.46.tar.gz) = eWlmH9KVilywluVsjhrQRErCu80AYb0oZgSFpEh5hY8= SHA256 (cargo/num-iter-0.1.44.tar.gz) = 2GnAHMDEVShBY/0AkvH5ODU4XMq1qYoNzEl7L4vwVak= @@ -155,7 +153,7 @@ SHA256 (cargo/rmp-0.8.14.tar.gz) = Io7XwW+jl4LDs0aOl0rsJ5XpCJFTzQjuLprvs2EzNMQ= SHA256 (cargo/rmpv-1.0.2.tar.gz) = 5UAoLxF1GVbIK8VSmn+3G4cbmY+/nPBsJBmyLhtDUN8= SHA256 (cargo/rsa-0.9.6.tar.gz) = XQ5RJPyzDnan55v+5oOidG24N4S4Yon2JRtUt5UKDfw= SHA256 (cargo/rustc-demangle-0.1.23.tar.gz) = 1ia7na534oIZk3rwRcJXwov9P2kzPFElU1B/X5eYy3Y= -SHA256 (cargo/rustix-0.38.32.tar.gz) = ZeBIYeZfIXduZ4iL++pEKzZCvqoBOP2x3XqEpS3/24k= +SHA256 (cargo/rustix-0.38.33.tar.gz) = 48xyhYBU/P9tfeoy3yrq7mp8JCJzZtfqQpqtovJrFq0= SHA256 (cargo/rustls-0.22.4.tar.gz) = v073NyGse815srMV2nd52PwJcYxrPS0bLZSFDrjBhDI= SHA256 (cargo/rustls-native-certs-0.7.0.tar.gz) = jx+4XvqTbELG1fwo0mKbtR5LL0uKUhHil9WZzFoJN5I= SHA256 (cargo/rustls-pemfile-2.1.2.tar.gz) = KZk6JWhneOuI1BiXQs1xPJvOlDvFQlGjNQncY8us9z0= @@ -277,7 +275,7 @@ SHA256 (cargo/x11rb-protocol-0.13.0.tar.gz) = 5j5xxLi9n/7CyWMXOk3Ey96e6Wlh1Py0Qp SHA256 (cargo/xcursor-0.3.5.tar.gz) = agzNe0pTRe380MNTVxik6f93mP/FNrtbWg4m/4RzKRE= SHA256 (cargo/xkeysym-0.2.0.tar.gz) = BUqOaLdiULJT9nHRJoy38a4InsNeGVsu+ypOmoNtBiE= SHA256 (cargo/zeroize-1.7.0.tar.gz) = UltOwULGtootEPAfe79nVVmco/gepTuEMbfdNI9f2y0= -SHA256 (rbw-1.10.0.tar.gz) = 0MKeW25/+zW2G54XdbMdqOiPE23ZNFHM0keAVxlfTRU= +SHA256 (rbw-1.10.1.tar.gz) = BkK8ewtopFcAl7o2iEWV6y4pYiVlwkVXuZ1Zxd3xu4c= SIZE (cargo/addr2line-0.21.0.tar.gz) = 40807 SIZE (cargo/adler-1.0.2.tar.gz) = 12778 SIZE (cargo/aes-0.8.4.tar.gz) = 124812 @@ -310,7 +308,6 @@ SIZE (cargo/calloop-wayland-source-0.2.0.tar.gz) = 11304 SIZE (cargo/cbc-0.1.2.tar.gz) = 23501 SIZE (cargo/cc-1.0.95.tar.gz) = 76485 SIZE (cargo/cfg-if-1.0.0.tar.gz) = 7934 -SIZE (cargo/cfg_aliases-0.1.1.tar.gz) = 6009 SIZE (cargo/cipher-0.4.4.tar.gz) =
security/keepassxc update
This updates keepassxc to latest version
Changelog https://github.com/keepassxreboot/keepassxc/releases/tag/2.7.8
I'm not sure how to update the plist for each flavors? Otherwise
it works on amd64 and compiles in a clean chroot.
diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
index 566f78ea030..c2764e189c5 100644
--- a/security/keepassxc/Makefile
+++ b/security/keepassxc/Makefile
@@ -1,8 +1,7 @@
COMMENT = management tool for passwords and sensitive data
-V =2.7.7
+V =2.7.8
DISTNAME = keepassxc-${V}
-REVISION = 0
CATEGORIES = security
diff --git a/security/keepassxc/distinfo b/security/keepassxc/distinfo
index 5dcb6c71904..c866b4d81e2 100644
--- a/security/keepassxc/distinfo
+++ b/security/keepassxc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (keepassxc-2.7.7-src.tar.xz) =
WPxFrpjks/+wUhAwFPW5ekH+/RcQLH9WBzk03TqC7mc=
-SIZE (keepassxc-2.7.7-src.tar.xz) = 9734460
+SHA256 (keepassxc-2.7.8-src.tar.xz) =
h9MQFxKzyGVqJLkIrVt+JSm8AXF8tBVvU7oZX7gXg6M=
+SIZE (keepassxc-2.7.8-src.tar.xz) = 9764860
www/tuir broken
tuir doesn't run, I'm not sure why though I'm not a regular user, last time I tried was in August 2023 and it worked :D ryzen$ tuir Traceback (most recent call last): File "/usr/local/lib/python3.11/site-packages/tuir/packages/__init__.py", line 18, in from . import praw File "/usr/local/lib/python3.11/site-packages/tuir/packages/praw/__init__.py", line 35, in from . import decorators, errors File "/usr/local/lib/python3.11/site-packages/tuir/packages/praw/decorators.py", line 26, in import decorator ModuleNotFoundError: No module named 'decorator' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/usr/local/bin/tuir", line 5, in from tuir.__main__ import main File "/usr/local/lib/python3.11/site-packages/tuir/__main__.py", line 36, in from . import packages File "/usr/local/lib/python3.11/site-packages/tuir/packages/__init__.py", line 20, in import praw ModuleNotFoundError: No module named 'praw'
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/07 08:14:22 Modified files: sysutils/fd: Makefile crates.inc distinfo sysutils/fd/patches: patch-Makefile Log message: Update to fd-10.0.0 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/06 09:19:43 Modified files: net/ngircd : Makefile distinfo net/ngircd/pkg : PLIST Log message: Update to ngircd-27 diff from maintainer Michael, thanks!
update www/dillo
this updates dillo to its latest version
Changelog: https://github.com/dillo-browser/dillo/releases/tag/v3.1.0
make port-lib-depends-check is happy, portcheck too
built fine in a clean proot using dpb
I had to pull in gtk4 because of the following error, is it possible
to get ride of it?
===> Installing dillo-3.1.0 from /usr/ports/packages/amd64/all/
Error in dillo-3.1.0: @tag gtk-update-icon-cache definition not found
Direct dependencies for dillo-3.1.0 resolve to jpeg-3.0.2v0 fltk-1.3.3p3
png-1.6.43 wget-1.21.4p0 libiconv-1.17 desktop-file-utils-0.27
Full dependency tree is desktop-file-utils-0.27 libunistring-0.9.7 xz-5.4.5
python-3.10.14p0 wget-1.21.4p0 png-1.6.43 libidn2-2.3.0p0 libpsl-0.21.1
fltk-1.3.3p3 jpeg-3.0.2v0 sqlite3-3.44.2 bzip2-1.0.8p0 libffi-3.4.4p1
glib2-2.80.0 gettext-runtime-0.22.5 libiconv-1.17 py3-packaging-23.2
pcre2-10.37p2
Couldn't install dillo-3.1.0
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index eabf3e0371c..f0136494302 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,10 +1,10 @@
COMMENT = fast and light graphical web browser
-DISTNAME = dillo-3.0.5
CATEGORIES = www
-REVISION = 5
-HOMEPAGE = https://www.dillo.org/
+DIST_TUPLE += github dillo-browser dillo v3.1.0 .
+
+HOMEPAGE = https://dillo-browser.github.io/
# GPLv3+
PERMIT_PACKAGE = Yes
@@ -14,7 +14,6 @@ WANTLIB += fltk fontconfig iconv jpeg m png pthread ssl
${COMPILER_LIBCXX} z
COMPILER = base-clang ports-gcc base-gcc
-SITES =https://www.dillo.org/download/
EXTRACT_SUFX = .tar.bz2
@@ -25,12 +24,15 @@ LIB_DEPENDS = converters/libiconv \
# XXX dillo should be patched to use ftp(1)
RUN_DEPENDS = devel/desktop-file-utils \
- net/wget
+ net/wget \
+ x11/gtk+4,-guic
USE_GMAKE =Yes
-CONFIGURE_STYLE = gnu
+AUTOCONF_VERSION= 2.71
+AUTOMAKE_VERSION= 1.16
+CONFIGURE_STYLE= autoreconf
CONFIGURE_ARGS = --enable-ipv6 \
- --enable-ssl
+ --enable-tls
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include -fcommon" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index bc2dcb51643..82b303dc9f1 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dillo-3.0.5.tar.bz2) = 2xvhbBxYQuvge0Gap8bvEaRWA6dd8od/mWNfT4NFFIs=
-SIZE (dillo-3.0.5.tar.bz2) = 734472
+SHA256 (dillo-browser-dillo-v3.1.0.tar.gz) =
OqKmhmSLODQXoMH1dcPVQx1qLVPzXC4Rv1ecslsrRec=
+SIZE (dillo-browser-dillo-v3.1.0.tar.gz) = 1514218
diff --git a/www/dillo/patches/patch-dillorc b/www/dillo/patches/patch-dillorc
deleted file mode 100644
index 5c042af4ffe..000
--- a/www/dillo/patches/patch-dillorc
+++ /dev/null
@@ -1,11 +0,0 @@
dillorc.orig Wed Apr 9 13:39:59 2014
-+++ dillorcThu Apr 10 09:34:20 2014
-@@ -51,7 +51,7 @@
- # "fc-list : family | cut -d ',' -f 2 | sort").
- #font_serif="DejaVu Serif"
- #font_sans_serif="DejaVu Sans"
--#font_cursive="URW Chancery L"
-+font_cursive="DejaVu Serif"
- #font_fantasy="DejaVu Sans"
- #font_monospace="DejaVu Sans Mono"
- #
diff --git a/www/dillo/patches/patch-dpi_https_c
b/www/dillo/patches/patch-dpi_https_c
deleted file mode 100644
index 3f0c20e9363..000
--- a/www/dillo/patches/patch-dpi_https_c
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: dpi/https.c
dpi/https.c.orig
-+++ dpi/https.c
-@@ -169,7 +169,7 @@ static void yes_ssl_support(void)
-/*FIXME - provide for sysconfdir variables and such*/
-if (exit_error == 0){
- if (SSL_CTX_load_verify_locations(
-- ssl_context, NULL, "/etc/ssl/certs/" ) == 0){
-+ ssl_context, "/etc/ssl/cert.pem", "/etc/ssl/certs/" ) == 0){
- MSG("Error opening system x509 certificate location\n");
- exit_error = 1;
- }
-@@ -476,7 +476,7 @@ static int handle_certificate_problem(SSL * ssl_connec
- case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
- /*Either self signed and untrusted*/
- /*Extract CN from certificate name information*/
-- if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
-+ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) ==
NULL) {
- strcpy(buf, "(no CN given)");
- } else {
- char *cn_end;
diff --git a/www/dillo/pkg/PLIST b/www/dillo/pkg/PLIST
index 404c6186c9b..cfb06451210 100644
--- a/www/dillo/pkg/PLIST
+++ b/www/dillo/pkg/PLIST
@@ -18,25 +18,12 @@ lib/dillo/dpi/ftp/
@bin lib/dillo/dpi/ftp/ftp.filter.dpi
lib/dillo/dpi/hello/
@bin lib/dillo/dpi/hello/hello.filter.dpi
-lib/dillo/dpi/https/
-@bin lib/dillo/dpi/https/https.filter.dpi
lib/dillo/dpi/vsource/
@bin lib/dillo/dpi/vsource/vsource.filter.dpi
@man man/man1/dillo.1
share/applications/dillo.desktop
share/doc/dillo/
-share/doc/dillo/CCCwork.txt
-share/doc/dillo/Cache.txt
update sysutils/fd
tested on amd64, works fine for me
changelog https://github.com/sharkdp/fd/releases/tag/v10.0.0
the first hunk of the patch was dropped because it's now upstream
man page is correctly installed without the xxpost-install line
diff --git a/sysutils/fd/Makefile b/sysutils/fd/Makefile
index 3ac438a46ed..d34416fb18b 100644
--- a/sysutils/fd/Makefile
+++ b/sysutils/fd/Makefile
@@ -2,7 +2,7 @@ COMMENT = simple, fast and user-friendly
alternative to 'find'
GH_ACCOUNT = sharkdp
GH_PROJECT = fd
-GH_TAGNAME = v9.0.0
+GH_TAGNAME = v10.0.0
CATEGORIES = sysutils
@@ -21,7 +21,6 @@ MODCARGO_INSTALL =No
USE_GMAKE =Yes
xxpost-install:
- ${INSTALL_DATA} ${WRKSRC}/doc/fd.1 ${PREFIX}/man/man1
cd ${WRKBUILD}; make -f ../fd-*/Makefile completions
.include "crates.inc"
diff --git a/sysutils/fd/crates.inc b/sysutils/fd/crates.inc
index 51f1ce4256c..a8d18dd87c0 100644
--- a/sysutils/fd/crates.inc
+++ b/sysutils/fd/crates.inc
@@ -1,104 +1,110 @@
-MODCARGO_CRATES += aho-corasick1.1.2 # Unlicense OR MIT
+MODCARGO_CRATES += aho-corasick1.1.3 # Unlicense OR MIT
MODCARGO_CRATES += android-tzdata 0.1.1 # MIT OR Apache-2.0
MODCARGO_CRATES += android_system_properties 0.1.5 # MIT/Apache-2.0
-MODCARGO_CRATES += anstream0.6.4 # MIT OR Apache-2.0
-MODCARGO_CRATES += anstyle 1.0.4 # MIT OR Apache-2.0
-MODCARGO_CRATES += anstyle-parse 0.2.2 # MIT OR Apache-2.0
-MODCARGO_CRATES += anstyle-query 1.0.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += anstyle-wincon 3.0.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += anyhow 1.0.75 # MIT OR Apache-2.0
+MODCARGO_CRATES += anstream0.6.14 # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle 1.0.7 # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle-parse 0.2.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle-query 1.0.3 # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle-wincon 3.0.3 # MIT OR Apache-2.0
+MODCARGO_CRATES += anyhow 1.0.82 # MIT OR Apache-2.0
MODCARGO_CRATES += argmax 0.3.1 # MIT/Apache-2.0
-MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
+MODCARGO_CRATES += autocfg 1.3.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += bitflags1.3.2 # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags2.4.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += bstr1.7.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += bumpalo 3.14.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += cc 1.0.83 # MIT OR Apache-2.0
+MODCARGO_CRATES += bitflags2.5.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += bstr1.9.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += bumpalo 3.16.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += cc 1.0.96 # MIT OR Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
-MODCARGO_CRATES += chrono 0.4.31 # MIT OR Apache-2.0
-MODCARGO_CRATES += clap4.4.10 # MIT OR Apache-2.0
-MODCARGO_CRATES += clap_builder4.4.9 # MIT OR Apache-2.0
-MODCARGO_CRATES += clap_complete 4.4.4 # MIT OR Apache-2.0
-MODCARGO_CRATES += clap_derive 4.4.7 # MIT OR Apache-2.0
-MODCARGO_CRATES += clap_lex0.6.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += colorchoice 1.0.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += core-foundation-sys 0.8.4 # MIT / Apache-2.0
-MODCARGO_CRATES += crossbeam-channel 0.5.8 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossbeam-deque 0.8.3 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossbeam-epoch 0.9.15 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossbeam-utils 0.8.16 # MIT OR Apache-2.0
-MODCARGO_CRATES += ctrlc 3.4.1 # MIT/Apache-2.0
+MODCARGO_CRATES += cfg_aliases 0.1.1 # MIT
+MODCARGO_CRATES += chrono 0.4.38 # MIT OR Apache-2.0
+MODCARGO_CRATES += clap4.5.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_builder4.5.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_complete 4.5.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_derive 4.5.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_lex0.7.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += colorchoice 1.0.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += core-foundation-sys 0.8.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-channel 0.5.12 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-deque 0.8.5 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-epoch 0.9.18 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-utils 0.8.19 # MIT OR Apache-2.0
+MODCARGO_CRATES += ctrlc 3.4.4 # MIT/Apache-2.0
MODCARGO_CRATES += diff0.1.13 # MIT OR Apache-2.0
-MODCARGO_CRATES += errno 0.3.5 # MIT OR Apache-2.0
+MODCARGO_CRATES += errno 0.3.8 # MIT OR Apache-2.0
MODCARGO_CRATES += etcetera0.8.0 # MIT OR Apache-2.0
MODCARGO_CRATES += faccess 0.2.4
Re: CVS: cvs.openbsd.org: ports
On Mon, May 06, 2024 at 02:55:54AM GMT, Solene Rapenne wrote: > CVSROOT: /cvs > Module name: ports > Changes by: sol...@cvs.openbsd.org 2024/05/06 02:55:54 > > Modified files: > audio/cozy : Makefile > > Log message: > remove useless dependency x11/gnome/libadwaita > cozy moved to gtk4 and this is not required anymore > > spotted by ajacoutot@ > I meant libhandy and not libadwaita
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/06 02:55:54 Modified files: audio/cozy : Makefile Log message: remove useless dependency x11/gnome/libadwaita cozy moved to gtk4 and this is not required anymore spotted by ajacoutot@
Re: CVS: cvs.openbsd.org: ports
On Mon, May 06, 2024 at 08:44:59AM GMT, Antoine Jacoutot wrote: > On Sun, May 05, 2024 at 05:11:56PM -0600, Solene Rapenne wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: sol...@cvs.openbsd.org 2024/05/05 17:11:56 > > > > Modified files: > > audio/cozy : Makefile > > > > Log message: > > unbreak build by adding x11/gnome/libadwaita > > > > spotted by tb@ > > It's weird to depend both on x11/gnome/libadwaita (gtk4) and x11/libhandy > (gtk3). > You sure it needs both? > > -- > Antoine it packages fine without libhandy indeed, I didn't know these packages were tied to a gtk version, and cozy switched to gtk4 with this version, thanks for the review
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/05 17:11:56 Modified files: audio/cozy : Makefile Log message: unbreak build by adding x11/gnome/libadwaita spotted by tb@
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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/05 08:52:52 Modified files: games/openttd : Makefile distinfo Removed files: games/openttd/patches: patch-src_core_random_func_cpp Log message: Update to openttd-14.1 ok thfr@ fine for Florian Viehweger (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/05 03:32:40 Modified files: audio/cozy : Makefile distinfo audio/cozy/pkg : PLIST Removed files: audio/cozy/patches: patch-cozy_ui_widgets_whats_new_window_py Log message: Update to cozy-1.3.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/05 03:29:30 Modified files: games/brogue : Makefile distinfo games/brogue/patches: patch-Makefile Removed files: games/brogue/patches: patch-src_brogue_Recordings_c Log message: Update to brogue-1.13 ok thfr@ maintainer timeout
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/05 03:22:49 Modified files: games/hyperrogue: Makefile distinfo games/hyperrogue/patches: patch-Makefile games/hyperrogue/pkg: PLIST Log message: Update to hyperrogue-13.0d ok bcallah@ (maintainer) and thfr@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/04 10:09:48 Modified files: x11/slock : Makefile distinfo Log message: Update to slock-1.5 ok gonzalo@ gsoares@ (maintainer)
update games/openttd
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? 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)))
update x11/slock
the changelog can be found on https://git.suckless.org/slock/log.html between 2022-10-04 17:45bump version to 1.5 and 2016-11-20 00:07bump version tested on amd64 ok? diff --git a/x11/slock/Makefile b/x11/slock/Makefile index d32ca4616d2..33b2d85ecf0 100644 --- a/x11/slock/Makefile +++ b/x11/slock/Makefile @@ -1,6 +1,6 @@ COMMENT= simple X screen locker -DISTNAME= slock-1.4 +DISTNAME= slock-1.5 CATEGORIES=x11 diff --git a/x11/slock/distinfo b/x11/slock/distinfo index 12625e724a7..73323314391 100644 --- a/x11/slock/distinfo +++ b/x11/slock/distinfo @@ -1,2 +1,2 @@ -SHA256 (slock-1.4.tar.gz) = tThJ28YBCamH16SbjaGXMFwpMH/XTBLcGK8NMEQ5Lmo= -SIZE (slock-1.4.tar.gz) = 6889 +SHA256 (slock-1.5.tar.gz) = ruHj+/aid/tiWjg4BzuXm2SD57rKTOgvVt4f8ZLbDk0= +SIZE (slock-1.5.tar.gz) = 6898
Re: update games/hyperrogue
On Thu, May 02, 2024 at 01:07:08PM GMT, Thomas Frohwein wrote:
> On Fri, Apr 19, 2024 at 10:27:49PM +0200, Solene Rapenne wrote:
> > our hyperrogue version is quite old of a dozen releases
> >
> > latest release adds a lot of changes
> > https://github.com/zenorogue/hyperrogue/releases
> >
> > the Makefile patch had to be reworked a bit because the original
> > Makefile differed from the patch, but it applies the same changes
> > as before.
> >
> > update-plist removed some honeycomb files, I don't know if it's
> > expected... the game plays fine
>
> Built it and it works as expected.
>
> Noticed that it save hyperrogue.log in $PWD which I find annoying, not
> sure if that's how upstream designed it. It would make more sense to
> have a location in the home directory for that. Might be worth checking
> on, but either way this update is ok thfr@, provided Brian is okay with
> it or timeout...
it also saves settings in $PWD...This can be solved by compiling
with -DFHS to have the files saved in $HOME/
Not sure if the place I've put it into CXXFLAGS variable is ok?
you can try quickly in game: open settings menu and choose "save"
diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 4c1a7417f10..3b211a563a9 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,4 +1,4 @@
-V =12.0f
+V =13.0d
COMMENT = roguelike game in a non-Euclidean world
CATEGORIES = games x11
@@ -24,7 +24,7 @@ LIB_DEPENDS = devel/sdl-gfx \
graphics/glew \
graphics/png
-CXXFLAGS +=-I${LOCALBASE}/include -I${X11BASE}/include \
+CXXFLAGS +=-I${LOCALBASE}/include -I${X11BASE}/include -DFHS\
-DHYPERPATH="\\\"${LOCALBASE}/share/hyperrogue/\\\""
LDFLAGS += -L${LOCALBASE}/lib -L${X11BASE}/lib
diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo
index 835425d2f49..fe08e61d88c 100644
--- a/games/hyperrogue/distinfo
+++ b/games/hyperrogue/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hyperrogue-12.0f.tar.gz) = ROeOk+0dMZg9680EeR1//Pz73EBpfnCaD2yi04wwID4=
-SIZE (hyperrogue-12.0f.tar.gz) = 79946099
+SHA256 (hyperrogue-13.0d.tar.gz) = 4ApHLRReh9u3dzH+FXCHyB2N5b0rBfogkbyQGFMIDoo=
+SIZE (hyperrogue-13.0d.tar.gz) = 87765129
diff --git a/games/hyperrogue/patches/patch-Makefile
b/games/hyperrogue/patches/patch-Makefile
index 1567a49854b..6d4afc867d8 100644
--- a/games/hyperrogue/patches/patch-Makefile
+++ b/games/hyperrogue/patches/patch-Makefile
@@ -26,9 +26,9 @@ Index: Makefile
-ifeq (${TOOLCHAIN},clang)
- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -march=native -fPIC
-- CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -Werror -pedantic
-- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized -Wno-unknown-warning-option
+- CXXFLAGS_EARLY += -fPIC
+- CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -pedantic
+- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized -Wno-char-subscripts -Wno-unknown-warning-option
- CXXFLAGS_EARLY += -Wno-invalid-offsetof
-endif
+CXXFLAGS_STD = -std=c++11
@@ -39,23 +39,23 @@ Index: Makefile
-ifeq (${TOOLCHAIN},gcc)
- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -march=native -fPIC
-- CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
+- CXXFLAGS_EARLY += -fPIC
+- CXXFLAGS_EARLY += -W -Wall -Wextra -pedantic
- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized
+- CXXFLAGS_EARLY += -Wno-invalid-offsetof
-endif
-
-ifeq (${TOOLCHAIN},mingw)
- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -march=native
-- CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
+- CXXFLAGS_EARLY += -W -Wall -Wextra
- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized
+- CXXFLAGS_EARLY += -Wno-invalid-offsetof
-endif
-
--
- ## We have now finished OS-specific and TOOLCHAIN-specific computations.
- ## Begin customization points for user-specifiable HYPERROGUE_USE_XXX macros.
-
-@@ -139,19 +120,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
+ ifeq (${FONTCONFIG},1)
+ CXXFLAGS_EARLY += -DFONTCONFIG `pkg-config --cflags fontconfig`
+ LDFLAGS_EARLY += `pkg-config --libs fontconfig`
+@@ -144,19 +125,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS}
hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES)
@@ -78,8 +78,8 @@ Index: Makefile
+ $(CXX) $(CXXFLAGS) makeh.cpp $(LDFLAGS) -o $@
autohdr.h: makeh$(EXE_EXTENSION) language-data.cpp *.cpp
- ./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp
geometry.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp
pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp language.c
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/03 10:00:05 Modified files: devel/fossil : Makefile distinfo Log message: Update to fossil-2.24 ok sthen@, jturner@ (maintainer)
update devel/fossil
this updates fossil to latest version, changelog available https://fossil-scm.org/home/doc/trunk/www/changes.wiki#v2_24 ok? diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile index fb869e9fa31..1311dd4fd49 100644 --- a/devel/fossil/Makefile +++ b/devel/fossil/Makefile @@ -1,7 +1,6 @@ COMMENT = simple distributed software configuration management -DISTNAME = fossil-2.23 -EPOCH =0 +DISTNAME = fossil-2.24 CATEGORIES = devel www MAINTAINER = James Turner diff --git a/devel/fossil/distinfo b/devel/fossil/distinfo index 6eaaf2a218f..eec4ebdd1f7 100644 --- a/devel/fossil/distinfo +++ b/devel/fossil/distinfo @@ -1,2 +1,2 @@ -SHA256 (fossil-2.23.tar.gz) = dfgI6BNRAYqXFnRtnvGh/huxkEcz6LQYZDiB04GYhZM= -SIZE (fossil-2.23.tar.gz) = 6798900 +SHA256 (fossil-2.24.tar.gz) = 7bXPKgf4FBDPUjl+DoQVWKp4qJFsYmin9xH2IXPYXMk= +SIZE (fossil-2.24.tar.gz) = 6798925
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/03 00:50:46 Modified files: emulators/dolphin: Makefile distinfo emulators/dolphin/pkg: PLIST-nogui Removed files: emulators/dolphin/patches: patch-Source_Core_AudioCommon_AudioCommon_cpp patch-Source_Core_UICommon_ResourcePack_ResourcePack_cpp Log message: Update to dolphin-5.0.0.2024042 diff from brad, maintainer thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/05/02 09:57:20 Modified files: shells/nushell : Makefile crates.inc distinfo Log message: Update to nushell-0.93.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/04/30 10:13:37 Modified files: net/dino : Makefile Added files: net/dino/patches: patch-plugins_gpgme-vala_vapi_gpgme_public_vapi Log message: Unbreak dino with a fix from upstream ok kn@ (maintainer) thanks kn@ who reported the issue upstream
Re: unbreak net/dino
On Tue, Apr 30, 2024 at 04:06:21PM GMT, Klemens Nanni wrote:
> On Tue, Apr 30, 2024 at 03:52:14PM GMT, Solene Rapenne wrote:
> > since kn@ reported dino build issue upstream, a fix was released
> >
> > I adapted the fix to work on latest release because it was done
> > on a file that does not exist yet in the tarball (got renamed?)
> >
> > tested on amd64, works fine again
>
> Thanks, did you explicitly tested PGP encrypted chats? I never used them.
I didn't try PGP at all, I never found a use as OMEMO works. I only used
dino as usual.
>
> >
> > make update-patches insisted to add the "No newline at end of file",
> > I'm not happy about it but I guess it's better to include it?
>
> I ended up with the same local patch, but don't see any newline churn.
I may have done something wrong, after removing the chunk from the patch,
make clean && make patch, there is no newline to apply so my editor certainly
did something previously
> OK kn with REVISION bump, users might have dino-0.4.3p1 built/installed
> with vala-0.15.16, they should also get an update.
sure
>
> >
> > diff --git a/net/dino/Makefile b/net/dino/Makefile
> > index 2ca126f6482..abc2a214758 100644
> > --- a/net/dino/Makefile
> > +++ b/net/dino/Makefile
> > @@ -1,5 +1,3 @@
> > -BROKEN=build failure with vala-0.56.17
> > https://github.com/dino/dino/issues/1576
> > -
> > COMMENT= XMPP desktop client
> > VERSION= 0.4.3
> > DISTNAME= dino-${VERSION}
> > diff --git
> > a/net/dino/patches/patch-plugins_gpgme-vala_vapi_gpgme_public_vapi
> > b/net/dino/patches/patch-plugins_gpgme-vala_vapi_gpgme_public_vapi
> > new file mode 100644
> > index 000..c72bc260f95
> > --- /dev/null
> > +++ b/net/dino/patches/patch-plugins_gpgme-vala_vapi_gpgme_public_vapi
> > @@ -0,0 +1,25 @@
> > +Fix to build dino since vala-c 0.56.17
> > +https://github.com/dino/dino/issues/1576
> > +
> > +Index: plugins/gpgme-vala/vapi/gpgme_public.vapi
> > +--- plugins/gpgme-vala/vapi/gpgme_public.vapi.orig
> > plugins/gpgme-vala/vapi/gpgme_public.vapi
> > +@@ -22,9 +22,9 @@ public class Key {
> > + public string issuer_name;
> > + public string chain_id;
> > + public Validity owner_trust;
> > +-[CCode(array_null_terminated = true)]
> > ++[CCode(array_length = false, array_null_terminated = true)]
> > + public SubKey[] subkeys;
> > +-[CCode(array_null_terminated = true)]
> > ++[CCode(array_length = false, array_null_terminated = true)]
> > + public UserID[] uids;
> > + public KeylistMode keylist_mode;
> > + // public string fpr; // requires gpgme >= 1.7.0
> > +@@ -159,4 +159,4 @@ public enum Validity {
> > + ULTIMATE
> > + }
> > +
> > +-}
> > +\ No newline at end of file
> > ++}
unbreak net/dino
since kn@ reported dino build issue upstream, a fix was released
I adapted the fix to work on latest release because it was done
on a file that does not exist yet in the tarball (got renamed?)
tested on amd64, works fine again
make update-patches insisted to add the "No newline at end of file",
I'm not happy about it but I guess it's better to include it?
diff --git a/net/dino/Makefile b/net/dino/Makefile
index 2ca126f6482..abc2a214758 100644
--- a/net/dino/Makefile
+++ b/net/dino/Makefile
@@ -1,5 +1,3 @@
-BROKEN=build failure with vala-0.56.17
https://github.com/dino/dino/issues/1576
-
COMMENT= XMPP desktop client
VERSION= 0.4.3
DISTNAME= dino-${VERSION}
diff --git a/net/dino/patches/patch-plugins_gpgme-vala_vapi_gpgme_public_vapi
b/net/dino/patches/patch-plugins_gpgme-vala_vapi_gpgme_public_vapi
new file mode 100644
index 000..c72bc260f95
--- /dev/null
+++ b/net/dino/patches/patch-plugins_gpgme-vala_vapi_gpgme_public_vapi
@@ -0,0 +1,25 @@
+Fix to build dino since vala-c 0.56.17
+https://github.com/dino/dino/issues/1576
+
+Index: plugins/gpgme-vala/vapi/gpgme_public.vapi
+--- plugins/gpgme-vala/vapi/gpgme_public.vapi.orig
plugins/gpgme-vala/vapi/gpgme_public.vapi
+@@ -22,9 +22,9 @@ public class Key {
+ public string issuer_name;
+ public string chain_id;
+ public Validity owner_trust;
+-[CCode(array_null_terminated = true)]
++[CCode(array_length = false, array_null_terminated = true)]
+ public SubKey[] subkeys;
+-[CCode(array_null_terminated = true)]
++[CCode(array_length = false, array_null_terminated = true)]
+ public UserID[] uids;
+ public KeylistMode keylist_mode;
+ // public string fpr; // requires gpgme >= 1.7.0
+@@ -159,4 +159,4 @@ public enum Validity {
+ ULTIMATE
+ }
+
+-}
+\ No newline at end of file
++}
Re: Update to node_exporter-1.8.0
looks good and works for me ok solene@ On Wed, Apr 24, 2024 at 09:47:56PM GMT, Daniel Jakots wrote: > Hey, > > They released 1.8.0 earlier today: > https://github.com/prometheus/node_exporter/releases/tag/v1.8.0 > > Lightly tested, looks fine. > > Comments? OK? > > Cheers, > Daniel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/04/29 04:53:53 Modified files: security/rbw : Makefile crates.inc distinfo Log message: Update to rbw-1.10.0
update net/iperf
update to latest version of iperf 2
tested with public servers as a client, worked fine
the cpp file patch is not required anymore, upstream
seems to have imported it
diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 8d753deda55..9cf1ddabe1a 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,8 +1,7 @@
COMMENT= tool for measuring maximum TCP and UDP bandwidth
-DISTNAME= iperf-2.0.12
+DISTNAME= iperf-2.2.0
CATEGORIES=net
-REVISION= 1
HOMEPAGE= https://sourceforge.net/projects/iperf/
@@ -18,7 +17,7 @@ COMPILER =base-clang ports-gcc base-gcc
SITES= ${SITE_SOURCEFORGE:=iperf2/}
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
+AUTOCONF_VERSION= 2.71
# Separate build breaks configure test for IPv6 support
SEPARATE_BUILD=No
diff --git a/net/iperf/distinfo b/net/iperf/distinfo
index 5c8314df734..01baf17c549 100644
--- a/net/iperf/distinfo
+++ b/net/iperf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (iperf-2.0.12.tar.gz) = Nn9lH7EmSxP2UY5BuKfgjOPkGyocgOmf8DR1Ye7TJkY=
-SIZE (iperf-2.0.12.tar.gz) = 324528
+SHA256 (iperf-2.2.0.tar.gz) = FoEKlXXkxt1l5KGKtd882sZzCzyDLPCAqJkPEy9oNko=
+SIZE (iperf-2.2.0.tar.gz) = 477261
diff --git a/net/iperf/patches/patch-configure_ac
b/net/iperf/patches/patch-configure_ac
index 9b364fcfc93..9ed269c2b63 100644
--- a/net/iperf/patches/patch-configure_ac
+++ b/net/iperf/patches/patch-configure_ac
@@ -1,13 +1,13 @@
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -73,9 +73,7 @@ dnl Checks for programs
+@@ -127,9 +127,7 @@ dnl Checks for programs
dnl ===
AC_PROG_CXX
-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
AC_PROG_CC
-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
- AC_ISC_POSIX
+ AC_SEARCH_LIBS([strerror],[cposix])
AC_PROG_INSTALL
AC_PROG_MAKE_SET
diff --git a/net/iperf/patches/patch-src_PerfSocket_cpp
b/net/iperf/patches/patch-src_PerfSocket_cpp
deleted file mode 100644
index c2c898e7921..000
--- a/net/iperf/patches/patch-src_PerfSocket_cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: src/PerfSocket.cpp
src/PerfSocket.cpp.orig
-+++ src/PerfSocket.cpp
-@@ -118,8 +118,8 @@ void SetSocketOptions( thread_Settings *inSettings ) {
- }
- if (inSettings->mTTL > 0) {
- // set TTL
-- int val = inSettings->mTTL;
- if ( !isIPV6(inSettings) ) {
-+ u_int8_t val = inSettings->mTTL;
- int rc = setsockopt( inSettings->mSock, IPPROTO_IP,
IP_MULTICAST_TTL,
-(char*) , (Socklen_t) sizeof(val));
-
-@@ -127,6 +127,7 @@ void SetSocketOptions( thread_Settings *inSettings ) {
- } else
- # ifdef HAVE_IPV6_MULTICAST
- {
-+ int val = inSettings->mTTL;
- int rc = setsockopt( inSettings->mSock, IPPROTO_IPV6,
IPV6_MULTICAST_HOPS,
-(char*) , (Socklen_t) sizeof(val));
- WARN_errno( rc == SOCKET_ERROR, "multicast v6 ttl" );
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/04/29 03:20:15 Modified files: www/vaultwarden-web: Makefile distinfo www/vaultwarden-web/pkg: PLIST Log message: update to vaultwarden-web-2024.3.1 ok aisha@ (maintainer) ok bket@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/04/27 05:10:40 Removed files: emulators/ppsspp/patches: patch-Core_AVIDump_cpp patch-Core_HLE_sceAtrac_cpp patch-Core_HLE_sceMpeg_cpp patch-Core_HW_MediaEngine_cpp patch-Core_HW_SimpleAudioDec_cpp patch-Core_HW_SimpleAudioDec_h Log message: forgot to remove empty patches spotted by brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/04/27 04:57:29 Modified files: emulators/ppsspp: Makefile distinfo emulators/ppsspp/patches: patch-CMakeLists_txt patch-Core_AVIDump_cpp patch-Core_HLE_sceAtrac_cpp patch-Core_HLE_sceMpeg_cpp patch-Core_HW_MediaEngine_cpp patch-Core_HW_SimpleAudioDec_cpp patch-Core_HW_SimpleAudioDec_h patch-UI_NativeApp_cpp emulators/ppsspp/pkg: PLIST Log message: Update to ppsspp-1.17.1 diff from brad
update www/vaultwarden-web
a new vaultwarden-web build is available upstream
https://github.com/dani-garcia/bw_web_builds/releases
diff --git a/www/vaultwarden-web/Makefile b/www/vaultwarden-web/Makefile
index 072fdf39347..ec1c62485fe 100644
--- a/www/vaultwarden-web/Makefile
+++ b/www/vaultwarden-web/Makefile
@@ -1,6 +1,6 @@
COMMENT = Web vault builds for vaultwarden
-VERSION = 2024.1.2b
+VERSION = 2024.3.1
DISTNAME = bw_web_v${VERSION}
PKGNAME = vaultwarden-web-${VERSION}
diff --git a/www/vaultwarden-web/distinfo b/www/vaultwarden-web/distinfo
index 84fca1bc4bc..a446675bac7 100644
--- a/www/vaultwarden-web/distinfo
+++ b/www/vaultwarden-web/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bw_web_v2024.1.2b.tar.gz) =
yaY/n3GJn/v/rJWfVftlGlw9Mfaljzb3KKHUkQ3Lu3Y=
-SIZE (bw_web_v2024.1.2b.tar.gz) = 11259948
+SHA256 (bw_web_v2024.3.1.tar.gz) = A9TS/WPZZ6joHLucsa+aql1+eUS1wefMPIkV8amFsYc=
+SIZE (bw_web_v2024.3.1.tar.gz) = 11663162
diff --git a/www/vaultwarden-web/pkg/PLIST b/www/vaultwarden-web/pkg/PLIST
index 9c9baf4f3b9..6dab0128b74 100644
--- a/www/vaultwarden-web/pkg/PLIST
+++ b/www/vaultwarden-web/pkg/PLIST
@@ -1,77 +1,80 @@
vaultwarden/
vaultwarden/web-vault/
vaultwarden/web-vault/.nojekyll
-vaultwarden/web-vault/111.facbcbc7e5b234b41e70.js
-vaultwarden/web-vault/111.facbcbc7e5b234b41e70.js.map
-vaultwarden/web-vault/125.8432c8d0f7a38fa653dc.js
-vaultwarden/web-vault/125.8432c8d0f7a38fa653dc.js.map
-vaultwarden/web-vault/182.bd99dac914b18e447d2a.js
-vaultwarden/web-vault/182.bd99dac914b18e447d2a.js.map
-vaultwarden/web-vault/228.b0ed71261666fc86e61c.js
-vaultwarden/web-vault/228.b0ed71261666fc86e61c.js.map
+vaultwarden/web-vault/125.99ad3392af9029ab785c.js
+vaultwarden/web-vault/125.99ad3392af9029ab785c.js.map
+vaultwarden/web-vault/319.f8244d96c41fa98843ef.js
+vaultwarden/web-vault/319.f8244d96c41fa98843ef.js.map
+vaultwarden/web-vault/367.00f5a63604ed125355fa.js
+vaultwarden/web-vault/367.00f5a63604ed125355fa.js.map
vaultwarden/web-vault/395.38a9c38835d7b081bc1d.js
vaultwarden/web-vault/395.38a9c38835d7b081bc1d.js.LICENSE.txt
vaultwarden/web-vault/395.38a9c38835d7b081bc1d.js.map
-vaultwarden/web-vault/407.99cd5bb569da79b7ad77.js
-vaultwarden/web-vault/407.99cd5bb569da79b7ad77.js.map
-vaultwarden/web-vault/551.58781405247873329959.js
-vaultwarden/web-vault/551.58781405247873329959.js.map
-vaultwarden/web-vault/677.f099bcd59898015da3cf.js
-vaultwarden/web-vault/677.f099bcd59898015da3cf.js.map
-vaultwarden/web-vault/74.555133792ea8b7f58415.js
-vaultwarden/web-vault/74.555133792ea8b7f58415.js.map
-vaultwarden/web-vault/77.f9a0f9e87ddc6e951e16.js
-vaultwarden/web-vault/77.f9a0f9e87ddc6e951e16.js.map
-vaultwarden/web-vault/795.b9d2ecb21b32fa59d464.js
-vaultwarden/web-vault/795.b9d2ecb21b32fa59d464.js.map
-vaultwarden/web-vault/883.a8a1148c8fb22429c4cc.js
-vaultwarden/web-vault/883.a8a1148c8fb22429c4cc.js.map
-vaultwarden/web-vault/941.b4347f9868520a6545b3.js
-vaultwarden/web-vault/941.b4347f9868520a6545b3.js.map
-vaultwarden/web-vault/946.bee1cfe71a4849b72c36.js
-vaultwarden/web-vault/946.bee1cfe71a4849b72c36.js.map
-vaultwarden/web-vault/968.4502fe302db58aaeb677.js
-vaultwarden/web-vault/968.4502fe302db58aaeb677.js.map
+vaultwarden/web-vault/409.1696c619d8380678bd38.js
+vaultwarden/web-vault/409.1696c619d8380678bd38.js.map
+vaultwarden/web-vault/44.544b48d02483cf302a8e.js
+vaultwarden/web-vault/44.544b48d02483cf302a8e.js.LICENSE.txt
+vaultwarden/web-vault/44.544b48d02483cf302a8e.js.map
+vaultwarden/web-vault/554.26858b356a8fca25f37b.js
+vaultwarden/web-vault/554.26858b356a8fca25f37b.js.map
+vaultwarden/web-vault/627.6c3604056804346e394f.js
+vaultwarden/web-vault/627.6c3604056804346e394f.js.map
+vaultwarden/web-vault/651.6617eae790351aa1ac81.js
+vaultwarden/web-vault/651.6617eae790351aa1ac81.js.map
+vaultwarden/web-vault/74.c6304b54543b574643f3.js
+vaultwarden/web-vault/74.c6304b54543b574643f3.js.map
+vaultwarden/web-vault/77.27e8598fd2fdf84e102c.js
+vaultwarden/web-vault/77.27e8598fd2fdf84e102c.js.map
+vaultwarden/web-vault/838.4708f4e6417b45fd413e.js
+vaultwarden/web-vault/838.4708f4e6417b45fd413e.js.map
+vaultwarden/web-vault/968.225a74c55200ccb35667.js
+vaultwarden/web-vault/968.225a74c55200ccb35667.js.map
+vaultwarden/web-vault/979.27e7418889fb723ffcfe.js
+vaultwarden/web-vault/979.27e7418889fb723ffcfe.js.map
vaultwarden/web-vault/app/
vaultwarden/web-vault/app-id.json
-vaultwarden/web-vault/app/main.a8f027a034b348c3f19d.js
-vaultwarden/web-vault/app/main.a8f027a034b348c3f19d.js.map
-vaultwarden/web-vault/app/main.bfda25c788b32075b928.css
-vaultwarden/web-vault/app/main.bfda25c788b32075b928.css.map
-vaultwarden/web-vault/app/polyfills.553f1c6e04a4256f1a4c.js
-vaultwarden/web-vault/app/polyfills.553f1c6e04a4256f1a4c.js.LICENSE.txt
-vaultwarden/web-vault/app/polyfills.553f1c6e04a4256f1a4c.js.map
-vaultwarden/web-vault/app/vendor.58a71e94f36c45876e9f.js
-vaultwarden/web-vault/app/vendor.58a71e94f36c45876e9f.js.LICENSE.txt
-vaultwarden/web-vault/app/vendor.58a71e94f36c45876e9f.js.map
Re: update games/openmw (but crash, need some help)
On Thu, Apr 25, 2024 at 05:33:03PM GMT, Pascal Stumpf wrote: > On Thu, 25 Apr 2024 17:56:28 +0200, Solene Rapenne wrote: > > I got openmw to work with latest version, > > but unfortunately I get an error before the in-game menu. > > > > I share the diff so people could try if it works with > > their hardware, and potentially figure a fix =D > > > > > > the crash logs looks like this, I tried to add egdb in $PATH > > with the name gdb, but it didn't help much to get a trace: > > > > This is the diff I sent to lraab@ some time ago, working from his > update. This fixes the crash you are likely seeing, although enabling > shadows will still cause the game to coredump. > > (the settings-default.cfg patch is the important bit) > > indeed, game runs fine with this patch ok solene@ for this diff
update games/openmw (but crash, need some help)
I got openmw to work with latest version,
but unfortunately I get an error before the in-game menu.
I share the diff so people could try if it works with
their hardware, and potentially figure a fix =D
the crash logs looks like this, I tried to add egdb in $PATH
with the name gdb, but it didn't help much to get a trace:
---
*** Fatal Error ***
Address not mapped to object (signal 11)
Address: 0x0
System: OpenBSD ryzen.my.domain 7.5 GENERIC.MP#0 amd64
Executing: gdb --quiet --batch --command=/tmp/gdb-respfile-GaRyuq
---
update diff
diff --git a/games/openmw/Makefile b/games/openmw/Makefile
index 7dac25cbe8b..a4d88fd7649 100644
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@@ -2,7 +2,9 @@ ONLY_FOR_ARCHS =amd64 i386
COMMENT = open source implementation of TES III: Morrowind
-V =0.47.0
+DPB_PROPERTIES = parallel
+
+V =0.48.0
GH_ACCOUNT = OpenMW
GH_PROJECT = openmw
GH_TAGNAME = openmw-$V
@@ -29,7 +31,10 @@ WANTLIB += osgViewer swresample swscale unshield
MODULES = devel/cmake x11/qt5
-BUILD_DEPENDS =sysutils/e2fsprogs
+BUILD_DEPENDS =devel/yaml-cpp \
+ lang/luajit \
+sysutils/e2fsprogs
+
LIB_DEPENDS = audio/openal \
devel/bullet \
devel/mygui \
@@ -37,6 +42,7 @@ LIB_DEPENDS = audio/openal \
graphics/ffmpeg \
graphics/openscenegraph \
archivers/unshield
+
RUN_DEPENDS = devel/desktop-file-utils
CONFIGURE_ARGS += -DBINDIR=${LOCALBASE}/bin \
diff --git a/games/openmw/distinfo b/games/openmw/distinfo
index 12c17c7c932..4b2f8900edf 100644
--- a/games/openmw/distinfo
+++ b/games/openmw/distinfo
@@ -1,4 +1,4 @@
SHA256 (openmw/e75adf86f91eb3082220085e42dda62679f9a3ea.zip) =
0zOarqHYEwe8rCvs4XbFNZ7V+Mj5ch/DYNKPgvkRklM=
-SHA256 (openmw/openmw-0.47.0.tar.gz) =
vX934VJ8IYDpsN/L5AHW+0jyTbs3cB2sd0dpeHPW7bQ=
+SHA256 (openmw/openmw-0.48.0.tar.gz) =
vpe46QCFPEPd6IFvLOSYAftnLP/fSKx6+Xgqv7inSvQ=
SIZE (openmw/e75adf86f91eb3082220085e42dda62679f9a3ea.zip) = 1644592
-SIZE (openmw/openmw-0.47.0.tar.gz) = 5156857
+SIZE (openmw/openmw-0.48.0.tar.gz) = 6022261
diff --git a/games/openmw/patches/patch-extern_CMakeLists_txt
b/games/openmw/patches/patch-extern_CMakeLists_txt
index 09f3470ae72..a0891484bdb 100644
--- a/games/openmw/patches/patch-extern_CMakeLists_txt
+++ b/games/openmw/patches/patch-extern_CMakeLists_txt
@@ -1,24 +1,25 @@
Index: extern/CMakeLists.txt
--- extern/CMakeLists.txt.orig
+++ extern/CMakeLists.txt
-@@ -178,11 +178,13 @@ if(NOT OPENMW_USE_SYSTEM_RECASTNAVIGATION)
+@@ -180,13 +180,14 @@ if(NOT OPENMW_USE_SYSTEM_RECASTNAVIGATION)
set(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "")
# master on 15 Feb 2021
-include(FetchContent)
-FetchContent_Declare(recastnavigation
-URL
https://github.com/recastnavigation/recastnavigation/archive/e75adf86f91eb3082220085e42dda62679f9a3ea.zip
--URL_HASH MD5=af905d121ef9d1cdfa979b0495cba059
+-URL_HASH
SHA512=93a19490cdfa55e98a6af9cc050e94af88fdb95fae2059ceeff28b62f3b48515f5fdd2c806c910550933b6861a4f6a91173ee0ed1b61c1396f7b34d4c78f0793
-SOURCE_DIR fetched/recastnavigation
-)
-FetchContent_MakeAvailableExcludeFromAll(recastnavigation)
-+#include(FetchContent)
-+#FetchContent_Declare(recastnavigation
-+#URL
https://github.com/recastnavigation/recastnavigation/archive/e75adf86f91eb3082220085e42dda62679f9a3ea.zip
-+#URL_HASH MD5=af905d121ef9d1cdfa979b0495cba059
-+#SOURCE_DIR fetched/recastnavigation
-+#)
-+#FetchContent_MakeAvailableExcludeFromAll(recastnavigation)
-+
++# include(FetchContent)
++# FetchContent_Declare(recastnavigation
++# URL
https://github.com/recastnavigation/recastnavigation/archive/e75adf86f91eb3082220085e42dda62679f9a3ea.zip
++# URL_HASH
SHA512=93a19490cdfa55e98a6af9cc050e94af88fdb95fae2059ceeff28b62f3b48515f5fdd2c806c910550933b6861a4f6a91173ee0ed1b61c1396f7b34d4c78f0793
++# SOURCE_DIR fetched/recastnavigation
++# )
++# FetchContent_MakeAvailableExcludeFromAll(recastnavigation)
+add_subdirectory("fetched/recastnavigation")
endif()
+
+ if (NOT OPENMW_USE_SYSTEM_SQLITE3)
diff --git a/games/openmw/pkg/PLIST b/games/openmw/pkg/PLIST
index a5b20c0e6cb..c8d409e91ed 100644
--- a/games/openmw/pkg/PLIST
+++ b/games/openmw/pkg/PLIST
@@ -2,11 +2,43 @@
@bin bin/esmtool
@bin bin/niftest
@bin bin/openmw
+@bin bin/openmw-bulletobjecttool
@bin bin/openmw-cs
@bin bin/openmw-essimporter
@bin bin/openmw-iniimporter
@bin bin/openmw-launcher
+@bin bin/openmw-navmeshtool
@bin bin/openmw-wizard
+include/recastnavigation/
+include/recastnavigation/DebugDraw.h
+include/recastnavigation/DetourAlloc.h
+include/recastnavigation/DetourAssert.h
delete net/kristall? (was update net/kristall)
On Thu, Apr 18, 2024 at 11:29:20PM GMT, Solene Rapenne wrote: > this updates kristall to latest commit > > not sure if we want to keep it, we have > many good gemini browsers nowadays and with > much less dependencies than this one on a second thought, I propose we remove this port
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/04/25 00:57:21 Modified files: emulators/mednafen: Makefile distinfo Log message: Update to mednafen-1.32.1 ok stsp@ and mestre@ (maintainer)
Re: dpb always rebuild rust-bootstrap
On Sun, Apr 21, 2024 at 11:56:30AM GMT, Stuart Henderson wrote:
> On 2024/04/21 11:35, Solene Rapenne wrote:
> > On Sat, Apr 20, 2024 at 10:02:38AM GMT, Solene Rapenne wrote:
> > > On Sat, Apr 20, 2024 at 09:00:30AM GMT, Sebastien Marie wrote:
> > > > Solene Rapenne writes:
> > > >
> > > > > hi, on a fresh current amd64 I had to set up dpb because it seems
> > > > > there was a libc bump at the wrong time for me :)
> > > > >
> > > > > however, now I have my working dpb (easy to setup once you understand
> > > > > it), I don't understand why dpb -R something_depending_on_rust
> > > > > always have to recompile lang/rust, in the packages directory, only
> > > > > the rust bootstrap package is changed everytime I run dpb.
> > > > >
> > > > > I'm not sure which logs I could provide though. This is quite
> > > > > annoying because lang/rust is heavy to compile and I like to trigger
> > > > > dpb every time I try a diff.
> > > > >
> > > > > Am I the only one with this issue?
> > > >
> > > > I'm interested to know if there are any problems with the way I did
> > > > rust-bootstrap.
> > > >
> > > > Currently, it is marked with 'always-update', because the package
> > > > content depend on the build host (system libraries are embedded in the
> > > > package for the bootstrap purpose). I expected that if the package isn't
> > > > installed (and it shouldn't in standard usage) it will not be a problem.
> > > >
> > > > Do you have it installed ? If it isn't the case, and dpb is rebuilding
> > > > it without purpose (I assume no port depending on it), it might be a
> > > > problem in dpb, or some side effect for a subpackage having
> > > > 'always-update'.
> > > >
> > > > I could look to remove the 'always-update' option from rust-bootstrap
> > > > without too much trouble.
> > > >
> > > > Thanks.
> > > > --
> > > > Sebastien Marie
> > >
> > > rust-bootstrap is not installed in the chroot after using dpb -R
> > > shells/nushell
> > > that rebuilt rust-bootstrap , I don't think junking happened
> > >
> > > I'll try without always-update
> > >
> >
> > dpb stopped rebuilding rust everytime since I removed always-update
> >
> > I don't know if REVISION could be set only for bootstrap, but
> > following diff works for me
>
> The plain REVISION bump like you've done is correct.
>
> I would set WANTLIB-bootstrap to the list of libraries used in the
> bootstrap. That way it will be automically updated when necessary.
> (Ignore the "not needed" from check-lib-depends).
>
> > diff --git a/lang/rust/Makefile b/lang/rust/Makefile
> > index 035767f1126..ba65386765a 100644
> > --- a/lang/rust/Makefile
> > +++ b/lang/rust/Makefile
> > @@ -17,6 +17,7 @@ COMMENT-src = Rust source component
> >
> > V =1.77.2
> > DISTNAME = rustc-${V}-src
> > +REVISION = 0
> >
> > # rustc bootstrap version
> > BV-aarch64 = 1.77.0-20240320
> > diff --git a/lang/rust/pkg/PLIST-bootstrap b/lang/rust/pkg/PLIST-bootstrap
> > index 17001b7230c..1b28ca27ca2 100644
> > --- a/lang/rust/pkg/PLIST-bootstrap
> > +++ b/lang/rust/pkg/PLIST-bootstrap
> > @@ -1,2 +1 @@
> > -@option always-update
> > lib/rustc-bootstrap-${MACHINE_ARCH}.tar
> >
I'm not entirely sure how to make a WANTLIB-boostrap,
I got an issue with a lib trying to generate it for bootstrap, so I
first checked -main using port-lib-depends-check on -main subpackage
but it reported an issue about ssh2 library, is this expected? There
is security/libssh2 and LIB_DEPENDS-main so it should be fine?
I have to admit I became a bit rusty with the ports tree :-)
ryzen$ env SUBPACKAGE=-main make port-lib-depends-check
===> Checking files for rust-1.77.2
`/usr/ports/distfiles/rust/rustc-1.77.2-src.tar.xz' is up to date.
`/usr/ports/distfiles/rust/rustc-bootstrap-amd64-1.77.0-20240318.tar.lz' is up
to date.
>> (SHA256) rust/rustc-1.77.2-src.tar.xz: OK
>> (SHA256) rust/rustc-bootstrap-amd64-1.77.0-20240318.tar.lz: OK
===> Verifying specs: c++ c++abi pthread c crypto curl m pthread ssh2 ssl z
c++ c++abi pthread c m pthread c++ c++abi pthread c m pthread
Missing library for ssh2>=0.0
Fatal error
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2489
'/usr/ports/pobj/rust-1.77.2/.buildwantlibs': @case X${_DEPENDS_CACHE} in X...)
*** Error 2 in /usr/ports/lang/rust
(/usr/ports/infrastructure/mk/bsd.port.mk:2796
'/usr/ports/pobj/rust-1.77.2/.extract_done': @cd /usr/por...)
update emulators/mednafen
A newer version is available, changelogs since our version:
- https://forum.fobby.net/index.php?t=msg=2181=0;
- https://forum.fobby.net/index.php?t=msg=2191=0;
tested on amd64, build and works fine, I tried a few games on super
nes and megadrive
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index cb08d15a0b8..f500b6896bf 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -1,10 +1,9 @@
BROKEN-hppa = ../../include/mednafen/state.h:21:7: error: 'exception_ptr' in
namespace 'std' does not name a type
COMMENT = emulates numerous game consoles
-VERSION = 1.31.0-UNSTABLE
+VERSION = 1.32.1
DISTNAME = mednafen-${VERSION}
PKGNAME = mednafen-${VERSION:C/-UNSTABLE//}
-REVISION = 2
CATEGORIES = emulators games
HOMEPAGE = https://mednafen.github.io
diff --git a/emulators/mednafen/distinfo b/emulators/mednafen/distinfo
index 4c9b4d330ba..fed5bcfad85 100644
--- a/emulators/mednafen/distinfo
+++ b/emulators/mednafen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mednafen-1.31.0-UNSTABLE.tar.xz) =
v8/3LjcOCeEro3kWAHghh/v14syda1/k+fNHFkIEY2c=
-SIZE (mednafen-1.31.0-UNSTABLE.tar.xz) = 3528532
+SHA256 (mednafen-1.32.1.tar.xz) = 3n65SrZiEq53WDdlJDaKirIII0szeWYlymMFR9vIODI=
+SIZE (mednafen-1.32.1.tar.xz) = 3571236
Re: dpb always rebuild rust-bootstrap
On Sat, Apr 20, 2024 at 10:02:38AM GMT, Solene Rapenne wrote:
> On Sat, Apr 20, 2024 at 09:00:30AM GMT, Sebastien Marie wrote:
> > Solene Rapenne writes:
> >
> > > hi, on a fresh current amd64 I had to set up dpb because it seems
> > > there was a libc bump at the wrong time for me :)
> > >
> > > however, now I have my working dpb (easy to setup once you understand
> > > it), I don't understand why dpb -R something_depending_on_rust
> > > always have to recompile lang/rust, in the packages directory, only
> > > the rust bootstrap package is changed everytime I run dpb.
> > >
> > > I'm not sure which logs I could provide though. This is quite
> > > annoying because lang/rust is heavy to compile and I like to trigger
> > > dpb every time I try a diff.
> > >
> > > Am I the only one with this issue?
> >
> > I'm interested to know if there are any problems with the way I did
> > rust-bootstrap.
> >
> > Currently, it is marked with 'always-update', because the package
> > content depend on the build host (system libraries are embedded in the
> > package for the bootstrap purpose). I expected that if the package isn't
> > installed (and it shouldn't in standard usage) it will not be a problem.
> >
> > Do you have it installed ? If it isn't the case, and dpb is rebuilding
> > it without purpose (I assume no port depending on it), it might be a
> > problem in dpb, or some side effect for a subpackage having
> > 'always-update'.
> >
> > I could look to remove the 'always-update' option from rust-bootstrap
> > without too much trouble.
> >
> > Thanks.
> > --
> > Sebastien Marie
>
> rust-bootstrap is not installed in the chroot after using dpb -R
> shells/nushell
> that rebuilt rust-bootstrap , I don't think junking happened
>
> I'll try without always-update
>
dpb stopped rebuilding rust everytime since I removed always-update
I don't know if REVISION could be set only for bootstrap, but
following diff works for me
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 035767f1126..ba65386765a 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -17,6 +17,7 @@ COMMENT-src = Rust source component
V =1.77.2
DISTNAME = rustc-${V}-src
+REVISION = 0
# rustc bootstrap version
BV-aarch64 = 1.77.0-20240320
diff --git a/lang/rust/pkg/PLIST-bootstrap b/lang/rust/pkg/PLIST-bootstrap
index 17001b7230c..1b28ca27ca2 100644
--- a/lang/rust/pkg/PLIST-bootstrap
+++ b/lang/rust/pkg/PLIST-bootstrap
@@ -1,2 +1 @@
-@option always-update
lib/rustc-bootstrap-${MACHINE_ARCH}.tar
Re: dpb always rebuild rust-bootstrap
On Sat, Apr 20, 2024 at 09:00:30AM GMT, Sebastien Marie wrote: > Solene Rapenne writes: > > > hi, on a fresh current amd64 I had to set up dpb because it seems > > there was a libc bump at the wrong time for me :) > > > > however, now I have my working dpb (easy to setup once you understand > > it), I don't understand why dpb -R something_depending_on_rust > > always have to recompile lang/rust, in the packages directory, only > > the rust bootstrap package is changed everytime I run dpb. > > > > I'm not sure which logs I could provide though. This is quite > > annoying because lang/rust is heavy to compile and I like to trigger > > dpb every time I try a diff. > > > > Am I the only one with this issue? > > I'm interested to know if there are any problems with the way I did > rust-bootstrap. > > Currently, it is marked with 'always-update', because the package > content depend on the build host (system libraries are embedded in the > package for the bootstrap purpose). I expected that if the package isn't > installed (and it shouldn't in standard usage) it will not be a problem. > > Do you have it installed ? If it isn't the case, and dpb is rebuilding > it without purpose (I assume no port depending on it), it might be a > problem in dpb, or some side effect for a subpackage having > 'always-update'. > > I could look to remove the 'always-update' option from rust-bootstrap > without too much trouble. > > Thanks. > -- > Sebastien Marie rust-bootstrap is not installed in the chroot after using dpb -R shells/nushell that rebuilt rust-bootstrap , I don't think junking happened I'll try without always-update
update audio/cozy
cozy got a new release after 2 years, including a commit we backported
to prevent a crash. This version has a slightly new UI, works fine
for me.
ok?
diff --git a/audio/cozy/Makefile b/audio/cozy/Makefile
index 9491989b6a1..8e4a9fc02ef 100644
--- a/audio/cozy/Makefile
+++ b/audio/cozy/Makefile
@@ -2,7 +2,7 @@ COMMENT = gtk3 audiobook player
GH_ACCOUNT = geigi
GH_PROJECT = cozy
-GH_TAGNAME = 1.2.1
+GH_TAGNAME = 1.3.0
CATEGORIES = audio
diff --git a/audio/cozy/distinfo b/audio/cozy/distinfo
index 4cc6807fb30..c2a3efae4eb 100644
--- a/audio/cozy/distinfo
+++ b/audio/cozy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cozy-1.2.1.tar.gz) = VSLdPiqop1R4UVxK4pnnH6MqkZcDzEpTL7p5c2PMWEQ=
-SIZE (cozy-1.2.1.tar.gz) = 831167
+SHA256 (cozy-1.3.0.tar.gz) = tOXUOPXT9dI2pJ8/y0M8pPpInX1ZlZYaXZZ5ULu2wQI=
+SIZE (cozy-1.3.0.tar.gz) = 332173
diff --git a/audio/cozy/patches/patch-cozy_ui_widgets_whats_new_window_py
b/audio/cozy/patches/patch-cozy_ui_widgets_whats_new_window_py
deleted file mode 100644
index 84f2f21a875..000
--- a/audio/cozy/patches/patch-cozy_ui_widgets_whats_new_window_py
+++ /dev/null
@@ -1,28 +0,0 @@
-this patch is required to make coyz run, until the following commit gets
merged upstream
-https://github.com/geigi/cozy/pull/762
-
-diff --git a/cozy/ui/widgets/whats_new_window.py
b/cozy/ui/widgets/whats_new_window.py
-index 1e80d1ef..1a79005b 100644
cozy/ui/widgets/whats_new_window.py
-+++ cozy/ui/widgets/whats_new_window.py
-@@ -51,12 +51,16 @@ def __init__(self, **kwargs):
- def _fill_window(self):
- self.children = []
-
--last_launched_version =
version.parse(self.app_settings.last_launched_version)
--
--if type(last_launched_version) is version.LegacyVersion:
-+try:
-+last_launched_version =
version.parse(self.app_settings.last_launched_version)
-+except version.InvalidVersion:
- self._fill_welcome()
- else:
--self._fill_whats_new(last_launched_version)
-+if type(last_launched_version) is version.LegacyVersion:
-+self._fill_welcome()
-+else:
-+self._fill_whats_new(last_launched_version)
-+
-
- def _fill_welcome(self):
- from cozy.ui.widgets.welcome import Welcome
diff --git a/audio/cozy/pkg/PLIST b/audio/cozy/pkg/PLIST
index 2e725b67027..0f9e2028bd6 100644
--- a/audio/cozy/pkg/PLIST
+++ b/audio/cozy/pkg/PLIST
@@ -87,10 +87,8 @@ lib/python${MODPY_VERSION}/site-packages/cozy/extensions/
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}gtk_widget.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}is_same_book.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}set.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cozy/extensions/gtk_widget.py
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/is_same_book.py
lib/python${MODPY_VERSION}/site-packages/cozy/extensions/set.py
lib/python${MODPY_VERSION}/site-packages/cozy/media/
@@ -122,7 +120,6 @@
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}chapter.${MO
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}database_importer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}library.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}single_file_chapter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}storage.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}track.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/model/book.py
@@ -130,7 +127,6 @@
lib/python${MODPY_VERSION}/site-packages/cozy/model/chapter.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/database_importer.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/library.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/settings.py
-lib/python${MODPY_VERSION}/site-packages/cozy/model/single_file_chapter.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/storage.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/track.py
lib/python${MODPY_VERSION}/site-packages/cozy/open_view.py
@@ -159,17 +155,14 @@
lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}disk_element.${
update games/hyperrogue
our hyperrogue version is quite old of a dozen releases
latest release adds a lot of changes
https://github.com/zenorogue/hyperrogue/releases
the Makefile patch had to be reworked a bit because the original
Makefile differed from the patch, but it applies the same changes
as before.
update-plist removed some honeycomb files, I don't know if it's
expected... the game plays fine
diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 4c1a7417f10..b5173d052ca 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,4 +1,4 @@
-V =12.0f
+V =13.0d
COMMENT = roguelike game in a non-Euclidean world
CATEGORIES = games x11
diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo
index 835425d2f49..fe08e61d88c 100644
--- a/games/hyperrogue/distinfo
+++ b/games/hyperrogue/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hyperrogue-12.0f.tar.gz) = ROeOk+0dMZg9680EeR1//Pz73EBpfnCaD2yi04wwID4=
-SIZE (hyperrogue-12.0f.tar.gz) = 79946099
+SHA256 (hyperrogue-13.0d.tar.gz) = 4ApHLRReh9u3dzH+FXCHyB2N5b0rBfogkbyQGFMIDoo=
+SIZE (hyperrogue-13.0d.tar.gz) = 87765129
diff --git a/games/hyperrogue/patches/patch-Makefile
b/games/hyperrogue/patches/patch-Makefile
index 1567a49854b..6d4afc867d8 100644
--- a/games/hyperrogue/patches/patch-Makefile
+++ b/games/hyperrogue/patches/patch-Makefile
@@ -26,9 +26,9 @@ Index: Makefile
-ifeq (${TOOLCHAIN},clang)
- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -march=native -fPIC
-- CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -Werror -pedantic
-- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized -Wno-unknown-warning-option
+- CXXFLAGS_EARLY += -fPIC
+- CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -pedantic
+- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized -Wno-char-subscripts -Wno-unknown-warning-option
- CXXFLAGS_EARLY += -Wno-invalid-offsetof
-endif
+CXXFLAGS_STD = -std=c++11
@@ -39,23 +39,23 @@ Index: Makefile
-ifeq (${TOOLCHAIN},gcc)
- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -march=native -fPIC
-- CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
+- CXXFLAGS_EARLY += -fPIC
+- CXXFLAGS_EARLY += -W -Wall -Wextra -pedantic
- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized
+- CXXFLAGS_EARLY += -Wno-invalid-offsetof
-endif
-
-ifeq (${TOOLCHAIN},mingw)
- CXXFLAGS_STD = -std=c++11
-- CXXFLAGS_EARLY += -march=native
-- CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
+- CXXFLAGS_EARLY += -W -Wall -Wextra
- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough
-Wno-maybe-uninitialized
+- CXXFLAGS_EARLY += -Wno-invalid-offsetof
-endif
-
--
- ## We have now finished OS-specific and TOOLCHAIN-specific computations.
- ## Begin customization points for user-specifiable HYPERROGUE_USE_XXX macros.
-
-@@ -139,19 +120,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
+ ifeq (${FONTCONFIG},1)
+ CXXFLAGS_EARLY += -DFONTCONFIG `pkg-config --cflags fontconfig`
+ LDFLAGS_EARLY += `pkg-config --libs fontconfig`
+@@ -144,19 +125,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS}
hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES)
@@ -78,8 +78,8 @@ Index: Makefile
+ $(CXX) $(CXXFLAGS) makeh.cpp $(LDFLAGS) -o $@
autohdr.h: makeh$(EXE_EXTENSION) language-data.cpp *.cpp
- ./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp
geometry.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp
pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp language.cpp
util.cpp complex.cpp *.cpp > autohdr.h
-@@ -160,10 +141,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
+ ./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp
geometry.cpp embeddings.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp
multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp
hprint.cpp language.cpp util.cpp complex.cpp multigame.cpp arbitrile.cpp
rulegen.cpp *.cpp > autohdr.h
+@@ -165,10 +146,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
./langen > language-data.cpp
savepng$(OBJ_EXTENSION): savepng.cpp
diff --git a/games/hyperrogue/pkg/PLIST b/games/hyperrogue/pkg/PLIST
index 3095c30894e..9d6cb6288c1 100644
--- a/games/hyperrogue/pkg/PLIST
+++ b/games/hyperrogue/pkg/PLIST
@@ -3,15 +3,6 @@ share/doc/hyperrogue/
share/doc/hyperrogue/README.md
share/hyperrogue/
share/hyperrogue/DejaVuSans-Bold.ttf
-share/hyperrogue/honeycomb-rules-344.dat
-share/hyperrogue/honeycomb-rules-353.dat
-share/hyperrogue/honeycomb-rules-354.dat
-share/hyperrogue/honeycomb-rules-355.dat
-share/hyperrogue/honeycomb-rules-435.dat
-share/hyperrogue/honeycomb-rules-436.dat
-share/hyperrogue/honeycomb-rules-534.dat
-share/hyperrogue/honeycomb-rules-535.dat
-share/hyperrogue/honeycomb-rules-536.dat
update games/brogue
this updates brogue to latest version, it introduces a quick game
mode
the Recordings.c patch isn't needed, upstream is now casting the
variable to unsigned long long instead of our long long, I guess
it's good enough to drop the patch?
the -Wformat-overflow=0 part in the Makefile was also dropped
upstream.
diff --git a/games/brogue/Makefile b/games/brogue/Makefile
index 7135bf18124..a73c8e05c4f 100644
--- a/games/brogue/Makefile
+++ b/games/brogue/Makefile
@@ -3,7 +3,7 @@ COMMENT-no_x11 =roguelike game by Brian Walker
GH_ACCOUNT = tmewett
GH_PROJECT = BrogueCE
-GH_TAGNAME = v1.12
+GH_TAGNAME = v1.13
PKGNAME = brogue-${GH_TAGNAME:S/v//}
diff --git a/games/brogue/distinfo b/games/brogue/distinfo
index 6bed27b849e..71416d88ad5 100644
--- a/games/brogue/distinfo
+++ b/games/brogue/distinfo
@@ -1,2 +1,2 @@
-SHA256 (BrogueCE-1.12.tar.gz) = ru0/bKD041ITewGW6d3b3OVCqemd2p7/2RXgGJI81Cg=
-SIZE (BrogueCE-1.12.tar.gz) = 1168482
+SHA256 (BrogueCE-1.13.tar.gz) = TGPpFjmQLVhWWrPChS2JpCBs3WAgC1hfqdk9aliBkGw=
+SIZE (BrogueCE-1.13.tar.gz) = 1294988
diff --git a/games/brogue/patches/patch-Makefile
b/games/brogue/patches/patch-Makefile
index baef5747b1f..c7a2949a183 100644
--- a/games/brogue/patches/patch-Makefile
+++ b/games/brogue/patches/patch-Makefile
@@ -4,21 +4,12 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -2,7 +2,7 @@ include config.mk
-
- cflags := -Isrc/brogue -Isrc/platform -std=c99 \
- -Wall -Wpedantic -Werror=implicit -Wno-parentheses -Wno-unused-result \
-- -Wformat -Werror=format-security -Wformat-overflow=0
-+ -Wformat -Werror=format-security
- libs := -lm
- cppflags := -DDATADIR=$(DATADIR)
-
-@@ -41,7 +41,7 @@ ifeq ($(DEBUG),YES)
- cflags += -g -Og
- cppflags += -DENABLE_PLAYBACK_SWITCH
+@@ -62,7 +62,7 @@ ifeq ($(DEBUG),YES)
+ cflags += -g -Og
+ cppflags += -DENABLE_PLAYBACK_SWITCH
else
-- cflags += -O2
-+ cflags +=
+-cflags += -O2
++cflags +=
endif
- objects := $(sources:.c=.o)
+ # Add user-provided flags.
diff --git a/games/brogue/patches/patch-src_brogue_Recordings_c
b/games/brogue/patches/patch-src_brogue_Recordings_c
deleted file mode 100644
index f173d23598b..000
--- a/games/brogue/patches/patch-src_brogue_Recordings_c
+++ /dev/null
@@ -1,18 +0,0 @@
-cast int64_t to long long for printing
-
-Index: src/brogue/Recordings.c
src/brogue/Recordings.c.orig
-+++ src/brogue/Recordings.c
-@@ -1454,10 +1454,10 @@ void parseFile() {
- numDepths = recallNumber(4);
- fileLength = recallNumber(4);
-
--fprintf(descriptionFile, "Parsed file \"%s\":\n\tVersion: %s\n\tSeed:
%li\n\tNumber of turns: %li\n\tNumber of depth changes: %li\n\tFile length:
%li\n",
-+fprintf(descriptionFile, "Parsed file \"%s\":\n\tVersion: %s\n\tSeed:
%lli\n\tNumber of turns: %li\n\tNumber of depth changes: %li\n\tFile length:
%li\n",
- currentFilePath,
- versionString,
--seed,
-+(long long)seed,
- numTurns,
- numDepths,
- fileLength);
dpb always rebuild rust-bootstrap
hi, on a fresh current amd64 I had to set up dpb because it seems there was a libc bump at the wrong time for me :) however, now I have my working dpb (easy to setup once you understand it), I don't understand why dpb -R something_depending_on_rust always have to recompile lang/rust, in the packages directory, only the rust bootstrap package is changed everytime I run dpb. I'm not sure which logs I could provide though. This is quite annoying because lang/rust is heavy to compile and I like to trigger dpb every time I try a diff. Am I the only one with this issue?
Re: CVS: cvs.openbsd.org: ports
On Fri, Apr 19, 2024 at 09:41:15PM GMT, Solene Rapenne wrote:
> On Fri, Apr 19, 2024 at 07:07:22AM GMT, Stuart Henderson wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: st...@cvs.openbsd.org 2024/04/19 07:07:22
> >
> > Modified files:
> > textproc/py-docutils: Makefile distinfo
> > textproc/py-docutils/pkg: PLIST
> >
> > Log message:
> > update to py3-docutils-0.21.1
> >
>
> fail to build on amd64
>
> >>> Running build in textproc/py-docutils,python3 at 1713555354.66
> ===> textproc/py-docutils,python3
> ===> Checking files for py3-docutils-0.21.1
> `/data/distfiles/docutils-0.21.1.tar.gz' is up to date.
> >> (SHA256) docutils-0.21.1.tar.gz: OK
> ===> Extracting for py3-docutils-0.21.1
> ===> Patching for py3-docutils-0.21.1
> ===> Compiler link: clang -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
> /usr/bin/clang
> ===> Compiler link: clang++ -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
> /usr/bin/clang++
> ===> Compiler link: cc -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
> /usr/bin/cc
> ===> Compiler link: c++ -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
> /usr/bin/c++
> ===> Generating configure for py3-docutils-0.21.1
> ===> Configuring for py3-docutils-0.21.1
> ===> Building for py3-docutils-0.21.1
> * Getting build dependencies for wheel...
>
> Traceback (most recent call last):
> File "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_impl.py",
> line 321, in _call_hook
> raise BackendUnavailable(data.get('traceback', ''))
> pyproject_hooks._impl.BackendUnavailable: Traceback (most recent call last):
> File
> "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_in_process/_in_process.py",
> line 77, in _build_backend
> obj = import_module(mod_path)
> File "/usr/local/lib/python3.10/importlib/__init__.py", line 126, in
> import_module
> return _bootstrap._gcd_import(name[level:], package, level)
> File "", line 1050, in _gcd_import
> File "", line 1027, in _find_and_load
> File "", line 992, in _find_and_load_unlocked
> File "", line 241, in _call_with_frames_removed
> File "", line 1050, in _gcd_import
> File "", line 1027, in _find_and_load
> File "", line 1004, in _find_and_load_unlocked
> ModuleNotFoundError: No module named 'flit_core'
>
> ERROR Backend 'flit_core.buildapi' is not available.
> *** Error 1 in textproc/py-docutils
> (/data/ports/lang/python/python.port.mk:370 'do-build': @: ; if [ -e
> /tmp/pobj/py-docutils-0.21.1-python...)
> *** Error 2 in textproc/py-docutils
> (/data/ports/infrastructure/mk/bsd.port.mk:3057
> '/tmp/pobj/py-docutils-0.21.1-python3/.build_done': @cd ...)
> *** Error 2 in textproc/py-docutils
> (/data/ports/infrastructure/mk/bsd.port.mk:2704 'build':
> @lock=py3-docutils-0.21.1; export _LOCKS_HELD=...)
> ===> Exiting textproc/py-docutils,python3 with an error
>
this diff seems to work for me
ok?
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 300c8d4caf4..dca2c5b5e80 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -4,6 +4,7 @@ MODPY_EGG_VERSION= 0.21.1
DISTNAME= docutils-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES=textproc
+REVISION= 0
HOMEPAGE= https://docutils.sourceforge.io/
@@ -15,6 +16,8 @@ MODULES= lang/python
MODPY_PI= Yes
MODPY_PYBUILD= setuptools
+BUILD_DEPENDS= devel/py-flit_core${MODPY_FLAVOR}
+
RUN_DEPENDS= textproc/py-pygments${MODPY_FLAVOR}
FLAVORS= python3
Re: CVS: cvs.openbsd.org: ports
On Fri, Apr 19, 2024 at 07:07:22AM GMT, Stuart Henderson wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: st...@cvs.openbsd.org 2024/04/19 07:07:22
>
> Modified files:
> textproc/py-docutils: Makefile distinfo
> textproc/py-docutils/pkg: PLIST
>
> Log message:
> update to py3-docutils-0.21.1
>
fail to build on amd64
>>> Running build in textproc/py-docutils,python3 at 1713555354.66
===> textproc/py-docutils,python3
===> Checking files for py3-docutils-0.21.1
`/data/distfiles/docutils-0.21.1.tar.gz' is up to date.
>> (SHA256) docutils-0.21.1.tar.gz: OK
===> Extracting for py3-docutils-0.21.1
===> Patching for py3-docutils-0.21.1
===> Compiler link: clang -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
/usr/bin/clang
===> Compiler link: clang++ -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
/usr/bin/clang++
===> Compiler link: cc -> env CCACHE_DIR=/tmp/pobj/.ccache ccache /usr/bin/cc
===> Compiler link: c++ -> env CCACHE_DIR=/tmp/pobj/.ccache ccache
/usr/bin/c++
===> Generating configure for py3-docutils-0.21.1
===> Configuring for py3-docutils-0.21.1
===> Building for py3-docutils-0.21.1
* Getting build dependencies for wheel...
Traceback (most recent call last):
File "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_impl.py", line
321, in _call_hook
raise BackendUnavailable(data.get('traceback', ''))
pyproject_hooks._impl.BackendUnavailable: Traceback (most recent call last):
File
"/usr/local/lib/python3.10/site-packages/pyproject_hooks/_in_process/_in_process.py",
line 77, in _build_backend
obj = import_module(mod_path)
File "/usr/local/lib/python3.10/importlib/__init__.py", line 126, in
import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "", line 1050, in _gcd_import
File "", line 1027, in _find_and_load
File "", line 992, in _find_and_load_unlocked
File "", line 241, in _call_with_frames_removed
File "", line 1050, in _gcd_import
File "", line 1027, in _find_and_load
File "", line 1004, in _find_and_load_unlocked
ModuleNotFoundError: No module named 'flit_core'
ERROR Backend 'flit_core.buildapi' is not available.
*** Error 1 in textproc/py-docutils (/data/ports/lang/python/python.port.mk:370
'do-build': @: ; if [ -e /tmp/pobj/py-docutils-0.21.1-python...)
*** Error 2 in textproc/py-docutils
(/data/ports/infrastructure/mk/bsd.port.mk:3057
'/tmp/pobj/py-docutils-0.21.1-python3/.build_done': @cd ...)
*** Error 2 in textproc/py-docutils
(/data/ports/infrastructure/mk/bsd.port.mk:2704 'build':
@lock=py3-docutils-0.21.1; export _LOCKS_HELD=...)
===> Exiting textproc/py-docutils,python3 with an error
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/04/18 16:21:22 Modified files: games/fheroes2 : Makefile distinfo Log message: Update to fheroes-1.0.13 ok thfr@ (maintainer)
update games/fheroes2
new update for fheroes2, works fine with GOG assets diff --git a/games/fheroes2/Makefile b/games/fheroes2/Makefile index 142b36cf104..3b790750107 100644 --- a/games/fheroes2/Makefile +++ b/games/fheroes2/Makefile @@ -1,6 +1,6 @@ COMMENT = engine recreation for Heroes of Might and Magic 2 -DIST_TUPLE = github ihhub fheroes2 1.0.12 . +DIST_TUPLE = github ihhub fheroes2 1.0.13 . CATEGORIES = games HOMEPAGE = https://ihhub.github.io/fheroes2/ MAINTAINER = Thomas Frohwein diff --git a/games/fheroes2/distinfo b/games/fheroes2/distinfo index 93372c2df96..e1001b64745 100644 --- a/games/fheroes2/distinfo +++ b/games/fheroes2/distinfo @@ -1,2 +1,2 @@ -SHA256 (ihhub-fheroes2-1.0.12.tar.gz) = pbCI/0wcbC4F5y11W7q96MDL6hnevqO1qCtdCLFswr4= -SIZE (ihhub-fheroes2-1.0.12.tar.gz) = 11949016 +SHA256 (ihhub-fheroes2-1.0.13.tar.gz) = 63+WDnfugBLlu6s4W69JWXl+V4RUrOgldKPG/uJPlMg= +SIZE (ihhub-fheroes2-1.0.13.tar.gz) = 11988273
Re: Remove misc/gone?
On Thu, Apr 18, 2024 at 11:42:49PM GMT, Frederic Cambus wrote: > Hi ports@, > > The p2k24 ports hackathon is almost over, but unless I've missed it no > attendees have proposed any ports for deletion. > > So I would like to nominate misc/gone! > > Last release is from 2003 and the program is crashing on at least amd64 > and arm64 when entering a passphrase: > > $ gone > Password: > Segmentation fault (core dumped) > > Comments? OK to remove? > ok solene@
update net/kristall
this updates kristall to latest commit
not sure if we want to keep it, we have
many good gemini browsers nowadays and with
much less dependencies than this one
diff --git a/net/kristall/Makefile b/net/kristall/Makefile
index 185bee8d7fc..a73b2fe4295 100644
--- a/net/kristall/Makefile
+++ b/net/kristall/Makefile
@@ -1,11 +1,10 @@
COMMENT = graphical multi-protocol navigator
-DISTNAME = kristall-202500
+DISTNAME = kristall-2024010500
GH_ACCOUNT = MasterQ32
GH_PROJECT = kristall
-GH_COMMIT =9744a24ffbf4d5ea6ad8b418d740c90336ee33b8
-REVISION = 1
+GH_COMMIT =b4c677cdb5a9d7337758bcad45db5b21e2b85280
CATEGORIES = net x11
@@ -31,6 +30,8 @@ USE_GMAKE = Yes
NO_TEST = Yes
+MAKE_ENV +=KRISTALL_VERSION=${DISTNAME}
+
ALL_TARGET = kristall
.include
diff --git a/net/kristall/distinfo b/net/kristall/distinfo
index 81db07c7eed..6a758256d4b 100644
--- a/net/kristall/distinfo
+++ b/net/kristall/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kristall-202500-9744a24f.tar.gz) =
LmKSQEGWbMpV5G7+Bljhbxg8IKi4mH/a6uh9IuL1qfo=
-SIZE (kristall-202500-9744a24f.tar.gz) = 22016994
+SHA256 (kristall-2024010500-b4c677cd.tar.gz) =
NqtkRCpYcE/lXYdiWbtyNDhIrVLn84P0cV2M8ngoQDk=
+SIZE (kristall-2024010500-b4c677cd.tar.gz) = 22026147
diff --git a/net/kristall/patches/patch-src_kristall_pro
b/net/kristall/patches/patch-src_kristall_pro
deleted file mode 100644
index 0b0c2b9dfef..000
--- a/net/kristall/patches/patch-src_kristall_pro
+++ /dev/null
@@ -1,14 +0,0 @@
-Prevent git run at every ${CC} call
-
-Index: src/kristall.pro
src/kristall.pro.orig
-+++ src/kristall.pro
-@@ -9,7 +9,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets networ
- # deprecated API in order to know how to port your code away from it.
- DEFINES += QT_DEPRECATED_WARNINGS
-
--DEFINES += KRISTALL_VERSION="\"$(shell cd $$PWD; git describe --tags)\""
-+DEFINES += KRISTALL_VERSION="OpenBSD"
-
- # You can also make your code fail to compile if it uses deprecated APIs.
- # In order to do so, uncomment the following line.
diff --git a/net/kristall/pkg/PLIST b/net/kristall/pkg/PLIST
index 757bd7eeec6..5e7a49d14d0 100644
--- a/net/kristall/pkg/PLIST
+++ b/net/kristall/pkg/PLIST
@@ -7,5 +7,7 @@ share/icons/hicolor/64x64/apps/net.random-projects.kristall.png
share/icons/hicolor/scalable/apps/net.random-projects.kristall.svg
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
+share/metainfo/
+share/metainfo/Kristall.metainfo.xml
share/mime/packages/kristall.xml
@tag update-mime-database
remove net/p5-Net-XMPP and net/p5-Net-Jabber
I removed net/sendxmpp which had net/p5-Net-XMPP as a run dependency, however p5-Net-XMPP is used by p5-Net-Jabber but the latter doesn't have any reverse dep. I suggest to remove both as we have no programs using them in ports. ok?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/02/27 06:29:58 Modified files: net: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: net/sendxmpp : distinfo Makefile net/sendxmpp/pkg: DESCR PLIST Log message: remove sendxmpp software barely works, upstream is inactive replaced by go-sendxmpp that is actively maintained ok paco@ maintainer timeout
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/02/27 06:23:24 Modified files: net: Makefile Log message: + go-sendxmpp
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/02/27 06:22:32 Log message: import go-sendxmpp-0.8.3 A command line tool to send messages to an XMPP contact or MUC inspired by sendxmpp. Replaces net/sendxmpp ok paco@ thanks to tb@ for ensuring the Go modules versions were ok Status: Vendor Tag: solene Release Tags: solene_20240227 N ports/net/go-sendxmpp/Makefile N ports/net/go-sendxmpp/distinfo N ports/net/go-sendxmpp/modules.inc N ports/net/go-sendxmpp/pkg/DESCR N ports/net/go-sendxmpp/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/01/24 14:08:06 Modified files: devel/objfw: Makefile distinfo Log message: Update to objfw-1.0.8 Patch from maintainer and upstream Jonathan Schleifer, thanks
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2024/01/17 05:05:34 Modified files: net/lagrange : Makefile distinfo Log message: Update to lagrange-1.17.6 >From maintainer Florian Viehweger, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2023/11/05 01:55:40 Modified files: net/syncthing : Makefile net/syncthing/pkg: PLIST Added files: net/syncthing/pkg: syncthing_discovery.rc syncthing_relay.rc Log message: add rc files for relay and discovery services ok edd@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2023/10/24 03:04:05 Modified files: sysutils/obsdfreqd: Tag: OPENBSD_7_4 Makefile distinfo Log message: update to obsdfreqd-1.2.1 fixes an issue with automatic threshold when not on battery approved by maintainer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2023/10/24 03:02:36 Modified files: sysutils/obsdfreqd: Makefile distinfo Log message: update to obsdfreqd-1.2.1 fixes an issue with automatic threshold when not on battery approved by maintainer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2023/09/25 07:01:11 Modified files: net/vnstat : Makefile distinfo Log message: Update to vnstat-2.11 ok pea@ (maintainer)
update net/vnstat
tested on amd64, works fine, vnstati tested and can produce images
make test gives the same output as previously
ok for commit?
2.11 / 19-Aug-2023
- Fixed
- Database queries worked only if SQLite double-quoted string (DQS)
feature (https://www.sqlite.org/quirks.html#dblquote) was enabled
- Disabling data resolutions in data retention configuration didn't
result in possibly existing database entries getting removed from
the database
- Disabling data resolutions in data retention configuration didn't
result in the data resolution getting disabled but instead storing
data forever
- "expr: syntax error" during configure in BSD (pull request by
namtsui)
- Image output summary would show only "no data available" text in
case of zero total traffic even when the historical data of no
traffic could have been shown instead
- Image output "-o -" content could get corrupted due to info,
warning and error messages also using stdout, configuration file
warnings being the most likely source, now uses stderr in image
output
- Configuration validation was too heavily limiting and enforcing
image output 5 minute graph related configuration options for
combinations that would have resulted in usable images
- New
- Database cleanup has been changed to interpret data retention
configuration as number of entries to be kept instead of calendar
time, this restores the behaviour to similar as it was up to version
1.18, the difference is visible only on systems that aren't powered
all the time
- Database is vacuumed during daemon startup and reload, behaviour is
configurable using VacuumOnStartup and VacuumOnHUPSignal
configuration options
- Add configuration option InterfaceOrder for controlling the
interface order in outputs with multiple interfaces
- Used data retention configuration is made visible during daemon
startup and after configuration reloads
- Daemon will no longer start if all data resolutions have been
disabled in the configuration file
- SQLite version is visible in --version outputs
- Notes
- "Not enough data available yet." message has been replaced with
"No data. Timestamp of last update is same -MM-DD HH:MM:SS as
of database creation." to better explain the reason why there's
nothing to show, this message is expected to disappear within
configured SaveInterval if the interface is active
Index: Makefile
===
RCS file: /cvs/ports/net/vnstat/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile24 May 2023 22:06:48 - 1.37
+++ Makefile25 Sep 2023 07:37:42 -
@@ -1,7 +1,7 @@
COMMENT-main = network traffic monitor
COMMENT-vnstati = image output support for vnstat
-V =2.10
+V =2.11
EPOCH =0
DISTNAME = vnstat-${V}
PKGNAME-main = ${DISTNAME}
Index: distinfo
===
RCS file: /cvs/ports/net/vnstat/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo24 May 2023 22:06:48 - 1.9
+++ distinfo25 Sep 2023 07:37:42 -
@@ -1,2 +1,2 @@
-SHA256 (vnstat-2.10.tar.gz) = qcYXROXNjDZuLbTSgrrcdAId22FL1ltBJAk3mX5FfSU=
-SIZE (vnstat-2.10.tar.gz) = 304464
+SHA256 (vnstat-2.11.tar.gz) = urw/FYPMQOTo/7L1MpbZPTCMtaUEPoUFT26ve0rleFY=
+SIZE (vnstat-2.11.tar.gz) = 312821
new net/go-sendxmpp
this program is meant to replace net/sendxmpp which is unmaintained and broken for most users (one person reported it worked for them but would be happy to switch to something maintained) it's just a command line tool that takes a message in parameter or on stdin and send it to XMPP contacts/MUC. It's working well and maintained ok to import? Once done, I'll ask to remove net/sendxmpp and add a quirk entry to automatically upgrade net/sendxmpp to net/go-sendxmpp, and add a FAQ entry about this change because the configuration file format changed. go-sendxmpp.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2023/09/22 02:45:19 Modified files: www/gotosocial : Makefile distinfo modules.inc www/gotosocial/pkg: PLIST Log message: Update to gotosocial-0.11.1 patch from maintainer Hukadan, thanks!
Re: [UPDATE] x11/windowmaker 0.96.0
Le Thu, 21 Sep 2023 00:11:40 +0200, Joel Carnat a écrit : > Hello, > > WindowMaker has been updated this summer. > Release note is available here: http://www.windowmaker.org/news/ > > Find a diff to port attached. > I'm running it on "OpenBSD/amd64 7.4-beta (GENERIC.MP) #1371" > > Regards, > Joel C. for some reasons I can't compile it cc -DHAVE_CONFIG_H -I. -I/tmp/pobj/WindowMaker-0.96.0/WindowMaker-0.96.0/util -I.. -I/tmp/pobj/WindowMaker-0.96.0/WindowMaker-0.96.0/WINGs -I../wrlib -I/usr/local/include -I/usr/X11R6/include -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\" -I/usr/X11R6/include -I/usr/local/include -DNDEBUG -DOPENBSD -O2 -pipe -std=gnu99 -std=c11 -Wall -Wextra -Wno-sign-compare -Wno-deprecated -Wno-deprecated-declarations -MT wmiv-wmiv.o -MD -MP -MF .deps/wmiv-wmiv.Tpo -c -o wmiv-wmiv.o `test -f 'wmiv.c' || echo '/tmp/pobj/WindowMaker-0.96.0/WindowMaker-0.96.0/util/'`wmiv.c /tmp/pobj/WindowMaker-0.96.0/WindowMaker-0.96.0/util/wmiv.c:27:10: fatal error: 'WINGs/WINGsP.h' file not found #include ^~~~ 1 error generated. gmake[3]: *** [Makefile:794: wmiv-wmiv.o] Error 1 gmake[3]: Leaving directory '/tmp/pobj/WindowMaker-0.96.0/build-amd64/util' gmake[2]: *** [Makefile:820: all-recursive] Error 1 gmake[2]: Leaving directory '/tmp/pobj/WindowMaker-0.96.0/build-amd64/util' gmake[1]: *** [Makefile:498: all-recursive] Error 1 gmake[1]: Leaving directory '/tmp/pobj/WindowMaker-0.96.0/build-amd64' gmake: *** [Makefile:434: all] Error 2
