11 files changed, 15 insertions, 12 deletions

diff --git a/usr.sbin/pcvt/Makefile.inc b/usr.sbin/pcvt/Makefile.inc
index 20f7cc0632e9..7899d9c307d2 100644
--- a/usr.sbin/pcvt/Makefile.inc
+++ b/usr.sbin/pcvt/Makefile.inc
@@ -2,8 +2,4 @@
 
 FONTDIR	=	/usr/share/misc/pcvtfonts
 
-MAN3EXT=	3
-MAN5EXT=	5
-MAN8EXT=	8
-
 .include "../Makefile.inc"
diff --git a/usr.sbin/pcvt/cursor/Makefile b/usr.sbin/pcvt/cursor/Makefile
index fb068782e417..56cdbb2e336f 100644
--- a/usr.sbin/pcvt/cursor/Makefile
+++ b/usr.sbin/pcvt/cursor/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	cursor
+MAN1=	${PROG}.1
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/fontedit/Makefile b/usr.sbin/pcvt/fontedit/Makefile
index 9cbe4e5a5b56..db978b04b713 100644
--- a/usr.sbin/pcvt/fontedit/Makefile
+++ b/usr.sbin/pcvt/fontedit/Makefile
@@ -1,3 +1,6 @@
+# $FreeBSD$
+
 PROG=	fontedit
+MAN1=	${PROG}.1
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/ispcvt/Makefile b/usr.sbin/pcvt/ispcvt/Makefile
index adec4f1836dc..107e99b90df3 100644
--- a/usr.sbin/pcvt/ispcvt/Makefile
+++ b/usr.sbin/pcvt/ispcvt/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG=	ispcvt
-MAN8=	ispcvt.${MAN8EXT}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile
index dbc94f9b03ac..1c21884919a4 100644
--- a/usr.sbin/pcvt/kcon/Makefile
+++ b/usr.sbin/pcvt/kcon/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 PROG=		kcon
+MAN1=		${PROG}.1
 DEVICE=		/dev/ttyv0
 CFLAGS+= 	-I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\"
 
diff --git a/usr.sbin/pcvt/keycap/Makefile b/usr.sbin/pcvt/keycap/Makefile
index fa7da94e5de2..6a294e094b4e 100644
--- a/usr.sbin/pcvt/keycap/Makefile
+++ b/usr.sbin/pcvt/keycap/Makefile
@@ -6,12 +6,12 @@ CAPPATH	=	$(CAPDIR)/keycap.pcvt
 KEYCAPSRC=	keycap.src
 CFLAGS	+=	-DKEYCAP_PATH=\"$(CAPPATH)\"
 SRCS	=	keycap.c
-MAN3	=	keycap.${MAN3EXT}
-MLINKS+=	keycap.${MAN3EXT} kgetent.${MAN3EXT} \
-		keycap.${MAN3EXT} kgetnum.${MAN3EXT} \
-		keycap.${MAN3EXT} kgetflag.${MAN3EXT} \
-		keycap.${MAN3EXT} kgetstr.${MAN3EXT}
-MAN5	=	man5/keycap.${MAN5EXT}
+MAN3	=	keycap.3
+MLINKS+=	keycap.3 kgetent.3 \
+		keycap.3 kgetnum.3 \
+		keycap.3 kgetflag.3 \
+		keycap.3 kgetstr.3
+MAN5	=	man5/keycap.5
 #CLEANFILES+=	keycap.0 man5/keycap.0
 
 beforeinstall:
diff --git a/usr.sbin/pcvt/loadfont/Makefile b/usr.sbin/pcvt/loadfont/Makefile
index 50646a7a7f0c..f1709b5cef97 100644
--- a/usr.sbin/pcvt/loadfont/Makefile
+++ b/usr.sbin/pcvt/loadfont/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	loadfont
+MAN1=	${PROG}.1
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/scon/Makefile b/usr.sbin/pcvt/scon/Makefile
index dc7d02a06598..8c096e53b3c4 100644
--- a/usr.sbin/pcvt/scon/Makefile
+++ b/usr.sbin/pcvt/scon/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	scon
+MAN1=	${PROG}.1
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/userkeys/Makefile b/usr.sbin/pcvt/userkeys/Makefile
index 66fe02217239..ed42145fa9a5 100644
--- a/usr.sbin/pcvt/userkeys/Makefile
+++ b/usr.sbin/pcvt/userkeys/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	vt220keys
+MAN1=	${PROG}.1
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile
index 431f6152db7e..99200a18f823 100644
--- a/usr.sbin/pcvt/vgaio/Makefile
+++ b/usr.sbin/pcvt/vgaio/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 PROG=	vgaio
-MAN8=	vgaio.${MAN8EXT}
 
 SRCS=	vgaio.y lex.l y.tab.h
 YACC=	yacc
diff --git a/usr.sbin/pcvt/vttest/Makefile b/usr.sbin/pcvt/vttest/Makefile
index 440962e60eed..5c892243f2a8 100644
--- a/usr.sbin/pcvt/vttest/Makefile
+++ b/usr.sbin/pcvt/vttest/Makefile
@@ -3,5 +3,6 @@
 PROG=		vttest
 CFLAGS+=	-traditional -DUSEMYSTTY
 SRCS=		main.c esc.c
+MAN1=		${PROG}.1
 
 .include <bsd.prog.mk>