4 files changed, 21 insertions, 17 deletions
diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile
index d7eda9b..324fb36 100644
--- a/usr.sbin/ctm/ctm/Makefile
+++ b/usr.sbin/ctm/ctm/Makefile
@@ -1,4 +1,3 @@
-#
 # ----------------------------------------------------------------------------
 # "THE BEER-WARE LICENSE" (Revision 42):
 # <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
@@ -7,15 +6,16 @@
 # ----------------------------------------------------------------------------
 #
 # $FreeBSD$
-#
 
 PROG=		ctm
-NOTYET=		ctm_ed.c
+MAN=		ctm.1 ctm.5
 SRCS=   	ctm.c ctm_input.c ctm_pass1.c ctm_pass2.c ctm_pass3.c \
 		ctm_passb.c ctm_syntax.c ctm_ed.c
-LDADD+=		-lmd
-DPADD+=		${LIBMD}
-MAN=		ctm.1 ctm.5
+
+NOTYET=		ctm_ed.c
+
+LDADD=		-lmd
+DPADD=		${LIBMD}
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile
index 475f00d..f12ecea 100644
--- a/usr.sbin/ctm/ctm_dequeue/Makefile
+++ b/usr.sbin/ctm/ctm_dequeue/Makefile
@@ -1,10 +1,11 @@
 # $FreeBSD$
 
-PROG=           ctm_dequeue
-SRCS=           ctm_dequeue.c error.c
-NOMAN=          yes
-CFLAGS+=	-I${.CURDIR}/../ctm_rmail
-
 .PATH: ${.CURDIR}/../ctm_rmail
 
+PROG=	ctm_dequeue
+NOMAN=	#true
+SRCS=	ctm_dequeue.c error.c
+
+CFLAGS+= -I${.CURDIR}/../ctm_rmail
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile
index 0dc756c..c2d0789 100644
--- a/usr.sbin/ctm/ctm_smail/Makefile
+++ b/usr.sbin/ctm/ctm_smail/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
-PROG=           ctm_smail
-SRCS=           ctm_smail.c error.c
-NOMAN=          1
-CFLAGS+=	-I${.CURDIR}/../ctm_rmail
 .PATH: ${.CURDIR}/../ctm_rmail
 
+PROG=	ctm_smail
+NOMAN=	#true
+SRCS=	ctm_smail.c error.c
+
+CFLAGS+= -I${.CURDIR}/../ctm_rmail
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ctm/mkCTM/Makefile b/usr.sbin/ctm/mkCTM/Makefile
index ea446b2..1ec255d 100644
--- a/usr.sbin/ctm/mkCTM/Makefile
+++ b/usr.sbin/ctm/mkCTM/Makefile
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 PROG=	mkctm
-SRCS=	mkctm.c
-LDADD= -lmd
 NOMAN=	1
+SRCS=	mkctm.c
+
+LDADD=	-lmd
 
 test:	mkctm
 	rm -f tst.out*