Prepare for powerpc-on-clang by deleting hard-coded tests for architecture

as a stand-in for "are we running on gcc".

Approved by:	portmgr (tier-2 blanket)

9 files changed, 15 insertions, 15 deletions

diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile
index f576ba2b8f0d..4a46fcd545e1 100644
--- a/devel/py-lxml/Makefile
+++ b/devel/py-lxml/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pythonic binding for the libxml2 and libxslt libraries
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/doc/licenses/BSD.txt
 
-USES=		gnome python uniquefiles:dirs
+USES=		compiler gnome python uniquefiles:dirs
 USE_GNOME=	libxml2 libxslt
 USE_PYTHON=	autoplist concurrent distutils
 
@@ -35,8 +35,8 @@ post-install-DOCS-on:
 
 .include <bsd.port.pre.mk>
 
-# on gcc-based architectures, use modern GCC due to use of #pragma
-.if ${ARCH} == mips || ${ARCH} == mips64 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpcspe || ${ARCH} == sparc64
+# if using gcc, force modern GCC due to use of #pragma
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 USE_GCC=	yes
 .endif
 
diff --git a/editors/encryptpad/Makefile b/editors/encryptpad/Makefile
index 353d78b4f91e..8423c999da7a 100644
--- a/editors/encryptpad/Makefile
+++ b/editors/encryptpad/Makefile
@@ -33,7 +33,7 @@ PORTDOCS=	*
 .include <bsd.port.pre.mk>
 
 post-patch:
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 	${REINPLACE_CMD} -e 's/freebsd-clang/freebsd-g++/' \
 		${WRKSRC}/build/Makefile.qt_ui
 .endif
diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile
index 1f81fc984b9e..b56a0c02dba6 100644
--- a/games/lpairs/Makefile
+++ b/games/lpairs/Makefile
@@ -35,7 +35,7 @@ NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	${REINPLACE_CMD} -e 's|games/lpairs|lpairs|' ${WRKSRC}/configure.in
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 	${REINPLACE_CMD} -e 's|-Wno-unused-result||' ${WRKSRC}/configure.in
 .endif
 
diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile
index 1cdf989054f6..9e3bfad3bde1 100644
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@@ -41,7 +41,7 @@ PLIST_FILES=	bin/comical \
 pre-patch:
 	@${MV} ${WRKSRC}/Comical\ Icons ${WRKSRC}/ComicalIcons
 
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 pre-configure:
 	${REINPLACE_CMD} -e 's|-Wno-unused-local-typedef||' ${WRKSRC}/src/Makefile
 .endif
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index d016163ff162..1e5ec925dd4f 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS=	libslang.so:devel/libslang2\
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		bison gmake shebangfix ssl
+USES=		bison compiler gmake shebangfix ssl
 
 SHEBANG_FILES=	bin/hb3rdpat.hbs
 SHEBANG_LANG=	hbrun
@@ -122,7 +122,7 @@ post-patch:
 		-e 's|utmp.h|utmpx.h|g' ${WRKSRC}/src/rtl/gtcrs/gtcrs.h
 
 # override default for gcc-based archs
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 HB_COMPILER=	gcc
 .endif
 
diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile
index 04060afb1586..7c51a6b84ba6 100644
--- a/mail/archiveopteryx-devel/Makefile
+++ b/mail/archiveopteryx-devel/Makefile
@@ -19,7 +19,7 @@ GH_ACCOUNT=	aox
 GH_PROJECT=	aox
 GH_TAGNAME=	96ab17e
 
-USES=		perl5 ssl
+USES=		compiler perl5 ssl
 USE_PERL5=	build
 WITH_PGSQL=	client
 
@@ -44,7 +44,7 @@ OPTIONS_DEFINE=	DOCS
 
 # force Clang when on FreeBSD with clang in base
 .if ${OPSYS} == FreeBSD
-.if ! ${ARCH:Mmips*} && ! ${ARCH:Mpowerpc*} && ! ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == clang
 JAMARG+=	"-sCLANG=1"
 .endif
 .endif
diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile
index 99874103da22..a8fd53d92285 100644
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@@ -14,7 +14,7 @@ LICENSE=	MIT
 
 BUILD_DEPENDS=	jam:devel/jam
 
-USES=		perl5 ssl tar:bzip2
+USES=		compiler perl5 ssl tar:bzip2
 USE_PERL5=	build
 WITH_PGSQL=	client
 
@@ -38,7 +38,7 @@ OPTIONS_DEFINE=	DOCS
 
 # force Clang when on FreeBSD with clang in base
 .if ${OPSYS} == FreeBSD
-.if ! ${ARCH:Mmips*} && ! ${ARCH:Mpowerpc*} && ! ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == clang
 JAMARG+=	"-sCLANG=1"
 .endif
 .endif
diff --git a/multimedia/oscam/Makefile b/multimedia/oscam/Makefile
index 5ba40a0a520e..471e4e8c75f6 100644
--- a/multimedia/oscam/Makefile
+++ b/multimedia/oscam/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Softcam software to decrypt digital tv channels
 
 LICENSE=	GPLv3
 
-USES=		gmake ssl tar:bzip2
+USES=		compiler gmake ssl tar:bzip2
 USE_RC_SUBR=	oscam
 
 .if target(gen-dist)
@@ -30,7 +30,7 @@ BROKEN_FreeBSD_12=	field has incomplete type 'BIGNUM' (aka 'struct bignum_st')
 BROKEN_FreeBSD_13=	field has incomplete type 'BIGNUM' (aka 'struct bignum_st')
 .endif
 
-.if ! ${ARCH:Mmips*} && ! ${ARCH:Mpowerpc*} && ! ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == clang
 MAKE_ARGS+=	HOSTCC=clang CC=clang
 .endif
 
diff --git a/news/nget/Makefile b/news/nget/Makefile
index b0ef756355fd..fca67b31c12c 100644
--- a/news/nget/Makefile
+++ b/news/nget/Makefile
@@ -29,7 +29,7 @@ WRKSRC=	${WRKDIR}/nget-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-std=c++11
 .else
 CXXFLAGS+=	-std=c++98