Index: share/mk/bsd.compat.mk
===================================================================
--- share/mk/bsd.compat.mk
+++ share/mk/bsd.compat.mk
@@ -5,12 +5,12 @@
 
 # -------------------------------------------------------------------
 # 32 bit world
-.if ${TARGET_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "amd64"
 HAS_COMPAT=32
-.if empty(TARGET_CPUTYPE)
+.if empty(CPUTYPE)
 LIB32CPUFLAGS=	-march=i686 -mmmx -msse -msse2
 .else
-LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
+LIB32CPUFLAGS=	-march=${CPUTYPE}
 .endif
 .if (defined(WANT_COMPILER_TYPE) && ${WANT_COMPILER_TYPE} == gcc) || \
     (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
@@ -24,29 +24,29 @@
 		AS="${XAS} --32" \
 		LD="${XLD} -m elf_i386_fbsd -L${LIBCOMPATTMP}/usr/lib32"
 
-.elif ${TARGET_ARCH} == "powerpc64"
+.elif ${MACHINE_ARCH} == "powerpc64"
 HAS_COMPAT=32
-.if empty(TARGET_CPUTYPE)
+.if empty(CPUTYPE)
 LIB32CPUFLAGS=	-mcpu=powerpc
 .else
-LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
+LIB32CPUFLAGS=	-mcpu=${CPUTYPE}
 .endif
 LIB32CPUFLAGS+=	-m32
 LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
 LIB32WMAKEFLAGS=	\
 		LD="${XLD} -m elf32ppc_fbsd"
 
-.elif ${TARGET_ARCH:Mmips64*} != ""
+.elif ${MACHINE_ARCH:Mmips64*} != ""
 HAS_COMPAT=32
 .if (defined(WANT_COMPILER_TYPE) && ${WANT_COMPILER_TYPE} == gcc) || \
     (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
-.if empty(TARGET_CPUTYPE)
+.if empty(CPUTYPE)
 LIB32CPUFLAGS=	-march=mips3
 .else
-LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
+LIB32CPUFLAGS=	-march=${CPUTYPE}
 .endif
 .else
-.if ${TARGET_ARCH:Mmips64el*} != ""
+.if ${MACHINE_ARCH:Mmips64el*} != ""
 LIB32CPUFLAGS=  -target mipsel-unknown-freebsd13.0
 .else
 LIB32CPUFLAGS=  -target mips-unknown-freebsd13.0
@@ -54,7 +54,7 @@
 .endif
 LIB32CPUFLAGS+= -mabi=32
 LIB32WMAKEENV=	MACHINE=mips MACHINE_ARCH=mips
-.if ${TARGET_ARCH:Mmips64el*} != ""
+.if ${MACHINE_ARCH:Mmips64el*} != ""
 LIB32WMAKEFLAGS= LD="${XLD} -m elf32ltsmip_fbsd"
 .else
 LIB32WMAKEFLAGS= LD="${XLD} -m elf32btsmip_fbsd"
@@ -70,11 +70,11 @@
 
 # -------------------------------------------------------------------
 # soft-fp world
-.if ${TARGET_ARCH:Marmv[67]*} != ""
+.if ${MACHINE_ARCH:Marmv[67]*} != ""
 HAS_COMPAT=SOFT
 LIBSOFTCFLAGS=        -DCOMPAT_SOFTFP
 LIBSOFTCPUFLAGS= -mfloat-abi=softfp
-LIBSOFTWMAKEENV= CPUTYPE=soft MACHINE=arm MACHINE_ARCH=${TARGET_ARCH}
+LIBSOFTWMAKEENV= CPUTYPE=soft MACHINE=arm MACHINE_ARCH=${MACHINE_ARCH}
 LIBSOFTWMAKEFLAGS=        -DCOMPAT_SOFTFP
 .endif
 
Index: share/mk/bsd.prog.mk
===================================================================
--- share/mk/bsd.prog.mk
+++ share/mk/bsd.prog.mk
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
-# .include <bsd.compat.mk>
+.include <bsd.compat.mk>
 .include <bsd.compiler.mk>
 .include <bsd.linker.mk>