17 files changed, 110 insertions, 124 deletions

diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile
index f50fe1060b7a3..aae31151b9491 100644
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@@ -4,15 +4,15 @@
 
 .PATH: ${SRCDIR}/binutils
 
-PROG=		ar
-SRCS=		ar.c not-ranlib.c
-CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
-CFLAGS+=	-I${SRCDIR}/binutils
-CFLAGS+=	-I${SRCDIR}/bfd
-NOSHARED?=	yes
-DPADD=		${RELTOP}/libbinutils/libbinutils.a
-DPADD+=		${RELTOP}/libbfd/libbfd.a
-DPADD+=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+PROG=	ar
+SRCS=	ar.c not-ranlib.c
+CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
+CFLAGS+= -I${SRCDIR}/binutils
+CFLAGS+= -I${SRCDIR}/bfd
+NOSHARED?= yes
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile
index 04d4a7bcdd69a..a8b506b705ed8 100644
--- a/gnu/usr.bin/binutils/gasp/Makefile
+++ b/gnu/usr.bin/binutils/gasp/Makefile
@@ -4,14 +4,14 @@
 
 .PATH: ${SRCDIR}/gas
 
-PROG=		gasp
-SRCS+=		gasp.c macro.c sb.c hash.c
-CFLAGS+=	-I${SRCDIR}
-CFLAGS+=	-I${SRCDIR}/gas
-CFLAGS+=	-I${SRCDIR}/gas/config
-CFLAGS+=	-I${.CURDIR}/../as/${TARGET_ARCH}-freebsd
-CFLAGS+=	-DBFD_ASSEMBLER
-DPADD=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+PROG=	gasp
+SRCS+=	gasp.c macro.c sb.c hash.c
+CFLAGS+= -I${SRCDIR}
+CFLAGS+= -I${SRCDIR}/gas
+CFLAGS+= -I${SRCDIR}/gas/config
+CFLAGS+= -I${.CURDIR}/../as/${TARGET_ARCH}-freebsd
+CFLAGS+= -DBFD_ASSEMBLER
+DPADD=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index 13a74bf98f983..beb9432b8692e 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -1,19 +1,17 @@
-#
 # $FreeBSD$
-#
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/binutils
 
-LIB=		binutils
-SRCS+=		arlex.l arparse.y arsup.c bucomm.c debug.c filemode.c \
-		ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \
-		wrstabs.c version.c
-CFLAGS+=	-DTARGET=\"${TARGET_ARCH}-unknown-freebsd\"
-CFLAGS+=	-DVERSION=\"${VERSION}\"
-CFLAGS+=	-I${SRCDIR}/binutils
-CFLAGS+=	-I${SRCDIR}/bfd
+LIB=	binutils
+SRCS+=	arlex.l arparse.y arsup.c bucomm.c debug.c filemode.c \
+	ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \
+	wrstabs.c version.c
+CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\"
+CFLAGS+= -DVERSION=\"${VERSION}\"
+CFLAGS+= -I${SRCDIR}/binutils
+CFLAGS+= -I${SRCDIR}/bfd
 NOPROFILE=	true
 NOPIC=		true
 INTERNALLIB=	true
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile b/gnu/usr.bin/binutils/libopcodes/Makefile
index 05ce09d66e5fb..356ecb706b42a 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile
@@ -1,14 +1,12 @@
-#
 # $FreeBSD$
-#
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/opcodes
 
-LIB=		opcodes
-SRCS+=		dis-buf.c disassemble.c
-CFLAGS+=	-I${SRCDIR}/opcodes -I${SRCDIR}/bfd
+LIB=	opcodes
+SRCS+=	dis-buf.c disassemble.c
+CFLAGS+= -I${SRCDIR}/opcodes -I${SRCDIR}/bfd
 NOPROFILE=	true
 NOPIC=		true
 INTERNALLIB=	true
@@ -18,9 +16,9 @@ INTERNALSTATICLIB=true
 # binutils release. FreeBSD only distributes the bits that are required to
 # build native architectures. BINUTILSDISTDIR is needed to build cross tools.
 .if	defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
-.PATH:		${BINUTILSDISTDIR}/bfd ${BINUTILSDISTDIR}/opcodes
-CFLAGS+=	-I${BINUTILSDISTDIR}/opcodes -I${BINUTILSDISTDIR}/bfd
-CFLAGS+=	-I${BINUTILSDISTDIR}/include
+.PATH: ${BINUTILSDISTDIR}/bfd ${BINUTILSDISTDIR}/opcodes
+CFLAGS+= -I${BINUTILSDISTDIR}/opcodes -I${BINUTILSDISTDIR}/bfd
+CFLAGS+= -I${BINUTILSDISTDIR}/include
 .endif
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
index b2f7a7912c0ba..03d911dbd73be 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		alpha-dis.c alpha-opc.c
-CFLAGS+=	-DARCH_alpha
+SRCS+=	alpha-dis.c alpha-opc.c
+CFLAGS+= -DARCH_alpha
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64 b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
index 96c0bc74af5b9..5b1ce3a96896d 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		i386-dis.c
-CFLAGS+=	-DARCH_i386
+SRCS+=	i386-dis.c
+CFLAGS+= -DARCH_i386
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.i386 b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
index 96c0bc74af5b9..5b1ce3a96896d 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.i386
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		i386-dis.c
-CFLAGS+=	-DARCH_i386
+SRCS+=	i386-dis.c
+CFLAGS+= -DARCH_i386
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
index 08fa527d5ff6b..cc010ec4a3060 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		ppc-dis.c ppc-opc.c
-CFLAGS+=	-DARCH_powerpc -DARCH_rs6000
+SRCS+=	ppc-dis.c ppc-opc.c
+CFLAGS+= -DARCH_powerpc -DARCH_rs6000
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64 b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
index 190b76621cc0f..e795ad494bba7 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		sparc-dis.c sparc-opc.c
-CFLAGS+=	-DARCH_sparc
+SRCS+=	sparc-dis.c sparc-opc.c
+CFLAGS+= -DARCH_sparc
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index 39d36c6d72745..89040cec69065 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -4,13 +4,13 @@
 
 .PATH: ${SRCDIR}/binutils
 
-PROG=		nm
-SRCS=		nm.c
-CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
-CFLAGS+=	-I${SRCDIR}/binutils
-DPADD=		${RELTOP}/libbinutils/libbinutils.a
-DPADD+=		${RELTOP}/libbfd/libbfd.a
-DPADD+=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+PROG=	nm
+SRCS=	nm.c
+CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
+CFLAGS+= -I${SRCDIR}/binutils
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index e8bd30bd0de70..ebcc2a7506dd7 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -4,13 +4,13 @@
 
 .PATH: ${SRCDIR}/binutils
 
-PROG=		objcopy
-SRCS=		objcopy.c not-strip.c
-CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
-CFLAGS+=	-I${SRCDIR}/binutils
-DPADD=		${RELTOP}/libbinutils/libbinutils.a
-DPADD+=		${RELTOP}/libbfd/libbfd.a
-DPADD+=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+PROG=	objcopy
+SRCS=	objcopy.c not-strip.c
+CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
+CFLAGS+= -I${SRCDIR}/binutils
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index b53f539676342..ec5b8be896ec9 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -4,15 +4,15 @@
 
 .PATH: ${SRCDIR}/binutils
 
-PROG=		objdump
-SRCS=		objdump.c prdbg.c
-CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
-CFLAGS+=	-I${SRCDIR}/binutils
-CFLAGS+=	-DBFD_VERSION=\"${VERSION}\"
-DPADD=		${RELTOP}/libbinutils/libbinutils.a
-DPADD+=		${RELTOP}/libopcodes/libopcodes.a
-DPADD+=		${RELTOP}/libbfd/libbfd.a
-DPADD+=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+PROG=	objdump
+SRCS=	objdump.c prdbg.c
+CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
+CFLAGS+= -I${SRCDIR}/binutils
+CFLAGS+= -DBFD_VERSION=\"${VERSION}\"
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libopcodes/libopcodes.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile
index ec13bbacf3b7a..1df57c08480c0 100644
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@@ -4,15 +4,15 @@
 
 .PATH: ${SRCDIR}/binutils
 
-PROG=		ranlib
-SRCS=		ar.o is-ranlib.o
-CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
-CFLAGS+=	-I${SRCDIR}/binutils
-CFLAGS+=	-I${SRCDIR}/bfd
-NOSHARED?=	yes
-DPADD=		${RELTOP}/libbinutils/libbinutils.a
-DPADD+=		${RELTOP}/libbfd/libbfd.a
-DPADD+=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+PROG=	ranlib
+SRCS=	ar.o is-ranlib.o
+CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
+CFLAGS+= -I${SRCDIR}/binutils
+CFLAGS+= -I${SRCDIR}/bfd
+NOSHARED?= yes
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile
index c681fe876bcb6..cdc6391fd39fd 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile
+++ b/gnu/usr.bin/binutils/readelf/Makefile
@@ -7,13 +7,13 @@
 # No a.out vs. ELF version so don't install in /usr/libexec/elf
 BINDIR=/usr/bin
 
-PROG=		readelf
-SRCS=		${PROG}.c
-CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils -I${SRCDIR}/binutils
+PROG=	readelf
+SRCS=	${PROG}.c
+CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils -I${SRCDIR}/binutils
 
-DPADD=		${RELTOP}/libbinutils/libbinutils.a
-DPADD+=		${RELTOP}/libbfd/libbfd.a
-DPADD+=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index d88f30a644e18..811ecabffd82d 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -4,13 +4,13 @@
 
 .PATH: ${SRCDIR}/binutils
 
-PROG=		size
-SRCS=		size.c
-CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
-CFLAGS+=	-I${SRCDIR}/binutils
-DPADD=		${RELTOP}/libbinutils/libbinutils.a
-DPADD+=		${RELTOP}/libbfd/libbfd.a
-DPADD+=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+PROG=	size
+SRCS=	size.c
+CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
+CFLAGS+= -I${SRCDIR}/binutils
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index ea5e864836356..1000aebe0020b 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -4,13 +4,13 @@
 
 .PATH: ${SRCDIR}/binutils
 
-PROG=		strings
-SRCS=		strings.c
-CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
-CFLAGS+=	-I${SRCDIR}/binutils
-DPADD=		${RELTOP}/libbinutils/libbinutils.a
-DPADD+=		${RELTOP}/libbfd/libbfd.a
-DPADD+=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+PROG=	strings
+SRCS=	strings.c
+CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
+CFLAGS+= -I${SRCDIR}/binutils
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index a0a935e6ad601..837b7626963b4 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -4,14 +4,14 @@
 
 .PATH: ${SRCDIR}/binutils
 
-PROG=		strip
-SRCS=		objcopy.c is-strip.c
-CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
-CFLAGS+=	-I${SRCDIR}/binutils
-DPADD=		${RELTOP}/libbinutils/libbinutils.a
-DPADD+=		${RELTOP}/libbfd/libbfd.a
-DPADD+=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+PROG=	strip
+SRCS=	objcopy.c is-strip.c
+CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
+CFLAGS+= -I${SRCDIR}/binutils
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 CLEANFILES+=	maybe_stripped
 
 all: maybe_stripped