From aabe13ddd2af1af114710acc6c325c8b26f21a84 Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 2 Aug 2018 05:30:17 +0000
Subject: [PATCH] Revert r476186, it fails to package

With hat:	portmgr
---
 base/binutils/Makefile  | 16 ----------------
 base/binutils/pkg-plist |  5 -----
 devel/binutils/Makefile |  6 +-----
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/base/binutils/Makefile b/base/binutils/Makefile
index 8e1b175504c9..7eb28ee8ac0a 100644
--- a/base/binutils/Makefile
+++ b/base/binutils/Makefile
@@ -23,27 +23,11 @@ BUTARGET=	${TARGETARCH}-unknown-${OPSYS:tl}${OSREL}
 
 CONFIGURE_ARGS+=	--disable-host-shared
 PREFIX=	/usr
-BUREMOVE=	addr2line \
-		ar \
-		c++filt \
-		dlltool \
-		elfedit \
-		gprof \
-		nlmconv \
-		nm \
-		ranlib \
-		readelf \
-		size \
-		strings \
-		strip \
-		windmc \
-		windres
 
 .include "${MASTERDIR}/Makefile"
 
 .if ${OSVERSION} >= 1100100
 PLIST_SUB+=	OBJCOPY="@comment "
-BUREMOVE+=	objcopy
 .else
 PLIST_SUB+=	OBJCOPY=""
 .endif
diff --git a/base/binutils/pkg-plist b/base/binutils/pkg-plist
index 39a589afdf3c..513e305b247e 100644
--- a/base/binutils/pkg-plist
+++ b/base/binutils/pkg-plist
@@ -8,11 +8,6 @@ bin/%%BUTARGET%%-ld
 bin/%%BUTARGET%%-ld.bfd
 %%OBJCOPY%%bin/%%BUTARGET%%-objcopy
 bin/%%BUTARGET%%-objdump
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%OBJCOPY%%%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
 %%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.x
 %%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xbn
 %%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xc
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 5ea9e0025c4d..676c856dce16 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -145,15 +145,11 @@ post-install:
 	${MV} ${STAGEDIR}/${MANDIR}1/objdump.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1
 	${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1
 	${LN} -fs ${BUTARGET}-objdump.1.gz ${STAGEDIR}/${MANDIR}1/objdump.1.gz
-	@${RM} -r ${STAGEDIR}${PREFIX}/include
-	@${RM} -r ${STAGEDIR}${PREFIX}/lib
 .endif
 .endif
 .for tool in ${BUREMOVE}
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${BUTARGET}-${tool} \
-	    ${STAGEDIR}${PREFIX}/bin/${tool} \
-	    ${STAGEDIR}${MANPREFIX}/man/man1/${BUTARGET}-${tool}.1 \
-	    ${STAGEDIR}${MANPREFIX}/man/man1/${tool}.1 \
+	    ${STAGEDIR}${PREFIX}/man/man1/${BUTARGET}-${tool}.1 \
 	    ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/${tool}
 .endfor
 .if defined(BUREMOVE) && ${BUREMOVE:Mld}