Fix cross build of base/ ports

This is a follow up to r461057 and fixes base/binutils and base/gcc in my
testing.

PR:		224217
Submitted by:	nwhitehorn (partially, I made additional changes)
Reviewed by:	bapt

3 files changed, 82 insertions, 63 deletions

diff --git a/base/binutils/Makefile b/base/binutils/Makefile
index 206025b3ae30..e9bcc293dd9d 100644
--- a/base/binutils/Makefile
+++ b/base/binutils/Makefile
@@ -2,12 +2,12 @@
 
 PORTEPOCH=	0
 CATEGORIES=	base
-PKGNAMEPREFIX=	${OPSYS}-
+PKGNAMEPREFIX=	${OPSYS:tl}-
 VALID_CATEGORIES=	base
 
 COMMENT=	GNU binary tools for base
 
-MASTERDIR=	${.CURDIR}/../..//devel/binutils
+MASTERDIR=	${.CURDIR}/../../devel/binutils
 PLIST=		${.CURDIR}/pkg-plist.${TARGET_ARCH}
 
 .if !defined(CROSS_TOOLCHAIN)
@@ -19,7 +19,8 @@ PLIST=		${.CURDIR}/pkg-plist.${TARGET_ARCH}
 .endif
 
 TARGET_ARCH=	${CROSS_TOOLCHAIN:C,-.*$,,}
-BUTARGET=	${TARGET_ARCH}-${OPSYS:tl}
+BUTARGET=	${TARGET_ARCH}-unknown-${OPSYS:tl}${OSREL}
+
 CONFIGURE_ARGS+=	--disable-host-shared
 PREFIX=	/usr
 
diff --git a/base/binutils/pkg-plist.powerpc64 b/base/binutils/pkg-plist.powerpc64
index 2defaf2f66fd..8638ee227a26 100644
--- a/base/binutils/pkg-plist.powerpc64
+++ b/base/binutils/pkg-plist.powerpc64
@@ -3,64 +3,73 @@ bin/ld
 bin/ld.bfd
 bin/objcopy
 bin/objdump
-powerpc64-freebsd/bin/as
-powerpc64-freebsd/bin/ld
-powerpc64-freebsd/bin/ld.bfd
-powerpc64-freebsd/bin/objcopy
-powerpc64-freebsd/bin/objdump
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.x
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xbn
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xc
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xd
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xdc
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xdw
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xn
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xr
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xs
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xsc
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xsw
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xu
-powerpc64-freebsd/lib/ldscripts/elf32ppc_fbsd.xw
-powerpc64-freebsd/lib/ldscripts/elf32ppc.x
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xbn
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xc
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xd
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xdc
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xdw
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xn
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xr
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xs
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xsc
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xsw
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xu
-powerpc64-freebsd/lib/ldscripts/elf32ppc.xw
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.x
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xbn
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xc
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xd
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xdc
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xdw
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xn
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xr
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xs
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xsc
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xsw
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xu
-powerpc64-freebsd/lib/ldscripts/elf64ppc_fbsd.xw
-powerpc64-freebsd/lib/ldscripts/elf64ppc.x
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xbn
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xc
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xd
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xdc
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xdw
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xn
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xr
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xs
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xsc
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xsw
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xu
-powerpc64-freebsd/lib/ldscripts/elf64ppc.xw
+bin/powerpc64-unknown-freebsd12.0-as
+bin/powerpc64-unknown-freebsd12.0-ld
+bin/powerpc64-unknown-freebsd12.0-ld.bfd
+bin/powerpc64-unknown-freebsd12.0-objcopy
+bin/powerpc64-unknown-freebsd12.0-objdump
+powerpc64-unknown-freebsd12.0/bin/as
+powerpc64-unknown-freebsd12.0/bin/ld
+powerpc64-unknown-freebsd12.0/bin/ld.bfd
+powerpc64-unknown-freebsd12.0/bin/objcopy
+powerpc64-unknown-freebsd12.0/bin/objdump
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.x
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xbn
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xd
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xdc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xdw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xn
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xr
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xs
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xsc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xsw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xu
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc_fbsd.xw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.x
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xbn
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xd
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xdc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xdw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xn
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xr
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xs
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xsc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xsw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xu
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf32ppc.xw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.x
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xbn
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xd
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xdc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xdw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xn
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xr
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xs
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xsc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xsw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xu
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc_fbsd.xw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.x
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xbn
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xd
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xdc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xdw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xn
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xr
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xs
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xsc
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xsw
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xu
+powerpc64-unknown-freebsd12.0/lib/ldscripts/elf64ppc.xw
 share/man/man1/as.1.gz
 share/man/man1/ld.1.gz
 share/man/man1/objcopy.1.gz
 share/man/man1/objdump.1.gz
+share/man/man1/powerpc64-unknown-freebsd12.0-as.1.gz
+share/man/man1/powerpc64-unknown-freebsd12.0-ld.1.gz
+share/man/man1/powerpc64-unknown-freebsd12.0-objcopy.1.gz
+share/man/man1/powerpc64-unknown-freebsd12.0-objdump.1.gz
diff --git a/base/gcc/Makefile b/base/gcc/Makefile
index a2ca9d5143ff..286352b55c98 100644
--- a/base/gcc/Makefile
+++ b/base/gcc/Makefile
@@ -29,10 +29,13 @@ LICENSE_COMB=	multi
 .endif
 
 PREFIX=		/usr
-CONFIGURE_ENV=	gcc_gxx_include_dir="/usr/include/c++/v1"
+CONFIGURE_ENV=	gcc_gxx_include_dir="/usr/include/c++/v1" \
+		NM=/usr/bin/nm \
+		AS_FOR_TARGET=/usr/bin/as \
+		LD_FOR_TARGET=/usr/bin/ld \
+		NM_FOR_TARGET=/usr/bin/nm
 TARGET_ARCH=	${CROSS_TOOLCHAIN:C,-.*$,,}
 GCC_TARGET=	${TARGET_ARCH}-unknown-${OPSYS:tl}${OSREL}
-
 USES=	gmake libtool tar:bzip2 makeinfo
 PLIST_SUB=	TARGETARCH=${TARGET_ARCH} \
 		OPSYS=${OPSYS:tl} \
@@ -44,8 +47,10 @@ EXTRA_PATCHES+= ${.CURDIR}/../../devel/powerpc64-gcc/files/freebsd-format-extens
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
-CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls \
+CONFIGURE_ARGS+=	\
+		--target=${GCC_TARGET} \
 		--enable-languages=c,c++ \
+		--disable-nls \
 		--without-headers \
 		--with-build-sysroot=${CROSS_SYSROOT} \
 		-with-pkgversion="GNU Collection for FreeBSD"
@@ -63,8 +68,12 @@ post-patch:
 		${WRKSRC}//gcc/cp/g++spec.c
 
 post-install:
+	${MV} ${STAGEDIR}/usr/bin/gcov-tool ${STAGEDIR}/usr/bin/${GCC_TARGET}-gcov-tool ; \
 	for tool in cpp gcc g++ gcov; do \
+		${MV} ${STAGEDIR}/usr/bin/$${tool} ${STAGEDIR}/usr/bin/${GCC_TARGET}-$${tool} ; \
 		${LN} -sf ${GCC_TARGET}-$${tool}  ${STAGEDIR}/usr/bin/$${tool} ; \
+		${MV} ${STAGEDIR}/${MANDIR}1/$${tool}.1 ${STAGEDIR}/${MANDIR}1/${GCC_TARGET}-$${tool}.1 ; \
+		${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${GCC_TARGET}-$${tool}.1 ; \
 		${LN} -sf ${GCC_TARGET}-$${tool}.1.gz ${STAGEDIR}/${MANDIR}1/$${tool}.1.gz ; \
 	done ; \
 	${LN} -sf ${GCC_TARGET}-g++  ${STAGEDIR}/usr/bin/c++ ; \