git: 23544948cb74 - main - */*: Cleanup use of CONFIGURE_TARGET
Date: Mon, 26 Oct 2026 16:35:58 UTC
The branch main has been updated by tijl:
URL: https://cgit.FreeBSD.org/ports/commit/?id=23544948cb74a8a0a66b4865ef705d3c5fea27fc
commit 23544948cb74a8a0a66b4865ef705d3c5fea27fc
Author: Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2026-10-17 18:37:41 +0000
Commit: Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2026-10-26 16:35:32 +0000
*/*: Cleanup use of CONFIGURE_TARGET
Since 4d1f8f16c1c9 replacing amd64 with x86_64 is not necessary.
---
audio/opus/Makefile | 1 -
devel/aarch64-none-elf-gcc/Makefile | 6 ------
devel/binutils/Makefile | 6 +-----
devel/freebsd-gcc12/Makefile | 6 ------
devel/freebsd-gcc13/Makefile | 6 ------
devel/freebsd-gcc14/Makefile | 6 ------
devel/freebsd-gcc15/Makefile | 6 ------
devel/gdb/Makefile | 4 ----
devel/gprbuild/Makefile | 4 ----
devel/libffcall/Makefile | 1 -
emulators/tme/Makefile | 1 -
games/openbor/Makefile | 2 +-
lang/clisp/Makefile | 1 -
lang/gcc12-devel/Makefile | 5 +----
lang/gcc12/Makefile | 5 +----
lang/gcc13-devel/Makefile | 5 +----
lang/gcc13/Makefile | 5 +----
lang/gcc14-devel/Makefile | 5 +----
lang/gcc14/Makefile | 5 +----
lang/gcc15-devel/Makefile | 5 +----
lang/gcc15/Makefile | 5 +----
lang/gcc16-devel/Makefile | 5 +----
lang/gcc16/Makefile | 5 +----
lang/gcc17-devel/Makefile | 5 +----
lang/gnat12/Makefile | 2 --
lang/gnat13/Makefile | 2 --
lang/gnat14/Makefile | 2 --
lang/gnat15/Makefile | 2 --
lang/gprolog/Makefile | 1 -
lang/pocl/Makefile | 2 +-
lang/sdcc/Makefile | 4 ----
lang/spidermonkey128/Makefile | 4 ----
lang/spidermonkey140/Makefile | 4 ----
lang/spidermonkey153/Makefile | 4 ----
multimedia/mjpegtools/Makefile | 1 -
multimedia/xvid/Makefile | 4 ----
security/libgcrypt/Makefile | 1 -
37 files changed, 14 insertions(+), 124 deletions(-)
diff --git a/audio/opus/Makefile b/audio/opus/Makefile
index 61deef1a790a..b82c263de22f 100644
--- a/audio/opus/Makefile
+++ b/audio/opus/Makefile
@@ -20,7 +20,6 @@ CONFIGURE_ARGS= --enable-custom-modes \
--enable-osce \
--enable-qext \
--disable-doc # requires doxygen
-CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
INSTALL_TARGET= install-strip
TEST_TARGET= check
diff --git a/devel/aarch64-none-elf-gcc/Makefile b/devel/aarch64-none-elf-gcc/Makefile
index a8cac18526a4..5fe4f53e7efd 100644
--- a/devel/aarch64-none-elf-gcc/Makefile
+++ b/devel/aarch64-none-elf-gcc/Makefile
@@ -57,12 +57,6 @@ post-patch:
@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
${WRKSRC}//gcc/Makefile.in
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL}
-.else
-CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL}
-.endif
-
# The following is required for clang to bootstrap gcc.
.if ${COMPILER_TYPE} == clang
MAKE_ARGS+= CXXFLAGS=-fbracket-depth=512
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 43d2d4bd84eb..fe60a7a09f6f 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -143,12 +143,8 @@ PLIST_SUB+= GOLD="@comment "
CONFIGURE_ARGS+= --enable-new-dtags
.endif
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
-.elif ${ARCH} == powerpcspe
+.if ${ARCH} == powerpcspe
CONFIGURE_TARGET= powerpc-portbld-freebsd${OSREL}
-.else
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.endif
post-patch:
diff --git a/devel/freebsd-gcc12/Makefile b/devel/freebsd-gcc12/Makefile
index 129d89aa46a8..11ced8a31f06 100644
--- a/devel/freebsd-gcc12/Makefile
+++ b/devel/freebsd-gcc12/Makefile
@@ -83,12 +83,6 @@ post-patch:
@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
${WRKSRC}//gcc/Makefile.in
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL}
-.else
-CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL}
-.endif
-
.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64"
CONFIGURE_ARGS+=--enable-multilib
.endif
diff --git a/devel/freebsd-gcc13/Makefile b/devel/freebsd-gcc13/Makefile
index 8f0f83e358e3..40cd61223388 100644
--- a/devel/freebsd-gcc13/Makefile
+++ b/devel/freebsd-gcc13/Makefile
@@ -83,12 +83,6 @@ post-patch:
@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
${WRKSRC}//gcc/Makefile.in
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL}
-.else
-CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL}
-.endif
-
.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64"
CONFIGURE_ARGS+=--enable-multilib
.endif
diff --git a/devel/freebsd-gcc14/Makefile b/devel/freebsd-gcc14/Makefile
index 9abed5e60714..7692e5a3106d 100644
--- a/devel/freebsd-gcc14/Makefile
+++ b/devel/freebsd-gcc14/Makefile
@@ -84,12 +84,6 @@ post-patch:
@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
${WRKSRC}//gcc/Makefile.in
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL}
-.else
-CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL}
-.endif
-
.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64"
CONFIGURE_ARGS+=--enable-multilib
.endif
diff --git a/devel/freebsd-gcc15/Makefile b/devel/freebsd-gcc15/Makefile
index 00b97cced17d..dfe5ecaafabb 100644
--- a/devel/freebsd-gcc15/Makefile
+++ b/devel/freebsd-gcc15/Makefile
@@ -84,12 +84,6 @@ post-patch:
@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
${WRKSRC}//gcc/Makefile.in
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL}
-.else
-CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL}
-.endif
-
.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64"
CONFIGURE_ARGS+=--enable-multilib
.endif
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 96f74089db93..063da36247f0 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -125,10 +125,6 @@ PLIST_SUB+= LIBCXX="@comment "
EXCLUDE+= zlib
.endif
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
-.endif
-
# powerpc64le switched long double to IEEE-128 in FreeBSD 16; apply the gdb
# long-double format fix only there so 14/15 packages keep the 64-bit format.
.if ${ARCH} == powerpc64le && ${OSVERSION} >= 1600019
diff --git a/devel/gprbuild/Makefile b/devel/gprbuild/Makefile
index 757f84238848..02366b2ee42c 100644
--- a/devel/gprbuild/Makefile
+++ b/devel/gprbuild/Makefile
@@ -25,8 +25,6 @@ USE_GITHUB= yes
GH_ACCOUNT= AdaCore
GH_PROJECT= gprconfig_kb:kb xmlada:xa
-CONFIGURE_TARGET= ${_CONFIGURE_ARCH}-portbld-${_CONFIGURE_PLATFORM}
-
MAKE_CMD= gprbuild
NO_SHLIB_REQUIRES_GLOB= libgnarl-${_ada_version}.so libgnat-${_ada_version}.so
@@ -72,8 +70,6 @@ _BOOTSTRAP_XMLADA_GPRINSTALL_ARGS= ${_XMLADA_GPR_PROJECT_ARGS} \
--prefix='${_BOOTSTRAP_PREFIX}' -p -v
_BOOTSTRAP_XMLADA_LIBRARY_TYPES= static-pic
_BOOTSTRAP_XMLADA_WRKSRC= ${WRKDIR}/xmlada-${DISTVERSION}
-_CONFIGURE_ARCH= ${ARCH:S/amd64/x86_64/}
-_CONFIGURE_PLATFORM= ${OPSYS:tl}${OSREL}
_DIST_BUILD_DATE= 20251007
_DIST_BUILD_TYPE= FSF
_DOCS_INSTALL_EXCLUDES= "-not -name .buildinfo -not -regex ^./_sources.*"
diff --git a/devel/libffcall/Makefile b/devel/libffcall/Makefile
index 380eb5e89026..5c36e81b019c 100644
--- a/devel/libffcall/Makefile
+++ b/devel/libffcall/Makefile
@@ -16,7 +16,6 @@ GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ARGS= --enable-shared
-CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
MAKE_JOBS_UNSAFE= yes
TEST_TARGET= check
CFLAGS+= -fPIC
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index 68c944ba9674..ecdd23dd91a8 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -20,7 +20,6 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static --disable-warnings
-CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
MAKE_JOBS_UNSAFE=yes
INSTALL_TARGET= install-strip
diff --git a/games/openbor/Makefile b/games/openbor/Makefile
index 540b373457b1..ecbab46124f2 100644
--- a/games/openbor/Makefile
+++ b/games/openbor/Makefile
@@ -53,7 +53,7 @@ USE_SDL= sdl2
.endif
WRKSRC_SUBDIR= engine
MAKE_ENV= BUILD_LINUX=1 SDKPATH="${LOCALBASE}" \
- GCC_TARGET="${CONFIGURE_TARGET:S/amd64/x86_64/}"
+ GCC_TARGET="${CONFIGURE_TARGET}"
MAKE_ARGS= CC="${CC}" LIBRARIES="${LOCALBASE}/lib" \
TARGET_ARCH=${ARCH:S/i386/x86/} ARCHFLAGS="" \
TARGET_FINAL='${TARGET}' BUILD_MMX="" ECHO="${ECHO}"
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 072b81d3bf04..ca64f8e5783f 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -31,7 +31,6 @@ CONFIGURE_ARGS= --docdir="${DOCSDIR}" \
--vimdir="${DATADIR}/vim" \
--with-libiconv=${ICONV_PREFIX}
CONFIGURE_ENV= FORCE_UNSAFE_CONFIGURE=1
-CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
MAKE_ENV= ${CONFIGURE_ENV}
MAKE_JOBS_UNSAFE= yes
diff --git a/lang/gcc12-devel/Makefile b/lang/gcc12-devel/Makefile
index 72d7b190bd94..2d9224add58d 100644
--- a/lang/gcc12-devel/Makefile
+++ b/lang/gcc12-devel/Makefile
@@ -76,10 +76,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
.include <bsd.port.pre.mk>
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile
index 70415ec46e23..5787ce6ffea3 100644
--- a/lang/gcc12/Makefile
+++ b/lang/gcc12/Makefile
@@ -73,10 +73,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
CONFIGURE_ARGS+= --with-long-double-format=ieee
.endif
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gcc13-devel/Makefile b/lang/gcc13-devel/Makefile
index 410af407a906..f8502fafbebe 100644
--- a/lang/gcc13-devel/Makefile
+++ b/lang/gcc13-devel/Makefile
@@ -75,10 +75,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
.include <bsd.port.pre.mk>
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gcc13/Makefile b/lang/gcc13/Makefile
index f3a02979b53b..3a5d1c222fbe 100644
--- a/lang/gcc13/Makefile
+++ b/lang/gcc13/Makefile
@@ -73,10 +73,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
CONFIGURE_ARGS+= --with-long-double-format=ieee
.endif
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gcc14-devel/Makefile b/lang/gcc14-devel/Makefile
index dbc236cbfd09..e59c46b16e27 100644
--- a/lang/gcc14-devel/Makefile
+++ b/lang/gcc14-devel/Makefile
@@ -77,10 +77,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
.include <bsd.port.pre.mk>
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gcc14/Makefile b/lang/gcc14/Makefile
index 3b47f0b67b51..0c8f5bef6ab2 100644
--- a/lang/gcc14/Makefile
+++ b/lang/gcc14/Makefile
@@ -77,10 +77,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
CONFIGURE_ARGS+= --with-long-double-format=ieee
.endif
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gcc15-devel/Makefile b/lang/gcc15-devel/Makefile
index 186594f4d184..37dfa51ca735 100644
--- a/lang/gcc15-devel/Makefile
+++ b/lang/gcc15-devel/Makefile
@@ -76,10 +76,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
.include <bsd.port.pre.mk>
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gcc15/Makefile b/lang/gcc15/Makefile
index d4d81ea255d3..c73e90cade78 100644
--- a/lang/gcc15/Makefile
+++ b/lang/gcc15/Makefile
@@ -77,10 +77,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
CONFIGURE_ARGS+= --with-long-double-format=ieee
.endif
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gcc16-devel/Makefile b/lang/gcc16-devel/Makefile
index 0729e761ab6e..60e1c1c04b6f 100644
--- a/lang/gcc16-devel/Makefile
+++ b/lang/gcc16-devel/Makefile
@@ -76,10 +76,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
.include <bsd.port.pre.mk>
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gcc16/Makefile b/lang/gcc16/Makefile
index 51b916831483..d810834987f3 100644
--- a/lang/gcc16/Makefile
+++ b/lang/gcc16/Makefile
@@ -77,10 +77,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
CONFIGURE_ARGS+= --with-long-double-format=ieee
.endif
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gcc17-devel/Makefile b/lang/gcc17-devel/Makefile
index 296777c0a2b8..21ecf32ad72f 100644
--- a/lang/gcc17-devel/Makefile
+++ b/lang/gcc17-devel/Makefile
@@ -76,10 +76,7 @@ GRAPHITE_CONFIGURE_WITH+= isl
.include <bsd.port.pre.mk>
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-
-.elif ${ARCH} == powerpc64
+.if ${ARCH} == powerpc64
CONFIGURE_ARGS+= --with-abi=elfv2
.endif
diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile
index 649ee35cd2d8..0e042dbc1e73 100644
--- a/lang/gnat12/Makefile
+++ b/lang/gnat12/Makefile
@@ -52,7 +52,6 @@ CONFIGURE_ENV+= CC=${_GCC6AUX_PATH}/gcc \
CXX=${_GCC6AUX_PATH}/g++ \
PATH=${_TOOLCHAIN_PATHS}
CONFIGURE_OUTSOURCE= yes
-CONFIGURE_TARGET= ${_GNAT_ARCH}-portbld-${_PLATFORM}
MAKE_ENV+= PATH=${_TOOLCHAIN_PATHS}
INSTALL_TARGET= install-strip
@@ -115,7 +114,6 @@ _GNAT_ARCH= ${ARCH:S/amd64/x86_64/}
_OS_LABEL4VERS= [${OPSYS}${_GNAT_ARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}]
_PHASE_FILE= ${WRKSRC}/gcc/DEV-PHASE
_PKG_PREFIX= ${PREFIX}/${PORTNAME}
-_PLATFORM= ${OPSYS:tl}${OSREL}
_PREV_ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${_PREV_ASSET_OSREL}-${_PREV_ASSET_VER}${_PREV_ASSET_REV}
_PREV_ASSET_GCC= ${PREV_ASSET_VER:R:R}
_PREV_ASSET_OSREL?= ${OSREL:R}
diff --git a/lang/gnat13/Makefile b/lang/gnat13/Makefile
index 3b60609c2aa5..36e31e3212de 100644
--- a/lang/gnat13/Makefile
+++ b/lang/gnat13/Makefile
@@ -50,7 +50,6 @@ CONFIGURE_ENV+= CC=${_GNAT_PATH}/gcc \
CXX=${_GNAT_PATH}/g++ \
PATH=${_TOOLCHAIN_PATHS}
CONFIGURE_OUTSOURCE= yes
-CONFIGURE_TARGET= ${_GNAT_ARCH}-portbld-${_PLATFORM}
MAKE_ENV+= PATH=${_TOOLCHAIN_PATHS}
INSTALL_TARGET= install-strip
@@ -114,7 +113,6 @@ _OSVERARCH= ${OSVERSION}${ARCH}
_OS_LABEL4VERS= [${OPSYS}${_GNAT_ARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}]
_PHASE_FILE= ${WRKSRC}/gcc/DEV-PHASE
_PKG_PREFIX= ${PREFIX}/${PORTNAME}
-_PLATFORM= ${OPSYS:tl}${OSREL}
_PREV_ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${_PREV_ASSET_OSREL}-${_PREV_ASSET_VER}${_PREV_ASSET_REV}
_PREV_ASSET_GCC= ${PREV_ASSET_VER:R:R}
_PREV_ASSET_OSREL?= ${OSREL:R}
diff --git a/lang/gnat14/Makefile b/lang/gnat14/Makefile
index 041274ae83f1..109d273e794e 100644
--- a/lang/gnat14/Makefile
+++ b/lang/gnat14/Makefile
@@ -50,7 +50,6 @@ CONFIGURE_ENV+= CC=${_GNAT_PATH}/gcc \
CXX=${_GNAT_PATH}/g++ \
PATH=${_TOOLCHAIN_PATHS}
CONFIGURE_OUTSOURCE= yes
-CONFIGURE_TARGET= ${_GNAT_ARCH}-portbld-${_PLATFORM}
MAKE_ENV+= PATH=${_TOOLCHAIN_PATHS}
INSTALL_TARGET= install-strip
@@ -114,7 +113,6 @@ _OSVERARCH= ${OSVERSION}${ARCH}
_OS_LABEL4VERS= [${OPSYS}${_GNAT_ARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}]
_PHASE_FILE= ${WRKSRC}/gcc/DEV-PHASE
_PKG_PREFIX= ${PREFIX}/${PORTNAME}
-_PLATFORM= ${OPSYS:tl}${OSREL}
_PREV_ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${_PREV_ASSET_OSREL}-${_PREV_ASSET_VER}${_PREV_ASSET_REV}
_PREV_ASSET_GCC= ${PREV_ASSET_VER:R:R}
_PREV_ASSET_OSREL?= ${OSREL:R}
diff --git a/lang/gnat15/Makefile b/lang/gnat15/Makefile
index b612dca236ea..25e5a33de549 100644
--- a/lang/gnat15/Makefile
+++ b/lang/gnat15/Makefile
@@ -49,7 +49,6 @@ CONFIGURE_ENV+= CC=${_GNAT_PATH}/gcc \
CXX=${_GNAT_PATH}/g++ \
PATH=${_TOOLCHAIN_PATHS}
CONFIGURE_OUTSOURCE= yes
-CONFIGURE_TARGET= ${_GNAT_ARCH}-portbld-${_PLATFORM}
MAKE_ENV+= PATH=${_TOOLCHAIN_PATHS}
INSTALL_TARGET= install-strip
@@ -113,7 +112,6 @@ _OSVERARCH= ${OSVERSION}${ARCH}
_OS_LABEL4VERS= [${OPSYS}${_GNAT_ARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}]
_PHASE_FILE= ${WRKSRC}/gcc/DEV-PHASE
_PKG_PREFIX= ${PREFIX}/${PORTNAME}
-_PLATFORM= ${OPSYS:tl}${OSREL}
_PREV_ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${_PREV_ASSET_OSREL}-${_PREV_ASSET_VER}${_PREV_ASSET_REV}
_PREV_ASSET_GCC= ${PREV_ASSET_VER:R:R}
_PREV_ASSET_OSREL?= ${OSREL:R}
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index 48d99b7f6dde..b201b041aa1c 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -22,7 +22,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-c-flags="${CFLAGS}" \
--with-doc-dir="${DOCSDIR}" \
--with-examples-dir="${EXAMPLESDIR}"
-CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
MAKE_JOBS_UNSAFE= yes
WRKSRC_SUBDIR= src
diff --git a/lang/pocl/Makefile b/lang/pocl/Makefile
index a4a2a0197841..afa898511853 100644
--- a/lang/pocl/Makefile
+++ b/lang/pocl/Makefile
@@ -45,7 +45,7 @@ CMAKE_ARGS_powerpc64= -DLLC_HOST_CPU=ppc64
CMAKE_ARGS_powerpc64le= -DLLC_HOST_CPU=ppc64le
CMAKE_ARGS_amd64= -DKERNELLIB_HOST_CPU_VARIANTS=distro
-PLIST_SUB= CONFIGURE_TARGET=${CONFIGURE_TARGET:S/amd64/x86_64/}
+PLIST_SUB= CONFIGURE_TARGET=${CONFIGURE_TARGET}
OPTIONS_DEFINE= CONFORMANCE DEBUG DOCS DOCS_PDF LTTNG OMP REMOTE \
SHARED_LIBS STATIC_LLVM TESTS
diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile
index aac3f6aae891..a324a7745690 100644
--- a/lang/sdcc/Makefile
+++ b/lang/sdcc/Makefile
@@ -43,10 +43,6 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-.endif
-
post-patch:
@${REINPLACE_CMD} '/install:/s/:.*/:/' \
${WRKSRC}/Makefile.in \
diff --git a/lang/spidermonkey128/Makefile b/lang/spidermonkey128/Makefile
index c156e0a23207..5a080c6e2a8f 100644
--- a/lang/spidermonkey128/Makefile
+++ b/lang/spidermonkey128/Makefile
@@ -53,10 +53,6 @@ PLIST_SUB= SP_VER=${SP_VER}
.include <bsd.port.pre.mk>
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
-.endif
-
.if ${ARCH} == powerpc64le && (${OSVERSION} < 1405000 || \
(${OSVERSION} >= 1500000 && ${OSVERSION} < 1501501) || \
(${OSVERSION} >= 1600000 && ${OSVERSION} < 1600019))
diff --git a/lang/spidermonkey140/Makefile b/lang/spidermonkey140/Makefile
index 079de44d5457..70903d120b24 100644
--- a/lang/spidermonkey140/Makefile
+++ b/lang/spidermonkey140/Makefile
@@ -53,10 +53,6 @@ PLIST_SUB= SP_VER=${SP_VER}
.include <bsd.port.pre.mk>
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
-.endif
-
.if ${CHOSEN_COMPILER_TYPE} == gcc
CONFIGURE_ENV+= LLVM_CONFIG=${LLVM_CONFIG} \
LLVM_OBJDUMP=llvm-objdump${LLVM_VERSION}
diff --git a/lang/spidermonkey153/Makefile b/lang/spidermonkey153/Makefile
index 7c856a830b0c..e055b417b893 100644
--- a/lang/spidermonkey153/Makefile
+++ b/lang/spidermonkey153/Makefile
@@ -54,10 +54,6 @@ PLIST_SUB= SP_VER=${SP_VER}
.include <bsd.port.pre.mk>
-.if ${ARCH} == amd64
-CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
-.endif
-
.if ${CHOSEN_COMPILER_TYPE} == gcc
CONFIGURE_ENV+= LLVM_CONFIG=${LLVM_CONFIG} \
LLVM_OBJDUMP=llvm-objdump${LLVM_VERSION}
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index b8d9f6376f6a..1b466a2e4757 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -26,7 +26,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-dga \
--without-libquicktime \
--without-x
-CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
INSTALL_TARGET= install-strip
CONFLICTS= mplex
diff --git a/multimedia/xvid/Makefile b/multimedia/xvid/Makefile
index 31d6a10c9756..71428450f92e 100644
--- a/multimedia/xvid/Makefile
+++ b/multimedia/xvid/Makefile
@@ -35,10 +35,6 @@ OPTIONS_DEFINE= OPTIMIZED_CFLAGS
.include <bsd.port.pre.mk>
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
-.endif
-
.if ${ARCH}=="i386"
# relocation against symbol in readonly segment
LLD_UNSAFE= yes
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 8ce2ddb0f9ea..fb6f90025906 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -29,7 +29,6 @@ DOCS= AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS THANKS TODO \
PORTDOCS= *
CONFIGURE_ARGS= --disable-drng-support
-CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
OPTIONS_DEFINE= DOCS INFO STATIC AVX512
OPTIONS_DEFAULT= DOCS INFO STATIC