Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 349C184EE9
	for <pkgsrc-changes@NetBSD.org>; Mon, 17 Jul 2023 22:00:28 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id 1x4x_RVqUM5d for <pkgsrc-changes@netbsd.org>;
	Mon, 17 Jul 2023 22:00:26 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 4E3AD84D4A
	for <pkgsrc-changes@NetBSD.org>; Mon, 17 Jul 2023 22:00:26 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 4B25AFBDB; Mon, 17 Jul 2023 22:00:26 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1689631226269040"
MIME-Version: 1.0
Date: Mon, 17 Jul 2023 22:00:26 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: nia@netbsd.org
X-Mailer: log_accum
Message-Id: <20230717220026.4B25AFBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1689631226269040
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Mon Jul 17 22:00:25 UTC 2023

Modified Files:
	pkgsrc/archivers/p7zip: Makefile
	pkgsrc/audio/goom: Makefile
	pkgsrc/biology/rasmol: Makefile
	pkgsrc/cad/fastcap: Makefile
	pkgsrc/cad/fasthenry: Makefile
	pkgsrc/chat/centerim: Makefile
	pkgsrc/emulators/gpsim-devel: Makefile
	pkgsrc/emulators/gpsim-oscilloscope: Makefile
	pkgsrc/emulators/gpsim-ptyusart: Makefile
	pkgsrc/games/sjeng: Makefile
	pkgsrc/games/xmahjongg: Makefile
	pkgsrc/games/zoom: Makefile
	pkgsrc/graphics/povray: Makefile
	pkgsrc/lang/gpc: Makefile
	pkgsrc/mail/cone: Makefile
	pkgsrc/mail/courier-mta: Makefile
	pkgsrc/math/scilab: Makefile
	pkgsrc/misc/celestia: Makefile
	pkgsrc/multimedia/avidemux: Makefile
	pkgsrc/multimedia/libogg: Makefile
	pkgsrc/multimedia/ogle_gui: Makefile
	pkgsrc/news/inn: Makefile
	pkgsrc/textproc/html2text: Makefile
	pkgsrc/textproc/xmlindent: Makefile
	pkgsrc/wm/windowmaker: Makefile
	pkgsrc/x11/neXtaw: Makefile
	pkgsrc/x11/xephem: Makefile
	pkgsrc/x11/xphoon: Makefile

Log Message:
*: Remove many GCC_REQD for particularly old GCCs

In many cases the reasoning is poorly documented, or the reasoning
for setting GCC_REQD is to work around a compiler bug. Practically
a c99 compiler is now required for bootstrap (in at least several
dependencies) so we can entirely rule out GCC versions before 3.0.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/archivers/p7zip/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/goom/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/biology/rasmol/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/cad/fastcap/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/cad/fasthenry/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/chat/centerim/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/emulators/gpsim-devel/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/emulators/gpsim-oscilloscope/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/emulators/gpsim-ptyusart/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/games/sjeng/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/games/xmahjongg/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/games/zoom/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/graphics/povray/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/gpc/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/mail/cone/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/mail/courier-mta/Makefile
cvs rdiff -u -r1.113 -r1.114 pkgsrc/math/scilab/Makefile
cvs rdiff -u -r1.92 -r1.93 pkgsrc/misc/celestia/Makefile
cvs rdiff -u -r1.136 -r1.137 pkgsrc/multimedia/avidemux/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/libogg/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/multimedia/ogle_gui/Makefile
cvs rdiff -u -r1.140 -r1.141 pkgsrc/news/inn/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/html2text/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/xmlindent/Makefile
cvs rdiff -u -r1.139 -r1.140 pkgsrc/wm/windowmaker/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/neXtaw/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/x11/xephem/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/xphoon/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1689631226269040
Content-Disposition: inline
Content-Length: 19078
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/archivers/p7zip/Makefile
diff -u pkgsrc/archivers/p7zip/Makefile:1.69 pkgsrc/archivers/p7zip/Makefile:1.70
--- pkgsrc/archivers/p7zip/Makefile:1.69	Sun Jan 26 05:26:08 2020
+++ pkgsrc/archivers/p7zip/Makefile	Mon Jul 17 22:00:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2020/01/26 05:26:08 rillig Exp $
+# $NetBSD: Makefile,v 1.70 2023/07/17 22:00:22 nia Exp $
 
 DISTNAME=	p7zip_16.02_src_all
 PKGNAME=	${DISTNAME:S/_src_all//S/_/-/}
@@ -23,8 +23,6 @@ PTHREAD_OPTS+=		require
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/-/_/}
 
-GCC_REQD+=		3.0
-
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 INSTALLATION_DIRS+=	share/doc/p7zip
 INSTALLATION_DIRS+=	share/doc/p7zip/commands

Index: pkgsrc/audio/goom/Makefile
diff -u pkgsrc/audio/goom/Makefile:1.13 pkgsrc/audio/goom/Makefile:1.14
--- pkgsrc/audio/goom/Makefile:1.13	Wed May 20 06:09:04 2020
+++ pkgsrc/audio/goom/Makefile	Mon Jul 17 22:00:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/05/20 06:09:04 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2023/07/17 22:00:22 nia Exp $
 
 DISTNAME=		goom-2k4-0-src
 PKGNAME=		goom-2004.0
@@ -15,9 +15,12 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgoom2.pc.in
 GNU_CONFIGURE=		yes
-GCC_REQD+=		3.3
 USE_TOOLS+=		pkg-config
 
+# "This package needs gcc-3.0 because it uses some inline assembler syntax
+# that gcc-2.95.3 does not understand."
+GCC_REQD+=		3.3
+
 # convolve_fx.c: In function 'create_output_with_brightness':
 # convolve_fx.c:222:20: error: array subscript has type 'char' [-Werror=char-subscripts]
 #        iff2 = ifftab[data->conv_motif[(ytex >>16) & CONV_MOTIF_WMASK][(xtex >> 16) & CONV_MOTIF_WMASK]];

Index: pkgsrc/biology/rasmol/Makefile
diff -u pkgsrc/biology/rasmol/Makefile:1.33 pkgsrc/biology/rasmol/Makefile:1.34
--- pkgsrc/biology/rasmol/Makefile:1.33	Tue Oct 23 10:24:02 2012
+++ pkgsrc/biology/rasmol/Makefile	Mon Jul 17 22:00:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/10/23 10:24:02 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2023/07/17 22:00:22 nia Exp $
 
 DISTNAME=	RasMol_2.7.3
 PKGNAME=	rasmol-2.7.3
@@ -18,10 +18,6 @@ MAKE_ENV+=	DEPTHDEF=${DEPTHDEF:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		2.95.3
-.endif
-
 .if defined(RASMOL_DEPTH)
 .  if ${RASMOL_DEPTH} == 32
 DEPTHDEF=	-DTHIRTYTWOBIT

Index: pkgsrc/cad/fastcap/Makefile
diff -u pkgsrc/cad/fastcap/Makefile:1.43 pkgsrc/cad/fastcap/Makefile:1.44
--- pkgsrc/cad/fastcap/Makefile:1.43	Tue Jun  6 12:40:18 2023
+++ pkgsrc/cad/fastcap/Makefile	Mon Jul 17 22:00:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2023/06/06 12:40:18 riastradh Exp $
+# $NetBSD: Makefile,v 1.44 2023/07/17 22:00:23 nia Exp $
 
 DISTNAME=	fastcap-2.0-18Sep92
 PKGNAME=	fastcap-2.0.19920918
@@ -30,10 +30,6 @@ CONFIGURE_ARGS+=	4
 MAKE_ENV+=		BIBTEX=${PREFIX}/bin/bibtex \
 			LATEX=${PREFIX}/bin/latex
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		2.95.3
-.endif
-
 INSTALLATION_DIRS=	bin
 
 post-patch:

Index: pkgsrc/cad/fasthenry/Makefile
diff -u pkgsrc/cad/fasthenry/Makefile:1.32 pkgsrc/cad/fasthenry/Makefile:1.33
--- pkgsrc/cad/fasthenry/Makefile:1.32	Wed May 20 06:09:03 2020
+++ pkgsrc/cad/fasthenry/Makefile	Mon Jul 17 22:00:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2020/05/20 06:09:03 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2023/07/17 22:00:23 nia Exp $
 #
 
 DISTNAME=	fasthenry-3.0-12Nov96
@@ -32,10 +32,6 @@ LIBS+=		-lffm
 LIBS+=		-lm
 MAKE_ENV+=	LIBS=${LIBS:M*:Q}
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		2.95.3
-.endif
-
 # contact.c: In function 'walk_along_edge':
 # contact.c:1334:40: error: array subscript has type 'char' [-Werror=char-subscripts]
 #    equiv_nodes_on_edge(cell->bndry.nodes[start_node], travel_dir,

Index: pkgsrc/chat/centerim/Makefile
diff -u pkgsrc/chat/centerim/Makefile:1.67 pkgsrc/chat/centerim/Makefile:1.68
--- pkgsrc/chat/centerim/Makefile:1.67	Wed Apr 19 08:09:14 2023
+++ pkgsrc/chat/centerim/Makefile	Mon Jul 17 22:00:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2023/04/19 08:09:14 adam Exp $
+# $NetBSD: Makefile,v 1.68 2023/07/17 22:00:23 nia Exp $
 #
 
 DISTNAME=	centerim-4.22.10
@@ -40,10 +40,6 @@ CPPFLAGS+=		-DAUDIO_PLAYER="\"${LOCALBAS
 # 1 safe instance in xmltok.c:1494
 BUILDLINK_TRANSFORM+=	rm:-Werror=char-subscripts
 
-.if !empty(MACHINE_ARCH:Msparc64)
-GCC_REQD+=		3.0	# see PR 29185
-.endif
-
 .include "../../lang/python/application.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/emulators/gpsim-devel/Makefile
diff -u pkgsrc/emulators/gpsim-devel/Makefile:1.55 pkgsrc/emulators/gpsim-devel/Makefile:1.56
--- pkgsrc/emulators/gpsim-devel/Makefile:1.55	Sun Jan 29 21:14:34 2023
+++ pkgsrc/emulators/gpsim-devel/Makefile	Mon Jul 17 22:00:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2023/01/29 21:14:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.56 2023/07/17 22:00:23 nia Exp $
 #
 
 DISTNAME=	gpsim-20050905
@@ -16,8 +16,6 @@ USE_LANGUAGES=	c c++03
 USE_TOOLS+=	bison gmake lex pkg-config
 USE_LIBTOOL=	YES
 
-GCC_REQD+=		3.0
-
 CONFLICTS=	eXdbm-[0-9]* gpsim-[0-9]*
 
 .include "../../devel/popt/buildlink3.mk"

Index: pkgsrc/emulators/gpsim-oscilloscope/Makefile
diff -u pkgsrc/emulators/gpsim-oscilloscope/Makefile:1.46 pkgsrc/emulators/gpsim-oscilloscope/Makefile:1.47
--- pkgsrc/emulators/gpsim-oscilloscope/Makefile:1.46	Sun Jan 29 21:16:00 2023
+++ pkgsrc/emulators/gpsim-oscilloscope/Makefile	Mon Jul 17 22:00:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2023/01/29 21:16:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2023/07/17 22:00:23 nia Exp $
 #
 
 DISTNAME=	oscilloscope-0.1.2
@@ -15,8 +15,6 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 USE_LIBTOOL=	YES
 
-GCC_REQD+=		3.0
-
 EGDIR=		${PREFIX}/share/examples/gpsim-oscilloscope
 
 INSTALLATION_DIRS=	${EGDIR}

Index: pkgsrc/emulators/gpsim-ptyusart/Makefile
diff -u pkgsrc/emulators/gpsim-ptyusart/Makefile:1.48 pkgsrc/emulators/gpsim-ptyusart/Makefile:1.49
--- pkgsrc/emulators/gpsim-ptyusart/Makefile:1.48	Sun Jan 29 21:16:00 2023
+++ pkgsrc/emulators/gpsim-ptyusart/Makefile	Mon Jul 17 22:00:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2023/01/29 21:16:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.49 2023/07/17 22:00:23 nia Exp $
 #
 
 DISTNAME=	ptyusart-0.3.2
@@ -19,8 +19,6 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 USE_TOOLS+=	pkg-config
 
-GCC_REQD+=		3.0
-
 EGDIR=		${PREFIX}/share/examples/gpsim-ptyusart
 INSTALLATION_DIRS=	${EGDIR}
 

Index: pkgsrc/games/sjeng/Makefile
diff -u pkgsrc/games/sjeng/Makefile:1.22 pkgsrc/games/sjeng/Makefile:1.23
--- pkgsrc/games/sjeng/Makefile:1.22	Sun Jan 28 20:10:51 2018
+++ pkgsrc/games/sjeng/Makefile	Mon Jul 17 22:00:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/01/28 20:10:51 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2023/07/17 22:00:23 nia Exp $
 
 DISTNAME=	Sjeng-Free-11.0
 PKGNAME=	sjeng-11.0
@@ -23,10 +23,6 @@ TBDIR=		${PREFIX}/share/egtb
 DOCDIR=		${PREFIX}/share/doc/sjeng
 EGDIR=		${PREFIX}/share/examples/sjeng
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=	3.0
-.endif
-
 post-build:
 	cd ${WRKSRC};							\
 	file="sjeng.rc";						\

Index: pkgsrc/games/xmahjongg/Makefile
diff -u pkgsrc/games/xmahjongg/Makefile:1.31 pkgsrc/games/xmahjongg/Makefile:1.32
--- pkgsrc/games/xmahjongg/Makefile:1.31	Sun Jan 26 17:31:18 2020
+++ pkgsrc/games/xmahjongg/Makefile	Mon Jul 17 22:00:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/01/26 17:31:18 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2023/07/17 22:00:23 nia Exp $
 #
 
 DISTNAME=	xmahjongg-3.7
@@ -13,11 +13,5 @@ COMMENT=	The Chinese game of Mah Jongg f
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++03
 
-.include "../../mk/bsd.prefs.mk"
-# XXX: hack - work round an ICE with GCC 3.3 on sparc
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
-GCC_REQD+=		3.4
-.endif
-
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/zoom/Makefile
diff -u pkgsrc/games/zoom/Makefile:1.48 pkgsrc/games/zoom/Makefile:1.49
--- pkgsrc/games/zoom/Makefile:1.48	Sun Jan 29 21:16:24 2023
+++ pkgsrc/games/zoom/Makefile	Mon Jul 17 22:00:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2023/01/29 21:16:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.49 2023/07/17 22:00:23 nia Exp $
 
 DISTNAME=	zoom-1.1.5
 PKGREVISION=	11
@@ -16,9 +16,6 @@ USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
 AUTO_MKDIRS=		yes
 
-.if ${MACHINE_ARCH} == "alpha"
-GCC_REQD+=		3.0
-.endif
 UNLIMIT_RESOURCES+=	datasize
 
 post-install:

Index: pkgsrc/graphics/povray/Makefile
diff -u pkgsrc/graphics/povray/Makefile:1.59 pkgsrc/graphics/povray/Makefile:1.60
--- pkgsrc/graphics/povray/Makefile:1.59	Tue Jan  3 17:37:29 2023
+++ pkgsrc/graphics/povray/Makefile	Mon Jul 17 22:00:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2023/01/03 17:37:29 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2023/07/17 22:00:24 nia Exp $
 
 DISTNAME=	povray-3.6.1
 PKGREVISION=	16
@@ -23,10 +23,6 @@ CONFIGURE_ENV+=		COMPILED_BY="The NetBSD
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == x86_64
-GCC_REQD+=	3.4
-.endif
-
 PLIST_SUBST+=	POVRAY=povray-3.6
 
 PKG_SYSCONFSUBDIR=	povray/3.6

Index: pkgsrc/lang/gpc/Makefile
diff -u pkgsrc/lang/gpc/Makefile:1.40 pkgsrc/lang/gpc/Makefile:1.41
--- pkgsrc/lang/gpc/Makefile:1.40	Sat Dec 25 21:34:12 2021
+++ pkgsrc/lang/gpc/Makefile	Mon Jul 17 22:00:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2021/12/25 21:34:12 dholland Exp $
+# $NetBSD: Makefile,v 1.41 2023/07/17 22:00:24 nia Exp $
 
 DISTNAME=		gpc-2.1
 PKGREVISION=		5
@@ -24,8 +24,6 @@ PLIST_SRC=		PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
-GCC_REQD+=		2.95.3
-
 .if ${OPSYS} == "NetBSD"
 CFLAGS+=		-DNETBSD_NATIVE
 GPC_PREFIX=		${PREFIX}

Index: pkgsrc/mail/cone/Makefile
diff -u pkgsrc/mail/cone/Makefile:1.50 pkgsrc/mail/cone/Makefile:1.51
--- pkgsrc/mail/cone/Makefile:1.50	Wed Apr 19 08:10:40 2023
+++ pkgsrc/mail/cone/Makefile	Mon Jul 17 22:00:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2023/04/19 08:10:40 adam Exp $
+# $NetBSD: Makefile,v 1.51 2023/07/17 22:00:24 nia Exp $
 
 DISTNAME=	cone-0.90
 PKGREVISION=	36
@@ -13,7 +13,6 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake perl true
-GCC_REQD+=		3.0	# need Standard C++ Library
 
 .include "options.mk"
 

Index: pkgsrc/mail/courier-mta/Makefile
diff -u pkgsrc/mail/courier-mta/Makefile:1.63 pkgsrc/mail/courier-mta/Makefile:1.64
--- pkgsrc/mail/courier-mta/Makefile:1.63	Thu Jul  6 09:40:41 2023
+++ pkgsrc/mail/courier-mta/Makefile	Mon Jul 17 22:00:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2023/07/06 09:40:41 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2023/07/17 22:00:24 nia Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-mta-/}
@@ -19,7 +19,6 @@ DEPENDS+=	maildrop>=2.5.0:../../mail/mai
 
 USE_TOOLS+=		gmake perl:run
 USE_LANGUAGES=		c c++
-GCC_REQD+=		3.0	# need Standard C++ Library
 
 .include "Makefile.common"
 

Index: pkgsrc/math/scilab/Makefile
diff -u pkgsrc/math/scilab/Makefile:1.113 pkgsrc/math/scilab/Makefile:1.114
--- pkgsrc/math/scilab/Makefile:1.113	Sun Jan 29 21:17:05 2023
+++ pkgsrc/math/scilab/Makefile	Mon Jul 17 22:00:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2023/01/29 21:17:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.114 2023/07/17 22:00:24 nia Exp $
 #
 
 DISTNAME=	${SCIBASE}-src
@@ -122,10 +122,6 @@ post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/scripts/${__tmp__}
 .endfor
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		2.95.3
-.endif
-
 # the "SCI=0 && unset SCI" is done because some of the tests really will
 # fail if SCI is set to anything.
 MAKE_ENV+=	SCI=${WRKSRC:Q}

Index: pkgsrc/misc/celestia/Makefile
diff -u pkgsrc/misc/celestia/Makefile:1.92 pkgsrc/misc/celestia/Makefile:1.93
--- pkgsrc/misc/celestia/Makefile:1.92	Wed Apr 19 08:10:47 2023
+++ pkgsrc/misc/celestia/Makefile	Mon Jul 17 22:00:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2023/04/19 08:10:47 adam Exp $
+# $NetBSD: Makefile,v 1.93 2023/07/17 22:00:24 nia Exp $
 
 DISTNAME=	celestia-1.6.1
 PKGREVISION=	35
@@ -19,7 +19,6 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 
-GCC_REQD+=		3.0
 CXXFLAGS+=	-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
 EGDIR=		${PREFIX}/share/examples/celestia

Index: pkgsrc/multimedia/avidemux/Makefile
diff -u pkgsrc/multimedia/avidemux/Makefile:1.136 pkgsrc/multimedia/avidemux/Makefile:1.137
--- pkgsrc/multimedia/avidemux/Makefile:1.136	Tue Jun  6 12:41:58 2023
+++ pkgsrc/multimedia/avidemux/Makefile	Mon Jul 17 22:00:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2023/06/06 12:41:58 riastradh Exp $
+# $NetBSD: Makefile,v 1.137 2023/07/17 22:00:24 nia Exp $
 
 DISTNAME=	avidemux_2.5.4
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -13,7 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 TOOL_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
 
-GCC_REQD+=		3.0
 USE_LANGUAGES=		c c++03
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes

Index: pkgsrc/multimedia/libogg/Makefile
diff -u pkgsrc/multimedia/libogg/Makefile:1.30 pkgsrc/multimedia/libogg/Makefile:1.31
--- pkgsrc/multimedia/libogg/Makefile:1.30	Mon Jul 25 11:12:26 2022
+++ pkgsrc/multimedia/libogg/Makefile	Mon Jul 17 22:00:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2022/07/25 11:12:26 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2023/07/17 22:00:24 nia Exp $
 
 DISTNAME=	libogg-1.3.5
 PKGREVISION=	1
@@ -16,6 +16,4 @@ GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	ogg.pc.in
 TEST_TARGET=		check
 
-GCC_REQD+=	2.95.3
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/ogle_gui/Makefile
diff -u pkgsrc/multimedia/ogle_gui/Makefile:1.62 pkgsrc/multimedia/ogle_gui/Makefile:1.63
--- pkgsrc/multimedia/ogle_gui/Makefile:1.62	Wed Apr 19 08:10:59 2023
+++ pkgsrc/multimedia/ogle_gui/Makefile	Mon Jul 17 22:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2023/04/19 08:10:59 adam Exp $
+# $NetBSD: Makefile,v 1.63 2023/07/17 22:00:25 nia Exp $
 
 DISTNAME=	ogle_gui-0.9.2
 PKGREVISION=	50
@@ -17,11 +17,8 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/lib/ogle
 CONFIGURE_ARGS+=	--enable-gtk2
 
-GCC_REQD+=		2.95.3
-
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../multimedia/ogle/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/news/inn/Makefile
diff -u pkgsrc/news/inn/Makefile:1.140 pkgsrc/news/inn/Makefile:1.141
--- pkgsrc/news/inn/Makefile:1.140	Thu Jul  6 09:41:16 2023
+++ pkgsrc/news/inn/Makefile	Mon Jul 17 22:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2023/07/06 09:41:16 wiz Exp $
+# $NetBSD: Makefile,v 1.141 2023/07/17 22:00:25 nia Exp $
 
 DISTNAME=		inn-2.7.1
 PKGREVISION=		1
@@ -203,10 +203,6 @@ post-extract:
 
 .endif
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		2.95.3
-.endif
-
 .include "options.mk"
 
 TEST_TARGET=	tests

Index: pkgsrc/textproc/html2text/Makefile
diff -u pkgsrc/textproc/html2text/Makefile:1.21 pkgsrc/textproc/html2text/Makefile:1.22
--- pkgsrc/textproc/html2text/Makefile:1.21	Mon Apr  6 09:30:48 2020
+++ pkgsrc/textproc/html2text/Makefile	Mon Jul 17 22:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/04/06 09:30:48 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2023/07/17 22:00:25 nia Exp $
 
 DISTNAME=	html2text-1.3.2a
 CATEGORIES=	textproc
@@ -12,7 +12,6 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gunzip
-GCC_REQD+=		3.0
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		ECHO=${ECHO:Q}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5

Index: pkgsrc/textproc/xmlindent/Makefile
diff -u pkgsrc/textproc/xmlindent/Makefile:1.16 pkgsrc/textproc/xmlindent/Makefile:1.17
--- pkgsrc/textproc/xmlindent/Makefile:1.16	Tue Jul 11 05:46:30 2023
+++ pkgsrc/textproc/xmlindent/Makefile	Mon Jul 17 22:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/07/11 05:46:30 nia Exp $
+# $NetBSD: Makefile,v 1.17 2023/07/17 22:00:25 nia Exp $
 #
 
 DISTNAME=	xmlindent-0.2.16
@@ -13,8 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	flex:run
 
-GCC_REQD+=	3.0
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:

Index: pkgsrc/wm/windowmaker/Makefile
diff -u pkgsrc/wm/windowmaker/Makefile:1.139 pkgsrc/wm/windowmaker/Makefile:1.140
--- pkgsrc/wm/windowmaker/Makefile:1.139	Sun Jan 29 21:15:02 2023
+++ pkgsrc/wm/windowmaker/Makefile	Mon Jul 17 22:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2023/01/29 21:15:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.140 2023/07/17 22:00:25 nia Exp $
 
 DISTNAME=	WindowMaker-0.95.9
 PKGNAME=	${DISTNAME:tl}
@@ -44,10 +44,6 @@ PKGCONFIG_OVERRIDE_STAGE=	post-build
 CONFIGURE_ENV+=		ac_cv_lib_Xext_XineramaGetInfo=no
 .endif
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=	3.0
-.endif
-
 CFLAGS.SunOS+=		-D__EXTENSIONS__
 
 PKG_SYSCONFSUBDIR=	WindowMaker

Index: pkgsrc/x11/neXtaw/Makefile
diff -u pkgsrc/x11/neXtaw/Makefile:1.29 pkgsrc/x11/neXtaw/Makefile:1.30
--- pkgsrc/x11/neXtaw/Makefile:1.29	Sat Jul  4 16:18:42 2015
+++ pkgsrc/x11/neXtaw/Makefile	Mon Jul 17 22:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:42 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2023/07/17 22:00:25 nia Exp $
 
 DISTNAME=	neXtaw-0.15.1
 PKGREVISION=	3
@@ -15,12 +15,6 @@ USE_LIBTOOL=		yes
 DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-alpha)
-GCC_REQD+=	2.95
-.endif
-
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR}
 
 post-install:

Index: pkgsrc/x11/xephem/Makefile
diff -u pkgsrc/x11/xephem/Makefile:1.72 pkgsrc/x11/xephem/Makefile:1.73
--- pkgsrc/x11/xephem/Makefile:1.72	Tue Jun 28 11:37:59 2022
+++ pkgsrc/x11/xephem/Makefile	Mon Jul 17 22:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2022/06/28 11:37:59 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2023/07/17 22:00:25 nia Exp $
 
 DISTNAME=	xephem-3.7.7
 PKGREVISION=	6
@@ -41,10 +41,6 @@ REPLACE.perl.old=	.*/bin/perl
 REPLACE.perl.new=	${PREFIX}/bin/perl
 REPLACE_FILES.perl=	auxil/astorb2edb.pl auxil/mpcorb2edb.pl
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=	2.95.3
-.endif
-
 INSTALLATION_DIRS=	bin lib/X11/app-defaults share/xephem/tools \
 			${PKGMANDIR}/man1
 

Index: pkgsrc/x11/xphoon/Makefile
diff -u pkgsrc/x11/xphoon/Makefile:1.28 pkgsrc/x11/xphoon/Makefile:1.29
--- pkgsrc/x11/xphoon/Makefile:1.28	Mon Oct 29 05:07:18 2012
+++ pkgsrc/x11/xphoon/Makefile	Mon Jul 17 22:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/10/29 05:07:18 asau Exp $
+# $NetBSD: Makefile,v 1.29 2023/07/17 22:00:25 nia Exp $
 #
 
 DISTNAME=	xphoon.tar
@@ -14,12 +14,6 @@ COMMENT=	Set the root window to the moon
 WRKSRC=		${WRKDIR}/xphoon
 USE_IMAKE=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=	2.95.3
-.endif
-
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


--_----------=_1689631226269040--