From: Claudio Jeker <cjeker@diehard.n-r-g.com>
Subject: gcc15: cleanup various c++ ports
To: ports@openbsd.org
Date: Mon, 15 Dec 2025 14:22:51 +0100

Now that we have a modern ports-gcc there is no need to special case
base-clang anymore since ports-gcc has the same issues.

In most cases we need to force the compiler down to a c++ spec that works
with the code base. In the codeworker case I had to fixup their stupid
Makefile so that generator.cpp is compiled like any other file and
actually gets the flags passed in.

-- 
:wq Claudio

Index: audio/calf/Makefile
===================================================================
RCS file: /cvs/ports/audio/calf/Makefile,v
diff -u -p -r1.38 Makefile
--- audio/calf/Makefile	15 Nov 2023 09:23:25 -0000	1.38
+++ audio/calf/Makefile	15 Dec 2025 12:53:30 -0000
@@ -23,7 +23,7 @@ SITES =			https://calf-studio-gear.org/f
 
 COMPILER =		base-clang ports-gcc
 
-CXXFLAGS_base-clang =	-std=c++14
+CXXFLAGS =		-std=c++14
 
 RUN_DEPENDS =		devel/desktop-file-utils \
 			x11/gtk+4,-guic
Index: devel/codeworker/Makefile
===================================================================
RCS file: /cvs/ports/devel/codeworker/Makefile,v
diff -u -p -r1.20 Makefile
--- devel/codeworker/Makefile	15 Nov 2023 14:23:49 -0000	1.20
+++ devel/codeworker/Makefile	15 Dec 2025 12:53:30 -0000
@@ -13,10 +13,9 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
-COMPILER =		base-clang ports-gcc base-gcc
+COMPILER =		base-clang ports-gcc
 
-CXXFLAGS_base-clang =	-std=c++14 \
-			-Wno-error=dynamic-exception-spec
+CXXFLAGS =		-std=c++14
 
 SITES =			${SITE_GOOGLECODE:=codeworker/} \
 			http://codeworker.free.fr/downloads/
Index: devel/codeworker/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/codeworker/patches/patch-Makefile,v
diff -u -p -r1.4 patch-Makefile
--- devel/codeworker/patches/patch-Makefile	11 Mar 2022 18:49:51 -0000	1.4
+++ devel/codeworker/patches/patch-Makefile	15 Dec 2025 12:53:30 -0000
@@ -1,13 +1,22 @@
---- Makefile.orig	Thu May 13 18:12:11 2010
-+++ Makefile	Thu May 13 18:12:19 2010
-@@ -150,8 +150,8 @@ all: build lib
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -141,7 +141,7 @@ OBJECTS = ASTCommand.o BNFAndOrJunction.o BNFBreak.o B
+ 		  GrfWriteTextOnce.o HTTPRequest.o JNIExternalHandling.o md5.o\
+ 		  NetSocket.o ScpStream.o UtlDate.o UtlDirectory.o\
+ 		  UtlException.o UtlString.o UtlTimer.o UtlTrace.o\
+-		  UtlXMLStream.o Workspace.o
++		  UtlXMLStream.o Workspace.o generator.o
+ ###end##"OBJECTS"
+ 
+ 
+@@ -150,8 +150,7 @@ all: build lib
  build: codeworker
  
  codeworker: $(OBJECTS)
 -	$(CC) -c generator.cpp
 -	$(CC) -o codeworker $(OBJECTS) generator.o $(LFLAGS) 
-+	$(CXX) -c generator.cpp
-+	$(CXX) -o codeworker $(OBJECTS) generator.o $(LDFLAGS) 
++	$(CXX) -o codeworker $(OBJECTS) $(LDFLAGS) 
  
  lib: $(OBJECTS)
  	ar -r libcodeworker.a $(OBJECTS)
Index: geo/gpstk/Makefile
===================================================================
RCS file: /cvs/ports/geo/gpstk/Makefile,v
diff -u -p -r1.25 Makefile
--- geo/gpstk/Makefile	15 Nov 2023 16:49:05 -0000	1.25
+++ geo/gpstk/Makefile	15 Dec 2025 12:53:30 -0000
@@ -28,7 +28,7 @@ CXXFLAGS+=             -O0
 
 COMPILER=		base-clang ports-gcc
 
-CXXFLAGS_base-clang +=	-std=c++14
+CXXFLAGS +=		-std=c++14
 
 CONFIGURE_ARGS=		-DBUILD_EXT=on
 
Index: textproc/source-highlight/Makefile
===================================================================
RCS file: /cvs/ports/textproc/source-highlight/Makefile,v
diff -u -p -r1.36 Makefile
--- textproc/source-highlight/Makefile	15 Nov 2023 18:38:15 -0000	1.36
+++ textproc/source-highlight/Makefile	15 Dec 2025 12:53:37 -0000
@@ -12,9 +12,9 @@ PERMIT_PACKAGE=	Yes
 WANTLIB += ${COMPILER_LIBCXX} boost_regex-mt c icudata icui18n
 WANTLIB += icuuc m
 
-COMPILER=	base-clang ports-gcc base-gcc
+COMPILER=	base-clang ports-gcc
 
-CXXFLAGS_base-clang =	-std=gnu++11
+CXXFLAGS =	-std=gnu++11
 
 SITES=		${SITE_GNU:=src-highlite/}
 
Index: www/dansguardian/Makefile
===================================================================
RCS file: /cvs/ports/www/dansguardian/Makefile,v
diff -u -p -r1.28 Makefile
--- www/dansguardian/Makefile	15 Nov 2023 09:14:37 -0000	1.28
+++ www/dansguardian/Makefile	15 Dec 2025 12:53:37 -0000
@@ -14,9 +14,9 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		c m pcre pcreposix ${COMPILER_LIBCXX} z
 
-COMPILER =		base-clang ports-gcc base-gcc
+COMPILER =		base-clang ports-gcc
 
-CXXFLAGS_base-clang =	-std=c++14
+CXXFLAGS =		-std=c++14
 
 SITES =			${SITE_SOURCEFORGE:=dansguardian/}