16 files changed, 65 insertions, 43 deletions

diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile
index 9214954aa6789..8581271697403 100644
--- a/usr.sbin/lpr/Makefile
+++ b/usr.sbin/lpr/Makefile
@@ -1,13 +1,12 @@
 # $FreeBSD$
 
-SUBDIR=	common_source chkprintcap lp lpc lpd lpq lpr lprm lptest pac \
-	filters filters.ru SMM.doc
-
 MAINTAINER=	wollman@FreeBSD.org
 MAINTAINER+=	gad@FreeBSD.org
 
+SUBDIR=	common_source chkprintcap lp lpc lpd lpq lpr lprm lptest pac \
+	filters filters.ru SMM.doc
+
 # Questions/ideas for lpr & friends could also be sent to:
 #	freebsd-print@bostonradio.org
 
 .include <bsd.subdir.mk>
-
diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc
index aba984eba3475..bd8272f065ab4 100644
--- a/usr.sbin/lpr/Makefile.inc
+++ b/usr.sbin/lpr/Makefile.inc
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-CFLAGS+=-DINET6
+CFLAGS+= -DINET6
 CWARNFLAGS=	${BDECFLAGS}
 
 .if exists(${.OBJDIR}/../common_source)
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index 54c3182d448a8..b527e525ce9b7 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile
+++ b/usr.sbin/lpr/chkprintcap/Makefile
@@ -1,9 +1,12 @@
 # $FreeBSD$
 
+.PATH: ${.CURDIR}/../common_source
+
 PROG=	chkprintcap
 MAN=	chkprintcap.8
-CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
-.PATH:	${.CURDIR}/../common_source
+
+CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS}
+
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}
 
diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile
index db64f3b5d3ec0..7a2304925451f 100644
--- a/usr.sbin/lpr/common_source/Makefile
+++ b/usr.sbin/lpr/common_source/Makefile
@@ -6,11 +6,12 @@
 # but the library makes it much easier to modularize them.
 #
 LIB=		lpr
-SRCS=		common.c ctlinfo.c displayq.c net.c printcap.c request.c \
-		rmjob.c startdaemon.c
-NOMAN=		noman
 NOPROFILE=	noprofile
 NOPIC=		nopic
+NOMAN=		noman
+SRCS=		common.c ctlinfo.c displayq.c net.c printcap.c request.c \
+		rmjob.c startdaemon.c
+
 CFLAGS+=	${CWARNFLAGS}
 
 install:
diff --git a/usr.sbin/lpr/filters.ru/Makefile b/usr.sbin/lpr/filters.ru/Makefile
index 0c7be10f30707..a2e0ae0e93130 100644
--- a/usr.sbin/lpr/filters.ru/Makefile
+++ b/usr.sbin/lpr/filters.ru/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-SUBDIR = koi2alt koi2855
+SUBDIR=	koi2alt koi2855
 
-SAMPLES=bjc-240.sh.sample
+SAMPLES= bjc-240.sh.sample
 
 afterinstall:
 	cd ${.CURDIR} && \
@@ -11,4 +11,3 @@ afterinstall:
 
 .include "Makefile.inc"
 .include <bsd.prog.mk>
-
diff --git a/usr.sbin/lpr/filters.ru/Makefile.inc b/usr.sbin/lpr/filters.ru/Makefile.inc
index c4a3a7fc878ad..a312e73941ec5 100644
--- a/usr.sbin/lpr/filters.ru/Makefile.inc
+++ b/usr.sbin/lpr/filters.ru/Makefile.inc
@@ -1,2 +1,3 @@
 # $FreeBSD$
-BINDIR= /usr/libexec/lpr/ru
+
+BINDIR=	/usr/libexec/lpr/ru
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile
index 3e83d97eb34ed..9bc28cda952d0 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=koi2855
-NOMAN=	noman
+PROG=	koi2855
+NOMAN=	#true
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
index f980bbfcb82ba..3af814f050816 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=koi2alt
-NOMAN=	noman
+PROG=	koi2alt
+NOMAN=	#true
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index c9d5c4f02158e..c8bdca76821ec 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -1,7 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
+
+BINDIR=	/usr/libexec/lpr
 
 PROG=	lpf
 NOMAN=	noman
-BINDIR=	/usr/libexec/lpr
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile
index 8876472e12201..2fcec43ec80b5 100644
--- a/usr.sbin/lpr/lp/Makefile
+++ b/usr.sbin/lpr/lp/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
+BINDIR=	/usr/bin
+
 SCRIPTS=lp.sh
 MAN=	lp.1
 
-BINDIR=	/usr/bin
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index 2c6ceae5449aa..51ab44d468217 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -1,13 +1,16 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.PATH: ${.CURDIR}/../common_source
+
 PROG=	lpc
-CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
 MAN=	lpc.8
 SRCS=	lpc.c cmds.c cmdtab.c
 BINGRP=	daemon
-BINMODE=2555
-.PATH:	${.CURDIR}/../common_source
+BINMODE= 2555
+
+CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS}
+
 DPADD=	${LIBLPR} ${LIBEDIT} ${LIBTERMCAP}
 LDADD=	${LIBLPR} -ledit -ltermcap
 
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index 1131262537ffb..6250e163faac0 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -2,9 +2,11 @@
 # $FreeBSD$
 
 PROG=	lpd
-CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
 MAN=	lpd.8
 SRCS=	lpd.c printjob.c recvjob.c lpdchar.c modes.c
+
+CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS}
+
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}
 
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 24afb7ab101af..2b795d9af6f6a 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -1,13 +1,15 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+BINDIR=	/usr/bin
+
 PROG=	lpq
-CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
+BINGRP=	daemon
+BINMODE= 6555
+
+CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS}
+
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}
 
-BINGRP=	daemon
-BINMODE=6555
-BINDIR=	/usr/bin
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index ae5fa174d9dc3..e952f608b3b7d 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -1,13 +1,17 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
-PROG=	lpr
-CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
-BINGRP=	daemon
-BINMODE=6555
+.PATH: ${.CURDIR}/../common_source
+
 BINDIR=	/usr/bin
+
+PROG=	lpr
 MAN=	lpr.1 printcap.5
-.PATH:	${.CURDIR}/../common_source
+BINGRP=	daemon
+BINMODE= 6555
+
+CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS}
+
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}
 
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index abeac25b290ef..cc9d07582706f 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -1,14 +1,17 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.PATH: ${.CURDIR}/../common_source
+
+BINDIR=	/usr/bin
+
 PROG=	lprm
-CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
-.PATH:	${.CURDIR}/../common_source
+BINGRP=	daemon
+BINMODE= 6555
+
+CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS}
+
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}
 
-BINGRP=	daemon
-BINMODE=6555
-BINDIR=	/usr/bin
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index 3a9c5ebf151f3..19ecdc98db95c 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -1,10 +1,13 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.PATH: ${.CURDIR}/../common_source
+
 PROG=	pac
-CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
 MAN=	pac.8
-.PATH:	${.CURDIR}/../common_source
+
+CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS}
+
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}