From eaa6761b21fcb3529ab27d9bf04a4a8d0307cf5c Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Tue, 26 Jan 2016 19:38:09 +0000
Subject: [PATCH] Sync with binutils.

---
 external/gpl3/binutils.old/Makefile.inc       |  4 ++++
 external/gpl3/binutils.old/lib/Makefile.inc   |  2 ++
 .../gpl3/binutils.old/lib/libbfd/Makefile     |  6 ++----
 .../gpl3/binutils.old/lib/libiberty/Makefile  |  6 ++----
 .../gpl3/binutils.old/lib/libopcodes/Makefile |  6 ++----
 .../gpl3/binutils.old/usr.bin/Makefile.inc    | 19 ++---------------
 .../binutils.old/usr.bin/addr2line/Makefile   |  4 +---
 .../gpl3/binutils.old/usr.bin/ar/Makefile     |  4 +---
 .../binutils.old/usr.bin/c++filt/Makefile     |  4 +---
 .../binutils.old/usr.bin/coffdump/Makefile    |  4 +---
 .../gpl3/binutils.old/usr.bin/common/Makefile |  6 +-----
 .../binutils.old/usr.bin/common/Makefile.inc  | 13 ++++++++++--
 .../binutils.old/usr.bin/common/Makefile.prog |  8 +++----
 .../binutils.old/usr.bin/elfedit/Makefile     |  4 +---
 .../gpl3/binutils.old/usr.bin/gas/Makefile    | 12 ++++-------
 .../gpl3/binutils.old/usr.bin/gprof/Makefile  |  7 ++-----
 .../gpl3/binutils.old/usr.bin/ld/Makefile     | 21 ++++++++-----------
 .../binutils.old/usr.bin/nlmconv/Makefile     |  4 +---
 .../gpl3/binutils.old/usr.bin/nm/Makefile     |  4 +---
 .../binutils.old/usr.bin/objcopy/Makefile     |  4 +---
 .../binutils.old/usr.bin/objdump/Makefile     |  4 +---
 .../gpl3/binutils.old/usr.bin/ranlib/Makefile |  4 +---
 .../binutils.old/usr.bin/readelf/Makefile     |  4 +---
 .../gpl3/binutils.old/usr.bin/size/Makefile   |  4 +---
 .../binutils.old/usr.bin/strings/Makefile     |  4 +---
 .../gpl3/binutils.old/usr.bin/strip/Makefile  |  4 +---
 .../gpl3/binutils.old/usr.sbin/Makefile.inc   |  3 ++-
 .../gpl3/binutils.old/usr.sbin/dbsym/Makefile |  4 +---
 .../binutils.old/usr.sbin/mdsetimage/Makefile |  4 +---
 29 files changed, 62 insertions(+), 115 deletions(-)
 create mode 100644 external/gpl3/binutils.old/Makefile.inc
 create mode 100644 external/gpl3/binutils.old/lib/Makefile.inc

diff --git a/external/gpl3/binutils.old/Makefile.inc b/external/gpl3/binutils.old/Makefile.inc
new file mode 100644
index 000000000000..07e8a748691d
--- /dev/null
+++ b/external/gpl3/binutils.old/Makefile.inc
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/26 19:38:09 christos Exp $
+.include <bsd.own.mk>
+TOP=	${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_BINUTILS_SUBDIR}
+DIST=	${TOP}/dist
diff --git a/external/gpl3/binutils.old/lib/Makefile.inc b/external/gpl3/binutils.old/lib/Makefile.inc
new file mode 100644
index 000000000000..77023220e136
--- /dev/null
+++ b/external/gpl3/binutils.old/lib/Makefile.inc
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/26 19:38:09 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
diff --git a/external/gpl3/binutils.old/lib/libbfd/Makefile b/external/gpl3/binutils.old/lib/libbfd/Makefile
index 8ed7a77d54db..53c33c72c6df 100644
--- a/external/gpl3/binutils.old/lib/libbfd/Makefile
+++ b/external/gpl3/binutils.old/lib/libbfd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:26:57 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:09 christos Exp $
 
 NOLINKLIB=	# defined
 NOLINT=		# defined
@@ -6,7 +6,7 @@ NOMAN=		# defined
 NOPROFILE=	# defined
 NOCLANGERROR=	# defined
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 # If the platform does not support shared libraries, we need to supply
 # *something* for BFD-using programs to link against.  Also provide an
@@ -25,8 +25,6 @@ DEFS_MK=${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk
 .if exists(${DEFS_MK})
 .include "${DEFS_MK}"
 
-DIST=		${NETBSDSRCDIR}/external/gpl3/binutils/dist
-
 SHLIB_MAJOR=	13
 SHLIB_MINOR=	0
 
diff --git a/external/gpl3/binutils.old/lib/libiberty/Makefile b/external/gpl3/binutils.old/lib/libiberty/Makefile
index bd7b94f132b4..a050eebb761b 100644
--- a/external/gpl3/binutils.old/lib/libiberty/Makefile
+++ b/external/gpl3/binutils.old/lib/libiberty/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
 NOLINT=		# defined
 NOPROFILE=	# defined
@@ -6,7 +6,7 @@ NOPIC=		# defined
 NOLINKLIB=	# defined
 NOCLANGERROR=	# defined
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 LIB=		iberty
 
@@ -19,8 +19,6 @@ COPTS.cp-demangle.c = -Wno-stack-protector
 COPTS.make-relative-prefix.c = -Wno-stack-protector
 COPTS.regex.c = -Wno-stack-protector
 
-DIST=		${NETBSDSRCDIR}/external/gpl3/binutils/dist
-
 SRCS=		${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
 		${G_LIBOBJS:.o=.c} ${G_ALLOCA:.o=.c}
 
diff --git a/external/gpl3/binutils.old/lib/libopcodes/Makefile b/external/gpl3/binutils.old/lib/libopcodes/Makefile
index e4cbb61e21e6..799bdfc60b35 100644
--- a/external/gpl3/binutils.old/lib/libopcodes/Makefile
+++ b/external/gpl3/binutils.old/lib/libopcodes/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
 NOLINKLIB=	# defined
 NOLINT=		# defined
@@ -6,7 +6,7 @@ NOMAN=		# defined
 NOPROFILE=	# defined
 NOCLANGERROR=	# defined
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 LIB=		opcodes
 
@@ -15,8 +15,6 @@ BFD_MACHINE_ARCH?=	${MACHINE_ARCH:C/armv[4-7]/arm/}
 .if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
 .include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
 
-DIST=		${NETBSDSRCDIR}/external/gpl3/binutils/dist
-
 SHLIB_MAJOR=	6
 SHLIB_MINOR=	0
 
diff --git a/external/gpl3/binutils.old/usr.bin/Makefile.inc b/external/gpl3/binutils.old/usr.bin/Makefile.inc
index 01e875034827..bae4a52391c0 100644
--- a/external/gpl3/binutils.old/usr.bin/Makefile.inc
+++ b/external/gpl3/binutils.old/usr.bin/Makefile.inc
@@ -1,20 +1,5 @@
-#	$NetBSD: Makefile.inc,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2016/01/26 19:38:10 christos Exp $
 
 BINDIR?=	/usr/bin
-
-.if !defined(__MAKEFILE_INC_INCLUDED__)
-__MAKEFILE_INC_INCLUDED__=1
-
-.include <bsd.own.mk>
-
-BINUTILS_MACHINE_ARCH=	${MACHINE_ARCH:C/armv[4-7]/arm/}
-
-GNUHOSTDIST=	${DIST}
-GNUCPPFLAGS=	${G_DEFS} ${G_INCLUDES}
-CPPFLAGS+=	${GNUCPPFLAGS:M-D*:N-DLOCALEDIR*} ${GNUCPPFLAGS:M-I*:N-I.*} \
-		-I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} \
-		-I${DIST}/include -I${DIST}/bfd -I${DIST}/binutils \
-		-DLOCALEDIR=\"${LOCALEDIR}\"
 NOGCCERROR=	# defined
-
-.endif # __MAKEFILE_INC_INCLUDED__
+.include "${.PARSEDIR}/../Makefile.inc"
diff --git a/external/gpl3/binutils.old/usr.bin/addr2line/Makefile b/external/gpl3/binutils.old/usr.bin/addr2line/Makefile
index 313b84458414..31b45cb461d5 100644
--- a/external/gpl3/binutils.old/usr.bin/addr2line/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/addr2line/Makefile
@@ -1,7 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
 PROG=		addr2line
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/ar/Makefile b/external/gpl3/binutils.old/usr.bin/ar/Makefile
index c6e8f60489f3..96b16a1978f2 100644
--- a/external/gpl3/binutils.old/usr.bin/ar/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/ar/Makefile
@@ -1,10 +1,8 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
 PROG=		ar
 
 COPTS.arparse.c = -Wno-stack-protector
 CPPFLAGS+=-Dbin_dummy_emulation=bin_vanilla_emulation
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/c++filt/Makefile b/external/gpl3/binutils.old/usr.bin/c++filt/Makefile
index b0528d2a32a9..cd511b341e38 100644
--- a/external/gpl3/binutils.old/usr.bin/c++filt/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/c++filt/Makefile
@@ -1,11 +1,9 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
 PROG=		c++filt
 CPPFLAGS+=	-DMAIN
 CLEANFILES+=	c++filt.1
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
 
 .PATH: ${DIST}/libiberty
diff --git a/external/gpl3/binutils.old/usr.bin/coffdump/Makefile b/external/gpl3/binutils.old/usr.bin/coffdump/Makefile
index d3a534bdc578..254be0c34343 100644
--- a/external/gpl3/binutils.old/usr.bin/coffdump/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/coffdump/Makefile
@@ -1,7 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
 PROG=		coffdump
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/common/Makefile b/external/gpl3/binutils.old/usr.bin/common/Makefile
index 797a655a7da4..896c5a97d2f2 100644
--- a/external/gpl3/binutils.old/usr.bin/common/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/common/Makefile
@@ -1,8 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
-
-.include <bsd.own.mk>
-
-TOP=		${NETBSDSRCDIR}/external/gpl3/binutils
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
 .include "${.CURDIR}/../common/Makefile.inc"
 .include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
diff --git a/external/gpl3/binutils.old/usr.bin/common/Makefile.inc b/external/gpl3/binutils.old/usr.bin/common/Makefile.inc
index e9d4acd70794..7159d0a17a39 100644
--- a/external/gpl3/binutils.old/usr.bin/common/Makefile.inc
+++ b/external/gpl3/binutils.old/usr.bin/common/Makefile.inc
@@ -1,10 +1,19 @@
-#	$NetBSD: Makefile.inc,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2016/01/26 19:38:10 christos Exp $
 
 .if !defined(__COMMON_MAKEFILE_INC_INCLUDED__)
 __COMMON_MAKEFILE_INC_INCLUDED__=1
+.include <bsd.init.mk>
+
+BINUTILS_MACHINE_ARCH=	${MACHINE_ARCH:C/armv[4-7]/arm/}
+
+GNUHOSTDIST=	${DIST}
+GNUCPPFLAGS=	${G_DEFS} ${G_INCLUDES}
+CPPFLAGS+=	${GNUCPPFLAGS:M-D*:N-DLOCALEDIR*} ${GNUCPPFLAGS:M-I*:N-I.*} \
+		-I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} \
+		-I${DIST}/include -I${DIST}/bfd -I${DIST}/binutils \
+		-DLOCALEDIR=\"${LOCALEDIR}\"
 
 BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
-DIST=		${NETBSDSRCDIR}/external/gpl3/binutils/dist
 BFDSUBDIR=	lib
 
 .endif
diff --git a/external/gpl3/binutils.old/usr.bin/common/Makefile.prog b/external/gpl3/binutils.old/usr.bin/common/Makefile.prog
index 388e4ad15e98..b55e142227c5 100644
--- a/external/gpl3/binutils.old/usr.bin/common/Makefile.prog
+++ b/external/gpl3/binutils.old/usr.bin/common/Makefile.prog
@@ -1,13 +1,12 @@
-#	$NetBSD: Makefile.prog,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile.prog,v 1.2 2016/01/26 19:38:10 christos Exp $
 #
 # Common Makefile fragment for a binutils program.
 #
 
-.include <bsd.own.mk>
-
 BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
+CPPFLAGS+=	-I${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}
 
-TOP=		${NETBSDSRCDIR}/external/gpl3/binutils
+.include <bsd.init.mk>
 
 .include "${.CURDIR}/../common/Makefile.inc"
 .include "${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
@@ -20,7 +19,6 @@ SRCS=		${G_${BUPROG}_OBJECTS:.o=.c} \
 		${G_${BUPROG}_DEPENDENCIES:M*.o:.o=.c}
 MAN=		${G_man_MANS:M${PROG}.1}
 
-CPPFLAGS+=	-I${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}
 
 .if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
 PROGDPLIBS+=	opcodes	${TOP}/${BFDSUBDIR}/libopcodes
diff --git a/external/gpl3/binutils.old/usr.bin/elfedit/Makefile b/external/gpl3/binutils.old/usr.bin/elfedit/Makefile
index 7fa7cae83a46..3c455c3770b4 100644
--- a/external/gpl3/binutils.old/usr.bin/elfedit/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/elfedit/Makefile
@@ -1,8 +1,6 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
 PROG=		elfedit
 SRCS=		elfcomm.c elfedit.c
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/gas/Makefile b/external/gpl3/binutils.old/usr.bin/gas/Makefile
index 1cc7bb708ad8..fcef382a579d 100644
--- a/external/gpl3/binutils.old/usr.bin/gas/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/gas/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
-.include <bsd.own.mk>
-
-TOP=		${NETBSDSRCDIR}/external/gpl3/binutils
+CPPFLAGS+=	-I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
+CPPFLAGS+=	-I${DIST}/gas -I${DIST}/gas/config
+CPPFLAGS+=	-I${DIST}
 
 .include "${.CURDIR}/../common/Makefile.inc"
 .include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
@@ -20,10 +20,6 @@ COPTS.symbols.c = -Wno-stack-protector
 COPTS.stabs.c = -Wno-stack-protector
 COPTS.macro.c = -Wno-stack-protector
 
-CPPFLAGS+=	-I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
-CPPFLAGS+=	-I${DIST}/gas -I${DIST}/gas/config
-CPPFLAGS+=	-I${DIST}
-
 PROGDPLIBS+=	opcodes	${TOP}/${BFDSUBDIR}/libopcodes
 PROGDPLIBS+=	bfd	${TOP}/${BFDSUBDIR}/libbfd
 PROGDPLIBS+=	iberty	${TOP}/${BFDSUBDIR}/libiberty
diff --git a/external/gpl3/binutils.old/usr.bin/gprof/Makefile b/external/gpl3/binutils.old/usr.bin/gprof/Makefile
index c416414686b5..72bbdb5d2a2c 100644
--- a/external/gpl3/binutils.old/usr.bin/gprof/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/gprof/Makefile
@@ -1,15 +1,12 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
-.include <bsd.own.mk>
-
-TOP=		${NETBSDSRCDIR}/external/gpl3/binutils
+CPPFLAGS+=	-I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
 
 .include "${.CURDIR}/../common/Makefile.inc"
 .include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
 
 PROG=		gprof
 SRCS=		${G_gprof_OBJECTS:.o=.c}
-CPPFLAGS+=	-I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
 
 PROGDPLIBS+=	bfd	${TOP}/${BFDSUBDIR}/libbfd
 PROGDPLIBS+=	iberty	${TOP}/${BFDSUBDIR}/libiberty
diff --git a/external/gpl3/binutils.old/usr.bin/ld/Makefile b/external/gpl3/binutils.old/usr.bin/ld/Makefile
index 81dc4c8e8668..71cb121af02e 100644
--- a/external/gpl3/binutils.old/usr.bin/ld/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/ld/Makefile
@@ -1,16 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
 
-.include <bsd.own.mk>
-
-TOP=		${NETBSDSRCDIR}/external/gpl3/binutils
-
-.include "${.CURDIR}/../common/Makefile.inc"
-.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
-
-SCRIPTSDIR=	/usr/libdata
-
-PROG=		ld
-SRCS=		${G_OFILES:.o=.c}
 CPPFLAGS+=	-I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
 		-I${DIST}/ld \
 		-DDEFAULT_EMULATION=\"${G_EMUL}\" \
@@ -20,6 +9,14 @@ CPPFLAGS+=	-I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
 		-DTOOLBINDIR=\"/usr/bin\" \
 		-DENABLE_PLUGINS
 
+.include "${.CURDIR}/../common/Makefile.inc"
+.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
+
+SCRIPTSDIR=	/usr/libdata
+
+PROG=		ld
+SRCS=		${G_OFILES:.o=.c}
+
 COPTS.ldgram.c = -Wno-stack-protector
 
 PROGDPLIBS+=	bfd	${TOP}/${BFDSUBDIR}/libbfd
diff --git a/external/gpl3/binutils.old/usr.bin/nlmconv/Makefile b/external/gpl3/binutils.old/usr.bin/nlmconv/Makefile
index f5f63a041072..fbb906cf134c 100644
--- a/external/gpl3/binutils.old/usr.bin/nlmconv/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/nlmconv/Makefile
@@ -1,7 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
 
 PROG=		nlmconv
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/nm/Makefile b/external/gpl3/binutils.old/usr.bin/nm/Makefile
index 941770576053..6793f515cd69 100644
--- a/external/gpl3/binutils.old/usr.bin/nm/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/nm/Makefile
@@ -1,7 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
 
 PROG=		nm
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/objcopy/Makefile b/external/gpl3/binutils.old/usr.bin/objcopy/Makefile
index 2d33cbdfb21b..9767389183c7 100644
--- a/external/gpl3/binutils.old/usr.bin/objcopy/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/objcopy/Makefile
@@ -1,7 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
 
 PROG=		objcopy
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/objdump/Makefile b/external/gpl3/binutils.old/usr.bin/objdump/Makefile
index 0aeeb3ed6f26..3468ac0ee79a 100644
--- a/external/gpl3/binutils.old/usr.bin/objdump/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/objdump/Makefile
@@ -1,9 +1,7 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
 
 PROG=		objdump
 
-.include <bsd.own.mk>
-
 CPPFLAGS+=-DOBJDUMP_PRIVATE_VECTORS=""
 
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/ranlib/Makefile b/external/gpl3/binutils.old/usr.bin/ranlib/Makefile
index 2fc639e263b8..a581d4fb58e1 100644
--- a/external/gpl3/binutils.old/usr.bin/ranlib/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/ranlib/Makefile
@@ -1,9 +1,7 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
 
 PROG=		ranlib
 
-.include <bsd.own.mk>
-
 COPTS.arparse.c = -Wno-stack-protector
 CPPFLAGS+=-Dbin_dummy_emulation=bin_vanilla_emulation
 
diff --git a/external/gpl3/binutils.old/usr.bin/readelf/Makefile b/external/gpl3/binutils.old/usr.bin/readelf/Makefile
index 97fa8184fff8..fec56cda5f69 100644
--- a/external/gpl3/binutils.old/usr.bin/readelf/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/readelf/Makefile
@@ -1,7 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
 
 PROG=		readelf
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/size/Makefile b/external/gpl3/binutils.old/usr.bin/size/Makefile
index f49e0d0ee20c..e903aa1b8269 100644
--- a/external/gpl3/binutils.old/usr.bin/size/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/size/Makefile
@@ -1,7 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
 
 PROG=		size
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/strings/Makefile b/external/gpl3/binutils.old/usr.bin/strings/Makefile
index aa40f8cb40ec..6601712334fa 100644
--- a/external/gpl3/binutils.old/usr.bin/strings/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/strings/Makefile
@@ -1,7 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
 
 PROG=		strings
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.bin/strip/Makefile b/external/gpl3/binutils.old/usr.bin/strip/Makefile
index 6b8c7191ef28..fdb59bc4b72d 100644
--- a/external/gpl3/binutils.old/usr.bin/strip/Makefile
+++ b/external/gpl3/binutils.old/usr.bin/strip/Makefile
@@ -1,7 +1,5 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
 
 PROG=		strip
 
-.include <bsd.own.mk>
-
 .include "${.CURDIR}/../common/Makefile.prog"
diff --git a/external/gpl3/binutils.old/usr.sbin/Makefile.inc b/external/gpl3/binutils.old/usr.sbin/Makefile.inc
index 06a6db03576e..e9969fad2525 100644
--- a/external/gpl3/binutils.old/usr.sbin/Makefile.inc
+++ b/external/gpl3/binutils.old/usr.sbin/Makefile.inc
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile.inc,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2016/01/26 19:38:11 christos Exp $
 
+.include "${.PARSEDIR}/../Makefile.inc"
 BINDIR?=	/usr/sbin
 WARNS?=		1
 
diff --git a/external/gpl3/binutils.old/usr.sbin/dbsym/Makefile b/external/gpl3/binutils.old/usr.sbin/dbsym/Makefile
index 88be85f992b7..4c0810e21916 100644
--- a/external/gpl3/binutils.old/usr.sbin/dbsym/Makefile
+++ b/external/gpl3/binutils.old/usr.sbin/dbsym/Makefile
@@ -1,12 +1,10 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
 
 .include <bsd.own.mk>
 
 .if (defined(HOSTPROG) && \
      (${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
     ${MKBINUTILS} != "no"
-TOP=		${NETBSDSRCDIR}/external/gpl3/binutils
-DIST=		${TOP}/dist
 BFDSUBDIR=	lib
 
 PROG=		dbsym
diff --git a/external/gpl3/binutils.old/usr.sbin/mdsetimage/Makefile b/external/gpl3/binutils.old/usr.sbin/mdsetimage/Makefile
index 2c6badf2bea3..c5ddbb9ddc6d 100644
--- a/external/gpl3/binutils.old/usr.sbin/mdsetimage/Makefile
+++ b/external/gpl3/binutils.old/usr.sbin/mdsetimage/Makefile
@@ -1,12 +1,10 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2016/01/26 19:38:12 christos Exp $
 
 .include <bsd.own.mk>
 
 .if (defined(HOSTPROG) && \
      (${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
     ${MKBINUTILS} != "no"
-TOP=		${NETBSDSRCDIR}/external/gpl3/binutils
-DIST=		${TOP}/dist
 BFDSUBDIR=	lib
 
 PROG=		mdsetimage