Re: [update] Elvish 0.16.3 -> 0.21.0

[Brian Callahan]

On 8/29/2024 1:19 PM, Stuart Henderson wrote:
> On 2024/08/29 16:49, Jag Talon wrote:
>> Hello! Wanted to bump this for review. 
>>
>> Does the upgrade work well for people?
> 
> I don't expect there to be loads of interest in this port.
> hopefully ${MAINTAINER} will get back to you :)
> 

I am here, just unfortunately very busy. I will try to get to this as
fast as I can.

~Brian

Re: UPDATE: math/R

[Brian Callahan]

On 8/25/2024 4:28 AM, Ingo Feinerer wrote:
>   Regarding 
> math/rstudio/patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp
>   bcallah@: Could you please bump this after the R update?
> 

Yes, can do.

~Brian

Re: UPDATE www/dooble to 2024.08.20

[Brian Callahan]

On 8/22/2024 1:42 PM, izzy Meyer wrote:
> On Thu, 22 Aug 2024 15:44:39 +0100
> Stuart Henderson  wrote:
> 
>>
>> The patch filename should have changed
>>
>> make patch
>> rm patches/patch-dooble_desktop
>> make update-patches
>>
> 
> Oops! Sorry. Here's a fixed diff.
> 
> This good?
> 

Thanks izzy. Will test and commit shortly.

~Brian

Re: sysutils/ugrep: Update to 6.4.0

[Brian Callahan]

On 8/8/2024 8:04 AM, wen heping wrote:
> Hi,
> 
>Here is a patch for sysutils/ugrep to update to 6.4.0.
>It build and run well and pass all tests on amd64-current system.
> 
> 
> Best Regards,
> wen

Committed (with a regen of patch-configure). Thanks!

~Brian

Re: sysutils/ugrep: Update to 6.4.0

[Brian Callahan]

On 8/8/2024 8:04 AM, wen heping wrote:
> Hi,
> 
>Here is a patch for sysutils/ugrep to update to 6.4.0.
>It build and run well and pass all tests on amd64-current system.
> 
> 
> Best Regards,
> wen

Thanks for this. Will test and commit shortly.

~Brian

Re: [update] games/openrct2 to 0.4.12

[Brian Callahan]

Hi Lucas --

On 7/28/2024 9:39 PM, Lucas Raab wrote:
> Hello,
> 
> Here's an update for OpenRCT2 to 0.4.12 that's worked on amd64/aarch64
> so far. Other tests?
> 
> changelog: https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.12
> 
> Thanks,
> Lucas

Looks like OBJECTS_V should be updated to 1.4.6:
https://github.com/OpenRCT2/OpenRCT2/blob/v0.4.12/CMakeLists.txt#L67

amd64/aarch64 is enough for testing I think. Maybe i386 and/or riscv64?

OK for me, assuming updating OBJECTS_V to 1.4.6 continues to work OK.

Thanks.

~Brian

NEW: sysutils/repology

[Brian Callahan]

Hi ports --

Attached is a new port, sysutils/repology. Repology is a command line 
utility for Repology.org.


I'm sure I'm not the only one who uses repology to track my outdated 
ports. With this, I can run a command in my terminal:

repology --maintainer  --outdated

and get all the info I need for my ports that need updating. It's useful 
to me and I figure it might be useful to others.


OK?

~Brian

repology.tgz
Description: application/compressed-tar

NEW: www/tuba

[Brian Callahan]

Hi ports --

Attached is a new port, www/tuba. Tuba is a desktop app for browsing the 
Fediverse.


This works OK for me on amd64. There is a small piece of runtime setup 
which is documented here: 
https://github.com/GeopJr/Tuba/wiki/keyring-issues -- Tuba will give you 
this link when you launch it for the first time. This is why there are 
RDEPS and gnome-keyring and seahorse. I can put an explanatory comment 
in the port Makefile about this if people think it makes sense.


OK?

~Brian

tuba.tgz
Description: application/compressed-tar

UPDATE: games/openjazz 20190120 => 20231028

[Brian Callahan]

Hi ports --

Here is an update to the open source Jazz Jackrabbit engine. Works OK on 
amd64, anyone else want to try it out?


~BrianIndex: Makefile
===
RCS file: /cvs/ports/games/openjazz/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile	24 Apr 2023 11:40:41 -	1.4
+++ Makefile	5 Jul 2024 02:11:31 -
@@ -1,13 +1,9 @@
 COMMENT =	open-source version of the classic Jazz Jackrabbit games
-DISTNAME =	openjazz-20190120
-REVISION =	1
 CATEGORIES =	games x11
 
-# Upstream does make real tarballs.
-# Will switch to those next release.
 GH_ACCOUNT =	AlisterT
 GH_PROJECT =	openjazz
-GH_COMMIT =	9e6ed1f4e1ed8581e49686fd64e69cfcd37bf558
+GH_TAGNAME =	20231028
 
 HOMEPAGE =	http://www.alister.eu/jazz/oj/
 MAINTAINER =	Brian Callahan 
@@ -15,29 +11,15 @@ MAINTAINER =	Brian Callahan 
Index: distinfo
===
RCS file: /cvs/ports/games/openjazz/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	8 Aug 2019 23:08:26 -	1.1.1.1
+++ distinfo	5 Jul 2024 02:11:31 -
@@ -1,2 +1,2 @@
-SHA256 (openjazz-20190120-9e6ed1f4.tar.gz) = 41LF2/PvugyqdvbxW2fdvBQQSMKN+nH5j8iKda67abo=
-SIZE (openjazz-20190120-9e6ed1f4.tar.gz) = 393226
+SHA256 (openjazz-20231028.tar.gz) = xF/0FNyEZWOteuS2yEj5OKtpXrSub5WIVrP6QJ2guKw=
+SIZE (openjazz-20231028.tar.gz) = 417317
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt	5 Jul 2024 02:11:31 -
@@ -0,0 +1,42 @@
+Don't do git.
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -202,36 +202,6 @@ endif()
+ # version
+ 
+ string(TIMESTAMP OJ_DATE "%Y-%m-%d")
+-include(GetGitRevisionDescription)
+-git_get_exact_tag(GIT_TAG)
+-# Do not include a hash, if we are building a release tag
+-if(NOT GIT_TAG)
+-	# otherwise concatenate a version with hash
+-	git_describe(GIT_DESCRIPTION)
+-	if(GIT_DESCRIPTION)
+-		string(REPLACE "-" ";" GIT_DESCRIPTION ${GIT_DESCRIPTION})
+-		list(LENGTH GIT_DESCRIPTION GIT_DESCRIPTION_PARTS)
+-		if(GIT_DESCRIPTION_PARTS EQUAL 3)
+-			list(GET GIT_DESCRIPTION 0 GIT_TAG)
+-			list(GET GIT_DESCRIPTION 1 GIT_COMMITS)
+-			list(GET GIT_DESCRIPTION 2 GIT_HASH)
+-			set(GIT_STATUS "${GIT_COMMITS} commits since tag \"${GIT_TAG}\", ")
+-			string(PREPEND GIT_COMMITS "+")
+-		else()
+-			# no tags found, only hash
+-			list(GET GIT_DESCRIPTION 0 GIT_HASH)
+-		endif()
+-		# strip the g prefix
+-		string(SUBSTRING ${GIT_HASH} 1 -1 GIT_HASH)
+-		set(OJ_VERSION_GIT "git${GIT_COMMITS}@${GIT_HASH}")
+-		string(APPEND GIT_STATUS "object hash is ${GIT_HASH}")
+-		git_local_changes(GIT_DIRTY)
+-		if(GIT_DIRTY STREQUAL "DIRTY")
+-			string(APPEND OJ_VERSION_GIT "-dirty")
+-			string(APPEND GIT_STATUS ", with uncommitted changes")
+-		endif()
+-	endif()
+-endif()
+ set_property(SOURCE src/version.cpp PROPERTY COMPILE_DEFINITIONS
+ 	OJ_VERSION="${PROJECT_VERSION}"; OJ_DATE="${OJ_DATE}";
+ 	$<$:OJ_VERSION_GIT="${OJ_VERSION_GIT}">)
Index: patches/patch-src_io_network_cpp
===
RCS file: /cvs/ports/games/openjazz/patches/patch-src_io_network_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_io_network_cpp
--- patches/patch-src_io_network_cpp	11 Mar 2022 19:04:45 -	1.2
+++ patches/patch-src_io_network_cpp	5 Jul 2024 02:11:31 -
@@ -3,9 +3,9 @@ Missing netinet/in.h and sys/select.h
 Index: src/io/network.cpp
 --- src/io/network.cpp.orig
 +++ src/io/network.cpp
-@@ -41,6 +41,8 @@
- 		#define EWOULDBLOCK WSAEWOULDBLOCK
- 		#define MSG_NOSIGNAL 0
+@@ -43,6 +43,8 @@
+ 			#define EWOULDBLOCK WSAEWOULDBLOCK
+ 		#endif
  	#else
 +		#include 
 +		#include 
Index: patches/patch-src_menu_mainmenu_cpp
===
RCS file: patches/patch-src_menu_mainmenu_cpp
diff -N patches/patch-src_menu_mainmenu_cpp
--- patches/patch-src_menu_mainmenu_cpp	11 Mar 2022 19:04:45 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-Full path to openjazz.000
-
-Index: src/menu/mainmenu.cpp
 src/menu/mainmenu.cpp.orig
-+++ src/menu/mainmenu.cpp
-@@ -50,7 +50,7 @@ MainMenu::MainMenu () {
- 
- 	try {
- 
--		file = new File("openjazz.000", false);
-+		file = new File("${TRUEPREFIX}/share/openjazz/openjazz.000", false);
- 
- 	} catch (int e) {
- 
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/openjazz/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST	11 Mar 2022 19:04:45 -	1.3
+++ pkg/PLIST	5 Jul 2024 02:11:31 -
@@ -4,7

Re: 回复: shall we create new port lang/cython3 ?

[Brian Callahan]

On 7/4/24 10:54, Stuart Henderson wrote:

On 2024/06/30 14:53, Stuart Henderson wrote:

On 2024/06/28 18:44, Daniel Dickman wrote:

These use python 2 and fail with cython 3:

games/pygame_sdl2
games/renpy


please mark these as BROKEN


I will get on updating these as soon as I am able. For now BROKEN is best.

~Brian

UPDATE: sysutils/mangl 1.1.2 => 1.1.5

[Brian Callahan]

Hi ports --

Attached is a simple update to mangl. Changelog is here: 
https://github.com/zigalenarcic/mangl/compare/v1.1.2...v1.1.5


If anyone can come up with a more elegant solution for the 
mandoc/configure patch, I would welcome that.


OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/sysutils/mangl/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile	14 Aug 2022 13:16:09 -	1.8
+++ Makefile	2 Jul 2024 03:37:48 -
@@ -3,24 +3,28 @@ CATEGORIES =	sysutils x11
 
 GH_ACCOUNT =	zigalenarcic
 GH_PROJECT =	mangl
-GH_TAGNAME =	v1.1.2
+GH_TAGNAME =	v1.1.5
 
 MAINTAINER =	Brian Callahan 
 
 # BSD
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += GL c freetype glfw m util z
+WANTLIB += GL bz2 c freetype glfw m util z
 
 DEBUG_PACKAGES =	${BUILD_PACKAGES}
 
-LIB_DEPENDS =	graphics/glfw
+LIB_DEPENDS =	archivers/bzip2 \
+		graphics/glfw
+
+RUN_DEPENDS =	devel/desktop-file-utils \
+		x11/gtk+4,-guic
 
 CONFIGURE_STYLE =	simple
 
 USE_GMAKE =	Yes
 ALL_TARGET =	mangl
-MAKE_FLAGS =	CC="${CC}" CFLAGS="${CFLAGS}"
+MAKE_FLAGS =	CC="${CC}" FLAGS="${CFLAGS}"
 
 NO_TEST =	Yes
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/mangl/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo	14 Aug 2022 13:16:09 -	1.6
+++ distinfo	2 Jul 2024 03:37:48 -
@@ -1,2 +1,2 @@
-SHA256 (mangl-1.1.2.tar.gz) = qPafMNLb3a/7nHZmaXOa0Mg41n6V14BvfO4zK7ME3Hs=
-SIZE (mangl-1.1.2.tar.gz) = 1985296
+SHA256 (mangl-1.1.5.tar.gz) = i7uttm0csw1+kU5bcZk5l+Z8WRA8VchgFBDu2jUGIVc=
+SIZE (mangl-1.1.5.tar.gz) = 1994968
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/sysutils/mangl/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile	29 Jun 2022 13:37:17 -	1.5
+++ patches/patch-Makefile	2 Jul 2024 03:37:48 -
@@ -1,4 +1,5 @@
 Remove hardcoded optimization flags.
+Remove a warning flag that clang doesn't understand.
 
 Index: Makefile
 --- Makefile.orig
@@ -6,17 +7,25 @@ Index: Makefile
 @@ -1,6 +1,6 @@
  include mandoc/Makefile.local
  
--CFLAGS = -g -O2 -Wall $(shell pkg-config --cflags zlib gl freetype2 glfw3)
-+CCFLAGS += -Wall $(shell pkg-config --cflags zlib gl freetype2 glfw3)
- LDFLAGS = -lm $(shell pkg-config --libs zlib gl freetype2 glfw3) ${LDADD}
+-CFLAGS = -g -O2 -Wall -Wno-maybe-uninitialized $(shell pkg-config --cflags zlib gl freetype2 glfw3)
++CFLAGS = $(FLAGS) -Wall $(shell pkg-config --cflags zlib gl freetype2 glfw3)
+ LDFLAGS = -lm $(shell pkg-config --libs zlib gl freetype2 glfw3) ${LDADD} -lbz2
  
  LIBMAN_OBJS	 = mandoc/man.o \
-@@ -56,7 +56,7 @@ MANGL_SOURCES = mandoc/tree.c \
- main.c
+@@ -66,12 +66,12 @@ sanitizer: mangl
+ install: mangl
+ 	mkdir -p ${DESTDIR}${BINDIR}
+ 	mkdir -p ${DESTDIR}${MANDIR}/man1
+-	mkdir -p ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/
+-	mkdir -p ${DESTDIR}/usr/share/applications/
++	mkdir -p ${DESTDIR}${TRUEPREFIX}/share/icons/hicolor/scalable/apps/
++	mkdir -p ${DESTDIR}${TRUEPREFIX}/share/applications/
+ 	${INSTALL_PROGRAM} mangl ${DESTDIR}${BINDIR}
+ 	${INSTALL_MAN} mangl.1 ${DESTDIR}${MANDIR}/man1/
+-	${INSTALL_DATA} art/mangl.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/mangl.svg
+-	${INSTALL_DATA} mangl.desktop ${DESTDIR}/usr/share/applications/mangl.desktop
++	${INSTALL_DATA} art/mangl.svg ${DESTDIR}${TRUEPREFIX}/share/icons/hicolor/scalable/apps/mangl.svg
++	${INSTALL_DATA} mangl.desktop ${DESTDIR}${TRUEPREFIX}/share/applications/mangl.desktop
  
- mangl: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(MANGL_SOURCES)
--	$(CC) $(CFLAGS) -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(MANGL_SOURCES) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(MANGL_SOURCES) $(LDFLAGS)
- 
- sanitizer: CFLAGS += -fsanitize=address
- sanitizer: mangl
+ .PHONY: clean
+ clean:
Index: patches/patch-mandoc_configure
===
RCS file: patches/patch-mandoc_configure
diff -N patches/patch-mandoc_configure
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-mandoc_configure	2 Jul 2024 03:37:48 -
@@ -0,0 +1,47 @@
+Force use of less as pager (these tests fail?)
+
+Index: mandoc/configure
+--- mandoc/configure.orig
 mandoc/configure
+@@ -349,34 +349,17 @@ fi
+ 
+ # --- pager ---
+ manual=
+-if [ -n "${BINM_PAGER}" ]; then
+-	manual=" (manual)"
+-elif less test-noop.c 1>/dev/null 2>&3; then
+-	BINM_PAGER=less
+-	echo "tested less: yes" 1>&2
+-	echo "tested less: yes" 1>&3
+-else
+-	BINM_PAGER=more
+-	echo "tested less: no" 1>&2
+-	echo "tested less: no" 1>&3
+-fi
++BINM_PAGER=less
++echo "tested less: yes" 1>&2
++echo "tested less: yes" 1>&3
+ echo &

UPDATE: lang/apl 1.8 => 1.9

[Brian Callahan]

Hi ports --

GNU APL had a new release. It is claimed to simply be a bugfix release. 
However, there is a good bit of churn in our patches.


Are there any APL users on the list? Diff attached.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/lang/apl/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile	15 Nov 2023 19:52:44 -	1.11
+++ Makefile	2 Jul 2024 00:06:02 -
@@ -1,10 +1,9 @@
 COMMENT =	interpreter for the programming language APL
-DISTNAME =	apl-1.8
-REVISION =	2
+DISTNAME =	apl-1.9
 CATEGORIES =	lang
 
 SHARED_LIBS +=	_sql  0.0 # 0.0
-SHARED_LIBS +=	emacs 0.1 # 0.1
+SHARED_LIBS +=	emacs 1.0 # 1.0
 
 HOMEPAGE =	https://www.gnu.org/software/apl/
 MAINTAINER =	Brian Callahan 
@@ -12,14 +11,15 @@ MAINTAINER =	Brian Callahan 
- #include 
- #include 
- #include 
-@@ -41,6 +42,7 @@ enum { MAX_RANK = MAX_RANK_WANTED };
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- 
Index: patches/patch-src_Output_cc
===
RCS file: patches/patch-src_Output_cc
diff -N patches/patch-src_Output_cc
--- patches/patch-src_Output_cc	11 Mar 2022 19:28:48 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-Fix for startup segfault.
-http://svn.savannah.gnu.org/viewvc/apl?view=revision&revision=1180
-
-Index: src/Output.cc
 src/Output.cc.orig
-+++ src/Output.cc
-@@ -89,8 +89,6 @@ int Output::color_UERR_background = 8;
- /// a filebuf for CERR
- ErrOut CERR_filebuf;
- 
--bool ErrOut::used = false;
--
- DiffOut DOUT_filebuf(false);
- DiffOut UERR_filebuf(true);
- 
Index: patches/patch-src_Quad_GTK_cc
===
RCS file: patches/patch-src_Quad_GTK_cc
diff -N patches/patch-src_Quad_GTK_cc
--- patches/patch-src_Quad_GTK_cc	11 Mar 2022 19:28:48 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-Index: src/Quad_GTK.cc
 src/Quad_GTK.cc.orig
-+++ src/Quad_GTK.cc
-@@ -387,7 +387,7 @@ pollfd fds[count];
-loop(w, count)
-{
-  fds[w].fd = open_windows[w].fd;
-- fds[w].events = POLLIN | POLLRDHUP;
-+ fds[w].events = POLLIN | POLLHUP;
-  fds[w].revents = 0;
-}
- 
-@@ -414,7 +414,7 @@ again:
- 
- pollfd pfd;
-pfd.fd = fd;
--   pfd.events = POLLIN | POLLRDHUP;
-+   pfd.events = POLLIN | POLLHUP;
-pfd.revents = 0;
- 
- const int ready = poll(&pfd, 1, 0);
Index: patches/patch-src_Quad_PNG_cc
===
RCS file: patches/patch-src_Quad_PNG_cc
diff -N patches/patch-src_Quad_PNG_cc
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_Quad_PNG_cc	2 Jul 2024 00:06:02 -
@@ -0,0 +1,27 @@
+Clang says this results in undefined behavior.
+We conditionally want GTK and PNG, so just say so.
+
+Index: src/Quad_PNG.cc
+--- src/Quad_PNG.cc.orig
 src/Quad_PNG.cc
+@@ -36,18 +36,11 @@ Quad_PNG  Quad_PNG::fun;
+ 
+ /// PNG_GTK defines whether ⎕PNG B with ⍴⍴B ←→ 3 (display of a PNG file in a
+ /// GTK window  shall be supported, Requires libgtk in addition to libnpng.
+-#define PNG_GTK	\
+-apl_X11  && \
+-defined( apl_GTK3  ) && \
+-defined( HAVE_LIBGTK_3 ) 
++#define PNG_GTK 1
+ 
+ /// PNG_LIBS defines if the PNG related libraries (and their header files)
+ /// are present
+-#define	PNG_LIBS	  \
+-defined( HAVE_LIBZ   ) && \
+-defined( HAVE_ZLIB_H ) && \
+-defined( HAVE_LIBPNG ) && \
+-defined( HAVE_LIBPNG16_PNG_H )
++#define	PNG_LIBS 1
+ 
+ #if PNG_LIBS
+ # include 
Index: patches/patch-src_Workspace_cc
===
RCS file: patches/patch-src_Workspace_cc
diff -N patches/patch-src_Workspace_cc
--- patches/patch-src_Workspace_cc	11 Mar 2022 19:28:48 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,20 +0,0 @@
-Fix for startup segfault.
-http://svn.savannah.gnu.org/viewvc/apl?view=revision&revision=1180
-
-Index: src/Workspace.cc
 src/Workspace.cc.orig
-+++ src/Workspace.cc
-@@ -61,6 +61,13 @@ Workspace::Workspace()
-distinguished_names.add_function(q, ID_ ## x, x::fun); }
- 
- #include "SystemVariable.def"
-+
-+   // (re-) instantiate ⎕CR, ⎕EC, and ⎕ES needed by macros...
-+   // This is (in theory) not needed, but may be for some compilers
-+   //
-+   new (&Quad_CR::_fun)   Quad_CR;   Quad_CR::fun = &Quad_CR ::_fun;
-+   new (&Quad_EC::_fun)   Quad_EC;   Quad_EC::fun = &Quad_EC ::_fun;
-+   new (&Quad_ES::_fun)   Quad_ES;   Quad_ES::fun = &Quad_ES ::_fun;
- }
- //-
- void
Index: patches/patch-src_buildtag
=

Re: math/veusz: BUILD_DEPENDS on textproc/py-tomli

[Brian Callahan]

On 06/30/2024 01:03 PM, Caspar Schutijser wrote:

Hi,

I locally have an update to devel/py-sip that will not depend on
textproc/py-tomli anymore. Therefore, this port needs to depend on it
explicitly (only at build-time, as far as I can see from the sources).

OK?



Yes, OK. Thanks.

~Brian


Caspar


Index: Makefile
===
RCS file: /cvs/ports/math/veusz/Makefile,v
diff -u -p -r1.37 Makefile
--- Makefile6 May 2024 12:23:45 -   1.37
+++ Makefile30 Jun 2024 17:00:54 -
@@ -2,7 +2,7 @@ COMMENT =   scientific plotting and graphi
 MODPY_EGG_VERSION =3.6.2
 DISTNAME = veusz-${MODPY_EGG_VERSION}
 CATEGORIES =   math graphics
-REVISION = 0
+REVISION = 1

 HOMEPAGE = https://veusz.github.io/
 MAINTAINER =   Brian Callahan 
@@ -21,6 +21,7 @@ MODPY_SETUPTOOLS =Yes

 BUILD_DEPENDS =devel/py-sip${MODPY_FLAVOR} \
math/py-numpy${MODPY_FLAVOR} \
+   textproc/py-tomli${MODPY_FLAVOR} \
x11/py-qt5${MODPY_FLAVOR}

 RUN_DEPENDS =  math/py-numpy${MODPY_FLAVOR} \

Re: aarch64 bulk build report

[Brian Callahan]

On 6/28/2024 12:32 PM, Jeremie Courreges-Anglas wrote:
> On Fri, Jun 28, 2024 at 04:04:44PM +0000, Brian Callahan wrote:
>> On 6/28/2024 8:35 AM, phess...@openbsd.org wrote:
>>> http://build-failures.rhaalovely.net/aarch64/2024-06-25/games/openrct2.log
>>
>> This one is probably because -Werror is turned on and it probably
>> shouldn't be. Diff attached.
>>
>> OK?
> 
> I consider -Werror as harmful in ports, ok jca@
> 

Thanks.

> That being said, it would be nice for someone who cares about this
> port to test it on arm64.
> 

Agreed. I'd do it myself, but I don't have any arm64 hardware at the
moment...

~Brian

Re: aarch64 bulk build report

[Brian Callahan]

On 6/28/2024 8:35 AM, phess...@openbsd.org wrote:
> http://build-failures.rhaalovely.net/aarch64/2024-06-25/games/openrct2.log

This one is probably because -Werror is turned on and it probably
shouldn't be. Diff attached.

OK?

~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/openrct2/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile29 May 2024 09:56:15 -  1.23
+++ Makefile28 Jun 2024 16:02:00 -
@@ -15,6 +15,7 @@ DISTFILES.c = opensfx-${OPENSFX_V}{open
 DISTFILES.d =  openmsx-${OPENMSX_V}{openmusic}.zip
 DISTFILES.e =  replays-${REPLAYS_V}{replays}.zip
 PKGNAME =  openrct2-${V}
+REVISION = 0
 CATEGORIES =   games x11
 
 HOMEPAGE = https://openrct2.org/
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt28 Jun 2024 16:02:00 -
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -332,7 +332,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}")
+ 
Index: patches/patch-src_openrct2_core_String_cpp
===
RCS file: /cvs/ports/games/openrct2/patches/patch-src_openrct2_core_String_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_openrct2_core_String_cpp
--- patches/patch-src_openrct2_core_String_cpp  31 May 2024 07:38:36 -  
1.1
+++ patches/patch-src_openrct2_core_String_cpp  28 Jun 2024 16:02:00 -
@@ -1,7 +1,7 @@
 Index: src/openrct2/core/String.cpp
 --- src/openrct2/core/String.cpp.orig
 +++ src/openrct2/core/String.cpp
-@@ -15,7 +15,7 @@
+@@ -14,7 +14,7 @@
  #include 
  #include 
  #ifndef _WIN32

lang/gcc/11: Enable gdc for riscv64

[Brian Callahan]

Hello --

I was recently gifted a SiFive Unleashed system. Attached is a diff to
build gdc on riscv64. I am able to build D programs on my machine with it.

Would appreciate other eyes on especially the build system parts to make
sure I didn't break anything. Eyes on the riscv64 assembly also appreciated.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/lang/gcc/11/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile15 Apr 2024 23:00:53 -  1.33
+++ Makefile25 Jun 2024 06:24:27 -
@@ -9,7 +9,7 @@ ONLY_FOR_ARCHS = aarch64 alpha amd64 arm
powerpc powerpc64 riscv64 sparc64
 
 ONLY_FOR_ARCHS-ada = amd64 i386 mips64 powerpc
-ONLY_FOR_ARCHS-dlang = aarch64 amd64 arm i386 powerpc powerpc64
+ONLY_FOR_ARCHS-dlang = aarch64 amd64 arm i386 powerpc powerpc64 riscv64
 
 DPB_PROPERTIES = parallel
 
@@ -18,7 +18,7 @@ USE_NOEXECONLY = Yes
 V = 11.2.0
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
-REVISION = 13
+REVISION = 14
 REVISION-c++ = 14
 
 ADASTRAP-amd64 = adastrap-amd64-$V-4.tar.xz
Index: patches/patch-libphobos_configure
===
RCS file: /cvs/ports/lang/gcc/11/patches/patch-libphobos_configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libphobos_configure
--- patches/patch-libphobos_configure   11 Mar 2022 19:28:58 -  1.2
+++ patches/patch-libphobos_configure   25 Jun 2024 06:24:27 -
@@ -1,15 +1,16 @@
-Add fiber asm for powerpc64, to avoid
+Add fiber asm for powerpc64 and riscv64, to avoid
 "configure: error: setcontext required but not found"
 
 Index: libphobos/configure
 --- libphobos/configure.orig
 +++ libphobos/configure
-@@ -15196,7 +15196,7 @@ fi
+@@ -15196,7 +15196,8 @@ fi
  aarch64* | \
  arm* | \
  i[34567]86|x86_64 | \
 -powerpc)
-+powerpc*)
++powerpc* | \
++riscv64)
druntime_fiber_asm_external=yes
;;
esac
Index: patches/patch-libphobos_libdruntime_Makefile_in
===
RCS file: 
/cvs/ports/lang/gcc/11/patches/patch-libphobos_libdruntime_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libphobos_libdruntime_Makefile_in
--- patches/patch-libphobos_libdruntime_Makefile_in 11 Mar 2022 19:28:58 
-  1.2
+++ patches/patch-libphobos_libdruntime_Makefile_in 25 Jun 2024 06:24:27 
-
@@ -1,7 +1,60 @@
 Index: libphobos/libdruntime/Makefile.in
 --- libphobos/libdruntime/Makefile.in.orig
 +++ libphobos/libdruntime/Makefile.in
-@@ -775,8 +775,9 @@ ALL_DRUNTIME_SOURCES = $(DRUNTIME_DSOURCES) $(DRUNTIME
+@@ -126,6 +126,7 @@ target_triplet = @target@
+ @DRUNTIME_CPU_ARM_TRUE@am__append_12 = config/arm/switchcontext.S
+ @DRUNTIME_CPU_MIPS_TRUE@am__append_13 = config/mips/switchcontext.S
+ @DRUNTIME_CPU_POWERPC_TRUE@am__append_14 = config/powerpc/switchcontext.S
++@DRUNTIME_CPU_RISCV64_TRUE@am__append_19 = config/riscv64/switchcontext.S
+ @DRUNTIME_CPU_X86_TRUE@@DRUNTIME_OS_MINGW_TRUE@am__append_15 = 
config/mingw/switchcontext.S
+ @DRUNTIME_CPU_X86_TRUE@@DRUNTIME_OS_MINGW_FALSE@am__append_16 = 
config/x86/switchcontext.S
+ @DRUNTIME_CPU_SYSTEMZ_TRUE@am__append_17 = config/systemz/get_tls_offset.S
+@@ -449,6 +450,7 @@ am__objects_21 = core/sys/solaris/dlfcn.lo core/sys/so
+ @DRUNTIME_CPU_ARM_TRUE@am__objects_24 = 
config/arm/libgdruntime_la-switchcontext.lo
+ @DRUNTIME_CPU_MIPS_TRUE@am__objects_25 = 
config/mips/libgdruntime_la-switchcontext.lo
+ @DRUNTIME_CPU_POWERPC_TRUE@am__objects_26 = 
config/powerpc/libgdruntime_la-switchcontext.lo
++@DRUNTIME_CPU_RISCV64_TRUE@am__objects_47 = 
config/riscv64/libgdruntime_la-switchcontext.lo
+ @DRUNTIME_CPU_X86_TRUE@@DRUNTIME_OS_MINGW_TRUE@am__objects_27 = 
config/mingw/libgdruntime_la-switchcontext.lo
+ @DRUNTIME_CPU_X86_TRUE@@DRUNTIME_OS_MINGW_FALSE@am__objects_28 = 
config/x86/libgdruntime_la-switchcontext.lo
+ @DRUNTIME_CPU_SYSTEMZ_TRUE@am__objects_29 = 
config/systemz/libgdruntime_la-get_tls_offset.lo
+@@ -458,7 +460,8 @@ am__objects_31 = $(am__objects_4) $(am__objects_6) $(a
+   $(am__objects_16) $(am__objects_18) $(am__objects_20) \
+   $(am__objects_22) $(am__objects_23) $(am__objects_24) \
+   $(am__objects_25) $(am__objects_26) $(am__objects_27) \
+-  $(am__objects_28) $(am__objects_29) $(am__objects_30)
++  $(am__objects_28) $(am__objects_29) $(am__objects_30) \
++  $(am__objects_47)
+ am__objects_32 = gcc/config.lo gcc/libbacktrace.lo
+ am__objects_33 = $(am__objects_1) $(am__objects_2) $(am__objects_31) \
+   $(am__objects_32)
+@@ -472,6 +475,7 @@ am__objects_34 = core/stdc/libgdruntime_convenience_la
+ @DRUNTIME_CPU_ARM_TRUE@am__objects_37 = 
config/arm/libgdruntime_convenience_la-switchcontext.lo
+ @DRUNTIME_CPU_MIPS_TRUE@am__objects_38 = 
config/mips/libgdruntime_convenience_la-switchcontext.lo
+ @DRUNTIME_CPU_POWERPC_TRUE@am__objects_39 = 
config/powerpc/libgdruntime_convenience_la-switchcontext.lo
++@DRUNTIME_CPU

Re: lang/dmd and lang/ldc are not appearing in 7.5 packages

[Brian Callahan]

On 6/24/2024 7:54 PM, Jeremy Baxter wrote:
> Stuart Henderson  writes:
>> They were broken during the 7 5 release and have since been fixed in 
>> -current.
> 
> Weird both of them broke. Thanks for the reply.
> 

Now with some improved processes, I can address breakages more quickly.

~Brian

Re: Fix algol68g on non-x86

[Brian Callahan]

On 6/4/2024 7:16 AM, Jeremie Courreges-Anglas wrote:
> 
> The diff at the end lets me build an algol68g package on riscv64 - and
> virtually any non-x86 architecture.  make package/test passes on
> riscv64.
> 
> However, configure.ac only recognizes OpenBSD/amd64 as tested, and
> thus builds a minimal version on other archs.  It doesn't make much
> sense to me (all our platforms have IEEE754 FP now) and I'd rather
> build the same package everywhere.  But that would require either
> patching configure or using autoreconf.  Addressing this could be
> delayed until it goes upstream.  Thoughts?
> 
> |Index: patches/patch-configure_ac
> |===
> |RCS file: patches/patch-configure_ac
> |diff -N patches/patch-configure_ac
> |--- /dev/null1 Jan 1970 00:00:00 -
> |+++ patches/patch-configure_ac   4 Jun 2024 07:28:27 -
> |@@ -0,0 +1,15 @@
> |+All our architectures have IEEE754 floating point, build the same set of
> |+features on all of them.
> |+
> |+Index: configure.ac
> |+--- configure.ac.orig
> | configure.ac
> |+@@ -99,7 +99,7 @@ case "$host" in
> |+ # OpenBSD.
> |+ #
> |+ 
> |+-*86-*-openbsd* | *86_64-*-openbsd*) 
> |++*-openbsd*)
> |+   AC_DEFINE(BUILD_BSD, 1, [Define this if OpenBSD was detected]) 
> |+   AC_DEFINE(HAVE_IEEE_754, 1, [Define this if IEEE_754 compliant]) 
> |+   bsd_include_dirs=yes
> 
> Now fo the minimal fix.  The src/a68g/parser-scanner.c patch fixes the
> cause of the build failure spotted on riscv64 and arm64[0]: when
> building a minimal package, ncurses isn't used and thus FALSE from
> ncurses.h isn't available.  Just use A68_FALSE as was probably
> intended.
> 
> Bumping REVISION is cheap but probably not required.  ok for the
> the diff below, or also for the full proposal?
> 
> Brian, do you wish to take care of upstreaming these fixes?  Else I
> can handle it as time permits.
> 

Yes ok for the full proposal. And yes, I will upstream. Upstream is
quite responsive.

~Brian

> 
> [0] http://build-failures.rhaalovely.net/aarch64/2024-05-29/lang/algol68g.log
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/algol68g/Makefile,v
> diff -u -p -r1.16 Makefile
> --- Makefile  21 May 2024 14:48:06 -  1.16
> +++ Makefile  4 Jun 2024 07:28:27 -
> @@ -1,5 +1,6 @@
>  COMMENT =Algol 68 Genie compiler-interpreter
>  DISTNAME =   algol68g-3.5.2
> +REVISION =   0
>  CATEGORIES = lang
>  
>  HOMEPAGE =   https://jmvdveer.home.xs4all.nl/algol.html
> Index: patches/patch-src_a68g_parser-scanner_c
> ===
> RCS file: patches/patch-src_a68g_parser-scanner_c
> diff -N patches/patch-src_a68g_parser-scanner_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_a68g_parser-scanner_c   4 Jun 2024 07:28:27 -
> @@ -0,0 +1,14 @@
> +Don't depend on curses defining FALSE.
> +
> +Index: src/a68g/parser-scanner.c
> +--- src/a68g/parser-scanner.c.orig
>  src/a68g/parser-scanner.c
> +@@ -856,7 +856,7 @@ char *pragment (int type, LINE_T ** ref_l, char **ref_
> + ADD_ONE_CHAR (c);
> + c = next_char (ref_l, ref_c, A68_FALSE);
> +   }
> +-  scan_next = FALSE;
> ++  scan_next = A68_FALSE;
> + } else if (IS_PRINT (c) || IS_SPACE (c)) {
> +   ADD_ONE_CHAR (c);
> + }
> 
> 

Re: [New] lang/nelua

[Brian Callahan]

Hello Nicolas --

On 5/27/2024 11:51 AM, Nicolas Sampaio wrote:
> Hi,
> 
> home: https://nelua.io/ 
> 
> comment: programming language with a lua flavor.
> 
> descr: Nelua is a minimal, statically-typed and meta-programmable 
> systems programming language heavily inspired by Lua, which compiles to
> C and native code.
> 
> I'm open to suggestions.
> 
> Reis
As a step in the right direction, how about the attached version?

The tests results:
[] runner | 9 successes / 8 failures / 0.174995 seconds
385 successes / 0 skipped / 123 failures / 8.737528 seconds

And all the failures look the same; my guess is if you can fix this all
the tests will pass:
./spec/tools/expect.lua:121: expected success status in run:
...a-20240113/nelua-lang-20240113/lualib/nelua/utils/fs.lua:174: attempt
to index a nil value (local 'p')
stack traceback:
...a-20240113/nelua-lang-20240113/lualib/nelua/utils/fs.lua:174:
in function 'nelua.utils.fs.abspath'
...a-20240113/nelua-lang-20240113/lualib/nelua/utils/fs.lua:297:
in function 'nelua.utils.fs.makepath'
...a-20240113/nelua-lang-20240113/lualib/nelua/utils/fs.lua:305:
in function 'nelua.utils.fs.makepath'
...a-20240113/nelua-lang-20240113/lualib/nelua/utils/fs.lua:305:
in function 'nelua.utils.fs.makepath'
...a-20240113/nelua-lang-20240113/lualib/nelua/utils/fs.lua:305:
in function 'nelua.utils.fs.makepath'
...a-20240113/nelua-lang-20240113/lualib/nelua/utils/fs.lua:305:
in function 'nelua.utils.fs.makepath'
...a-20240113/nelua-lang-20240113/lualib/nelua/utils/fs.lua:321:
in function 'nelua.utils.fs.makefile'
...-20240113/nelua-lang-20240113/lualib/nelua/ccompiler.lua:292:
in function 'nelua.ccompiler.compile_code'
...lua-20240113/nelua-lang-20240113/lualib/nelua/runner.lua:229:
in upvalue 'run'
...lua-20240113/nelua-lang-20240113/lualib/nelua/runner.lua:262:
in function
<...lua-20240113/nelua-lang-20240113/lualib/nelua/runner.lua:261>
... (skipping 3 levels)
./spec/tools/expect.lua:100: in upvalue 'run'
./spec/tools/expect.lua:120: in function 'spec.tools.expect.run'
./spec/runner_spec.lua:186: in function <./spec/runner_spec.lua:185>
[C]: in function 'xpcall'
(...lester...)



stack traceback:
[C]: in function 'error'
...40113/nelua-lang-20240113/lualib/nelua/utils/errorer.lua:15:
in function 'nelua.utils.errorer.assertf'
./spec/tools/expect.lua:121: in function 'spec.tools.expect.run'
./spec/runner_spec.lua:186: in function <./spec/runner_spec.lua:185>
[C]: in function 'xpcall'
...3/nelua-lang-20240113/lualib/nelua/thirdparty/lester.lua:309:
in function 'nelua.thirdparty.lester.it'
./spec/runner_spec.lua:185: in local 'func'
...3/nelua-lang-20240113/lualib/nelua/thirdparty/lester.lua:214:
in function 'nelua.thirdparty.lester.describe'
./spec/runner_spec.lua:10: in main chunk
[C]: in function 'require'
spec/init.lua:19: in main chunk
[C]: in ?

~Brian


nelua.tgz
Description: application/compressed

UNBREAK/UPDATE: lang/ldc 1.35.0 => 1.38.0, and de-bootstrap ldc

[Brian Callahan]

Hi ports --

Attached is an update to the latest LDC. With this, I would also like to
make the build process a lot easier.

LDC does not need to be built with itself; it can be built with DMD or
GDC as well. I would like to make LDC have a BDEP on DMD. Now that DMD
has an LTS bootstrap it should be always have a package available. Also,
Phobos, the D standard library, is always built and shipped as a static
library, so DMD won't be an LDEP or RDEP, just a BDEP.

This has the instant benefit of enabling LDC on i386, which I have
tested alongside amd64 and does work. This also has the benefit of
making LDC much easier to update. Should be as easy as cranking version
number, updating patches, and updating plist.

Other platforms may need a bootstrap or use GDC to build LDC, but I will
tackle those on an as-needed basis.

I tried making an LTS bootstrap of LDC but there are linker errors for
multiple symbols of the same name. And I think this new strategy is good
enough.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/lang/ldc/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile9 Mar 2024 15:18:28 -   1.13
+++ Makefile24 May 2024 00:52:45 -
@@ -1,15 +1,14 @@
-BROKEN=needs new bootstrap
+# A bootstrap may be needed for !amd64, !i386 archs.
+# Can try GDC to bootstrap as well.
+ONLY_FOR_ARCHS =   amd64 i386
 
-# You must create a bootstrap for each supported arch.
-# Can use GDC to create said bootstrap compiler.
-ONLY_FOR_ARCHS =   amd64
+# No BT CFI yet.
+USE_NOBTCFI =  Yes
 
-V =1.35.0
+V =1.38.0
 COMMENT =  LLVM D Compiler
 DISTFILES =ldc-${V}-src.tar.gz
-DISTFILES.boot= ldc-${V}-bootstrap.tar.gz
 PKGNAME =  ldc-${V}
-REVISION = 0
 CATEGORIES =   lang
 
 HOMEPAGE = https://wiki.dlang.org/LDC
@@ -23,7 +22,6 @@ PERMIT_PACKAGE =  Yes
 WANTLIB += ${COMPILER_LIBCXX} c execinfo m z
 
 SITES =
https://github.com/ldc-developers/ldc/releases/download/v${V}/
-SITES.boot =   https://github.com/ibara/ldc/releases/download/bootstrap-${V}/
 
 # C++14
 COMPILER = base-clang ports-gcc
@@ -34,29 +32,18 @@ MODCLANG_COMPILER_LINKS =   No
 MODCLANG_RUNDEP =  No
 MODCLANG_VERSION = 16
 
+BUILD_DEPENDS =lang/dmd
+
 # COMPILE_D_MODULES_SEPARATELY=ON lets ldc compile with sane memory limits.
 CONFIGURE_ARGS =   -DCOMPILE_D_MODULES_SEPARATELY=ON \
-DLDC_DYNAMIC_COMPILE=OFF \
-DLDC_WITH_LLD=OFF \

-DLLVM_CONFIG="${LOCALBASE}/bin/llvm-config-${MODCLANG_VERSION}"
 
-# Use a bootstrap compiler, similar to DMD.
-CONFIGURE_ENV =
DMD="${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ldmd2" \
-   LD_LIBRARY_PATH="${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}"
-
-MAKE_ENV +=LD_LIBRARY_PATH="${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}"
+# Use DMD as the bootstrap compiler.
+CONFIGURE_ENV =DMD="${LOCALBASE}/bin/dmd"
 
 WRKDIST=   ${WRKDIR}/ldc-${V}-src
-
-# I put a vanilla ldc2.conf in the bootstrap tarball.
-# This fixes it up for the specifics for each arch.
-post-patch:
-   sed -i 's#/usr/local/include/d#${WRKDIR}/ldc-${V}-bootstrap/d#g' \
-   ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ldc2.conf
-   sed -i 
's#"/usr/local/lib",#"/usr/local/lib","${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}",#g'
 \
-   ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ldc2.conf
-   chmod 644 ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/lib*.so* # XXX
-   cp /usr/lib/libc.so.98.* ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ 
# XXX
 
 # Same trick as with flang:
 #   Replace the shared LLVM.so library with the static libraries.
Index: distinfo
===
RCS file: /cvs/ports/lang/ldc/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo14 Dec 2023 15:31:31 -  1.6
+++ distinfo24 May 2024 00:52:45 -
@@ -1,4 +1,2 @@
-SHA256 (ldc-1.35.0-bootstrap.tar.gz) = 
8IbnqIzaBxRP2vOWAl3c3sTvyTVv9NxMuJD24CVF1i8=
-SHA256 (ldc-1.35.0-src.tar.gz) = bilpk3BsdsCT5gkTmqCz+HBDVfoPN1b2dY141EIm36A=
-SIZE (ldc-1.35.0-bootstrap.tar.gz) = 49813924
-SIZE (ldc-1.35.0-src.tar.gz) = 8241960
+SHA256 (ldc-1.38.0-src.tar.gz) = ymI47+Ai40zTB2dB+KBwxqN3GWNRxhlJpIpIyZN5844=
+SIZE (ldc-1.38.0-src.tar.gz) = 8691096
Index: patches/patch-driver_cl_options_instrumentation_cpp
===
RCS file: patches/patch-driver_cl_options_instrumentation_cpp
diff -N patches/patch-driver_cl_options_instrumentation_cpp
--- patches/patch-driver_cl_options_instrumentation_cpp 14 Aug 2023 22:35:35 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-Default to -fcf-protection=branch
-May need to be tweaked if ldc grows !amd64 packages...
-
-Index: driver/cl_opt

Re: UNBREAK/UPDATE: lang/dmd 2.106.0 => 2.108.1, and LTS bootstrap

[Brian Callahan]

On 5/20/2024 9:20 PM, Brian Callahan wrote:
> Hi ports --
> 
> Attached is a diff to unbreak and update the reference D compiler.
> 
> In addition, this update includes what I am hoping can serve as an LTS
> bootstrap compiler. Very old versions of the D compiler, all the way
> back to 2.076.1, can bootstrap the current D compiler. The bootstrap
> compiler was built with -static using GDC 14.1 and therefore doesn't
> have any library dependencies. I would like to be able to use this as an
> LTS bootstrap compiler until either it no longer builds modern versions
> of the D compiler or no longer runs on OpenBSD (or until I feel like
> giving it an update). Should make updating as easy as cranking version
> number, updating patches, and updating plist.
> 
> OK?
> 
> ~Brian

Updated diff, now including i386 support using the same process to
create a bootstrap compiler.

OK?

~Brian
Index: Makefile
===
RCS file: /cvs/ports/lang/dmd/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile9 Mar 2024 15:18:28 -   1.17
+++ Makefile22 May 2024 15:59:36 -
@@ -1,15 +1,14 @@
-BROKEN=needs new bootstrap
-
-# i386 forthcoming
-ONLY_FOR_ARCHS =   amd64
+# Backend only supports amd64 and i386
+ONLY_FOR_ARCHS =   amd64 i386
 
 # No BT CFI yet.
 USE_NOBTCFI =  Yes
 
-V =2.106.0
+V =2.108.1
+BOOTSTRAP =2.108.1
 COMMENT =  reference compiler for the D programming language
 DISTFILES =dmd-${V}{v${V}}.tar.gz
-DISTFILES.boot=dmd-${V}-bootstrap.tar.gz
+DISTFILES.boot=dmd-${BOOTSTRAP}-bootstrap.tar.gz
 DISTFILES.phobos = phobos-${V}{v${V}}.tar.gz
 PKGNAME =  dmd-${V}
 CATEGORIES =   lang
@@ -22,15 +21,13 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB += c c++abi execinfo m pthread
 
-SITES.boot =   https://github.com/ibara/dmd/releases/download/bootstrap-${V}/
+SITES.boot =   
https://github.com/ibara/dmd/releases/download/bootstrap-${BOOTSTRAP}/
 SITES =https://github.com/dlang/dmd/archive/refs/tags/
 SITES.phobos = https://github.com/dlang/phobos/archive/refs/tags/
 
 USE_GMAKE =Yes
 MAKE_ENV = HOST_CXX="${CXX}" \
-   HOST_DMD="${WRKDIR}/dmd-bootstrap/openbsd/bin${MODEL}/dmd" \
-   LD_LIBRARY_PATH="${WRKSRC}/dmd-bootstrap/openbsd/bin${MODEL}"
-MAKE_FILE =posix.mak
+   HOST_DMD="${WRKDIR}/dmd-bootstrap/openbsd/bin${MODEL}/dmd"
 
 NO_TEST =  Yes
 
@@ -45,21 +42,21 @@ MODEL = 32
 post-extract:
mv ${WRKSRC}/dmd-${V} ${WRKSRC}/dmd
mv ${WRKSRC}/phobos-${V} ${WRKSRC}/phobos
-   chmod 644 ${WRKDIR}/dmd-bootstrap/openbsd/bin64/lib*.so* # XXX
-   cp /usr/lib/libc.so.98.* ${WRKDIR}/dmd-bootstrap/openbsd/bin64/ # XXX
 
 # We need to do this manually.
 # Yes, this is all really correct.
 do-build:
cd ${WRKDIR}/phobos && \
-   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} && \
-   ${SETENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} install
+   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} && \
+   ${SETENV} ${MAKE_PROGRAM} install
cd ${WRKDIR}/dmd/druntime && \
-   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} && \
-   ${SETENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} install
+   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} && \
+   ${SETENV} ${MAKE_PROGRAM} install
mkdir ${WRKDIR}/install/openbsd/bin${MODEL}
cp ${WRKDIR}/dmd/generated/openbsd/release/${MODEL}/dmd \
${WRKDIR}/install/openbsd/bin${MODEL}
+   cd ${WRKDIR}/dmd/compiler/docs && \
+   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} build
 
 # We need to do this manually too.
 do-install:
@@ -67,7 +64,8 @@ do-install:
${PREFIX}/bin
${INSTALL_DATA} ${WRKDIR}/install/openbsd/lib${MODEL}/libphobos2.a \
${PREFIX}/lib
-   ${INSTALL_MAN} ${WRKDIR}/dmd-bootstrap/dmd.1 ${PREFIX}/man/man1
+   ${INSTALL_MAN} ${WRKSRC}/dmd/generated/docs/man/man1/dmd.1 \
+   ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKDIR}/dmd/compiler/docs/man/man5/dmd.conf.5 \
${PREFIX}/man/man5
${INSTALL_DATA_DIR} ${PREFIX}/include/dmd
Index: distinfo
===
RCS file: /cvs/ports/lang/dmd/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo18 Dec 2023 22:20:58 -  1.11
+++ distinfo22 May 2024 15:59:36 -
@@ -1,6 +1,6 @@
-SHA256 (dmd-2.106.0-bootstrap.tar.gz) = 
lSsGN+CaT80zcTbEuUQHbFV0wL5DXikDGWFepL7/nbY=
-SHA256 (dmd-2.106.0.tar.gz) = EHlknEGpuODT6BxXPILYTNaHOzr8lbN9b1IGhCztx8k=
-SHA256 (phobos-2.106.0.tar.gz) = P5Ju4mkFwvb+RX560v5P6sjK2DxXGnCt6jC2zU

UPDATE: sysutils/coreutils 9.4 => 9.5

[Brian Callahan]

Hi ports --

Attached is an update to the GNU coreutils. Changelog is here:
https://git.savannah.gnu.org/cgit/coreutils.git/tree/NEWS

All tests pass on amd64, but I do not have any big endian machines to
test with.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/sysutils/coreutils/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile19 Jan 2024 08:28:52 -  1.30
+++ Makefile21 May 2024 13:03:28 -
@@ -1,8 +1,7 @@
 COMMENT =  file, shell and text manipulation utilities
 
-DISTNAME = coreutils-9.4
+DISTNAME = coreutils-9.5
 CATEGORIES =   sysutils
-REVISION = 0
 
 MAINTAINER =   Brian Callahan 
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/coreutils/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo16 Jan 2024 22:12:45 -  1.15
+++ distinfo21 May 2024 13:03:28 -
@@ -1,2 +1,2 @@
-SHA256 (coreutils-9.4.tar.xz) = 6mE6TPRGEjJukXIBu7zfvTAd4h/8O1m25cB+BAsnXlI=
-SIZE (coreutils-9.4.tar.xz) = 5979200
+SHA256 (coreutils-9.5.tar.xz) = zTKO3qyS9qZl3p8yPJO3Eq8YWLwuDYjz9xAEaUcKG4o=
+SIZE (coreutils-9.5.tar.xz) = 6007136
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/coreutils/patches/patch-Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-Makefile_in
--- patches/patch-Makefile_in   16 Jan 2024 22:12:45 -  1.15
+++ patches/patch-Makefile_in   21 May 2024 13:03:28 -
@@ -3,7 +3,7 @@ XXX: Avoid rebuilding coreutils.info; ou
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -22186,6 +22186,7 @@ doc/$(am__dirstamp):
+@@ -22237,6 +22237,7 @@ doc/$(am__dirstamp):
@: > doc/$(am__dirstamp)
  
  $(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi 
$(doc_coreutils_TEXINFOS)
Index: patches/patch-src_split_c
===
RCS file: patches/patch-src_split_c
diff -N patches/patch-src_split_c
--- patches/patch-src_split_c   19 Jan 2024 08:28:52 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-Fix heap buffer overflow
-
-https://github.com/coreutils/coreutils/commit/c4c5ed8f4e9cd55a12966d4f520e3a13101637d9
-https://marc.info/?l=oss-security&m=170556990821840&w=2
-
-Index: src/split.c
 src/split.c.orig
-+++ src/split.c
-@@ -809,10 +809,7 @@ line_bytes_split (intmax_t n_bytes, char *buf, idx_t b
- {
-   cwrite (n_out == 0, hold, n_hold);
-   n_out += n_hold;
--  if (n_hold > bufsize)
--hold = xirealloc (hold, bufsize);
-   n_hold = 0;
--  hold_size = bufsize;
- }
- 
-   /* Output to eol if present.  */

UNBREAK/UPDATE: lang/dmd 2.106.0 => 2.108.1, and LTS bootstrap

[Brian Callahan]

Hi ports --

Attached is a diff to unbreak and update the reference D compiler.

In addition, this update includes what I am hoping can serve as an LTS
bootstrap compiler. Very old versions of the D compiler, all the way
back to 2.076.1, can bootstrap the current D compiler. The bootstrap
compiler was built with -static using GDC 14.1 and therefore doesn't
have any library dependencies. I would like to be able to use this as an
LTS bootstrap compiler until either it no longer builds modern versions
of the D compiler or no longer runs on OpenBSD (or until I feel like
giving it an update). Should make updating as easy as cranking version
number, updating patches, and updating plist.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/lang/dmd/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile9 Mar 2024 15:18:28 -   1.17
+++ Makefile21 May 2024 00:34:49 -
@@ -1,15 +1,14 @@
-BROKEN=needs new bootstrap
-
 # i386 forthcoming
 ONLY_FOR_ARCHS =   amd64
 
 # No BT CFI yet.
 USE_NOBTCFI =  Yes
 
-V =2.106.0
+V =2.108.1
+BOOTSTRAP =2.108.1
 COMMENT =  reference compiler for the D programming language
 DISTFILES =dmd-${V}{v${V}}.tar.gz
-DISTFILES.boot=dmd-${V}-bootstrap.tar.gz
+DISTFILES.boot=dmd-${BOOTSTRAP}-bootstrap.tar.gz
 DISTFILES.phobos = phobos-${V}{v${V}}.tar.gz
 PKGNAME =  dmd-${V}
 CATEGORIES =   lang
@@ -22,15 +21,13 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB += c c++abi execinfo m pthread
 
-SITES.boot =   https://github.com/ibara/dmd/releases/download/bootstrap-${V}/
+SITES.boot =   
https://github.com/ibara/dmd/releases/download/bootstrap-${BOOTSTRAP}/
 SITES =https://github.com/dlang/dmd/archive/refs/tags/
 SITES.phobos = https://github.com/dlang/phobos/archive/refs/tags/
 
 USE_GMAKE =Yes
 MAKE_ENV = HOST_CXX="${CXX}" \
-   HOST_DMD="${WRKDIR}/dmd-bootstrap/openbsd/bin${MODEL}/dmd" \
-   LD_LIBRARY_PATH="${WRKSRC}/dmd-bootstrap/openbsd/bin${MODEL}"
-MAKE_FILE =posix.mak
+   HOST_DMD="${WRKDIR}/dmd-bootstrap/openbsd/bin${MODEL}/dmd"
 
 NO_TEST =  Yes
 
@@ -45,21 +42,21 @@ MODEL = 32
 post-extract:
mv ${WRKSRC}/dmd-${V} ${WRKSRC}/dmd
mv ${WRKSRC}/phobos-${V} ${WRKSRC}/phobos
-   chmod 644 ${WRKDIR}/dmd-bootstrap/openbsd/bin64/lib*.so* # XXX
-   cp /usr/lib/libc.so.98.* ${WRKDIR}/dmd-bootstrap/openbsd/bin64/ # XXX
 
 # We need to do this manually.
 # Yes, this is all really correct.
 do-build:
cd ${WRKDIR}/phobos && \
-   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} && \
-   ${SETENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} install
+   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} && \
+   ${SETENV} ${MAKE_PROGRAM} install
cd ${WRKDIR}/dmd/druntime && \
-   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} && \
-   ${SETENV} ${MAKE_PROGRAM} -f ${MAKE_FILE} install
+   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} && \
+   ${SETENV} ${MAKE_PROGRAM} install
mkdir ${WRKDIR}/install/openbsd/bin${MODEL}
cp ${WRKDIR}/dmd/generated/openbsd/release/${MODEL}/dmd \
${WRKDIR}/install/openbsd/bin${MODEL}
+   cd ${WRKDIR}/dmd/compiler/docs && \
+   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} build
 
 # We need to do this manually too.
 do-install:
@@ -67,7 +64,8 @@ do-install:
${PREFIX}/bin
${INSTALL_DATA} ${WRKDIR}/install/openbsd/lib${MODEL}/libphobos2.a \
${PREFIX}/lib
-   ${INSTALL_MAN} ${WRKDIR}/dmd-bootstrap/dmd.1 ${PREFIX}/man/man1
+   ${INSTALL_MAN} ${WRKSRC}/dmd/generated/docs/man/man1/dmd.1 \
+   ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKDIR}/dmd/compiler/docs/man/man5/dmd.conf.5 \
${PREFIX}/man/man5
${INSTALL_DATA_DIR} ${PREFIX}/include/dmd
Index: distinfo
===
RCS file: /cvs/ports/lang/dmd/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo18 Dec 2023 22:20:58 -  1.11
+++ distinfo21 May 2024 00:34:49 -
@@ -1,6 +1,6 @@
-SHA256 (dmd-2.106.0-bootstrap.tar.gz) = 
lSsGN+CaT80zcTbEuUQHbFV0wL5DXikDGWFepL7/nbY=
-SHA256 (dmd-2.106.0.tar.gz) = EHlknEGpuODT6BxXPILYTNaHOzr8lbN9b1IGhCztx8k=
-SHA256 (phobos-2.106.0.tar.gz) = P5Ju4mkFwvb+RX560v5P6sjK2DxXGnCt6jC2zUpDZrY=
-SIZE (dmd-2.106.0-bootstrap.tar.gz) = 10233808
-SIZE (dmd-2.106.0.tar.gz) = 5936389
-SIZE (phobos-2.106.0.tar.gz) = 2761012
+SHA256 (dmd-2.108.1-bootstrap.tar.gz) = 
5YU+4e1lVsILcYqtiWh60fUNZhOLuscH5BdobY8hxLM=
+SHA256 (dmd-2.108.1.tar.gz) = Rw6xKJV44XlSX5Ir6IAD1e0jEAC4qxLCe451A013/Lc=
+SHA256 (phobos-2.108.1.tar.gz) = bYAxAGqJd7rqXBleP3E0rOclGWK22IxgILf5M/7eYno=
+SIZE (dmd-2.108.1-bootstrap.tar.gz) = 11189652

Re: update games/openrct2

[Brian Callahan]

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

Re: [Please, unbreak] multimedia/handbrake

[Brian Callahan]

On 4/13/2024 12:02 PM, Stuart Henderson wrote:
> On 2024/04/13 15:47, Rubén Llorente wrote:
>> Here you are.
> 
> There are definitely some problems with that one.
> 
> Testing Brad's diff and reporting back to the list is probably the best way 
> to move this forward.
> 

Agreed. I won't be able to look at this until the end of the month at
the earliest.

~Brian

Re: UPDATE: zimg 3.0.5

[Brian Callahan]

Hi Brad --

On 3/2/2024 6:01 PM, Brad Smith wrote:
> Here is an update to zimg 3.0.5.
> 
> 
> 3.0.5
> colorspace: add ST.428-1 (gamma 2.6) transfer function
> depth: fix AVX-512 integer to float border handling (introduced in 2.6)
> depth: fix NEON dither border handling (introduced in 3.0)
> graph: fix clipping in alpha premultiplication (introduced in 3.0)
> x86: optimizations for AMD Zen4 processors
> 

Thanks. I am away until Tuesday evening; either I will commit then or
someone else is free to test and commit.

~Brian

Re: missing endbr64

[Brian Callahan]

On 2/25/2024 4:39 AM, Theo Buehler wrote
> D
> Missing NOBTCFI for some of these?
> 
> devel/dtools.log
> devel/dub,dmd.log
> lang/dmd.log
> lang/ldc.log
> sysutils/trash-d.log
> 

Yes, the D ports should have NOBTCFI. I am working on this, but it is
not yet ready for prime time.

Thanks.

~Brian

Re: retire some python 2 ports

[Brian Callahan]

On 2/23/2024 8:29 AM, Jeremie Courreges-Anglas wrote:
> Le Thu, Feb 22, 2024 at 11:48:10PM +0000, Brian Callahan a écrit :
>>>
>>>> - lang/flang and lang/cparser (bcallah@ may have a plan)
>>>
>>> flang seems to be out of sync with LLVM versions anyway.
>>> cparser doesn't use python at all?
>>>
>>
>> Flang I have updated to the latest version but something else is subtly
>> broken; I am working on it.
> 
> Unless you already have the fix, would it make sense to just commit
> what you have, leaving the BROKEN marker in place for now?
> 

It is incredibly invasive; it's really a brand new port at this point.
No more need for subports, new build system, new everything.

It honestly might make the most sense to retire the flang port and I can
revive it once it is ready.

~Brian

Re: [update] graphics/azpainter to 3.0.7

[Brian Callahan]

On 2/23/2024 2:40 AM, Justin Berthault wrote:
> Hi ports@
> 
> Update azpainter to 3.0.7 and patch added to remove uses of -v
> argument with install(1) (not available on OpenBSD).
> 
> Built and tested on arm64.
> 
> bcallah CC.
> 
> 

Committed, thanks.

~Brian

Re: retire some python 2 ports

[Brian Callahan]

> 
>> - lang/flang and lang/cparser (bcallah@ may have a plan)
> 
> flang seems to be out of sync with LLVM versions anyway.
> cparser doesn't use python at all?
> 

Flang I have updated to the latest version but something else is subtly
broken; I am working on it.

CParser should work with python3, I'll test right now.

~Brian

Re: retire some python 2 ports

[Brian Callahan]

On 2/17/2024 11:51 AM, Daniel Dickman wrote:
>   audio/solfege

This isn't a Python 2 port. It was converted to Python 3 by jca@ back in
2020: https://marc.info/?l=openbsd-ports-cvs&m=160485114510586&w=2

However, one of its dependencies is:
audio/solfege -> print/lilypond -> print/mftrace -> print/fontforge

Font Forge is what has the Py2 dep. I suppose it makes the most sense to
update fontforge. Unfortunately, I don't have the bandwidth to do that
right now.

~Brian

Re: lang/qbe: update to 1.2

[Brian Callahan]

On 2/16/2024 4:28 PM, Tobias Heider wrote:
> New qbe version is out and required for the latest hare
> update.  Looks like we can drop our patches too.
> 
> ok?
> 

Awesome! Yes, ok.

~Brian

Re: [update] games/devilutionx to 1.5.2

[Brian Callahan]

On 2/9/2024 7:49 PM, Lucas Raab wrote:
> Hello,
> 
> Here's an update for devilutionx that's been working fine on amd64.
> Other tests?
> 

(Accidentally hit reply instead of reply-all in my reply.)

I don't know where I put my copy of Diablo 🙁
But, this is a pretty trivial update diff-wise. If it works for you, go
ahead.

~Brian

Re: Streamlink 2.0.0p2

[Brian Callahan]

On 1/27/2024 9:53 AM, Stuart Henderson wrote:
> On 2024/01/27 06:48, Simon Parrer wrote:
>> Hello Brian,
>>
>> i want to ask if you can update Streamlink, it is really old at the moment 
>> but a good tool to pipe Videos into Mplayer.
>>
>> At the moment we are at 2.0.0p2 and the newest Version is 6.5.1.
>>
>> https://streamlink.github.io/
>>
>> Many Thanks and Best Regards
>> Simon
> 
> Here's an update diff and tar of the new required dependencies.
> Lightly tested only.
> 

Thanks Stuart. I'll take a look at this later today.

~Brian

Re: UPDATE: sysutils/coreutils 9.3 => 9.4

[Brian Callahan]

On 1/18/2024 4:56 AM, Theo Buehler wrote:
> And right after it was committed, someone found a bug in split
> 
> https://marc.info/?l=oss-security&m=170556990821840&w=2
> 

Hah! Of course...

ok, thanks!

~Brian

Re: UPDATE: sysutils/coreutils 9.3 => 9.4

[Brian Callahan]

On 1/8/2024 9:27 AM, Theo Buehler wrote:
>> Tests pass on amd64 and i386; big endian testing would be appreciated.
>>
>> OK?
> 
> I'm ok with this, but I'm unsure how much testing is required since it
> is a dep for a sizable number of ports.
> 

I feel the same way. That's why I always post updates and give it a fair
bit of time.

> Tests look good on sparc64:
> 

Thanks for the sparc64 test!

~Brian

UPDATE: sysutils/coreutils 9.3 => 9.4

[Brian Callahan]

Hi ports --

Reviving this. Update to the GNU coreutils.

Changelog is here: https://git.savannah.gnu.org/cgit/coreutils.git/tree/NEWS

Tests pass on amd64 and i386; big endian testing would be appreciated.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/sysutils/coreutils/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile27 Sep 2023 17:16:24 -  1.28
+++ Makefile8 Jan 2024 00:32:08 -
@@ -1,6 +1,6 @@
 COMMENT =  file, shell and text manipulation utilities
 
-DISTNAME = coreutils-9.3
+DISTNAME = coreutils-9.4
 CATEGORIES =   sysutils
 
 MAINTAINER =   Brian Callahan 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/coreutils/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo4 Jun 2023 17:26:47 -   1.14
+++ distinfo8 Jan 2024 00:32:08 -
@@ -1,2 +1,2 @@
-SHA256 (coreutils-9.3.tar.xz) = rbz8/omSNbceh2jc8HzVMlILf1T5qAZIQ/jRmakEu6o=
-SIZE (coreutils-9.3.tar.xz) = 5808696
+SHA256 (coreutils-9.4.tar.xz) = 6mE6TPRGEjJukXIBu7zfvTAd4h/8O1m25cB+BAsnXlI=
+SIZE (coreutils-9.4.tar.xz) = 5979200
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/coreutils/patches/patch-Makefile_in,v
retrieving revision 1.14
diff -u -p -r1.14 patch-Makefile_in
--- patches/patch-Makefile_in   4 Jun 2023 17:26:47 -   1.14
+++ patches/patch-Makefile_in   8 Jan 2024 00:32:08 -
@@ -3,7 +3,7 @@ XXX: Avoid rebuilding coreutils.info; ou
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -21087,6 +21087,7 @@ doc/$(am__dirstamp):
+@@ -22186,6 +22186,7 @@ doc/$(am__dirstamp):
@: > doc/$(am__dirstamp)
  
  $(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi 
$(doc_coreutils_TEXINFOS)
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/coreutils/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST   4 Jun 2023 17:26:47 -   1.12
+++ pkg/PLIST   8 Jan 2024 00:32:08 -
@@ -291,8 +291,6 @@ share/locale/it/LC_TIME/coreutils.mo
 share/locale/ja/LC_MESSAGES/coreutils.mo
 share/locale/ja/LC_TIME/
 share/locale/ja/LC_TIME/coreutils.mo
-share/locale/ka/
-share/locale/ka/LC_MESSAGES/
 share/locale/ka/LC_MESSAGES/coreutils.mo
 share/locale/ka/LC_TIME/
 share/locale/ka/LC_TIME/coreutils.mo
@@ -352,6 +350,11 @@ share/locale/sr/LC_TIME/coreutils.mo
 share/locale/sv/LC_MESSAGES/coreutils.mo
 share/locale/sv/LC_TIME/
 share/locale/sv/LC_TIME/coreutils.mo
+share/locale/ta/
+share/locale/ta/LC_MESSAGES/
+share/locale/ta/LC_MESSAGES/coreutils.mo
+share/locale/ta/LC_TIME/
+share/locale/ta/LC_TIME/coreutils.mo
 share/locale/tr/LC_MESSAGES/coreutils.mo
 share/locale/tr/LC_TIME/
 share/locale/tr/LC_TIME/coreutils.mo

UPDATE: lang/dmd 2.106.0 => 2.106.1 + i386 package

[Brian Callahan]

Hi ports --

Attached is an update for dmd. It also enables a dmd package for i386.
Tests good on my i386 netbook.

The new bootstrap should hopefully be more resilient against libc and
other library bumps.

Additionally, dmd should no longer need any hacks for nobtcfi. But as my
laptop doesn't support it, I can't test directly. Reports welcome.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/lang/dmd/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile19 Dec 2023 22:34:04 -  1.16
+++ Makefile4 Jan 2024 23:19:47 -
@@ -1,10 +1,6 @@
-# i386 forthcoming
-ONLY_FOR_ARCHS =   amd64
+ONLY_FOR_ARCHS =   amd64 i386
 
-# No BT CFI yet.
-USE_NOBTCFI =  Yes
-
-V =2.106.0
+V =2.106.1
 COMMENT =  reference compiler for the D programming language
 DISTFILES =dmd-${V}{v${V}}.tar.gz
 DISTFILES.boot=dmd-${V}-bootstrap.tar.gz
@@ -26,8 +22,7 @@ SITES.phobos =https://github.com/dlang/
 
 USE_GMAKE =Yes
 MAKE_ENV = HOST_CXX="${CXX}" \
-   HOST_DMD="${WRKDIR}/dmd-bootstrap/openbsd/bin${MODEL}/dmd" \
-   LD_LIBRARY_PATH="${WRKSRC}/dmd-bootstrap/openbsd/bin${MODEL}"
+   HOST_DMD="${WRKDIR}/dmd-bootstrap/openbsd/bin${MODEL}/dmd"
 MAKE_FILE =posix.mak
 
 NO_TEST =  Yes
@@ -43,8 +38,6 @@ MODEL = 32
 post-extract:
mv ${WRKSRC}/dmd-${V} ${WRKSRC}/dmd
mv ${WRKSRC}/phobos-${V} ${WRKSRC}/phobos
-   chmod 644 ${WRKDIR}/dmd-bootstrap/openbsd/bin64/lib*.so* # XXX
-   cp /usr/lib/libc.so.98.* ${WRKDIR}/dmd-bootstrap/openbsd/bin64/ # XXX
 
 # We need to do this manually.
 # Yes, this is all really correct.
Index: distinfo
===
RCS file: /cvs/ports/lang/dmd/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo18 Dec 2023 22:20:58 -  1.11
+++ distinfo4 Jan 2024 23:19:47 -
@@ -1,6 +1,6 @@
-SHA256 (dmd-2.106.0-bootstrap.tar.gz) = 
lSsGN+CaT80zcTbEuUQHbFV0wL5DXikDGWFepL7/nbY=
-SHA256 (dmd-2.106.0.tar.gz) = EHlknEGpuODT6BxXPILYTNaHOzr8lbN9b1IGhCztx8k=
-SHA256 (phobos-2.106.0.tar.gz) = P5Ju4mkFwvb+RX560v5P6sjK2DxXGnCt6jC2zUpDZrY=
-SIZE (dmd-2.106.0-bootstrap.tar.gz) = 10233808
-SIZE (dmd-2.106.0.tar.gz) = 5936389
-SIZE (phobos-2.106.0.tar.gz) = 2761012
+SHA256 (dmd-2.106.1-bootstrap.tar.gz) = 
kTaydzarj0/h54XfnTYRJ8G11ukH/DCilVEPc6EYcJw=
+SHA256 (dmd-2.106.1.tar.gz) = KY4pM6TPh5M/c+jO1Sw09L6X6ISky2+V4xdU5iuhD8s=
+SHA256 (phobos-2.106.1.tar.gz) = rPKie7N/GK/zALXziHXCrx27cgPe3cp/hws9aaeR8zM=
+SIZE (dmd-2.106.1-bootstrap.tar.gz) = 19821871
+SIZE (dmd-2.106.1.tar.gz) = 5932908
+SIZE (phobos-2.106.1.tar.gz) = 2760300
Index: patches/patch-dmd-bootstrap_openbsd_bin32_dmd_conf
===
RCS file: patches/patch-dmd-bootstrap_openbsd_bin32_dmd_conf
diff -N patches/patch-dmd-bootstrap_openbsd_bin32_dmd_conf
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-dmd-bootstrap_openbsd_bin32_dmd_conf  4 Jan 2024 23:19:47 
-
@@ -0,0 +1,12 @@
+Use the bootstrap libphobos2.a when linking the initially built dmd.
+
+Index: dmd-bootstrap/openbsd/bin32/dmd.conf
+--- dmd-bootstrap/openbsd/bin32/dmd.conf.orig
 dmd-bootstrap/openbsd/bin32/dmd.conf
+@@ -1,5 +1,5 @@
+ [Environment32]
+-DFLAGS=-I${TRUEPREFIX}/include/dmd/phobos 
-I${TRUEPREFIX}/include/dmd/druntime/import -L-L/usr/lib -L-L${TRUEPREFIX}/lib 
-L--export-dynamic -fPIC
++DFLAGS=-I%@P%/../../../dmd/druntime/src -I%@P%/../../../phobos 
-L-L%@P%/../../../phobos/generated/openbsd/release/32 -L--export-dynamic -fPIC 
-L-L%@P%/../../../dmd-bootstrap/openbsd/lib32
+ 
+ [Environment64]
+ DFLAGS=-I${TRUEPREFIX}/include/dmd/phobos 
-I${TRUEPREFIX}/include/dmd/druntime/import -L-L/usr/lib -L-L${TRUEPREFIX}/lib 
-L--export-dynamic -fPIC
Index: patches/patch-dmd_compiler_src_dmd_libmach_d
===
RCS file: patches/patch-dmd_compiler_src_dmd_libmach_d
diff -N patches/patch-dmd_compiler_src_dmd_libmach_d
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-dmd_compiler_src_dmd_libmach_d4 Jan 2024 23:19:47 
-
@@ -0,0 +1,20 @@
+This is always 64-bit.
+
+Index: dmd/compiler/src/dmd/libmach.d
+--- dmd/compiler/src/dmd/libmach.d.orig
 dmd/compiler/src/dmd/libmach.d
+@@ -484,7 +484,14 @@ struct MachObjModule
+ uint length; // in bytes
+ uint offset; // offset from start of library
+ const(char)[] name; // module name (file name) with terminating 0
++version (OpenBSD)
++{
++long file_time; // file time
++}
++else
++{
+ c_long file_time; // file time
++}
+ uint user_id;
+ uint group_id;
+ uint file_mode;
Index: patches/patch-dmd_compiler_src_dmd_link_d
===
RCS file: patches/patch-dmd_compiler_src_dmd_link_d
diff -N patches/patch-dmd_compile

Re: amnesia-tdd, crack-attack, manaplus vs libcxx update

[Brian Callahan]

On 1/2/2024 7:45 AM, Theo Buehler wrote:
> On Tue, Jan 02, 2024 at 11:13:58AM +0100, Theo Buehler wrote:
>> The following games will no longer build once robert updates libcxx and
>> friends because they use std::unary_function or std::binary_function,
>> which were deprecated in C++11 and removed in C++17.
>>
>> An ugly workaround is to re-enable these to fix the build as in the diff
>> below. Another ugly workaround is to switch to a build with C++ <= 14.
>>
>> Please check if upstream has fixed this already and do either one of
>> 1. update the port
>> 2. backport the fix
>> 3. remove the annotations in the affected functions and test
>> 4. if you don't like the below, figure out a better fix.
>>
>> Thanks
> 
> Index: games/manaplus/Makefile
> ===
> RCS file: /cvs/ports/games/manaplus/Makefile,v
> diff -u -p -r1.106 Makefile
> --- games/manaplus/Makefile   26 Sep 2023 09:41:38 -  1.106
> +++ games/manaplus/Makefile   2 Jan 2024 10:03:56 -
> @@ -41,6 +41,8 @@ CONFIGURE_ARGS =--without-librt \
>   --with-sdl2 \
>   --without-internalsdlgfx
>  
> +CXXFLAGS +=  -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
> +
>  FAKE_FLAGS +=desktopdir=${PREFIX}/share/applications/
>  
>  AUTOCONF_VERSION =   2.69
> 

For manaplus, the unary_function bits can simply be removed.

OK?

~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile26 Sep 2023 09:41:38 -  1.106
+++ Makefile2 Jan 2024 14:48:33 -
@@ -1,5 +1,5 @@
 V =2.1.3.17
-REVISION = 1
+REVISION = 2
 COMMENT =  client for The Mana World
 DISTNAME = manaplus-${V}
 EXTRACT_SUFX = .tar.xz
Index: patches/patch-src_utils_dtor_h
===
RCS file: patches/patch-src_utils_dtor_h
diff -N patches/patch-src_utils_dtor_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_utils_dtor_h  2 Jan 2024 14:48:33 -
@@ -0,0 +1,24 @@
+C++17 compliance
+
+Index: src/utils/dtor.h
+--- src/utils/dtor.h.orig
 src/utils/dtor.h
+@@ -30,7 +30,7 @@
+ #include "localconsts.h"
+ 
+ template
+-struct dtor final : public std::unary_function 
++struct dtor final
+ {
+ A_DEFAULT_COPY(dtor)
+ 
+@@ -39,8 +39,7 @@ struct dtor final : public std::unary_function 
+-struct dtor > :
+-public std::unary_function , void>
++struct dtor >
+ {
+ void operator()(std::pair &pair)
+ { delete pair.second; }

NEW: lang/ghdl

[Brian Callahan]

Hi ports --

This commit[0] from earlier today suggested porting GHDL as a
replacement for FreeHDL. Attached is that port.

---
pkg/DESCR:
GHDL is an open-source analyzer, compiler, simulator and (experimental)
synthesizer for VHDL, a Hardware Description Language (HDL). GHDL is not
an interpreter: it allows you to analyse and elaborate sources for
generating machine code from your design.

Supports the 1987, 1993, 2002 versions of the IEEE 1076 VHDL standard,
with partial support for the 2008 and 2019 revisions and PSL.
---

I don't necessarily want to be maintainer of this, as I'm no VHDL
expert. But it worked fine as far as I can tell on some simple vhdl
files I found on the Internet.

OK?

~Brian

[0] https://marc.info/?l=openbsd-ports-cvs&m=170413896711647&w=2

ghdl.tgz
Description: application/compressed

Re: lang/ldc fails to compile multiple source files

[Brian Callahan]

On 12/20/2023 11:15 PM, Jeremy Baxter wrote:
> Hi list,
> 
> Supplying multiple sources at ldc's command line with ldc 1.35.0
> on -current amd64 fails with a SIGABRT and this message:
> 
> module flag identifiers must be unique (or of 'require' type)
> !"cf-protection-branch"
> LLVM ERROR: Broken module found, compilation aborted!
> 
> I can reproduce it by adding `import mod; void main() {}' in one file,
> creating mod.d (leaving it empty), and running `ldc2 main.d mod.d'.
> This also occurred on 7.4. Is this a known bug or just something on my side?
> 
> -- Jeremy
> 

Can confirm. I'll look into it. For the time being, dmd doesn't have
this issue.

~Brian

Re: lang/dmd build failure

[Brian Callahan]

On 12/13/2023 1:20 AM, Theo Buehler wrote:
> I think we had this one before.
> 
> cp /usr/lib/libc.so.97.* /tmp/pobj/dmd-2.104.0/dmd-bootstrap/openbsd/bin64/ # 
> XXX
> cp: /usr/lib/libc.so.97.*: No such file or directory
> 
> I don't have a good suggestion. Maybe this should be mimicking the
> | sort -rV | head -1 dance from /etc/rc to be a bit more robust.
> 

This happens when the libc major is cranked, which it just was. I don't
have a good suggestion either, other than to rebuild the bootstraps,
which I will do later today.

~Brian

Re: lang/hare build failure (Re: NEW: lang/hare)

[Brian Callahan]

On 12/11/2023 7:42 PM, Brian Callahan wrote:
> On 12/11/2023 6:34 PM, Stuart Henderson wrote:
>> On 2023/12/11 16:40, Lorenz (xha) wrote:
>>> FYI hare only needs gas and not the complete binutils package. and gas
>>> is just needed because the "as" in the base system is too old.
>>>
>>
>> Will the version from devel/gas (2.31.1) also work? If so, you could do
>> this to prefer binutils-* but use gas-* if already installed.
>>
> 
> For some reason, I thought devel/gas was too old to have riscv64
> support, but it seems I misremembered that.
> 
> It works fine for amd64, I will check on arm64 and riscv64.
> 
> I don't see a reason not to use devel/gas if we can and just forget
> about devel/binutils. I wouldn't want people to install hare and then
> try to install gcc only to have it fail for something easily fixed.
> 
> OK to replace devel/binutils with devel/gas and bump, assuming arm64 and
> riscv64 check out?
> 

Now after testing arm64 and riscv64:
amd64 and arm64 work with devel/gas. riscv64 does not work with
devel/gas and requires devel/binutils.

Attached is a patch that tweaks things. Also adds a patch from tobhe@
that got missed during import that has been upstreamed.

OK?

~Brian
Index: hare/Makefile
===
RCS file: /cvs/ports/lang/hare/hare/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- hare/Makefile   3 Dec 2023 19:07:28 -   1.1.1.1
+++ hare/Makefile   12 Dec 2023 03:16:59 -
@@ -17,7 +17,7 @@ do-gen:
cp ${WRKSRC}/configs/openbsd.mk ${WRKSRC}/config.mk
sed -i "s/aarch64-//g" ${WRKSRC}/config.mk
sed -i "s/riscv64-//g" ${WRKSRC}/config.mk
-.if ${MACHINE_ARCH:Marm64}
+.if ${MACHINE_ARCH:Maarch64} || ${MACHINE_ARCH:Mriscv64}
echo "ARCH = $$(arch -s)" >> ${WRKSRC}/config.mk
 .endif
 
Index: harec/Makefile
===
RCS file: /cvs/ports/lang/hare/harec/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- harec/Makefile  3 Dec 2023 19:07:28 -   1.1.1.1
+++ harec/Makefile  12 Dec 2023 03:16:59 -
@@ -1,4 +1,5 @@
 DISTNAME = harec-0.0.0pl20231202
+REVISION = 0
 
 WANTLIB += c m
 
@@ -7,9 +8,15 @@ COMPILER = base-clang ports-gcc
 
 BUILD_DEPENDS =${RUN_DEPENDS}
 
-# Needs a newer GNU as
-RUN_DEPENDS =  devel/binutils \
-   lang/qbe
+RUN_DEPENDS =  lang/qbe
+
+# All archs need a newer GNU as
+# gas-2.31.1 is not new enough for riscv64
+.if ${MACHINE_ARCH:Mriscv64}
+RUN_DEPENDS += devel/binutils
+.else
+RUN_DEPENDS += devel/gas
+.endif
 
 CONFIGURE_STYLE =  simple
 CONFIGURE_ARGS =   --sysconfdir="${SYSCONFDIR}"
Index: harec/patches/patch-rt_+openbsd_start+aarch64_s
===
RCS file: harec/patches/patch-rt_+openbsd_start+aarch64_s
diff -N harec/patches/patch-rt_+openbsd_start+aarch64_s
--- /dev/null   1 Jan 1970 00:00:00 -
+++ harec/patches/patch-rt_+openbsd_start+aarch64_s 12 Dec 2023 03:16:59 
-
@@ -0,0 +1,11 @@
+Already upstreamed, from tobhe@
+
+Index: rt/+openbsd/start+aarch64.s
+--- rt/+openbsd/start+aarch64.s.orig
 rt/+openbsd/start+aarch64.s
+@@ -5,5 +5,4 @@ _start:
+   mov x30, #0
+   mov x0, sp
+   add sp, x0, #-16
+-  and sp, sp, #-16
+   b rt.start_ha

Re: lang/hare build failure (Re: NEW: lang/hare)

[Brian Callahan]

On 12/11/2023 6:34 PM, Stuart Henderson wrote:
> On 2023/12/11 16:40, Lorenz (xha) wrote:
>> FYI hare only needs gas and not the complete binutils package. and gas
>> is just needed because the "as" in the base system is too old.
>>
> 
> Will the version from devel/gas (2.31.1) also work? If so, you could do
> this to prefer binutils-* but use gas-* if already installed.
> 

For some reason, I thought devel/gas was too old to have riscv64
support, but it seems I misremembered that.

It works fine for amd64, I will check on arm64 and riscv64.

I don't see a reason not to use devel/gas if we can and just forget
about devel/binutils. I wouldn't want people to install hare and then
try to install gcc only to have it fail for something easily fixed.

OK to replace devel/binutils with devel/gas and bump, assuming arm64 and
riscv64 check out?

~Brian

Re: lang/hare build failure (Re: NEW: lang/hare)

[Brian Callahan]

On 12/10/2023 8:52 PM, Theo Buehler wrote:
> I thought someone mentioned a conflict in this thread, but I can't find
> it anymore:
> 

That was a different conflict, and (hopefully) I fixed it here:
https://marc.info/?l=openbsd-ports-cvs&m=170207582213615&w=2

This one, it seems that binutils correctly has a @conflict on gas-* but
gas is missing a @conflict on binutils-*. Though it does beg the
question of if we need a (now outdated) gas package if we have an
up-to-date binutils package.

In any event, here is a diff for devel/gas.

~Brian

Index: Makefile
===
RCS file: /cvs/ports/devel/gas/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile21 Sep 2023 09:49:53 -  1.5
+++ Makefile11 Dec 2023 15:33:48 -
@@ -3,6 +3,7 @@ COMMENT =   GNU assembler
 V =2.31.1
 DISTNAME = binutils-$V
 PKGNAME =  gas-$V
+REVISION = 0
 
 CATEGORIES =   devel
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/gas/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   11 Mar 2022 18:50:04 -  1.2
+++ pkg/PLIST   11 Dec 2023 15:33:48 -
@@ -1,3 +1,4 @@
+@conflict binutils-*
 @bin bin/gas
 @info info/gas.info
 @man man/man1/gas.1

Re: [update] graphics/feh to 3.10.2

[Brian Callahan]

On 12/5/2023 7:18 AM, Justin Berthault wrote:
> Hi ports@
> 
> Updating feh to 3.10.2
> 
> Built and tested on arm64
> 
> bcallah@ cc
> 
> 

Thanks, I'll take a look later tonight.

~Brian

Re: misc/sent - add command line options patch

[Brian Callahan]

On 12/5/2023 1:57 AM, Stefan Hagen wrote:
> Hi,
> 
> I'd like to add the command line patch to misc/sent to make it more usable.
> This allows to specify the font and colors using command lines switches.
> 
> $ sent -f serif -c \#cc88cc -b gray90 sample.txt
> 
> OK?
> 

OK for me.

~Brian

Re: NEW: lang/hare

[Brian Callahan]

On 12/3/2023 7:38 AM, Lorenz (xha) wrote:
> On Sun, Dec 03, 2023 at 01:22:31PM +0100, Omar Polo wrote:
>> There are a small number of tests that fail, and one that segfaults, but
>> as support is brand new, I don't think that's necessarily a showstopper.

 can you tell me which test segfaults so i can fix this? all tests should
 and are passing for me (amd64)
>>>
>>> The harec tests don't seem to work at all for me.
>>
>> I'm new to hare, just playing with it, so sorry for chiming in, but
>> tests are fully passing for me, both hare and harec ones.  (There are
>> three skipped tests in hare, but it's just the 'slow tests'.)
>>
>> I'm on amd64 without ibt.
> 
> the harec tree hasn't been updated to compile with -z nobtcfi on
> openbsd, this is why it fails on amd64 with ibt.
> 
> the hare stdlib tests (hare directory) should work with and without ibt
> since we add -z nobtcfi.

Thanks, all. It's in and I've sent my test logs to Lorenz; hopefully he
can help smooth the warts.

~Brian

NEW: lang/hare

[Brian Callahan]

Hi ports --

Attached is a new port for the Hare programming language. Support for
OpenBSD was just announced.

This is good enough to compile the Hello world example on the main
harelang.org. The port itself is a snapshot I just made of the mainline
code, making sure to include some additional improvements from tobhe@
that just hit their tree.

Specifically looking for arm64 and riscv64 testing. I've only been able
to test it on amd64. I believe some tweaks will be needed for the other
archs.

There are a small number of tests that fail, and one that segfaults, but
as support is brand new, I don't think that's necessarily a showstopper.

OK?

~Brian

hare.tgz
Description: application/compressed

UPDATE: lang/qbe for upcoming harelang port

[Brian Callahan]

Hi ports --

This is a snapshot update of lang/qbe so that harelang works.

Should not have any surprises, but including it via email as my next
email will be a harelang port.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/lang/qbe/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile26 Sep 2023 12:02:03 -  1.5
+++ Makefile2 Dec 2023 19:59:39 -
@@ -2,8 +2,7 @@
 ONLY_FOR_ARCHS =   amd64 arm64 riscv64
 
 COMMENT =  small, quick compiler backend
-DISTNAME = qbe-1.1
-EXTRACT_SUFX = .tar.xz
+DISTNAME = qbe-1.1pl20230925
 CATEGORIES =   lang devel
 
 HOMEPAGE = https://c9x.me/compile/
@@ -14,7 +13,7 @@ PERMIT_PACKAGE =  Yes
 
 WANTLIB += c
 
-SITES =https://c9x.me/compile/release/
+SITES =https://github.com/ibara/ports/releases/download/v1.0/
 
 DEBUG_PACKAGES =   ${BUILD_PACKAGES}
 
Index: distinfo
===
RCS file: /cvs/ports/lang/qbe/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo4 Feb 2023 16:15:05 -   1.3
+++ distinfo2 Dec 2023 19:59:39 -
@@ -1,2 +1,2 @@
-SHA256 (qbe-1.1.tar.xz) = fQpT3UDfSAcqrjF+Ed3eFdGpgGcxYOUU4jW57KodsSw=
-SIZE (qbe-1.1.tar.xz) = 244740
+SHA256 (qbe-1.1pl20230925.tar.gz) = 
8HFVyjMmMgzARvknqUKFqICTJIqbtCljaYHloK6F4Qg=
+SIZE (qbe-1.1pl20230925.tar.gz) = 360885

Re: sysutils/truncate: drop "cpath" under -c

[Brian Callahan]

On 11/27/2023 9:41 PM, Klemens Nanni wrote:
> Promise not creating files.
> Add usual Makefile comment.
> 
> Could also defer initial pledge after getopt handling to have a single
>   if (no_create)
>   pledge("stdio rpath wpath cpath")
>   else
>   pledge("stdio rpath wpath")
> 
> Feedback? OK?
> 

ok for me. Thanks.

~Brian

Re: [update] sysutils/ugrep to 4.3.4

[Brian Callahan]

On 11/25/2023 11:19 AM, Justin Berthault wrote:
> Trivial update of ugrep to v4.3.4.
> 
> Built and tested on arm64
> 

I'm away for the US holiday. I'll commit when I'm home.

Thanks.

~Brian

Re: multimedia/assimp error Re: aarch64 bulk build report

[Brian Callahan]

On 11/19/2023 5:17 PM, Theo Buehler wrote:
> On Sun, Nov 19, 2023 at 10:52:35PM +0100, Peter Hessler wrote:
>> On 2023 Nov 18 (Sat) at 00:36:16 -0700 (-0700), phess...@openbsd.org wrote:
>> :http://build-failures.rhaalovely.net/aarch64/2023-11-15/multimedia/assimp.log
>>
>> Not a java-related error and doesn't seem to happen on amd64, but does on 
>> arm64:
> 
>> error: field  within 'Assimp::MDL::Vertex_MDL7' is less aligned than 
>> 'Assimp::MDL::Vertex_MDL7::(anonymous union at 
>> /usr/obj/ports/assimp-5.2.5/assimp-5.2.5/code/AssetLib/MDL/MDLFileData.h:603:5)'
>> and is usually due to 'Assimp::MDL::Vertex_MDL7' being packed, which can 
>> lead to unaligned accesses [-Werror,-Wunaligned-access]
>> union {
>> ^
>> 1 error generated.
>> ninja: build stopped: subcommand failed.
> 
> -Werror strikes again. Given that this packed struct is part of a file
> format, I doubt there's much we can do.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/assimp/Makefile,v
> diff -u -p -r1.9 Makefile
> --- Makefile  29 Aug 2023 10:46:34 -  1.9
> +++ Makefile  19 Nov 2023 22:02:12 -
> @@ -21,6 +21,8 @@ COMPILER =  base-clang ports-gcc
>  
>  # make sure we dont pickup minizip from ports as its not the same
>  CONFIGURE_ARGS+=-DASSIMP_BUILD_MINIZIP:bool=true
> +# arm64 emits a warning about unaligned access
> +CONFIGURE_ARGS+=-DASSIMP_WARNINGS_AS_ERRORS:bool=false
>  MODULES =devel/cmake
>  
>  BUILD_DEPENDS =  devel/boost
> 

Yup; this makes the most sense to me.

~Brian

Re: amd64: llvm 16 fallout (2023-11-14)

[Brian Callahan]

On 11/17/2023 5:30 PM, Anthony J. Bentley wrote:
> Klemens Nanni writes:
>> On Fri, Nov 17, 2023 at 12:26:08AM +0100, Christian Weisgerber wrote:
>>> games/mars  C++ std::random_shuffle
>>
>> Same as xprobe, can add yet another patch to this dead horse or bring
>> it behind the barn, I prefer getting rid of maintanence burdens like these.
>>
>> Unmaintained, No update after import in 2014, broke 2016 due to SMFL update,
>> broke 2022 due to SMFL and/or base LLVM update, old 2013 SourceForge HOMEAGE,
>> www.marsshooter.org yields 503, linked from a github repo w/o tags/releases,
>> last commit 2021: https://github.com/thelaui/M.A.R.S./
>>
>> OK to remove?
> 
> Old/dead, yes, but not actually a big maintenance burden, so I'd rather
> keep it for now. It's a neat little game.
> 

I feel the same way. It's a neat game that we don't have anything like
it elsewhere.

I am happy to re-take MAINTAINER of this--I'm the one responsible for
importing it way back when.

~Brian

Re: audio/mscore 3.6.2, some clean-up and enable portmidi

[Brian Callahan]

On 10/23/2023 2:35 PM, Sebastian Reitenbach wrote:
> Hi,
> 
> this updates MuseScore to latest 3.x version. Whike there, change to use GH_* 
> and some clean-up. Portmidi is in the ports tree since some while, so enable 
> it. Makes Midi note input working.
> So far, works for me. 
> 
> OK?
> 

OK and thanks. I'll try to find time to get Musescore 4 ported as well.

~Brian

Re: update lang/pcbasic --> 2.0.7

[Brian Callahan]

Hi Paco --

On 10/6/2023 4:31 AM, Stuart Henderson wrote:
> ${MODPY_FLAVOR} is missing from the new BDEP.
> 
> Standard method for setting the home dir is "PORTHOME=${WRKDIST}" rather
> than in TEST_ENV.
> 
> You may be able to skip the hanging test with MODPY_PYTEST_ARGS=--ignore
> path/to/file.py.
> 

Thanks for the update. I will test as well once I get my machines to the
latest snaps.

~Brian

Re: Update games/wtf(6) to wtf-20230906

[Brian Callahan]

On 9/30/2023 7:06 AM, Stuart Henderson wrote:
> On 2023/09/30 12:40, Marcus MERIGHI wrote:
>> Hello, 
>>
>> the following would update wtf(6) to 20230906 (from 20230828).
>> Does this need a quirk because the package name changes?
> 
> changes in what way?
> 

wtf is boring and routine to update; it barely ever changes. Almost
always just adding some new terms to its database.

Whoever wants to commit this can go ahead--I don't think it needs my ok
because these updates are so trivial but you can count this as my ok.

If no one wants to, I'll do it tomorrow.

~Brian

Re: games/devilutionx - unbreak on arm64

[Brian Callahan]

On 9/8/2023 1:28 PM, Anthony J. Bentley wrote:
> Lucas Raab writes:
>> Currently, devilutionx is broken on arm64 with an immediate crash. Setting
>> USE_NOBTCFI=Yes allows it to run there and still compiles/runs on amd64 as
>> well.
> 
> If amd64 works fine without it, maybe wrap the assignment in
> .if ${MACHINE_ARCH} == "aarch64"
> ?
> 

That was my request as well in Lucas's initial email to me.
He tells me that amd64 works (I can't test that myself right now).

~Brian

Re: Longtime BROKEN ports

[Brian Callahan]

On 9/6/2023 4:12 PM, Christian Weisgerber wrote:
> lang/ponyc  2019-07-06 jca

This one can be unbroken once I wrap my head around llvm-16.
But as that's not likely to happen soon, it can go and I can always
revive the port later when ready.

~Brian

UPDATE: sysutils/coreutils 9.3 => 9.4

[Brian Callahan]

Hi ports --

Attached is an update to the GNU coreutils.

NEWS: https://git.savannah.gnu.org/cgit/coreutils.git/tree/NEWS

All tests pass on amd64; a big endian test would be appreciated.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/sysutils/coreutils/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile4 Jun 2023 17:26:47 -   1.27
+++ Makefile3 Sep 2023 12:41:49 -
@@ -1,6 +1,6 @@
 COMMENT =  file, shell and text manipulation utilities
 
-DISTNAME = coreutils-9.3
+DISTNAME = coreutils-9.4
 CATEGORIES =   sysutils
 
 MAINTAINER =   Brian Callahan 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/coreutils/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo4 Jun 2023 17:26:47 -   1.14
+++ distinfo3 Sep 2023 12:41:49 -
@@ -1,2 +1,2 @@
-SHA256 (coreutils-9.3.tar.xz) = rbz8/omSNbceh2jc8HzVMlILf1T5qAZIQ/jRmakEu6o=
-SIZE (coreutils-9.3.tar.xz) = 5808696
+SHA256 (coreutils-9.4.tar.xz) = 6mE6TPRGEjJukXIBu7zfvTAd4h/8O1m25cB+BAsnXlI=
+SIZE (coreutils-9.4.tar.xz) = 5979200
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/coreutils/patches/patch-Makefile_in,v
retrieving revision 1.14
diff -u -p -r1.14 patch-Makefile_in
--- patches/patch-Makefile_in   4 Jun 2023 17:26:47 -   1.14
+++ patches/patch-Makefile_in   3 Sep 2023 12:41:49 -
@@ -3,7 +3,7 @@ XXX: Avoid rebuilding coreutils.info; ou
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -21087,6 +21087,7 @@ doc/$(am__dirstamp):
+@@ -22186,6 +22186,7 @@ doc/$(am__dirstamp):
@: > doc/$(am__dirstamp)
  
  $(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi 
$(doc_coreutils_TEXINFOS)
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/coreutils/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST   4 Jun 2023 17:26:47 -   1.12
+++ pkg/PLIST   3 Sep 2023 12:41:49 -
@@ -352,6 +352,11 @@ share/locale/sr/LC_TIME/coreutils.mo
 share/locale/sv/LC_MESSAGES/coreutils.mo
 share/locale/sv/LC_TIME/
 share/locale/sv/LC_TIME/coreutils.mo
+share/locale/ta/
+share/locale/ta/LC_MESSAGES/
+share/locale/ta/LC_MESSAGES/coreutils.mo
+share/locale/ta/LC_TIME/
+share/locale/ta/LC_TIME/coreutils.mo
 share/locale/tr/LC_MESSAGES/coreutils.mo
 share/locale/tr/LC_TIME/
 share/locale/tr/LC_TIME/coreutils.mo

Re: [update] games/devilutionx to 1.5.1

[Brian Callahan]

On 9/3/2023 4:29 AM, Stefan Hagen wrote:
> Lucas Raab wrote (2023-09-02 18:16 IST):
>> On Sat, Sep 02, 2023 at 05:06:31PM +, Lucas Raab wrote:
>>> On Sat, Sep 02, 2023 at 03:42:22PM +, Lucas Raab wrote:
 On Sat, Sep 02, 2023 at 12:35:01PM +, Lucas Raab wrote:
> Hello,
>
> With the recent additions of libmpq, sdl2-audiolib, simpleini, and
> libsmackerdec, this devilutionx update should work. I've only tested on 
> amd64
> and only with single player.
>
> Using plain `devilutionx` will crash attempting to play the intro video, 
> but
> for now, that can be skipped with `devilutionx -n`. Other tests and 
> feedback?
>
> Much thanks to bcallah@ for getting the diff to this point!
>
> Thanks,
> Lucas

 1.5.1 was released just yesterday so here's an updated diff taking that 
 into
 account along with sthen's feedback

 (also cc MAINTAINER since I forgot to last time :/)
>>>
>>> Updated diff after feedback from sdk@ and thfr@
>>
>> And one last update with feedback from tb@, thanks!
> 
> I have a few more things:
> 
> Changes:
> * -DBINARY_RELEASE=ON is not checked anymore.It's now called
>   -DCMAKE_BUILD_TYPE=Release
> * Added -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON
> * Added a patch to disable sound in movie sequences (avoids startup 
>   crash without -n)
> * Added a sentence about the movie sound to README
> 
> I tried fixing the crash/sound in movies, but couldn't. So I disabled
> it.
> 

OK for this version. I'll look into the movie audio next update.

~Brian

Re: UPDATE: quazip-qt5-1.4

[Brian Callahan]

On 8/31/2023 1:55 AM, Rafael Sadowski wrote:
> Simple update quazip-qt5-1.4. OK?
> 
> Cheers Rafael
> 

I won't be able to test this for a few days. But if it works, go ahead.

~Brian

Re: UPDATE: R-4.2.3

[Brian Callahan]

On 8/29/2023 8:54 AM, Ingo Feinerer wrote:
> Thanks a lot for the diff! Please sync
> math/rstudio/patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp as
> well
> (see comment above SO_VERSION).
> 

I will try to get on updating RStudio sooner than later.

~Brian

Re: Question about updating devel/pygame

[Brian Callahan]

On 8/29/2023 6:18 PM, Daniel Dickman wrote:
> 
> games/hypatia should probably be removed at this point.
> 

Yes and OK to this.

~Brian

Re: UPDATE: assimp-5.2.5

[Brian Callahan]

On 8/28/2023 5:28 PM, Rafael Sadowski wrote:
> Simple update assimp-5.2.5. Tested with Qt on amd64. OK?
> 
> Cheers Rafael
> 

Yes, please. OK and thank you.

~Brian

Re: NEW/WIP/Preview: www/ladybird

[Brian Callahan]

On 8/21/23 2:49 PM, Justin BERTHAULT wrote:
> Hi there,
> 
> Thanks for the WIP port of ladybird.
> 
> I think there is a missing ${DIST_SUBDIR} where we copy all the distfiles.
> 
> Building on a rpi400 right now To be continued.
> 

As mentioned yesterday, a new version of the port is coming soon; I'd
wait to build if you just started.

~Brian

Re: NEW/WIP/Preview: www/ladybird

[Brian Callahan]

Hi Andrew --

On 8/20/2023 3:58 PM, Andrew Kaster wrote:
> Brian,
> 
> I added a CMake option last week called ENABLE_NETWORK_DOWNLOADS that should
> make one of your patches obsolete. Setting it to OFF should have the desired
> effect. We recently added another required download for the Public Suffix
> list from https://github.com/publicsuffix/list
>  as well.
> 

That's helpful. Setting things up manually beforehand is not all that
difficult once you know what you need.

> I'm surprised by your clang 15 -> clang 13 patch. Last time I tried to use
> that version of clang to compile ladybird, the compiler ICE'd pretty badly.
> 

I wasn't sure how to answer this when Linus said something, and I'm
still not sure how to answer this. I have multiple reports from
developers and users that Ladybird works on OpenBSD on amd64 and aarch64
with the in-base compiler. Whether that's because OpenBSD clang
backported some fixes or some other reason, I don't know.

> Ladybird is known to work on both amd64 and aarch64, fwiw. I've at least
> tested it on aarch64 macOS and Asahi Linux (on the same Apple silicon
> machine)
> 

It also works on OpenBSD on an M2, reported by tobhe@:
https://bsd.network/web/@tobhe/110748264101076472

> Your build script looks similar-ish to a few that I've been messing around
> with for nixOS [1] and Flatpak [2]. I'm not sure what the best way around
> manually setting up the Cache directory for the data files is though.
> 

If there's a common strategy to ease maintenance for all portable
targets, let me know I can move to that.

> If you want /usr/local/ladybird/res then passing -DCMAKE_INSTALL_DATADIR
> should do the right thing, assuming you also patch Ladybird/Utilities.cpp
> to tell Ladybird where its "resource root" is (i.e. /usr/local/ladybird).
> 

It should be /usr/local/share/ladybird/res to match the general package
structure (I typo'd my original email), but the end result is the same.
I did not try this but would be worth trying.

> One snag with bumping up to a revision with ENABLE_NETWORK_DOWNLOADS is that
> I moved the "current binary directory" detection logic out of Qt to
> reduce the
> dependence on Qt in the helper processes (WebContent, RequestServer, etc).
> But all the googling I tried showed that OpenBSD doesn't have a good way to
> figure that out aside from looking for argv[0] in $PATH. The logic is in
> LibCore/System.cpp:1734 in current_executable_path. Of course for what it's
> used for in Ladybird, one could simply hardcode "/usr/local/bin/foobar" and
> it would probably work.
> 

We would hardcode "/usr/local/bin/ladybird" for the OpenBSD package.

I'll try to get a new package/port out over the next few days after
updating the codebase and trying some of this out.

~Brian

Re: pcc i386 build fails / autoconf [Re: CVS: cvs.openbsd.org: ports]

[Brian Callahan]

On 8/16/2023 10:55 AM, Stuart Henderson wrote:
> On 2023/08/16 14:06, Brian Callahan wrote:
>> On 8/16/2023 9:43 AM, Stuart Henderson wrote:
>>>
>>> also, the comment about why it's using a wrong version of autoconf
>>> should have the version bumped to 2.71 (though if there's a problem
>>> with AC_PROG_LEX in 2.70/2.71 that should probably be fixed in autoconf..)
>>
>> You may want to try using autoconf-2.71. The scripts were last reconf'd
>> with 2.71, and I was the one who last reconf'd them, on an OpenBSD
>> machine. Worked fine here.
> 
> It fails in a ports build with 2.71, and it fails with the bundled
> configure script.
> 
> Seems that the problem is that ac_cv_prog_lex_root ("checking for
> lex output file root... lex.yy" is set by ports infrastructure in
> config.cache but that the subsequent "checking for lex library"
> depends on the file created in the ac_cv_prog_lex_root check.
> 

Ah, I see the issue. Admittedly, I don't build pcc within the ports
tree, so with lex.yy not cached, things work fine.

~Brian

Re: pcc i386 build fails / autoconf [Re: CVS: cvs.openbsd.org: ports]

[Brian Callahan]

On 8/16/2023 9:43 AM, Stuart Henderson wrote:
> On 2023/08/12 20:43, Daniel Dickman wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by:  dan...@cvs.openbsd.org  2023/08/12 20:43:15
>>
>> Modified files:
>>  lang/pcc   : Makefile.inc 
>>  lang/pcc/pcc   : distinfo 
>>  lang/pcc/pcc/patches: patch-arch_powerpc_local_c 
>>patch-cc_cc_cc_c 
>>  lang/pcc/pcc-libs: Makefile distinfo 
>>
>> Log message:
>> update to pcc 20230813
> 
> i386 fails:
> 
> cc  -O2 -pipe  -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow 
> -Wsign-compare -DGCC_COMPAT -DPCC_DEBUG -D_ISOC
> 99_SOURCE  -Dos_openbsd -Dmach_i386  -I. -I. -I../.. -I../../mip 
> -I../../arch/i386  -I../../os/openbsd -I../../common
> -c -o code.o ../../arch/i386/code.c
> ../../arch/i386/code.c:452:22: error: no member named 'ss' in 'struct attr'
> if (stcall && (ap = strattr(p->n_left->n_ap)) &&
> ^~~~   
> ./pass1.h:623:26: note: expanded from macro 'strattr' 
> #define strattr(x)  ((x)->ss)
>  ~~~  ^
> 1 error generated.
> 
> 
> also, the comment about why it's using a wrong version of autoconf
> should have the version bumped to 2.71 (though if there's a problem
> with AC_PROG_LEX in 2.70/2.71 that should probably be fixed in autoconf..)
> 

You may want to try using autoconf-2.71. The scripts were last reconf'd
with 2.71, and I was the one who last reconf'd them, on an OpenBSD
machine. Worked fine here.

~Brian

Re: Fix sysutils/ugrep ug+/ugrep+ scripts

[Brian Callahan]

On 8/15/2023 11:54 AM, Volker Schlecht wrote:
> 
> The port currently installs two shell scripts named ug+ and ugrep+ that
> refer to /bin/bash.
> 
> I was thinking about proposing a dependency on bash, but we'd still need
> to patch the two scripts that look to me like perfectly fine Posix sh,
> so I propose to patch them to use /bin/sh
> 
> Thoughts? OK?
> 
> cheers,
> Volker

Sure, but can you try pushing this upstream as well?

Thanks.

~Brian

UPDATE: games/corsixth 0.66 => 0.67

[Brian Callahan]

Hi ports --

Attached is a quite straightforward update to CorsixTH. Upstream tagged
the code but hasn't yet made the formal release.

Changelog is here:
https://github.com/CorsixTH/CorsixTH/compare/v0.66...v0.67

A big endian test would be appreciated. It's fine on amd64 and i386,
even on a paltry little n270 atom netbook.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/games/corsixth/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile	13 May 2023 18:01:55 -	1.15
+++ Makefile	9 Aug 2023 00:16:34 -
@@ -1,6 +1,4 @@
-ONLY_FOR_ARCHS =	${CXX11_ARCHS}
-
-V =		0.66
+V =		0.67
 COMMENT =	open source clone of Theme Hospital
 PKGNAME =	corsixth-${V}
 CATEGORIES =	games x11
@@ -36,8 +34,8 @@ RUN_DEPENDS =	audio/timidity \
 
 NO_TEST =	Yes
 
-# Remove the .orig file
+# Remove the .orig.port file
 post-install:
-	@rm -f ${PREFIX}/share/corsix-th/Lua/app.lua.orig
+	@rm -f ${PREFIX}/share/corsix-th/Lua/app.lua.orig.port
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/games/corsixth/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo	13 May 2023 18:01:55 -	1.8
+++ distinfo	9 Aug 2023 00:16:34 -
@@ -1,2 +1,2 @@
-SHA256 (CorsixTH-0.66.tar.gz) = n4f/ACQFUBsSeYpxW2kUlndaT5cnGI7roWcUOBaZKg8=
-SIZE (CorsixTH-0.66.tar.gz) = 4117046
+SHA256 (CorsixTH-0.67.tar.gz) = TojPGRa/TXwwS1Ud25H7kZTxELrUZjA4ynPTG5OdaeM=
+SIZE (CorsixTH-0.67.tar.gz) = 4127698
Index: patches/patch-CorsixTH_Lua_app_lua
===
RCS file: /cvs/ports/games/corsixth/patches/patch-CorsixTH_Lua_app_lua,v
retrieving revision 1.4
diff -u -p -r1.4 patch-CorsixTH_Lua_app_lua
--- patches/patch-CorsixTH_Lua_app_lua	13 May 2023 18:01:55 -	1.4
+++ patches/patch-CorsixTH_Lua_app_lua	9 Aug 2023 00:16:34 -
@@ -9,6 +9,6 @@ Index: CorsixTH/Lua/app.lua
self.savegame_version = SAVEGAME_VERSION
 -  self.check_for_updates = true
 +  self.check_for_updates = false
+   self.idle_tick = 0
  end
  
- --! Starts a Lua DBGp client & connects it to a DBGp server.
Index: patches/patch-CorsixTH_Src_th_movie_cpp
===
RCS file: patches/patch-CorsixTH_Src_th_movie_cpp
diff -N patches/patch-CorsixTH_Src_th_movie_cpp
--- patches/patch-CorsixTH_Src_th_movie_cpp	13 May 2023 18:01:55 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,44 +0,0 @@
-Use ffmpeg 5.1 new channel layout api
-
-Index: CorsixTH/Src/th_movie.cpp
 CorsixTH/Src/th_movie.cpp.orig
-+++ CorsixTH/Src/th_movie.cpp
-@@ -446,9 +446,29 @@ void movie_player::play(int iChannel) {
-   default:
- std::cerr << "WARN: unsupported channel layout " << mixer_channels
-   << ". Please report issue.";
--target_channel_layout = av_get_default_channel_layout(mixer_channels);
-+target_channel_layout = 0;
- }
- 
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 24, 100) && \
-+LIBSWRESAMPLE_VERSION_INT >= AV_VERSION_INT(4, 5, 100)
-+av_channel_layout_unique_ptr ch_layout(new AVChannelLayout{});
-+
-+if (target_channel_layout == 0) {
-+  av_channel_layout_default(ch_layout.get(), mixer_channels);
-+} else {
-+  av_channel_layout_from_mask(ch_layout.get(), target_channel_layout);
-+}
-+
-+swr_alloc_set_opts2(&audio_resample_context, ch_layout.get(),
-+AV_SAMPLE_FMT_S16, mixer_frequency,
-+&(audio_codec_context->ch_layout),
-+audio_codec_context->sample_fmt,
-+audio_codec_context->sample_rate, 0, nullptr);
-+#else
-+if (target_channel_layout == 0) {
-+  target_channel_layout = av_get_default_channel_layout(mixer_channels);
-+}
-+
- audio_resample_context = swr_alloc_set_opts(
- audio_resample_context,
- static_cast(target_channel_layout), AV_SAMPLE_FMT_S16,
-@@ -456,6 +476,7 @@ void movie_player::play(int iChannel) {
- static_cast(audio_codec_context->channel_layout),
- audio_codec_context->sample_fmt, audio_codec_context->sample_rate, 0,
- nullptr);
-+#endif
- swr_init(audio_resample_context);
- empty_audio_chunk.reset(
- Mix_QuickLoad_RAW(audio_chunk_buffer.data(),
Index: patches/patch-CorsixTH_Src_th_movie_h
===
RCS file: patches/patch-CorsixTH_Src_th_movie_h
diff -N patches/patch-CorsixTH_Src_th_movie_h
--- patches/patch-CorsixTH_Src_th_movie_h	13 May 2023 18:01:55 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,27 +0,0 @@
-Use ffmpeg 5.1 new channel layout api
-
-Index: CorsixTH/Src/th_movie.h
 CorsixTH/Src/th_movie.h.orig
-+++ CorsixTH/Src/th_movie.h
-@@ -96,6 +96,21 @@ class mix_chunk_deleter {
- 
- using mix_chunk_unique_ptr = std::unique_ptr;
- 
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_I

Re: UPDATE: games/openrct2 0.3.1 => 0.4.5

[Brian Callahan]

On 8/4/23 10:19 PM, Thomas Frohwein wrote:
> On Fri, Aug 04, 2023 at 11:07:12PM +0000, Brian Callahan wrote:
>> Hi ports --
>>
>> Attached is an update to OpenRCT2. It brings in several years worth of
>> updates. The updates to the port itself will make updating OpenRCT2
>> easier going forward, so we won't be years behind any more.
>>
>> This works fine on amd64. Also seemed OK with some light testing on
>> i386, but I only have an old atom n270 netbook running i386, so was only
>> getting 10 or fewer fps when there was any real activity going on.
>> Fortunately, low fps doesn't appear to affect the game loop all that much.
>>
>> Diff is gzipped because it is very large.
>>
>> OK?
>>
>> ~Brian
> 
> It builds fine. I don't think I can really run it without Roller Coaster
> Tycoon 2 which I don't own currently; Roller Coaster Tycoon Deluxe
> doesn't seem to suffice on its own. Looking through the diff, a large
> part is just PLIST changes. Also now needs a bunch of github
> submodules... ah well.
> 
> ok thfr@

It always required those extra github modules. The difference is before
I was pre-packaging them and then hosting my own tarball. That's a lot
more work; letting the ports infrastructure handle it will greatly
reduce the effort needed to update OpenRCT2 and improves the process, so
feels like a big net-win.

~Brian

Re: NEW: games/candycrisis

[Brian Callahan]

On 8/1/23 10:24 PM, George Koehler wrote:
> On Sun, 30 Jul 2023 14:43:14 +
> Brian Callahan  wrote:
> 
>> Works well on amd64 and i386. Would be interested in seeing how it fares
>> on a big endian machine.
> 
> powerpc is big-endian, but the last powerpc bulk is missing some
> dependencies for candycrisis.  After 2 days of difficult preparation
> (mixing local packages and month-old snap packages), I built
> candycrisis-3.0.1 for powerpc.
> 
> candycrisis quickly shows a dialog box,
> 
>  cmixer
> 
> CMVoice_LoadWAV:885: unsupported WAVE format
> 
>  OK
> 
> After I clicked OK, it died by "Abort trap (core dumped)".
> WRKSRC/src/support/cmixer.c is missing some endian swaps.
> 

Thanks for the report. That's disappointing but maybe not surprising.
I will have to find one of my old iMac G4s and get it up and running
again...

~Brian

UPDATE: games/openrct2 0.3.1 => 0.4.5

[Brian Callahan]

Hi ports --

Attached is an update to OpenRCT2. It brings in several years worth of
updates. The updates to the port itself will make updating OpenRCT2
easier going forward, so we won't be years behind any more.

This works fine on amd64. Also seemed OK with some light testing on
i386, but I only have an old atom n270 netbook running i386, so was only
getting 10 or fewer fps when there was any real activity going on.
Fortunately, low fps doesn't appear to affect the game loop all that much.

Diff is gzipped because it is very large.

OK?

~Brian

openrct2-045.diff.gz
Description: application/gzip

UPDATE: astro/gnuastro 0.18 => 0.20

[Brian Callahan]

Hi ports --

Attached is an update to gnuastro. Major bump to the shared library as
symbols have been removed.

Posting this because I don't use gnu astro much anymore, and would be
happy to see someone else take over as maintainer.

Test suite results on amd64:

Testsuite summary for GNU Astronomy Utilities 0.20

# TOTAL: 76
# PASS:  67
# SKIP:  0
# XFAIL: 0
# FAIL:  9
# XPASS: 0
# ERROR: 0

~BrianIndex: Makefile
===
RCS file: /cvs/ports/astro/gnuastro/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile	28 Feb 2023 07:59:03 -	1.10
+++ Makefile	31 Jul 2023 21:08:37 -
@@ -1,9 +1,9 @@
 COMMENT =	GNU Astronomy Utilities
-DISTNAME =	gnuastro-0.18
+DISTNAME =	gnuastro-0.20
 CATEGORIES =	astro
-REVISION =	0
 
-SHARED_LIBS +=	gnuastro  3.1 # 16.0
+SHARED_LIBS +=	gnuastro  4.0 # 18.0
+SHARED_LIBS +=  gnuastro_make 0.0 # 18.0
 
 HOMEPAGE =	https://www.gnu.org/software/gnuastro/
 MAINTAINER =	Brian Callahan 
Index: distinfo
===
RCS file: /cvs/ports/astro/gnuastro/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo	14 Aug 2022 14:07:01 -	1.7
+++ distinfo	31 Jul 2023 21:08:37 -
@@ -1,2 +1,2 @@
-SHA256 (gnuastro-0.18.tar.gz) = bKfiLhQFERdMbwL9+UitCL8/dB/k6YKNjBzfKnCtWec=
-SIZE (gnuastro-0.18.tar.gz) = 6754502
+SHA256 (gnuastro-0.20.tar.gz) = kkuLtqwc0VFj3a3Dqb/bi4jKx7UJnV+CHs7bw/Cwac0=
+SIZE (gnuastro-0.20.tar.gz) = 7318098
Index: patches/patch-configure
===
RCS file: /cvs/ports/astro/gnuastro/patches/patch-configure,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure
--- patches/patch-configure	14 Aug 2022 14:07:01 -	1.7
+++ patches/patch-configure	31 Jul 2023 21:08:37 -
@@ -3,7 +3,7 @@ Remove hardcoded -O3
 Index: configure
 --- configure.orig
 +++ configure
-@@ -21353,7 +21353,7 @@ if test "x$enable_debug" = "xyes"
+@@ -21278,7 +21278,7 @@ if test "x$enable_debug" = "xyes"
  then :
cflags_add="-g -O0"; enable_shared=no
  else $as_nop
@@ -12,7 +12,7 @@ Index: configure
  fi
  CFLAGS="-Wall $cflags_add $CFLAGS"
  CXXFLAGS="-Wall $cflags_add $CXXFLAGS"
-@@ -30660,7 +30660,7 @@ printf %s "checking for shell to use with libtool... "
+@@ -30609,7 +30609,7 @@ printf %s "checking for shell to use with libtool... "
  cprog=libtool_shell_test.c
  printf "%s\n" "#include " > $cprog
  printf "%s\n" "int main(void){printf(\"success\\n\"); return 0;}" >> $cprog
Index: pkg/PLIST
===
RCS file: /cvs/ports/astro/gnuastro/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST	14 Aug 2022 14:07:01 -	1.7
+++ pkg/PLIST	31 Jul 2023 21:08:37 -
@@ -20,6 +20,7 @@ bin/astscript-psf-subtract
 bin/astscript-psf-unite
 bin/astscript-radial-profile
 bin/astscript-sort-by-night
+bin/astscript-zeropoint
 @bin bin/astsegment
 @bin bin/aststatistics
 @bin bin/asttable
@@ -30,6 +31,7 @@ include/gnuastro/array.h
 include/gnuastro/binary.h
 include/gnuastro/blank.h
 include/gnuastro/box.h
+include/gnuastro/color.h
 include/gnuastro/config.h
 include/gnuastro/convolve.h
 include/gnuastro/cosmology.h
@@ -37,6 +39,7 @@ include/gnuastro/data.h
 include/gnuastro/dimension.h
 include/gnuastro/ds9.h
 include/gnuastro/eps.h
+include/gnuastro/fit.h
 include/gnuastro/fits.h
 include/gnuastro/git.h
 include/gnuastro/interpolate.h
@@ -59,9 +62,14 @@ include/gnuastro/tile.h
 include/gnuastro/txt.h
 include/gnuastro/type.h
 include/gnuastro/units.h
+include/gnuastro/warp.h
 include/gnuastro/wcs.h
 info/gnuastro-figures/
 info/gnuastro-figures/README
+info/gnuastro-figures/color-names.eps
+info/gnuastro-figures/color-names.pdf
+info/gnuastro-figures/color-names.png
+info/gnuastro-figures/color-names.txt
 info/gnuastro-figures/done.txt
 info/gnuastro-figures/epicycles.eps
 info/gnuastro-figures/epicycles.png
@@ -90,6 +98,9 @@ info/gnuastro-figures/sphereandplane.txt
 @static-lib lib/libgnuastro.a
 lib/libgnuastro.la
 @lib lib/libgnuastro.so.${LIBgnuastro_VERSION}
+@static-lib lib/libgnuastro_make.a
+lib/libgnuastro_make.la
+@lib lib/libgnuastro_make.so.${LIBgnuastro_make_VERSION}
 lib/pkgconfig/gnuastro.pc
 @man man/man1/astarithmetic.1
 @man man/man1/astbuildprog.1
@@ -113,6 +124,7 @@ lib/pkgconfig/gnuastro.pc
 @man man/man1/astscript-psf-unite.1
 @man man/man1/astscript-radial-profile.1
 @man man/man1/astscript-sort-by-night.1
+@man man/man1/astscript-zeropoint.1
 @man man/man1/astsegment.1
 @man man/man1/aststatistics.1
 @man man/man1/asttable.1

NEW: games/candycrisis

[Brian Callahan]

Hi ports --

Attached is a new port, games/candycrisis. It is an open source clone of
Puyo Puyo.

---
pkg/DESCR:
Candy Crisis is an unofficial source port of the old Mac game Candy
Crisis to modern operating systems. This version has an optional
widescreen mode.

It is a clone of the game Puyo Puyo with 12 stages and multiplayer.
---

Works well on amd64 and i386. Would be interested in seeing how it fares
on a big endian machine.

OK?

~Brian

candycrisis.tgz
Description: application/compressed-tar

UPDATE: graphics/azpainter 3.0.4 => 3.0.6

[Brian Callahan]

Hi ports --

Attached is an update to azpainter. The software works fine. My primary
question is that they moved from make to a configure script that
generates a ninja file, and I was wondering if there was a better way to
handle building with ninja outside of cmake/meson.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/graphics/azpainter/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile	24 Apr 2023 11:40:43 -	1.6
+++ Makefile	30 Jul 2023 00:22:24 -
@@ -1,10 +1,9 @@
-V =		3.0.4
+V =		3.0.6
 COMMENT =	full color painting software for illustrations
 DISTNAME =	azpainter-v${V}
 PKGNAME =	azpainter-${V}
 EXTRACT_SUFX =	.tar.bz2
 CATEGORIES =	graphics multimedia x11
-REVISION =	0
 
 HOMEPAGE =	http://azsky2.html.xdomain.jp/
 MAINTAINER =	Brian Callahan 
@@ -13,7 +12,7 @@ MAINTAINER =	Brian Callahan https://gitlab.com/azelpg/azpainter/-/archive/v${V}/
 
@@ -21,6 +20,9 @@ MASTER_SITES =	https://gitlab.com/azelpg
 COMPILER =	base-clang ports-gcc
 COMPILER_LANGS =	c
 
+# Uses ninja as of 3.0.6, see build and install targets
+BUILD_DEPENDS =	devel/ninja
+
 LIB_DEPENDS =	converters/libiconv \
 		graphics/jpeg \
 		graphics/libwebp \
@@ -33,15 +35,19 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 # CONFIGURE_ARGS is not a typo.
 # The configure script is broken.
 CONFIGURE_STYLE =	simple
-CONFIGURE_ARGS =	CC="${CC}"
+CONFIGURE_ARGS =	CC="${CC}" CFLAGS="${CFLAGS}"
 
 CFLAGS +=	-std=gnu11
 
-USE_GMAKE =	Yes
-
 NO_TEST =	Yes
 
 do-gen:
 	sed -i "s,%LOCALBASE%,${LOCALBASE},g" ${WRKSRC}/src/main.c
+
+do-build:
+	cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV} ninja -v
+
+do-install:
+	cd ${WRKSRC}/build && ninja install
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/graphics/azpainter/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo	16 Mar 2022 01:44:05 -	1.3
+++ distinfo	30 Jul 2023 00:22:24 -
@@ -1,2 +1,2 @@
-SHA256 (azpainter-v3.0.4.tar.bz2) = o8g4Kt87ZP4Mgl/VYHUoag5OJ+QXL+VhcWeVXxO+5qU=
-SIZE (azpainter-v3.0.4.tar.bz2) = 986326
+SHA256 (azpainter-v3.0.6.tar.bz2) = rJW6YtqQP+rrAHRr0Fg/pLMXKYfX4UhVFPVFa5MZYMQ=
+SIZE (azpainter-v3.0.6.tar.bz2) = 991153
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in	16 Mar 2022 01:44:05 -	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-Respect CFLAGS.
-
-Index: Makefile.in
 Makefile.in.orig
-+++ Makefile.in
-@@ -15,7 +15,7 @@ inst_dir := install -m 755 -d
- inst_file := install -m 644
- 
- CC := @CC@
--CFLAGS := @CFLAGS@ -pthread -Isrc/include -Imlk/include -I. -DHAVE_CONFIG_H
-+CFLAGS += @CFLAGS@ -pthread -Isrc/include -Imlk/include -I. -DHAVE_CONFIG_H
- LDFLAGS := @LDFLAGS@ -pthread
- LIBS := @LIBS@ -lm
- 
Index: patches/patch-configure
===
RCS file: /cvs/ports/graphics/azpainter/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure	20 Oct 2022 20:57:02 -	1.4
+++ patches/patch-configure	30 Jul 2023 00:22:24 -
@@ -1,36 +1,14 @@
-Don't hardcode optimization flags.
-Add OpenBSD to supported OS list.
+Remove hardcoded -O2
 
 Index: configure
 --- configure.orig
 +++ configure
-@@ -274,7 +274,7 @@ if test -z "$CFLAGS";then
+@@ -158,8 +158,6 @@ done
+ if test -z "$CFLAGS";then
  	if test "$cf_debug" = yes;then
- 		CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-g -Wall"`
- 	else
--		CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-O2 -Wall"`
-+		CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-Wall"`
+ 		CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-g"`
+-	else
+-		CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-O2"`
  	fi
  fi
  
-@@ -293,6 +293,11 @@ elif test "$tmp1" = FreeBSD;then
- 	cf_make=gmake
- 	CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
- 	LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
-+elif test "$tmp1" = OpenBSD;then
-+	cf_os=openbsd
-+	cf_make=gmake
-+	CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
-+	LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
- fi
- 
- # dir
-@@ -349,7 +354,7 @@ fc_check_sharedlib "iconv"
- fc_check_funclink rt "clock_gettime"
- 
- fc_check_lib libpng "libpng" "" "-lpng -lz" "png.h" "" "libpng-dev or libpng-devel or libpng or png"
--fc_check_lib zlib "zlib" "" "" "zlib.h" "" "zlib1g-dev or zlib-devel or zlib"
-+fc_check_lib zlib &

NEW/WIP/Preview: www/ladybird

[Brian Callahan]

Hi ports --

Attached is a new port, www/ladybird. Ladybird is an independent web
browser from the SerenityOS project. Posting it here because I know
there are some people who are looking for a port.

---
pkg/DESCR:
Ladybird is an independent cross-platform web browser based on the
LibWeb and LibJS engines from SerenityOS.
---

There is a little bit of messiness in the port:
1. There are a number of dependencies that CMake tries to download at
configure time. That's obviously no good for us so everything gets
pre-downloaded and set up before CMake is run.
2. There are a lot of files installed to /usr/local/res -- this seems to
be a paradigm of SerenityOS itself. I looked into trying to set up
something more sane (maybe /usr/local/ladybird/res) but it looks like
those tendrils are everywhere so perhaps a better strategy is worthwhile.

This does in fact build and run on amd64. Don't expect miracles but it
is more web compliant than dillo and possibly more web compliant than
netsurf. It does have a mostly complete JavaScript engine, but it is
slow. It was somewhat able to load the YouTube homepage after some time,
for example. Does not play video though.

If you're looking for a package so you can play around with it without
compiling:
https://github.com/ibara/ports/releases/download/v1.0/ladybird-0.0.0pl20230719.tgz

Not necessarily looking for OKs right now; feedback might be more
appropriate.

~Brian

ladybird.tgz
Description: application/compressed

Re: retire multimedia/gnome-twitch? dead upstream...

[Brian Callahan]

On 7/15/2023 7:43 PM, Morgan Aldridge wrote:
> On Sat, Jul 15, 2023 at 14:20 Thomas Frohwein 
> wrote:
> 
>> I propose retiring multimedia/gnome-twitch. The GH thread at [1] makes
>> it fairly clear that since Twitch API change in 2020 [2], the project
>> is dead. The last commit on their master branch was in 2019, and the
>> last release version was in 2018.
>>
>> [1] mentions streamlink-twitch-gui as an alternative [3]... note a quick
>> look shows this is a JS project involving monsters like node and
>> chromium...
>>
>> ok to send gnome-twitch to the attic?
>>

Yes, please do.

> 
> Semi-related, we’ll want to keep an eye on the streamlink port and its
> twitch plugin as there are some larger changes coming which will require it
> to fire up a chromium-based browser when the streaming access token needs a
> client-integrity token. See:
> 
> - 
> - 
> 
> 
> 

Will keep an eye on this...

~Brian

Re: [update] thunderbird 115.0

[Brian Callahan]

Hi Landry --

On 7/12/23 8:10 AM, Landry Breuil wrote:
> hi,
> 
> upstream released the new major version, with a new 'supernova' UI.
> My goal is to push this to -current soon so that it's battle-tested
> enough for 7.4. The 102esr branch will be eol soon.
> been using betas on my work laptops since some months without particular
> issues. feedback from users of specific features (pgp, newsgroups,
> xmpp/matrix, calendar, google mail integration) welcome.
> 
> cf 
> https://blog.thunderbird.net/2023/07/our-fastest-most-beautiful-release-ever-thunderbird-115-supernova-is-here/
> 
> as usual, there's a pkg on my repo. cvs diff attached.
> 
> Landry

Built no problem. The new UI is great. I'm not a user of all those
additional features. For basic mail use, no issues.

Thanks!

~Brian

Re: lang/* BTI breakage

[Brian Callahan]

On 7/10/2023 9:33 AM, Theo de Raadt wrote:
> Brian Callahan  wrote:
> 
>> Pushed a nobtcfi fix for DMD.
> 
> nobtcfi should never be considered a "fix".  It is a workaround we make
> available to allow laggard software to continue running -- nothing more.
> 
> 
> 

Agreed. And I made the same clear to them.

Re: lang/* BTI breakage

[Brian Callahan]

On 7/9/2023 5:56 PM, Christian Weisgerber wrote:
> The remaining build failures are:
> 
> lang/crystal
> lang/dmd
> lang/gprolog
> lang/ldc
> lang/mono
> lang/ocaml
> lang/racket-minimal
> 

Pushed a nobtcfi fix for DMD. I will work with upstream to get them to
fix things, but DMD has a custom backend and that might take a bit.

Am working with LDC now to get things to work. As LDC is just LLVM, I
suspect this one might be a lot easier.

~Brian

Re: scid - info for @bcallahan

[Brian Callahan]

Hello Maurice (and ports) --

On 5/9/2023 7:41 PM, Brian Callahan wrote:
> On 5/6/2023 10:06 AM, Maurice McCarthy wrote:
>> Just did a fresh install of 7.3 not problems.
>> When I launched scid-4.7.0 I had he same problems as last year.
>> But the identical cure worked. I used your diff to upgrade to 4.7.4
>> and all worked perfectly.
>>
>> https://marc.info/?l=openbsd-ports&m=166886213023708&q=p3
>>
>> Thanks again for all the fine efforts!
>>
> 
> Thanks for the heads up. Glad it is still working. Will commit soon...
> 
> ~Brian
> 

Attached in an update to scid-5.0.2. Please test and let me know if it
is still good for you.

Thanks.

~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/scid/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile11 Mar 2022 19:04:53 -  1.7
+++ Makefile5 Jun 2023 18:56:10 -
@@ -1,6 +1,6 @@
-V =4.7.0
+V =5.0.2
 COMMENT =  chess database software
-DISTNAME = scid-code-${V}
+DISTNAME = scid_src_${V}
 PKGNAME =  scid-${V}
 EXTRACT_SUFX = .zip
 CATEGORIES =   games x11
@@ -15,12 +15,11 @@ WANTLIB += ${COMPILER_LIBCXX} ${MODTCL_W
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=scid/}
 
-# C++11
-COMPILER = base-clang ports-gcc base-gcc
+# C++20
+COMPILER = base-clang ports-gcc
 
 MODULES =  lang/python \
x11/tk
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
 MODTK_VERSION =8.6
 MODPY_ADJ_FILES =  scripts/pgnfix.py
 
@@ -35,7 +34,7 @@ MAKE_FLAGS =  CXX="${CXX}"
 
 NO_TEST =  Yes
 
-WRKDIST =  ${WRKDIR}/scid
+WRKDIST =  ${WRKDIR}/scid-${V}
 FIX_CRLF_FILES = engines/togaII1.2.1a/src/Makefile
 
 pre-configure:
@@ -51,5 +50,8 @@ post-configure:
@${MODTCL_TCLSH_ADJ} ${WRKSRC}/tcl/lang/checklangs.tcl
@${MODTCL_TCLSH_ADJ} ${WRKSRC}/tcl/lang/propagatelang.tcl
@${MODTCL_TCLSH_ADJ} ${WRKSRC}/tcl/lang/removetoken.tcl
+
+post-install:
+   rm -f ${PREFIX}/share/scid/tcl/utils/tooltip.tcl.orig.port
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/games/scid/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo31 Mar 2019 21:31:16 -  1.2
+++ distinfo5 Jun 2023 18:56:10 -
@@ -1,2 +1,2 @@
-SHA256 (scid-code-4.7.0.zip) = LtJXgew8gtYPzuhSWcGf2JNP6uJUf5RkMEzbAZYPhto=
-SIZE (scid-code-4.7.0.zip) = 15782104
+SHA256 (scid_src_5.0.2.zip) = J0HQGoA1nhHImf+JTf+gVSkvJPYoeTuvQTS1t1gZy3s=
+SIZE (scid_src_5.0.2.zip) = 15661705
Index: patches/patch-configure
===
RCS file: /cvs/ports/games/scid/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 11 Mar 2022 19:04:53 -  1.3
+++ patches/patch-configure 5 Jun 2023 18:56:10 -
@@ -14,12 +14,12 @@ Index: configure
  set var(DEBUG) {-DNDEBUG}
  set var(OBJS) {$(SCIDOBJS)}
  set var(THREADS) {-pthread}
--set var(OPTIMIZE) {-std=c++14 -O3 -march=native -fno-rtti -fno-exceptions}
-+set var(OPTIMIZE) {${CXXFLAGS} -std=c++14 -fno-rtti -fno-exceptions}
+-set var(OPTIMIZE) {-std=c++20 -O3 -march=native -fno-rtti -fno-exceptions}
++set var(OPTIMIZE) {${CXXFLAGS} -std=c++20 -fno-rtti -fno-exceptions}
  set var(PROFILE) {}
  set var(SCIDFLAGS) {}
 -set var(SHAREDIR) /usr/local/share/scid
 +set var(SHAREDIR) ${LOCALBASE}/share/scid
- set var(TB) {-DSCID_USE_TB -DT41_INCLUDE}
  set var(TCL_VERSION) $tcl_version
  set var(WARNINGS) -Wall
+ set var(MAKEFILE) Makefile.conf
Index: patches/patch-engines_scidlet_scidlet_cpp
===
RCS file: patches/patch-engines_scidlet_scidlet_cpp
diff -N patches/patch-engines_scidlet_scidlet_cpp
--- patches/patch-engines_scidlet_scidlet_cpp   11 Mar 2022 19:04:53 -  
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-Missing sys/select.h
-
-Index: engines/scidlet/scidlet.cpp
 engines/scidlet/scidlet.cpp.orig
-+++ engines/scidlet/scidlet.cpp
-@@ -17,6 +17,7 @@
- 
- #include "../../src/engine.h"
- #include "../../src/misc.h"
-+#include 
- #include 
- #include 
- #include 
Index: patches/patch-tcl_utils_tooltip_tcl
===
RCS file: patches/patch-tcl_utils_tooltip_tcl
diff -N patches/patch-tcl_utils_tooltip_tcl
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-tcl_utils_tooltip_tcl 5 Jun 2023 18:56:10 -
@@ -0,0 +1,15 @@
+Force the use of the built-in tooltip package.
+Otherwise, there is a problem if you have tk-8.5 and tk-8.6 installed.
+
+Index: tcl/utils/tooltip.tcl
+--- tcl/utils/tooltip.tcl.orig
 tcl/utils/tooltip.tcl
+@@ -3,7 +3,7 @@
+ # Tooltips
+ #
+ 
+-set useLocalTklib [catch {package require tooltip 1.4

Re: UPDATE: devel/dwz 0.14 => 0.15

[Brian Callahan]

On 6/4/2023 2:36 PM, Klemens Nanni wrote:
> 
> Perhaps "Use local copy to break dependency cycle" to clarify that?
> Then I wouldn't have asked in the first place, as I read your comment
> as ''  does not exist, force "xxhash.h" ''
> 

I'll put a comment like that in the port Makefile.

~Brian

Re: UPDATE: devel/dwz 0.14 => 0.15

[Brian Callahan]

On 6/4/2023 1:56 PM, Theo Buehler wrote:
> On Sun, Jun 04, 2023 at 05:55:02PM +, Klemens Nanni wrote:
>> On Sun, Jun 04, 2023 at 05:48:24PM +0000, Brian Callahan wrote:
>>> Hi ports --
>>>
>>> Attached is an update to devel/dwz. The main benefit for us is a modest
>>> speedup.
>>>
>>> The full announcement with changes is here:
>>> https://sourceware.org/pipermail/dwz/2022q4/001385.html
>>>
>>> Seems OK on my end on amd64. But since dwz is integral for debug
>>> packages, looking for more eyeballs.
>>>
>>> OK?
>>>
>>> ~Brian
>>
>> You fetch xxhash and turn it into a local include.
>> Did you try adding the following as dependency instead?
>>
>>  $ pkglocate include/xxhash.h
>>  xxhash-0.8.1p0:sysutils/xxhash:/usr/local/include/xxhash.h
> 
> I think that would create a loop. xxhash has DEBUG_PACKAGES set and
> dwz is needed to extract the debug info.
> 

That's correct. That's what I did things the way I did.

~Brian

UPDATE: devel/dwz 0.14 => 0.15

[Brian Callahan]

Hi ports --

Attached is an update to devel/dwz. The main benefit for us is a modest
speedup.

The full announcement with changes is here:
https://sourceware.org/pipermail/dwz/2022q4/001385.html

Seems OK on my end on amd64. But since dwz is integral for debug
packages, looking for more eyeballs.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/devel/dwz/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile11 Mar 2022 18:50:00 -  1.6
+++ Makefile29 Nov 2022 23:40:09 -
@@ -1,5 +1,8 @@
 COMMENT =  DWARF optimization and duplicate removal tool
-DISTNAME = dwz-0.14
+PKGNAME =  dwz-0.15
+XXHASH_V = 0.8.1
+DISTFILES =${PKGNAME}.tar.gz:0 \
+   xxhash-${XXHASH_V}{xxhash}.h:1
 
 CATEGORIES =   devel
 
@@ -11,7 +14,8 @@ PERMIT_PACKAGE =  Yes
 
 WANTLIB += c elf
 
-MASTER_SITES = https://sourceware.org/ftp/dwz/releases/
+MASTER_SITES0 =https://sourceware.org/ftp/dwz/releases/
+MASTER_SITES1 =
https://raw.githubusercontent.com/Cyan4973/xxHash/v${XXHASH_V}/
 
 DEBUG_PACKAGES =   ${BUILD_PACKAGES}
 
@@ -25,5 +29,23 @@ WRKDIST =${WRKDIR}/dwz
 # XXX bootstrap: DEBUG_PACKAGES needs a dwz binary to work
 
 DWZ = ${WRKBUILD}/dwz
+
+EXTRACT_ONLY = ${PKGNAME}.tar.gz
+
+post-extract:
+   cp ${DISTDIR}/xxhash-${XXHASH_V}.h ${WRKSRC}/xxhash.h
+
+.include 
+.if ${PROPERTIES:Mlp64}
+CFLAGS +=  -DNATIVE_POINTER_SIZE=8
+.else
+CFLAGS +=  -DNATIVE_POINTER_SIZE=4
+.endif
+
+.if ${PROPERTIES:Mle}
+CFLAGS +=  -DNATIVE_ENDIAN_VAL=ELFDATA2LSB
+.else
+CFLAGS +=  -DNATIVE_ENDIAN_VAL=ELFDATA2MSB
+.endif
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/dwz/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo8 Mar 2021 16:51:11 -   1.2
+++ distinfo29 Nov 2022 23:40:09 -
@@ -1,2 +1,4 @@
-SHA256 (dwz-0.14.tar.gz) = MwBuq4df8KB/E/yIWIPFvZUU2D7OqfGLxGtXMt3fDR8=
-SIZE (dwz-0.14.tar.gz) = 186623
+SHA256 (dwz-0.15.tar.gz) = 7VnGEuIEFeaX+8RRH1J+91cAe8VvoalU5JrKHans+0Q=
+SHA256 (xxhash-0.8.1.h) = 1PK5G1R8eQYWSRhnIaazMWCfK/hZVIWiHqYxyC7D75M=
+SIZE (dwz-0.15.tar.gz) = 192777
+SIZE (xxhash-0.8.1.h) = 209646
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/dwz/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile  11 Mar 2022 18:50:00 -  1.3
+++ patches/patch-Makefile  29 Nov 2022 23:40:09 -
@@ -6,31 +6,76 @@ Convert to bsd make
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -1,20 +1,16 @@
+@@ -1,51 +1,21 @@
 -ifneq ($(srcdir),)
 -VPATH = $(srcdir)
 -else
 -srcdir=$(shell pwd)
 -endif
+-
 -CFLAGS = -O2 -g
 -DWZ_VERSION := $(shell cat $(srcdir)/VERSION)
--override CFLAGS += -Wall -W -D_FILE_OFFSET_BITS=64 \
--  -DDWZ_VERSION='"$(DWZ_VERSION)"' $(shell cat $(srcdir)/COPYRIGHT_YEARS)
+-CFLAGS_VERSION = -DDWZ_VERSION='"$(DWZ_VERSION)"'
+-CFLAGS_COPYRIGHT = $(shell cat $(srcdir)/COPYRIGHT_YEARS)
+-CFLAGS_COMMON = -Wall -W -D_FILE_OFFSET_BITS=64
+-XXH_PROG = "\#define XXH_INLINE_ALL 1\n\#include \n"
+-XXH_INLINE_ALL_WORKS = $(shell printf $(XXH_PROG) \
+-  | $(CC) -xc -c - -o /dev/null 2>/dev/null \
+-  && echo -n 1)
+-ifeq "$(XXH_INLINE_ALL_WORKS)" "1"
+-  CFLAGS_COMMON += -DXXH_INLINE_ALL=1
+-endif
+-
+-override CFLAGS += $(CFLAGS_COMMON) $(CFLAGS_VERSION) $(CFLAGS_COPYRIGHT)
+-
 +srcdir = .
 +CFLAGS ?= -O2 -g
 +DWZ_VERSION != cat $(srcdir)/VERSION
 +CFLAGS += -DDWZ_VERSION='"$(DWZ_VERSION)"'
 +CFLAGS !+= cat $(srcdir)/COPYRIGHT_YEARS
++CFLAGS += -D_FILE_OFFSET_BITS=64
++CFLAGS += -DXXH_INLINE_ALL=1
  prefix = /usr
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  datarootdir = $(prefix)/share
  mandir = $(datarootdir)/man
--OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o
-+OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o obstack.o
+-OBJECTS = args.o dwz.o hashtab.o pool.o sha1.o dwarfnames.o
++OBJECTS = args.o dwz.o hashtab.o pool.o sha1.o dwarfnames.o obstack.o
+ LIBS=-lelf
+-ifneq "$(XXH_INLINE_ALL_WORKS)" "1"
+-LIBS += -lxxhash
+-endif
  dwz: $(OBJECTS)
--  $(CC) $(LDFLAGS) -o $@ $^ -lelf
-+  $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lelf
+-  $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+-args.o: native.o
+-args.o: CFLAGS_FOR_SOURCE = \
+-  -DNATIVE_ENDIAN_VAL=$(NATIVE_ENDIAN_VAL) \
+-  -DNATIVE_POINTER_SIZE=$(NATIVE_POINTER_SIZE)
+-NATIVE_ENDIAN=$(shell readelf -h native.o \
+-  | grep Data \
+-  | sed 's/.*, //;s/ endian//')
+-NATIVE_ENDIAN_LITTLE=$(findstring $(NATIVE_ENDIAN),$(findstring 
little,$(NATIVE_ENDIAN)))
+-NATIVE_ENDIAN_BIG=$(findstring $(NATIVE_ENDIAN),$(findstring 
big,$(NATIVE_ENDIAN)))
+-NATIVE_ENDIAN_VAL=$(if $(NATIVE_ENDIAN_LITTLE),ELFDATA2LSB,$(if 
$(NATIVE_ENDIAN_BIG),ELFDATA2MSB,ELFDATANONE))
+-NATIVE_POINTER_SIZE=$(shell readelf -wi native.o

Re: handrake fails to build (aws vs gawk)

[Brian Callahan]

Hi Antoine --

On 6/4/2023 12:42 PM, Antoine Jacoutot wrote:
> Hi.
> 
> It seems some configure scripts are run at build time.
> If gawk is installed, it is prefered over awk but if dpb(1) junks it, then
> packaging fails.
> 
> Full log attached.
> 

Thanks for the heads up. I added AWK=/usr/bin/awk to MAKE_ENV to prevent
picking up gawk.

~Brian

UPDATE: sysutils/coreutils 9.1 => 9.3

[Brian Callahan]

Hi ports --

Here's a rather straightforward update to the GNU coreutils.
Changelog is here: https://git.savannah.gnu.org/cgit/coreutils.git/tree/NEWS

All tests pass on amd64. A big endian test would be appreciated.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/sysutils/coreutils/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile10 Jan 2023 20:00:13 -  1.26
+++ Makefile17 May 2023 22:14:23 -
@@ -1,6 +1,6 @@
 COMMENT =  file, shell and text manipulation utilities
 
-DISTNAME = coreutils-9.1
+DISTNAME = coreutils-9.3
 CATEGORIES =   sysutils
 
 MAINTAINER =   Brian Callahan 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/coreutils/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo5 Jun 2022 00:25:07 -   1.13
+++ distinfo17 May 2023 22:14:23 -
@@ -1,2 +1,2 @@
-SHA256 (coreutils-9.1.tar.xz) = YaH0ENeLp+fzelpPUObRMgrKMzdUhKMlXt3xejhYBCM=
-SIZE (coreutils-9.1.tar.xz) = 5712104
+SHA256 (coreutils-9.3.tar.xz) = rbz8/omSNbceh2jc8HzVMlILf1T5qAZIQ/jRmakEu6o=
+SIZE (coreutils-9.3.tar.xz) = 5808696
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/coreutils/patches/patch-Makefile_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-Makefile_in
--- patches/patch-Makefile_in   5 Jun 2022 00:25:07 -   1.13
+++ patches/patch-Makefile_in   17 May 2023 22:14:23 -
@@ -3,7 +3,7 @@ XXX: Avoid rebuilding coreutils.info; ou
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -20801,6 +20801,7 @@ doc/$(am__dirstamp):
+@@ -21087,6 +21087,7 @@ doc/$(am__dirstamp):
@: > doc/$(am__dirstamp)
  
  $(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi 
$(doc_coreutils_TEXINFOS)
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/coreutils/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST   11 Mar 2022 19:57:18 -  1.11
+++ pkg/PLIST   17 May 2023 22:14:23 -
@@ -291,6 +291,11 @@ share/locale/it/LC_TIME/coreutils.mo
 share/locale/ja/LC_MESSAGES/coreutils.mo
 share/locale/ja/LC_TIME/
 share/locale/ja/LC_TIME/coreutils.mo
+share/locale/ka/
+share/locale/ka/LC_MESSAGES/
+share/locale/ka/LC_MESSAGES/coreutils.mo
+share/locale/ka/LC_TIME/
+share/locale/ka/LC_TIME/coreutils.mo
 share/locale/kk/
 share/locale/kk/LC_MESSAGES/
 share/locale/kk/LC_MESSAGES/coreutils.mo

Re: UPDATE: corsixth 0.66

[Brian Callahan]

On 5/13/2023 1:46 PM, Thomas Frohwein wrote:
> On Thu, May 11, 2023 at 12:29:38AM -0400, Brad Smith wrote:
>> Here is an update to corsixth 0.66.
> 
> Tested, still builds and runs. ok thfr@
> 

Thanks. I've only build tested it so far.
Please commit with my ok.

~Brian

Re: scid - info for @bcallahan

[Brian Callahan]

On 5/6/2023 10:06 AM, Maurice McCarthy wrote:
> Just did a fresh install of 7.3 not problems.
> When I launched scid-4.7.0 I had he same problems as last year.
> But the identical cure worked. I used your diff to upgrade to 4.7.4
> and all worked perfectly.
> 
> https://marc.info/?l=openbsd-ports&m=166886213023708&q=p3
> 
> Thanks again for all the fine efforts!
> 

Thanks for the heads up. Glad it is still working. Will commit soon...

~Brian

Re: [proposal] math/rstudio - depend on net/curl as default download method

[Brian Callahan]

Hello Volker --

On 4/27/2023 4:37 PM, Volker Schlecht wrote:
> Oh crap... forgot a REVISION bump, and let a broken experiment slip
> through.
> 
> Sorry! Working diff is attached.
> 
> On 4/27/23 18:38, Volker Schlecht wrote:
>> Ping, patch updated against the recently bumped version in tree.
>>
>> * adds a RUN_DEPENDS on net/curl
>> That's already a transitory dependency via math/R, so in effect no new
>> dependency
>>
>> * adds a patch for RStudio to default to curl as default download method
>> Required for RStudio to realize that it can use libcurl to pull packages
>> from CRAN, and thus avoids an unneccesary warning message at startuo.
>>
>> On 4/17/23 20:42, Volker Schlecht wrote:
>>> Ping - patch reattached.

I am sorry this has taken so long. I finally have some space to get back
to OpenBSD hacking next week. I will review and commit.

~Brian

Re: UPDATE: devel/sdcc 4.2.0

[Brian Callahan]

On 4/10/2023 1:56 AM, Rafael Sadowski wrote:
> 
> Thanks Sven, your changes make sense to me.  Sorry Brian I was probably
> something in Easter mode and too fast. This was committed.
> 

Fine by me. Thanks!

~Brian

Re: SysInfo Port

[Brian Callahan]

On 3/27/2023 10:17 AM, Stefan Hagen wrote:
> If you want a more interactive kick start, I can recommend Brians porting 
> workshop: https://www.youtube.com/watch?v=z_TnemhzbXQ
> 

Thanks Stefan for reminding me that I need to update that workshop :)

~Brian

Re: [proposal] set curl as default download method

[Brian Callahan]

On 3/3/2023 3:08 AM, Stuart Henderson wrote:
> On 2023/03/02 22:41, Brian Callahan wrote:
>> Hi Volker --
>>
>> On 2/27/2023 1:18 PM, Volker Schlecht wrote:
>>>
>>>
>>> On 2/27/23 18:49, Stuart Henderson wrote:
>>>
>>>> Ah, looking at that file note the difference between "curl" and
>>>> "libcurl", it seems that it tries to use libcurl first and then there
>>>> are fallbacks to use wget/curl binaries. So it seems the lines you
>>>> patched wouldn't have been reached in the first place if libcurl
>>>> detection was working properly?
>>>
>>> It's a fallback yes, but the fallback is implemented in function
>>> posixMethod(), which takes the fallback as a parameter, but only uses it
>>> if haveLibcurl==false:
>>>
>>> posixMethod <- function(utility) {
>>>   if (haveLibcurl)
>>>  "libcurl"
>>>   else if (nzchar(Sys.which(utility)))
>>>  utility
>>>   else
>>>  ""
>>>    }
>>>
>>> I'm quite certain that libcurl detection works and that
>>> haveLibcurl==true on OpenBSD, but unless the OS is one of "Windows",
>>> "Darwin" or "Linux", posixMethod() is never called, libcurl is never
>>> detected, and an empty string is returned...
>>>
>>
>> Is there an updated patch on this?
> 
> I've looked at the surrounding code now and while I don't read R very
> well, I think the existing diff is ok (R itself already depends on curl
> so no new dep). Seems a bit strange that they'd go out of their way to
> avoid trying to autodetect libcurl except on named OS but *shrug*
>> ~Brian

Thanks Stuart. I'll test and commit this evening.

~Brian

Re: [proposal] set curl as default download method

[Brian Callahan]

Hi Volker --

On 2/27/2023 1:18 PM, Volker Schlecht wrote:
> 
> 
> On 2/27/23 18:49, Stuart Henderson wrote:
> 
>> Ah, looking at that file note the difference between "curl" and
>> "libcurl", it seems that it tries to use libcurl first and then there
>> are fallbacks to use wget/curl binaries. So it seems the lines you
>> patched wouldn't have been reached in the first place if libcurl
>> detection was working properly?
> 
> It's a fallback yes, but the fallback is implemented in function
> posixMethod(), which takes the fallback as a parameter, but only uses it
> if haveLibcurl==false:
> 
> posixMethod <- function(utility) {
>   if (haveLibcurl)
>  "libcurl"
>   else if (nzchar(Sys.which(utility)))
>  utility
>   else
>  ""
>    }
> 
> I'm quite certain that libcurl detection works and that
> haveLibcurl==true on OpenBSD, but unless the OS is one of "Windows",
> "Darwin" or "Linux", posixMethod() is never called, libcurl is never
> detected, and an empty string is returned...
> 

Is there an updated patch on this?

~Brian

Re: drawpile plist change: cmake problem?

[Brian Callahan]

Hi Stuart --

On 2/28/2023 11:51 AM, Stuart Henderson wrote:
> On 2023/02/08 20:31, Brian Callahan wrote:
>> Hi Stuart --
>>
>> On 2/8/2023 2:59 PM, Stuart Henderson wrote:
>>> Drawpile has been failing to package for a while (probably since the
>>> cmake update to 3.25.2, though I see nothing that looked relevant in
>>> cmake's changelog). The plist changed:
>>>
>>> --- /mnt/plist/i386/drawpile-2.1.17p0
>>> +++ /mnt/plist/i386/drawpile-2.1.17p0-new
>>> @@ -46,7 +46,6 @@
>>>  @wantlib vpx.15.0
>>>  @cwd /usr/local
>>>  bin/drawpile
>>> -@symlink drawpile-2.1.17
>>>  @bin bin/drawpile-2.1.17
>>>  @bin bin/drawpile-srv
>>>  @man man/man1/drawpile-srv.1
>>>
>>> Does anyone know what's going on? It might just be that all that's
>>> needed is a REVISION bump to acknowledge the change, but I'd kind of
>>> like to have a reason for that ..
>>>
>>
>> Someone (naddy?) reached out to me about this a few days ago. I am OK
>> with a bump if that fixes things. I am not a cmake expert, so I defer to
>> them if there is a better fix.
>>
>> ~Brian
>>
> 
> So the additional file is a second copy of the binary, but unstripped.
> 
> I propose updating to the newer release, and @commenting the extra file
> in PLIST. OK?
> 

I thought Rafael sent me an update to 2.1.20, but maybe I am misremembering.

In any event, yes this is ok for me.

Thanks.

~Brian

Re: [proposal] math/rstudio - depend on net/curl as default download method

[Brian Callahan]

Hi Volker --

On 2/26/2023 2:42 PM, Volker Schlecht wrote:
> Ping, with updated subject. The initial one was a bit unfortunate...
> 
> On 2/17/23 22:55, Volker Schlecht wrote:
>> Cc: Maintainer
>>
>> Currently math/rstudio always reports
>>
>> "Unable to set a secure (HTTPS) download.file.method (no compatible
>> method available in this installation of R)."
>>
>> at startup, which based on a sample size of one (me), may be confusing
>> to users and take quite a while to track down.
>>
>> The attached patch
>>
>> * adds a RUN_DEPENDS on net/curl
>> * adds a patch for RStudio to default to curl as default download
>> method for OpenBSD, just as for Darwin and Linux.
>>
>> With that in place, installing packages from a https CRAN mirror works
>> nicely for me.

I will test shortly. I am not opposed to this if it makes life easier.

~Brian

Re: lang/ldc does not build

[Brian Callahan]

Hi Antoine --

On 2/13/2023 2:36 AM, Antoine Jacoutot wrote:
> Hi.
> 
> The bootstrap needs some love.
> 
> Patching file runtime/druntime/src/rt/sections_ldc.d using Plan A...
> Hunk #1 succeeded at 30.
> done
> sed -i 
> 's#/usr/local/include/d#/exopi-obj/pobj/ldc-1.28.0/ldc-1.28.0-bootstrap/d#g'  
> /exopi-obj/pobj/ldc-1.28.0/ldc-1.28.0-bootstrap/amd64/ldc2.conf
> sed -i 
> 's#"/usr/local/lib",#"/usr/local/lib","/exopi-obj/pobj/ldc-1.28.0/ldc-1.28.0-bootstrap/amd64",#g'
>   /exopi-obj/pobj/ldc-1.28.0/ldc-1.28.0-bootstrap/amd64/ldc2.conf
> chmod 644 /exopi-obj/pobj/ldc-1.28.0/ldc-1.28.0-bootstrap/amd64/lib*.so* # XXX
> cp /usr/lib/libc.so.96.* 
> /exopi-obj/pobj/ldc-1.28.0/ldc-1.28.0-bootstrap/amd64/ # XXX
> cp: /usr/lib/libc.so.96.*: No such file or directory
> *** Error 1 in lang/ldc (Makefile:57 'post-patch')
> 
> I am not sure copying a versioned libc is a persistent solution...
> 

I think your latest build began before my update to ldc. The bootstrap
was updated for the new libc:
https://github.com/openbsd/ports/blob/master/lang/ldc/Makefile#L56

I agree that copying a versioned lib isn't a persistent solution, but I
haven't found a working alternative yet. Trying to build LDC fully
statically for example doesn't work; it just create an LDC that
segfaults immediately.

~Brian

Re: LLVM-15 UPDATE: lang/ldc 1.28.0 => 1.31.0

[Brian Callahan]

On 2/12/2023 5:44 PM, Theo Buehler wrote:
> On Sun, Feb 12, 2023 at 10:01:55PM +0000, Brian Callahan wrote:
>> Hi ports --
>>
>> tb@ emailed me to say that our version of ldc doesn't support LLVM 15.
>> Attached is a diff to update ldc to version 1.31.0, released yesterday.
>> This is the first version of ldc to have LLVM 15 support, though they
>> say it is preliminary. I don't have a machine updated to LLVM 15 yet but
>> this update does work on my LLVM 13 machine.
> 
> Builds and packages fine with llvm 15 and hello world works. Thanks!
> 
> ok tb

Awesome. Committed. Thanks.

~Brian

LLVM-15 UPDATE: lang/ldc 1.28.0 => 1.31.0

[Brian Callahan]

Hi ports --

tb@ emailed me to say that our version of ldc doesn't support LLVM 15.
Attached is a diff to update ldc to version 1.31.0, released yesterday.
This is the first version of ldc to have LLVM 15 support, though they
say it is preliminary. I don't have a machine updated to LLVM 15 yet but
this update does work on my LLVM 13 machine.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/lang/ldc/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile19 Nov 2022 21:04:40 -  1.5
+++ Makefile12 Feb 2023 20:58:16 -
@@ -2,12 +2,11 @@
 # Can use GDC to create said bootstrap compiler.
 ONLY_FOR_ARCHS =   amd64
 
-V =1.28.0
+V =1.31.0
 COMMENT =  LLVM D Compiler
 DISTFILES =ldc-${V}-src.tar.gz:0 \
ldc-${V}-bootstrap.tar.gz:1
 PKGNAME =  ldc-${V}
-REVISION = 0
 CATEGORIES =   lang
 
 HOMEPAGE = https://wiki.dlang.org/LDC
@@ -18,7 +17,7 @@ MAINTAINER =  Brian Callahan https://github.com/ldc-developers/ldc/releases/download/v${V}/
 MASTER_SITES1 =
https://github.com/ibara/ldc/releases/download/bootstrap-${V}/
@@ -54,15 +53,19 @@ post-patch:
sed -i 
's#"/usr/local/lib",#"/usr/local/lib","${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}",#g'
 \
${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ldc2.conf
chmod 644 ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/lib*.so* # XXX
-   cp /usr/lib/libc.so.96.* ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ 
# XXX
+   cp /usr/lib/libc.so.97.* ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ 
# XXX
 
 # Same trick as with flang:
 #   Replace the shared LLVM.so library with the static libraries.
 #   Fixes runtime warnings about symbol size mismatches.
 #   Revisit on occasion (maybe these warning go away someday?)
+#   We're using LLVM 13 now, but LLVM 15 is coming.
 post-configure:
sed -i \
-   's,-lLLVM-11,`${LOCALBASE}/bin/llvm-config --libs all --link-static 
--ignore-libllvm` -lz,g' \
+   's,-lLLVM-13,`${LOCALBASE}/bin/llvm-config --libs all --link-static 
--ignore-libllvm` -lz,g' \
+   ${WRKBUILD}/build.ninja
+   sed -i \
+   's,-lLLVM-15,`${LOCALBASE}/bin/llvm-config --libs all --link-static 
--ignore-libllvm` -lz,g' \
${WRKBUILD}/build.ninja
 
 # Move the default ldc2.conf to its proper packaging location.
Index: distinfo
===
RCS file: /cvs/ports/lang/ldc/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo21 Nov 2021 13:51:47 -  1.1.1.1
+++ distinfo12 Feb 2023 20:58:16 -
@@ -1,4 +1,4 @@
-SHA256 (ldc-1.28.0-bootstrap.tar.gz) = 
poUGzPKLeyBbrEH4Gqak/5OLWK5IQnePezNSt0MHxKA=
-SHA256 (ldc-1.28.0-src.tar.gz) = F/7ou1Nby4zaCkWUdSZVXEbARfMCpzScyHEbJU5Uzwk=
-SIZE (ldc-1.28.0-bootstrap.tar.gz) = 41093692
-SIZE (ldc-1.28.0-src.tar.gz) = 7923347
+SHA256 (ldc-1.31.0-bootstrap.tar.gz) = 
LfWVLVDRgOZeec+7ix25otNIcIc5YcpYQdXAz57jGzg=
+SHA256 (ldc-1.31.0-src.tar.gz) = 8cjs6eHjWAbDRBvyT75mbN3Y7vN1WSwZzY/uRwHNVFg=
+SIZE (ldc-1.31.0-bootstrap.tar.gz) = 44655908
+SIZE (ldc-1.31.0-src.tar.gz) = 8042077
Index: patches/patch-driver_linker-gcc_cpp
===
RCS file: /cvs/ports/lang/ldc/patches/patch-driver_linker-gcc_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-driver_linker-gcc_cpp
--- patches/patch-driver_linker-gcc_cpp 11 Mar 2022 19:29:04 -  1.2
+++ patches/patch-driver_linker-gcc_cpp 12 Feb 2023 20:58:16 -
@@ -1,9 +1,10 @@
 Taken from ports LLVM.
+Need -lexecinfo for Backtrace symbols.
 
 Index: driver/linker-gcc.cpp
 --- driver/linker-gcc.cpp.orig
 +++ driver/linker-gcc.cpp
-@@ -422,7 +422,6 @@ void ArgsBuilder::addCppStdlibLinkFlags(const llvm::Tr
+@@ -414,7 +414,6 @@ void ArgsBuilder::addCppStdlibLinkFlags(const llvm::Tr
  break;
case llvm::Triple::Solaris:
case llvm::Triple::NetBSD:
@@ -11,7 +12,7 @@ Index: driver/linker-gcc.cpp
case llvm::Triple::DragonFly:
  args.push_back("-lstdc++");
  break;
-@@ -432,6 +431,7 @@ void ArgsBuilder::addCppStdlibLinkFlags(const llvm::Tr
+@@ -424,6 +423,7 @@ void ArgsBuilder::addCppStdlibLinkFlags(const llvm::Tr
case llvm::Triple::WatchOS:
case llvm::Triple::TvOS:
case llvm::Triple::FreeBSD:
@@ -19,11 +20,12 @@ Index: driver/linker-gcc.cpp
  args.push_back("-lc++");
  break;
default:
-@@ -663,11 +663,13 @@ void ArgsBuilder::addDefaultPlatformLibs() {
+@@ -665,11 +665,14 @@ void ArgsBuilder::addDefaultPlatformLibs() {
  args.push_back("-lrt");
  args.push_back("-ldl");
// fallthrough
 +  case llvm::Triple::OpenBSD:
++args.push_back("-lexecinfo");
 +args.push_back("-lc++abi");
 +  // fallthrough
case llvm::Tripl