From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: Remove gcc3 from ports
To: ports@openbsd.org
Date: Fri, 24 Oct 2025 06:54:45 +0200

Now that gcc3 has left the building, we can remove the parts from
the ports-tree. CHOSEN_COMPILER fallback to base-gcc which is gcc4.

OK?

Index: devel/gettext/Makefile
===================================================================
RCS file: /cvs/ports/devel/gettext/Makefile,v
diff -u -p -r1.109 Makefile
--- devel/gettext/Makefile	24 Jan 2025 16:39:35 -0000	1.109
+++ devel/gettext/Makefile	24 Oct 2025 04:51:10 -0000
@@ -45,7 +45,7 @@ DEBUG_PACKAGES=	${BUILD_PACKAGES}
 
 # on critical path to lang/gcc.  XXX c++ used in libasprintf but seems
 # unused at present; may need to revisit if this changes
-COMPILER =		base-clang base-gcc gcc3
+COMPILER =		base-clang base-gcc
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--disable-csharp \
Index: infrastructure/bin/portcheck
===================================================================
RCS file: /cvs/ports/infrastructure/bin/portcheck,v
diff -u -p -r1.149 portcheck
--- infrastructure/bin/portcheck	26 Feb 2025 14:22:53 -0000	1.149
+++ infrastructure/bin/portcheck	24 Oct 2025 04:51:25 -0000
@@ -887,7 +887,7 @@ sub_checks() {
 					fi
 				fi
 
-				[[ "$compiler" == "base-clang base-gcc gcc3" ]] \
+				[[ "$compiler" == "base-clang base-gcc" ]] \
 				    && default_compiler=true
 
 				check_wantlib "$portref" "$modules" \
Index: infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
diff -u -p -r1.1645 bsd.port.mk
--- infrastructure/mk/bsd.port.mk	30 Jul 2025 12:06:30 -0000	1.1645
+++ infrastructure/mk/bsd.port.mk	24 Oct 2025 04:51:25 -0000
@@ -320,14 +320,12 @@ PORTROACH ?=
 
 # this only happens if we exit modules without having ever gone
 # thru compiler.port.mk - update portcheck if changing COMPILER default
-COMPILER ?= base-clang base-gcc gcc3
+COMPILER ?= base-clang base-gcc
 COMPILER_LANGS ?= c c++
 .if ${PROPERTIES:Mclang}
 CHOSEN_COMPILER ?= base-clang
-.elif ${PROPERTIES:Mgcc4}
-CHOSEN_COMPILER ?= base-gcc
 .else
-CHOSEN_COMPILER ?= gcc3
+CHOSEN_COMPILER ?= base-gcc
 .endif
 COMPILER_LIBCXX ?= ${LIBCXX}
 
Index: infrastructure/mk/compiler.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/compiler.port.mk,v
diff -u -p -r1.5 compiler.port.mk
--- infrastructure/mk/compiler.port.mk	17 Nov 2017 00:24:01 -0000	1.5
+++ infrastructure/mk/compiler.port.mk	24 Oct 2025 04:51:25 -0000
@@ -30,11 +30,6 @@ _COMPILER_ARCHS += ${GCC4_ARCHS}
 .    if ${PROPERTIES:Mgcc4}
 CHOSEN_COMPILER ?= base-gcc
 .    endif
-.  elif "$c" == "gcc3"
-_COMPILER_ARCHS += ${GCC3_ARCHS}
-.    if ${PROPERTIES:Mgcc3}
-CHOSEN_COMPILER ?= gcc3
-.    endif
 .  elif "$c" == "base-clang"
 _COMPILER_ARCHS += ${CLANG_ARCHS}
 .    if ${PROPERTIES:Mclang}