Updated this to be more FreeBSD-like; there was a lot of bipartisan cruft

in here that just made it a heck of a lot more confusing to maintain.
Somebody like Joerg can reality-check this at some point, when they have more
time.  For now, it works.

8 files changed, 14 insertions, 149 deletions

diff --git a/usr.sbin/pcvt/Makefile b/usr.sbin/pcvt/Makefile
index 78fc669..6644184 100644
--- a/usr.sbin/pcvt/Makefile
+++ b/usr.sbin/pcvt/Makefile
@@ -1,26 +1,6 @@
-.if !exists(Makefile.inc)
-
-error:
-	@echo
-	@echo "                      You MUST link/copy"
-	@echo
-	@echo "       Makefile.inc.NetBSD    or   Makefile.inc.FreeBSD"
-	@echo
-	@echo "             to Makefile.inc before you can proceed !"
-	@echo
-
-all:		error
-clean:		error
-cleandir:	error
-depend:		error
-install:	error
-
-.else
-
 SUBDIR= 	keycap cursor fontedit fonts kcon loadfont scon \
 		userkeys vttest ispcvt mcon
 SUBDIR+=	vgaio kbdio set2061
 SUBDIR+=	demo
 
 .include <bsd.subdir.mk>
-.endif
diff --git a/usr.sbin/pcvt/Makefile.inc b/usr.sbin/pcvt/Makefile.inc
index 210acb0..1329c97 100644
--- a/usr.sbin/pcvt/Makefile.inc
+++ b/usr.sbin/pcvt/Makefile.inc
@@ -1,25 +1,8 @@
-BINDIR	=	/usr/local/bin
+BINDIR	=	/usr/sbin
 FONTDIR	=	/usr/share/misc/pcvtfonts
-LIBDIR	=	/usr/local/lib
+LIBDIR	=	/usr/lib
 LIBMODE	=	644
 
-# for pcvt_ioctl.h
-
-INCDIR	=	/usr/include/machine
-INCOWN	=	bin
-INCGRP	=	bin
-INCMODE	=	444
-
-${INCDIR}/pcvt_ioctl.h: ${.CURDIR}/../../pcvt_ioctl.h
-	install ${COPY} -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \
-	${.CURDIR}/../../pcvt_ioctl.h ${INCDIR}
-
-.depend:	${INCDIR}/pcvt_ioctl.h
-
-# for FreeBSD (they nroffify "on the fly")
-
-MAN3EXT	=	3
-MAN4EXT	=	4
-MAN5EXT	=	5
-MAN8EXT	=	8
-MANDIR	=	/usr/local/man/man
+MAN3EXT=	3
+MAN5EXT=	5
+MAN8EXT=	8
diff --git a/usr.sbin/pcvt/cursor/Makefile b/usr.sbin/pcvt/cursor/Makefile
index 47894b8..b5afd6c 100644
--- a/usr.sbin/pcvt/cursor/Makefile
+++ b/usr.sbin/pcvt/cursor/Makefile
@@ -1,18 +1,3 @@
-.if !exists(${.CURDIR}/../Makefile.inc)
-error:
-	@echo
-	@echo "                      You MUST link/copy"
-	@echo
-	@echo "       ../Makefile.inc.NetBSD    or   ../Makefile.inc.FreeBSD"
-	@echo
-	@echo "             to ../Makefile.inc before you can proceed !"
-	@echo
-.else
-
-PROG	=	cursor
+PROG=	cursor
 
 .include <bsd.prog.mk>
-
-$(PROG):	$(INCDIR)/pcvt_ioctl.h
-
-.endif
diff --git a/usr.sbin/pcvt/ispcvt/Makefile b/usr.sbin/pcvt/ispcvt/Makefile
index 1787cc2..01204b1 100644
--- a/usr.sbin/pcvt/ispcvt/Makefile
+++ b/usr.sbin/pcvt/ispcvt/Makefile
@@ -1,27 +1,8 @@
-
-.if !exists(${.CURDIR}/../Makefile.inc)
-error:
-	@echo
-	@echo "                      You MUST link/copy"
-	@echo
-	@echo "       ../Makefile.inc.NetBSD    or   ../Makefile.inc.FreeBSD"
-	@echo
-	@echo "             to ../Makefile.inc before you can proceed !"
-	@echo
-.else
-
-PROG	=	ispcvt
-MAN8	=	ispcvt.${MAN8EXT}
-
-.include <bsd.prog.mk>
-
-# special bindir, this MUST stand after include <bsd.prog.mk>
-BINDIR	=	/usr/sbin
-
-$(PROG):	$(INCDIR)/pcvt_ioctl.h
+PROG=	ispcvt
+MAN8=	ispcvt.${MAN8EXT}
 
 beforeinstall:
 	@if [ ! -d $(MANDIR)8 ] ; then		\
 	echo making $(MANDIR)8; mkdir $(MANDIR)8; fi
 
-.endif
+.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile
index 31c5acc..4826870 100644
--- a/usr.sbin/pcvt/kcon/Makefile
+++ b/usr.sbin/pcvt/kcon/Makefile
@@ -1,18 +1,6 @@
-
-.if !exists(${.CURDIR}/../Makefile.inc)
-error:
-	@echo
-	@echo "                      You MUST link/copy"
-	@echo
-	@echo "       ../Makefile.inc.NetBSD    or   ../Makefile.inc.FreeBSD"
-	@echo
-	@echo "             to ../Makefile.inc before you can proceed !"
-	@echo
-.else
-
-PROG	=	kcon
-DEVICE	=	/dev/ttyv0
-CFLAGS	+= 	-I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\"
+PROG=		kcon
+DEVICE=		/dev/ttyv0
+CFLAGS+= 	-I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\"
 
 # the -Lfoo could be omitted if libkeycap.a were installed before
 # making those programs here
@@ -20,7 +8,3 @@ CFLAGS	+= 	-I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\"
 LDADD =       -L${.CURDIR}/../keycap -L${.CURDIR}/../keycap/obj -lkeycap
 
 .include <bsd.prog.mk>
-
-$(PROG):	$(INCDIR)/pcvt_ioctl.h
-
-.endif
diff --git a/usr.sbin/pcvt/loadfont/Makefile b/usr.sbin/pcvt/loadfont/Makefile
index 4a45ff7..c0f454f 100644
--- a/usr.sbin/pcvt/loadfont/Makefile
+++ b/usr.sbin/pcvt/loadfont/Makefile
@@ -1,19 +1,3 @@
-
-.if !exists(${.CURDIR}/../Makefile.inc)
-error:
-	@echo
-	@echo "                      You MUST link/copy"
-	@echo
-	@echo "       ../Makefile.inc.NetBSD    or   ../Makefile.inc.FreeBSD"
-	@echo
-	@echo "             to ../Makefile.inc before you can proceed !"
-	@echo
-.else
-
-PROG	=	loadfont
+PROG=	loadfont
 
 .include <bsd.prog.mk>
-
-$(PROG):	$(INCDIR)/pcvt_ioctl.h
-
-.endif
diff --git a/usr.sbin/pcvt/mcon/Makefile b/usr.sbin/pcvt/mcon/Makefile
index 156e431..1a3b934 100644
--- a/usr.sbin/pcvt/mcon/Makefile
+++ b/usr.sbin/pcvt/mcon/Makefile
@@ -1,19 +1,3 @@
-
-.if !exists(${.CURDIR}/../Makefile.inc)
-error:
-	@echo
-	@echo "                      You MUST link/copy"
-	@echo
-	@echo "       ../Makefile.inc.NetBSD    or   ../Makefile.inc.FreeBSD"
-	@echo
-	@echo "             to ../Makefile.inc before you can proceed !"
-	@echo
-.else
-
 PROG=	mcon
 
 .include <bsd.prog.mk>
-
-$(PROG):	$(INCDIR)/pcvt_ioctl.h
-
-.endif
diff --git a/usr.sbin/pcvt/scon/Makefile b/usr.sbin/pcvt/scon/Makefile
index 58316d3..6fdb94e 100644
--- a/usr.sbin/pcvt/scon/Makefile
+++ b/usr.sbin/pcvt/scon/Makefile
@@ -1,19 +1,3 @@
-
-.if !exists(${.CURDIR}/../Makefile.inc)
-error:
-	@echo
-	@echo "                      You MUST link/copy"
-	@echo
-	@echo "       ../Makefile.inc.NetBSD    or   ../Makefile.inc.FreeBSD"
-	@echo
-	@echo "             to ../Makefile.inc before you can proceed !"
-	@echo
-.else
-
-PROG	=	scon
+PROG=	scon
 
 .include <bsd.prog.mk>
-
-$(PROG):	$(INCDIR)/pcvt_ioctl.h
-
-.endif