Fixed some of style bugs.

8 files changed, 37 insertions, 31 deletions

diff --git a/gnu/libexec/uucp/cu/Makefile b/gnu/libexec/uucp/cu/Makefile
index faad03b..2503fc6 100644
--- a/gnu/libexec/uucp/cu/Makefile
+++ b/gnu/libexec/uucp/cu/Makefile
@@ -1,18 +1,19 @@
 # Makefile for cu
 # $FreeBSD$
 
-BINDIR=		$(bindir)
-BINOWN=		$(owner)
-BINGRP=         dialer
-BINMODE=        6555
-
 PROG=		cu
 SRCS=           cu.c prot.c log.c chat.c conn.c copy.c
-LDADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 DPADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
+LDADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 CFLAGS+=	-I$(.CURDIR)/../common_sources\
 		-DVERSION=\"$(VERSION)\"
-INSTALLFLAGS+= -fschg
+
+BINDIR=		$(bindir)
+BINOWN=		$(owner)
+BINGRP=         dialer
+BINMODE=        6555
+INSTALLFLAGS=	-fschg
 
 .include <bsd.prog.mk>
+
 .PATH: $(.CURDIR)/../common_sources
diff --git a/gnu/libexec/uucp/uucp/Makefile b/gnu/libexec/uucp/uucp/Makefile
index 2f91d82..aef5933 100644
--- a/gnu/libexec/uucp/uucp/Makefile
+++ b/gnu/libexec/uucp/uucp/Makefile
@@ -1,17 +1,18 @@
 # Makefile for uucp
 # $FreeBSD$
 
-BINDIR=		$(bindir)
-BINOWN=		$(owner)
-BINMODE=        4555
-
 PROG=		uucp
 SRCS=		uucp.c util.c log.c copy.c
 LDADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 DPADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 CFLAGS+=	-I$(.CURDIR)/../common_sources\
 		-DVERSION=\"$(VERSION)\"
-INSTALLFLAGS+= -fschg
+
+BINDIR=		$(bindir)
+BINOWN=		$(owner)
+BINMODE=        4555
+INSTALLFLAGS=	-fschg
 
 .include <bsd.prog.mk>
+
 .PATH: $(.CURDIR)/../common_sources
diff --git a/gnu/libexec/uucp/uuname/Makefile b/gnu/libexec/uucp/uuname/Makefile
index 743a3b5..f30b10f 100644
--- a/gnu/libexec/uucp/uuname/Makefile
+++ b/gnu/libexec/uucp/uuname/Makefile
@@ -1,17 +1,18 @@
 # Makefile for uuname
 # $FreeBSD$
 
-BINDIR=		$(bindir)
-BINOWN=		$(owner)
-BINMODE=	4555
-
 PROG=		uuname
 SRCS=		uuname.c log.c
 LDADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 DPADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 CFLAGS+=	-I$(.CURDIR)/../common_sources\
 		-DVERSION=\"$(VERSION)\"
-INSTALLFLAGS+= -fschg
+
+BINDIR=		$(bindir)
+BINOWN=		$(owner)
+BINMODE=	4555
+INSTALLFLAGS=	-fschg
 
 .include <bsd.prog.mk>
+
 .PATH: $(.CURDIR)/../common_sources
diff --git a/gnu/libexec/uucp/uustat/Makefile b/gnu/libexec/uucp/uustat/Makefile
index 5743180..650fe22 100644
--- a/gnu/libexec/uucp/uustat/Makefile
+++ b/gnu/libexec/uucp/uustat/Makefile
@@ -1,11 +1,6 @@
 # Makefile for uustat
 # $FreeBSD$
 
-BINDIR=		$(bindir)
-BINOWN=		$(owner)
-BINGRP=         dialer
-BINMODE=        6555
-
 PROG=		uustat
 SRCS=		uustat.c util.c log.c copy.c
 LDADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
@@ -13,7 +8,14 @@ DPADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 CFLAGS+=	-I$(.CURDIR)/../common_sources\
 		-DOWNER=\"$(owner)\"\
 		-DVERSION=\"$(VERSION)\"
-INSTALLFLAGS+= -fschg
+
+BINDIR=		$(bindir)
+BINOWN=		$(owner)
+BINGRP=         dialer
+BINMODE=        6555
+
+INSTALLFLAGS=	-fschg
 
 .include <bsd.prog.mk>
+
 .PATH: $(.CURDIR)/../common_sources
diff --git a/gnu/libexec/uucp/uux/Makefile b/gnu/libexec/uucp/uux/Makefile
index 9194c1e..89c246b 100644
--- a/gnu/libexec/uucp/uux/Makefile
+++ b/gnu/libexec/uucp/uux/Makefile
@@ -1,17 +1,18 @@
 # Makefile for uux
 # $FreeBSD$
 
-BINDIR=		$(bindir)
-BINOWN=		$(owner)
-BINMODE=        4555
-
 PROG=		uux
 SRCS=		uux.c util.c log.c copy.c
 LDADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 DPADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 CFLAGS+=	-I$(.CURDIR)/../common_sources\
 		-DVERSION=\"$(VERSION)\"
-INSTALLFLAGS+= -fschg
+
+BINDIR=		$(bindir)
+BINOWN=		$(owner)
+BINMODE=        4555
+INSTALLFLAGS=	-fschg
 
 .include <bsd.prog.mk>
+
 .PATH: $(.CURDIR)/../common_sources
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index 050f1d4..395fd43 100644
--- a/gnu/usr.bin/man/man/Makefile
+++ b/gnu/usr.bin/man/man/Makefile
@@ -7,7 +7,7 @@ PROG=	man
 SRCS=	man.c manpath.c glob.c
 BINOWN= man
 BINMODE=4555
-INSTALLFLAGS+= -fschg
+INSTALLFLAGS=	-fschg
 
 CFLAGS+= -I${LIBDESTDIR}
 DPADD=	${LIBMAN}
diff --git a/libexec/rtld-aout/Makefile b/libexec/rtld-aout/Makefile
index b9647d6..9bee501 100644
--- a/libexec/rtld-aout/Makefile
+++ b/libexec/rtld-aout/Makefile
@@ -9,7 +9,7 @@ LDFLAGS+=-nostdlib -Wl,-Bshareable,-Bsymbolic,-assert,nosymbolic
 ASFLAGS+=-k
 DPADD+=	${LIBC:S/c.a/c_pic.a/} ${LIBC:S/c.a/gcc_pic.a/}
 LDADD+=	-lc_pic -lgcc_pic
-INSTALLFLAGS+=	-fschg -C	# -C to install as atomically as possible
+INSTALLFLAGS=	-fschg -C	# -C to install as atomically as possible
 MLINKS= rtld.1aout ld.so.1aout
 
 .PATH: ${.CURDIR}/${MACHINE_ARCH}
diff --git a/usr.bin/tip/tip/Makefile b/usr.bin/tip/tip/Makefile
index 982f3dc..5b67c36 100644
--- a/usr.bin/tip/tip/Makefile
+++ b/usr.bin/tip/tip/Makefile
@@ -21,12 +21,12 @@ LINKS=	${BINDIR}/tip
 MAN=	tip.1 modems.5
 SRCS=	acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c \
 	remote.c tip.c tipout.c value.c vars.c
-INSTALLFLAGS+= -fschg
 
 BINDIR?=	/usr/bin
 BINOWN=		uucp
 BINGRP=		dialer
 #BINMODE?=	4510
+INSTALLFLAGS=	-fschg
 
 # XXX: there is some concern that `tip' in its current state shouldn't run
 #      SUID.  If it believed it should, the mode above may still no be proper.