From 770d844aaffe6f98e4a1b34318bc679e676c6791 Mon Sep 17 00:00:00 2001
From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Fri, 11 May 1990 20:00:31 -0800
Subject: [PATCH] first pass for new make

SCCS-vsn: bin/Makefile 5.29
SCCS-vsn: bin/kill/Makefile 5.2
SCCS-vsn: bin/date/Makefile 5.2
SCCS-vsn: bin/chmod/Makefile 5.2
SCCS-vsn: bin/rcp/Makefile 5.3
SCCS-vsn: bin/cat/Makefile 5.2
SCCS-vsn: bin/dd/Makefile 5.2
SCCS-vsn: bin/ps/Makefile 5.3
SCCS-vsn: bin/sync/Makefile 5.2
SCCS-vsn: bin/stty/Makefile 5.2
SCCS-vsn: bin/cp/Makefile 5.2
SCCS-vsn: old/tar/Makefile 5.3
SCCS-vsn: bin/rm/Makefile 5.2
SCCS-vsn: bin/pwd/Makefile 5.2
SCCS-vsn: bin/ls/Makefile 5.3
SCCS-vsn: bin/rmdir/Makefile 5.2
SCCS-vsn: bin/df/Makefile 5.3
SCCS-vsn: bin/mkdir/Makefile 5.2
SCCS-vsn: bin/rmail/Makefile 5.1
SCCS-vsn: bin/ed/Makefile 5.2
SCCS-vsn: bin/expr/Makefile 5.3
SCCS-vsn: bin/echo/Makefile 5.4
SCCS-vsn: bin/mv/Makefile 5.4
SCCS-vsn: bin/hostname/Makefile 5.3
SCCS-vsn: bin/sleep/Makefile 5.3
SCCS-vsn: bin/csh/Makefile 5.16
SCCS-vsn: old/sh/Makefile 4.12
SCCS-vsn: old/test/Makefile 5.3
SCCS-vsn: old/adb/common_scripts/Makefile 5.6
SCCS-vsn: old/adb/Makefile 5.7
SCCS-vsn: old/adb/scripts.tahoe/Makefile 5.5
SCCS-vsn: old/adb/scripts.vax/Makefile 5.5
SCCS-vsn: old/adb/adb.tahoe/Makefile 5.5
SCCS-vsn: old/adb/adb.vax/Makefile 5.6
SCCS-vsn: games/arithmetic/Makefile 5.2
SCCS-vsn: games/ppt/Makefile 5.1
SCCS-vsn: games/morse/Makefile 5.1
SCCS-vsn: games/primes/Makefile 5.1
SCCS-vsn: games/caesar/Makefile 5.2
SCCS-vsn: games/ching/cno/Makefile 5.1
SCCS-vsn: games/ching/phx/Makefile 5.1
SCCS-vsn: games/ching/Makefile 5.2
SCCS-vsn: games/wump/Makefile 5.4
SCCS-vsn: games/fish/Makefile 5.3
SCCS-vsn: games/bcd/Makefile 5.3
SCCS-vsn: games/pom/Makefile 5.1
SCCS-vsn: games/factor/Makefile 5.6
SCCS-vsn: games/worms/Makefile 5.3
SCCS-vsn: games/worm/Makefile 5.3
SCCS-vsn: games/wargames/Makefile 5.2
SCCS-vsn: games/Makefile 5.14
SCCS-vsn: games/rain/Makefile 5.3
SCCS-vsn: games/number/Makefile 5.2
SCCS-vsn: games/phantasia/Makefile 5.9
SCCS-vsn: games/battlestar/Makefile 5.5
SCCS-vsn: games/robots/Makefile 5.10
SCCS-vsn: games/sail/Makefile 5.10
SCCS-vsn: games/rogue/Makefile 5.7
SCCS-vsn: games/larn/Makefile 5.8
SCCS-vsn: games/canfield/cfscores/Makefile 5.1
SCCS-vsn: games/canfield/canfield/Makefile 5.6
SCCS-vsn: games/chess/Makefile 5.4
SCCS-vsn: old/boggle/Makefile 5.13
SCCS-vsn: games/hack/Makefile 5.9
SCCS-vsn: games/adventure/Makefile 4.12
SCCS-vsn: games/quiz/Makefile 4.8
SCCS-vsn: games/backgammon/backgammon/Makefile 5.16
SCCS-vsn: games/backgammon/teachgammon/Makefile 5.1
SCCS-vsn: games/mille/Makefile 5.10
SCCS-vsn: games/snake/snscore/Makefile 5.1
SCCS-vsn: games/snake/snake/Makefile 5.10
SCCS-vsn: games/trek/Makefile 5.8
SCCS-vsn: games/monop/Makefile 5.5
SCCS-vsn: games/dm/Makefile 5.5
SCCS-vsn: games/fortune/Makefile 5.1
SCCS-vsn: games/atc/Makefile 5.6
SCCS-vsn: games/hangman/Makefile 5.7
SCCS-vsn: games/cribbage/Makefile 5.11
SCCS-vsn: include/Makefile 5.30
SCCS-vsn: lib/csu/tahoe/Makefile 5.9
SCCS-vsn: lib/libcompat/Makefile 5.2
SCCS-vsn: lib/liby/Makefile 5.4
SCCS-vsn: lib/csu/vax/Makefile 5.12
SCCS-vsn: lib/libutil/Makefile 5.5
SCCS-vsn: lib/libc/Makefile 4.37
SCCS-vsn: lib/librpc/rpc/Makefile 5.1
SCCS-vsn: old/lex/libln/Makefile 4.5
SCCS-vsn: old/libndbm/Makefile 5.7
SCCS-vsn: lib/libmp/Makefile 5.1
SCCS-vsn: lib/libterm/Makefile 5.9
SCCS-vsn: usr.bin/f77/libU77/Makefile 5.5
SCCS-vsn: usr.bin/f77/libI77/Makefile 5.9
SCCS-vsn: lib/libm/Makefile 1.12
SCCS-vsn: usr.bin/pascal/libpc/Makefile 1.27
SCCS-vsn: lib/libcurses/Makefile 5.9
SCCS-vsn: lib/libplot/f77plot/Makefile 5.3
SCCS-vsn: lib/libplot/Makefile 4.15
SCCS-vsn: lib/libplot/bitgraph/Makefile 5.3
SCCS-vsn: lib/libplot/hp7221/Makefile 5.3
SCCS-vsn: lib/libplot/vt0/Makefile 4.5
SCCS-vsn: lib/libplot/grn/Makefile 6.3
SCCS-vsn: lib/libplot/hp2648/Makefile 5.3
SCCS-vsn: lib/libplot/t450/Makefile 4.5
SCCS-vsn: lib/libplot/t4014/Makefile 4.7
SCCS-vsn: lib/libplot/t300s/Makefile 4.5
SCCS-vsn: lib/libplot/t300/Makefile 4.5
SCCS-vsn: lib/libplot/imagen/Makefile 5.6
SCCS-vsn: lib/libplot/t4013/Makefile 5.3
SCCS-vsn: lib/libplot/aed/Makefile 5.3
SCCS-vsn: lib/libplot/plot/Makefile 4.4
SCCS-vsn: lib/libplot/gigi/Makefile 5.3
SCCS-vsn: usr.bin/f77/libF77/Makefile 5.11
SCCS-vsn: lib/Makefile 5.18
SCCS-vsn: libexec/mail.local/Makefile 5.1
SCCS-vsn: libexec/bugfiler/Makefile 5.15
SCCS-vsn: old/pcc/c2.vax/Makefile 4.10
SCCS-vsn: old/pcc/c2.tahoe/Makefile 5.1
SCCS-vsn: libexec/Makefile 5.2
SCCS-vsn: libexec/uucpd/Makefile 5.2
SCCS-vsn: libexec/getNAME/Makefile 5.3
SCCS-vsn: libexec/makekey/Makefile 5.3
SCCS-vsn: libexec/telnetd/Makefile 5.8
SCCS-vsn: libexec/talkd/Makefile 5.10
SCCS-vsn: libexec/rshd/Makefile 5.5
SCCS-vsn: libexec/rlogind/Makefile 5.8
SCCS-vsn: libexec/rexecd/Makefile 5.3
SCCS-vsn: libexec/getty/Makefile 5.7
SCCS-vsn: libexec/ftpd/Makefile 5.12
SCCS-vsn: libexec/tftpd/Makefile 5.10
SCCS-vsn: libexec/fingerd/Makefile 5.3
SCCS-vsn: libexec/comsat/Makefile 5.3
SCCS-vsn: bin/Makefile.inc 5.1
SCCS-vsn: games/Makefile.inc 5.1
SCCS-vsn: libexec/Makefile.inc 5.1
SCCS-vsn: sbin/Makefile.inc 5.1
SCCS-vsn: share/Makefile.inc 5.1
SCCS-vsn: usr.bin/Makefile.inc 5.1
SCCS-vsn: usr.sbin/Makefile.inc 5.1
SCCS-vsn: sbin/XNSrouted/Makefile 5.11
SCCS-vsn: sbin/nfsd/Makefile 5.2
SCCS-vsn: sbin/mountd/Makefile 5.2
SCCS-vsn: old/enpload/Makefile 5.6
SCCS-vsn: sbin/routed/Makefile 5.11
---
 usr/src/bin/Makefile                          | 282 +-----------
 usr/src/bin/Makefile.inc                      |   3 +
 usr/src/bin/cat/Makefile                      |  49 +--
 usr/src/bin/chmod/Makefile                    |  49 +--
 usr/src/bin/cp/Makefile                       |  49 +--
 usr/src/bin/csh/Makefile                      |  83 +---
 usr/src/bin/date/Makefile                     |  51 +--
 usr/src/bin/dd/Makefile                       |  49 +--
 usr/src/bin/df/Makefile                       |  52 +--
 usr/src/bin/echo/Makefile                     |  49 +--
 usr/src/bin/ed/Makefile                       |  49 +--
 usr/src/bin/expr/Makefile                     |  49 +--
 usr/src/bin/hostname/Makefile                 |  49 +--
 usr/src/bin/kill/Makefile                     |  49 +--
 usr/src/bin/ls/Makefile                       |  50 +--
 usr/src/bin/mkdir/Makefile                    |  49 +--
 usr/src/bin/mv/Makefile                       |  49 +--
 usr/src/bin/ps/Makefile                       |  54 +--
 usr/src/bin/pwd/Makefile                      |  49 +--
 usr/src/bin/rcp/Makefile                      |  57 +--
 usr/src/bin/rm/Makefile                       |  49 +--
 usr/src/bin/rmail/Makefile                    |   5 +
 usr/src/bin/rmdir/Makefile                    |  49 +--
 usr/src/bin/sleep/Makefile                    |  49 +--
 usr/src/bin/stty/Makefile                     |  49 +--
 usr/src/bin/sync/Makefile                     |  50 +--
 usr/src/games/Makefile                        |  41 +-
 usr/src/games/Makefile.inc                    |   9 +
 usr/src/games/adventure/Makefile              |  64 +--
 usr/src/games/arithmetic/Makefile             |  51 +--
 usr/src/games/atc/Makefile                    |  10 +-
 usr/src/games/backgammon/backgammon/Makefile  |  76 +---
 usr/src/games/backgammon/teachgammon/Makefile |  15 +
 usr/src/games/battlestar/Makefile             |  57 +--
 usr/src/games/bcd/Makefile                    |  54 +--
 usr/src/games/caesar/Makefile                 |  56 +--
 usr/src/games/canfield/canfield/Makefile      |  63 +--
 usr/src/games/canfield/cfscores/Makefile      |   9 +
 usr/src/games/chess/Makefile                  |  79 +---
 usr/src/games/ching/Makefile                  |  55 +--
 usr/src/games/ching/cno/Makefile              |   8 +
 usr/src/games/ching/phx/Makefile              |   8 +
 usr/src/games/cribbage/Makefile               |  67 +--
 usr/src/games/dm/Makefile                     |  57 +--
 usr/src/games/factor/Makefile                 |  59 +--
 usr/src/games/fish/Makefile                   |  52 +--
 usr/src/games/fortune/Makefile                |  90 ++--
 usr/src/games/hack/Makefile                   |  87 +---
 usr/src/games/hangman/Makefile                |  53 +--
 usr/src/games/larn/Makefile                   |  83 +---
 usr/src/games/mille/Makefile                  |  64 +--
 usr/src/games/monop/Makefile                  |  76 +---
 usr/src/games/morse/Makefile                  |   8 +
 usr/src/games/number/Makefile                 |  50 +--
 usr/src/games/phantasia/Makefile              | 106 +----
 usr/src/games/pom/Makefile                    |   8 +
 usr/src/games/ppt/Makefile                    |   8 +
 usr/src/games/primes/Makefile                 |   9 +
 usr/src/games/quiz/Makefile                   |  59 +--
 usr/src/games/rain/Makefile                   |  52 +--
 usr/src/games/robots/Makefile                 |  60 +--
 usr/src/games/rogue/Makefile                  |  57 +--
 usr/src/games/sail/Makefile                   |  57 +--
 usr/src/games/snake/snake/Makefile            |  64 +--
 usr/src/games/snake/snscore/Makefile          |   9 +
 usr/src/games/trek/Makefile                   |  63 +--
 usr/src/games/wargames/Makefile               |  27 +-
 usr/src/games/worm/Makefile                   |  53 +--
 usr/src/games/worms/Makefile                  |  52 +--
 usr/src/games/wump/Makefile                   |  54 +--
 usr/src/include/Makefile                      | 125 ++----
 usr/src/lib/Makefile                          |  38 +-
 usr/src/lib/csu/tahoe/Makefile                |  76 +---
 usr/src/lib/csu/vax/Makefile                  | 102 ++---
 usr/src/lib/libc/Makefile                     | 400 +++++++++++++-----
 usr/src/lib/libcompat/Makefile                |  88 ++--
 usr/src/lib/libcurses/Makefile                |  70 +--
 usr/src/lib/libm/Makefile                     | 172 +++-----
 usr/src/lib/libmp/Makefile                    |  55 +--
 usr/src/lib/libplot/Makefile                  | 112 +----
 usr/src/lib/libplot/aed/Makefile              |  79 +---
 usr/src/lib/libplot/bitgraph/Makefile         |  56 +--
 usr/src/lib/libplot/f77plot/Makefile          |  54 +--
 usr/src/lib/libplot/gigi/Makefile             |  56 +--
 usr/src/lib/libplot/grn/Makefile              |  55 +--
 usr/src/lib/libplot/hp2648/Makefile           |  59 +--
 usr/src/lib/libplot/hp7221/Makefile           |  57 +--
 usr/src/lib/libplot/imagen/Makefile           |  58 +--
 usr/src/lib/libplot/plot/Makefile             |  59 +--
 usr/src/lib/libplot/t300/Makefile             |  61 +--
 usr/src/lib/libplot/t300s/Makefile            |  62 +--
 usr/src/lib/libplot/t4013/Makefile            |  54 +--
 usr/src/lib/libplot/t4014/Makefile            |  54 +--
 usr/src/lib/libplot/t450/Makefile             |  61 +--
 usr/src/lib/libplot/vt0/Makefile              |  54 +--
 usr/src/lib/librpc/rpc/Makefile               | 161 ++-----
 usr/src/lib/libterm/Makefile                  |  86 +---
 usr/src/lib/libutil/Makefile                  |  69 +--
 usr/src/lib/liby/Makefile                     |  50 +--
 usr/src/libexec/Makefile                      |  36 +-
 usr/src/libexec/Makefile.inc                  |   3 +
 usr/src/libexec/bugfiler/Makefile             |  56 +--
 usr/src/libexec/comsat/Makefile               |  50 +--
 usr/src/libexec/fingerd/Makefile              |  50 +--
 usr/src/libexec/ftpd/Makefile                 |  53 +--
 usr/src/libexec/getNAME/Makefile              |  49 +--
 usr/src/libexec/getty/Makefile                |  56 +--
 usr/src/libexec/mail.local/Makefile           |   7 +
 usr/src/libexec/makekey/Makefile              |  50 +--
 usr/src/libexec/rexecd/Makefile               |  50 +--
 usr/src/libexec/rlogind/Makefile              |  54 +--
 usr/src/libexec/rshd/Makefile                 |  56 +--
 usr/src/libexec/talkd/Makefile                |  50 +--
 usr/src/libexec/telnetd/Makefile              | 102 +----
 usr/src/libexec/tftpd/Makefile                |  52 +--
 usr/src/libexec/uucpd/Makefile                |  53 +--
 usr/src/old/adb/Makefile                      |  34 +-
 usr/src/old/adb/adb.tahoe/Makefile            |  58 +--
 usr/src/old/adb/adb.vax/Makefile              |  63 +--
 usr/src/old/adb/common_scripts/Makefile       |  44 +-
 usr/src/old/adb/scripts.tahoe/Makefile        |  31 +-
 usr/src/old/adb/scripts.vax/Makefile          |  32 +-
 usr/src/old/boggle/Makefile                   |  62 +--
 usr/src/old/enpload/Makefile                  |  56 +--
 usr/src/old/lex/libln/Makefile                |  54 +--
 usr/src/old/libndbm/Makefile                  |  70 +--
 usr/src/old/pcc/c2.tahoe/Makefile             |  48 +--
 usr/src/old/pcc/c2.vax/Makefile               |  47 +-
 usr/src/old/sh/Makefile                       |  65 +--
 usr/src/old/tar/Makefile                      |  51 +--
 usr/src/old/test/Makefile                     |  52 +--
 usr/src/sbin/Makefile.inc                     |   3 +
 usr/src/sbin/XNSrouted/Makefile               |  49 +--
 usr/src/sbin/mountd/Makefile                  |  53 +--
 usr/src/sbin/nfsd/Makefile                    |  53 +--
 usr/src/sbin/routed/Makefile                  |  65 +--
 usr/src/share/Makefile.inc                    |   3 +
 usr/src/usr.bin/Makefile.inc                  |   3 +
 usr/src/usr.bin/f77/libF77/Makefile           | 127 ++----
 usr/src/usr.bin/f77/libI77/Makefile           | 103 ++---
 usr/src/usr.bin/f77/libU77/Makefile           | 111 ++---
 usr/src/usr.bin/pascal/libpc/Makefile         |  66 +--
 usr/src/usr.sbin/Makefile.inc                 |   3 +
 143 files changed, 1524 insertions(+), 6802 deletions(-)
 create mode 100644 usr/src/bin/Makefile.inc
 create mode 100644 usr/src/bin/rmail/Makefile
 create mode 100644 usr/src/games/Makefile.inc
 create mode 100644 usr/src/games/backgammon/teachgammon/Makefile
 create mode 100644 usr/src/games/canfield/cfscores/Makefile
 create mode 100644 usr/src/games/ching/cno/Makefile
 create mode 100644 usr/src/games/ching/phx/Makefile
 create mode 100644 usr/src/games/morse/Makefile
 create mode 100644 usr/src/games/pom/Makefile
 create mode 100644 usr/src/games/ppt/Makefile
 create mode 100644 usr/src/games/primes/Makefile
 create mode 100644 usr/src/games/snake/snscore/Makefile
 create mode 100644 usr/src/libexec/Makefile.inc
 create mode 100644 usr/src/libexec/mail.local/Makefile
 create mode 100644 usr/src/sbin/Makefile.inc
 create mode 100644 usr/src/share/Makefile.inc
 create mode 100644 usr/src/usr.bin/Makefile.inc
 create mode 100644 usr/src/usr.sbin/Makefile.inc

diff --git a/usr/src/bin/Makefile b/usr/src/bin/Makefile
index e435f3eb07..65d9092847 100644
--- a/usr/src/bin/Makefile
+++ b/usr/src/bin/Makefile
@@ -1,280 +1,6 @@
-#
-# Copyright (c) 1980, 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.28 (Berkeley) %G%
-#
-DESTDIR=
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.29 (Berkeley) %G%
 
-# Programs that live in subdirectories, and have makefiles of their own.
-#
-SUBDIR=	adb as awk cpio csh diff make passwd sed sh tp
+SUBDIR=	adb cat chmod cp csh date dd df echo ed expr hostname kill ls mkdir \
+	mv ps pwd rcp rm rmail rmdir sh sleep stty sync tar test
 
-# Shell scripts that need only be installed and are never removed.
-#
-SCRIPT=	false true
-
-# C source that lives in the current directory
-#
-SRCS=	ar.c cat.c cc.c chmod.c cmp.c cp.c date.c dd.c df.c du.c \
-	echo.c ed.c expr.c hostid.c hostname.c kill.c ld.c ln.c login.c \
-	ls.c machine.c mkdir.c mt.c mv.c nice.c nm.c od.c pagesize.c \
-	pr.c ps.c pwd.c rcp.c rm.c rmdir.c size.c strip.c \
-	stty.c su.c sync.c tar.c tee.c test.c time.c wall.c who.c write.c
-
-# C programs that live in the current directory and do not need
-# explicit make lines.
-#
-STD=	ar cat cc chmod cmp cp date dd du echo ed hostid \
-	hostname kill ld ln ls machine mkdir mt mv nice nm od pagesize pr \
-	pwd rm rmdir size strip stty sync tar tee test time who
-
-# C programs that live in the current directory and need explicit make lines.
-#
-NSTD=	expr ps
-
-# Programs that get installed with special permissions
-#
-PERM=	df login rcp su wall write
-
-all:	${SUBDIR} ${STD} ${NSTD} ${PERM}
-
-${SUBDIR}: FRC
-	cd $@; make ${MFLAGS}
-
-${STD} ${PERM}: ${LIBC}
-	${CC} ${CFLAGS} -o $@ $@.c
-
-install: FRC
-	-for i in ${SUBDIR}; do \
-		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
-	-for i in ${SCRIPT}; do \
-		(install -c -o bin -g bin -m 755 $$i.sh ${DESTDIR}/bin/$$i); \
-	done
-	install -o bin -g bin -m 755 ${STD} ${DESTDIR}/bin
-# programs that run with special permissions
-	install -s -o root -g bin -m 4755 login ${DESTDIR}/bin/login
-	install -s -o root -g bin -m 4755 rcp ${DESTDIR}/bin/rcp
-	install -s -o root -g bin -m 4755 su ${DESTDIR}/bin/su
-	install -s -o bin -g operator -m 2755 df ${DESTDIR}/bin/df
-	install -s -o bin -g kmem -m 2755 ps ${DESTDIR}/bin/ps
-	install -s -o bin -g tty -m 2755 wall ${DESTDIR}/bin/wall
-	install -s -o bin -g tty -m 2755 write ${DESTDIR}/bin/write
-	install -s -o bin -g bin -m 755 expr ${DESTDIR}/bin/expr
-# directories and links
-	rm -f ${DESTDIR}/bin/[; ln ${DESTDIR}/bin/test ${DESTDIR}/bin/[
-	rm -f ${DESTDIR}/bin/e; ln ${DESTDIR}/bin/ed ${DESTDIR}/bin/e
-
-clean: FRC
-	rm -f ${STD} ${NSTD} ${PERM} expr.c a.out core *.s *.o errs
-	for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
-
-depend: ldepend
-	for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} depend); done
-
-ldepend: expr.c FRC
-	mkdep -p ${CFLAGS} ${SRCS}
-
-FRC:
-
-# Files listed in ${NSTD} have explicit make lines given below.
-
-expr: expr.o
-	${CC} ${CFLAGS} -o $@ expr.o
-
-ps:
-	${CC} ${CFLAGS} -o $@ ps.c -lm
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-ar: ar.c /usr/include/sys/param.h /usr/include/sys/types.h
-ar: /usr/include/signal.h /usr/include/machine/trap.h
-ar: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-ar: /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/time.h
-ar: /usr/include/stdio.h /usr/include/ar.h
-cat: cat.c /usr/include/stdio.h /usr/include/sys/types.h
-cat: /usr/include/sys/stat.h
-cc: cc.c /usr/include/sys/param.h /usr/include/sys/types.h
-cc: /usr/include/signal.h /usr/include/machine/trap.h
-cc: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-cc: /usr/include/stdio.h /usr/include/ctype.h /usr/include/signal.h
-cc: /usr/include/sys/dir.h
-chmod: chmod.c /usr/include/stdio.h /usr/include/sys/types.h
-chmod: /usr/include/sys/stat.h /usr/include/sys/dir.h
-cmp: cmp.c /usr/include/sys/param.h /usr/include/sys/types.h
-cmp: /usr/include/signal.h /usr/include/machine/trap.h
-cmp: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-cmp: /usr/include/sys/file.h /usr/include/sys/stat.h /usr/include/stdio.h
-cmp: /usr/include/ctype.h /usr/include/errno.h
-cp: cp.c /usr/include/stdio.h /usr/include/sys/param.h /usr/include/sys/types.h
-cp: /usr/include/signal.h /usr/include/machine/trap.h
-cp: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-cp: /usr/include/sys/stat.h /usr/include/sys/dir.h /usr/include/sys/time.h
-cp: /usr/include/time.h
-date: date.c /usr/include/sys/param.h /usr/include/sys/types.h
-date: /usr/include/signal.h /usr/include/machine/trap.h
-date: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-date: /usr/include/sys/time.h /usr/include/time.h /usr/include/sys/file.h
-date: /usr/include/errno.h /usr/include/syslog.h /usr/include/utmp.h
-date: /usr/include/tzfile.h /usr/include/stdio.h /usr/include/ctype.h
-date: /usr/include/strings.h /usr/include/sys/socket.h
-date: /usr/include/netinet/in.h /usr/include/netdb.h
-date: /usr/include/protocols/timed.h
-dd: dd.c /usr/include/sys/file.h /usr/include/stdio.h /usr/include/signal.h
-dd: /usr/include/machine/trap.h
-df: df.c /usr/include/sys/param.h /usr/include/sys/types.h
-df: /usr/include/signal.h /usr/include/machine/trap.h
-df: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-df: /usr/include/sys/fs.h /usr/include/sys/stat.h /usr/include/errno.h
-df: /usr/include/stdio.h /usr/include/fstab.h /usr/include/mtab.h
-du: du.c /usr/include/stdio.h /usr/include/sys/param.h /usr/include/sys/types.h
-du: /usr/include/signal.h /usr/include/machine/trap.h
-du: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-du: /usr/include/sys/stat.h /usr/include/sys/dir.h
-echo: echo.c /usr/include/stdio.h
-ed: ed.c /usr/include/signal.h /usr/include/machine/trap.h /usr/include/sgtty.h
-ed: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-ed: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
-ed: /usr/include/setjmp.h
-expr: expr.c /usr/include/stdio.h
-hostid: hostid.c /usr/include/sys/types.h /usr/include/stdio.h
-hostid: /usr/include/ctype.h /usr/include/netdb.h
-hostname: hostname.c /usr/include/stdio.h
-kill: kill.c /usr/include/signal.h /usr/include/machine/trap.h
-kill: /usr/include/ctype.h
-ld: ld.c /usr/include/sys/param.h /usr/include/sys/types.h
-ld: /usr/include/signal.h /usr/include/machine/trap.h
-ld: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-ld: /usr/include/signal.h /usr/include/stdio.h /usr/include/ctype.h
-ld: /usr/include/ar.h /usr/include/a.out.h /usr/include/sys/exec.h
-ld: /usr/include/ranlib.h /usr/include/sys/stat.h /usr/include/sys/file.h
-ln: ln.c /usr/include/sys/param.h /usr/include/sys/types.h
-ln: /usr/include/signal.h /usr/include/machine/trap.h
-ln: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-ln: /usr/include/sys/stat.h /usr/include/stdio.h /usr/include/errno.h
-login: login.c /usr/include/sys/param.h /usr/include/sys/types.h
-login: /usr/include/signal.h /usr/include/machine/trap.h
-login: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-login: /usr/include/sys/quota.h /usr/include/sys/stat.h /usr/include/sys/time.h
-login: /usr/include/time.h /usr/include/sys/resource.h /usr/include/sys/file.h
-login: /usr/include/sgtty.h /usr/include/sys/ioctl.h
-login: /usr/include/sys/ttychars.h /usr/include/sys/ttydefaults.h
-login: /usr/include/sys/ttydev.h /usr/include/utmp.h /usr/include/signal.h
-login: /usr/include/pwd.h /usr/include/stdio.h /usr/include/lastlog.h
-login: /usr/include/errno.h /usr/include/ttyent.h /usr/include/syslog.h
-login: /usr/include/grp.h
-ls: ls.c /usr/include/sys/param.h /usr/include/sys/types.h
-ls: /usr/include/signal.h /usr/include/machine/trap.h
-ls: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-ls: /usr/include/sys/stat.h /usr/include/sys/dir.h /usr/include/stdio.h
-ls: /usr/include/sgtty.h /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-ls: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h /usr/include/pwd.h
-ls: /usr/include/grp.h /usr/include/utmp.h
-machine: machine.c /usr/include/sys/param.h /usr/include/sys/types.h
-machine: /usr/include/signal.h /usr/include/machine/trap.h
-machine: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-mkdir: mkdir.c /usr/include/stdio.h
-mt: mt.c /usr/include/stdio.h /usr/include/ctype.h /usr/include/sys/types.h
-mt: /usr/include/sys/mtio.h /usr/include/sys/ioctl.h
-mt: /usr/include/sys/ttychars.h /usr/include/sys/ttydefaults.h
-mt: /usr/include/sys/ttydev.h /usr/include/tahoevba/cyreg.h
-mv: mv.c /usr/include/sys/param.h /usr/include/sys/types.h
-mv: /usr/include/signal.h /usr/include/machine/trap.h
-mv: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-mv: /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/time.h
-mv: /usr/include/sys/file.h /usr/include/stdio.h /usr/include/errno.h
-nice: nice.c /usr/include/stdio.h /usr/include/sys/time.h /usr/include/time.h
-nice: /usr/include/sys/resource.h
-nm: nm.c /usr/include/sys/types.h /usr/include/sys/file.h /usr/include/ar.h
-nm: /usr/include/stdio.h /usr/include/ctype.h /usr/include/a.out.h
-nm: /usr/include/sys/exec.h /usr/include/stab.h /usr/include/ranlib.h
-od: od.c /usr/include/stdio.h /usr/include/sys/types.h /usr/include/sys/stat.h
-pagesize: pagesize.c
-pr: pr.c /usr/include/stdio.h /usr/include/signal.h /usr/include/machine/trap.h
-pr: /usr/include/sys/types.h /usr/include/sys/stat.h
-ps: ps.c /usr/include/stdio.h /usr/include/ctype.h /usr/include/a.out.h
-ps: /usr/include/sys/exec.h /usr/include/pwd.h /usr/include/sys/param.h
-ps: /usr/include/sys/types.h /usr/include/signal.h /usr/include/machine/trap.h
-ps: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-ps: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-ps: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
-ps: /usr/include/sys/tty.h /usr/include/sys/ttychars.h
-ps: /usr/include/sys/ttydev.h /usr/include/sys/dir.h /usr/include/sys/user.h
-ps: /usr/include/machine/pcb.h /usr/include/sys/dmap.h /usr/include/sys/time.h
-ps: /usr/include/time.h /usr/include/sys/resource.h /usr/include/sys/namei.h
-ps: /usr/include/sys/uio.h /usr/include/errno.h /usr/include/sys/proc.h
-ps: /usr/include/machine/pte.h /usr/include/sys/vm.h /usr/include/sys/vmparam.h
-ps: /usr/include/machine/vmparam.h /usr/include/sys/vmmac.h
-ps: /usr/include/sys/vmmeter.h /usr/include/sys/vmsystm.h
-ps: /usr/include/sys/text.h /usr/include/sys/stat.h /usr/include/sys/mbuf.h
-ps: /usr/include/math.h /usr/include/errno.h /usr/include/utmp.h
-pwd: pwd.c /usr/include/stdio.h /usr/include/sys/param.h
-pwd: /usr/include/sys/types.h /usr/include/signal.h /usr/include/machine/trap.h
-pwd: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-rcp: rcp.c /usr/include/sys/param.h /usr/include/sys/types.h
-rcp: /usr/include/signal.h /usr/include/machine/trap.h
-rcp: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-rcp: /usr/include/sys/file.h /usr/include/sys/stat.h /usr/include/sys/time.h
-rcp: /usr/include/time.h /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-rcp: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
-rcp: /usr/include/netinet/in.h /usr/include/stdio.h /usr/include/signal.h
-rcp: /usr/include/pwd.h /usr/include/ctype.h /usr/include/netdb.h
-rcp: /usr/include/errno.h /usr/include/sys/dir.h
-rm: rm.c /usr/include/stdio.h /usr/include/sys/param.h /usr/include/sys/types.h
-rm: /usr/include/signal.h /usr/include/machine/trap.h
-rm: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-rm: /usr/include/sys/stat.h /usr/include/sys/dir.h /usr/include/sys/file.h
-rmdir: rmdir.c /usr/include/stdio.h
-size: size.c /usr/include/stdio.h /usr/include/a.out.h /usr/include/sys/exec.h
-strip: strip.c /usr/include/a.out.h /usr/include/sys/exec.h
-strip: /usr/include/signal.h /usr/include/machine/trap.h /usr/include/stdio.h
-strip: /usr/include/sys/file.h
-stty: stty.c /usr/include/stdio.h /usr/include/sys/ioctl.h
-stty: /usr/include/sys/ttychars.h /usr/include/sys/ttydefaults.h
-stty: /usr/include/sys/ttydev.h
-su: su.c /usr/include/stdio.h /usr/include/pwd.h /usr/include/grp.h
-su: /usr/include/syslog.h /usr/include/sys/types.h /usr/include/sys/time.h
-su: /usr/include/time.h /usr/include/sys/resource.h
-sync: sync.c
-tar: tar.c /usr/include/stdio.h /usr/include/sys/param.h
-tar: /usr/include/sys/types.h /usr/include/signal.h /usr/include/machine/trap.h
-tar: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-tar: /usr/include/sys/stat.h /usr/include/sys/dir.h /usr/include/sys/ioctl.h
-tar: /usr/include/sys/ttychars.h /usr/include/sys/ttydefaults.h
-tar: /usr/include/sys/ttydev.h /usr/include/sys/mtio.h /usr/include/sys/time.h
-tar: /usr/include/time.h /usr/include/signal.h /usr/include/errno.h
-tar: /usr/include/fcntl.h
-tee: tee.c /usr/include/signal.h /usr/include/machine/trap.h
-tee: /usr/include/sys/types.h /usr/include/sys/stat.h /usr/include/errno.h
-test: test.c /usr/include/stdio.h /usr/include/sys/types.h
-test: /usr/include/sys/stat.h
-time: time.c /usr/include/stdio.h /usr/include/signal.h
-time: /usr/include/machine/trap.h /usr/include/sys/types.h
-time: /usr/include/sys/time.h /usr/include/time.h /usr/include/sys/resource.h
-wall: wall.c /usr/include/stdio.h /usr/include/utmp.h /usr/include/errno.h
-wall: /usr/include/signal.h /usr/include/machine/trap.h /usr/include/sys/time.h
-wall: /usr/include/time.h /usr/include/fcntl.h /usr/include/sys/types.h
-wall: /usr/include/sys/stat.h
-who: who.c /usr/include/stdio.h /usr/include/utmp.h /usr/include/pwd.h
-who: /usr/include/ctype.h
-write: write.c /usr/include/stdio.h /usr/include/ctype.h
-write: /usr/include/sys/types.h /usr/include/sys/stat.h /usr/include/signal.h
-write: /usr/include/machine/trap.h /usr/include/utmp.h /usr/include/sys/time.h
-write: /usr/include/time.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.subdir.mk>
diff --git a/usr/src/bin/Makefile.inc b/usr/src/bin/Makefile.inc
new file mode 100644
index 0000000000..3124564261
--- /dev/null
+++ b/usr/src/bin/Makefile.inc
@@ -0,0 +1,3 @@
+#	@(#)Makefile.inc	5.1 (Berkeley) %G%
+
+BINDIR?=	/bin
diff --git a/usr/src/bin/cat/Makefile b/usr/src/bin/cat/Makefile
index 753134661d..ed9b4356f7 100644
--- a/usr/src/bin/cat/Makefile
+++ b/usr/src/bin/cat/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	cat.c
-OBJS=
-MAN=	cat.0
+PROG=	cat
 
-all: cat
-
-cat: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core cat
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 cat ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/chmod/Makefile b/usr/src/bin/chmod/Makefile
index 31e2a9250d..d8f69997b4 100644
--- a/usr/src/bin/chmod/Makefile
+++ b/usr/src/bin/chmod/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	chmod.c
-OBJS=
-MAN=	chmod.0
+PROG=	chmod
 
-all: chmod
-
-chmod: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core chmod
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 chmod ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/cp/Makefile b/usr/src/bin/cp/Makefile
index 595fde11db..8c2374b206 100644
--- a/usr/src/bin/cp/Makefile
+++ b/usr/src/bin/cp/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	cp.c
-OBJS=
-MAN=	cp.0
+PROG=	cp
 
-all: cp
-
-cp: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core cp
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 cp ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/csh/Makefile b/usr/src/bin/csh/Makefile
index 79c3a5972f..aeb774c6d9 100644
--- a/usr/src/bin/csh/Makefile
+++ b/usr/src/bin/csh/Makefile
@@ -1,82 +1,35 @@
-#
-# Copyright (c) 1987 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.15 (Berkeley) %G%
+#	@(#)Makefile	5.16 (Berkeley) %G%
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
 #
 # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
 
-DEFS=	-DTELL -DVFORK -DFILEC
-CFLAGS=	${DEFS} -I. -O
-MAN=	csh.0
-
+PROG=	csh
+SHAREDSTRINGS=1
+CFLAGS+=-DTELL -DVFORK -DFILEC
 SRCS=	alloc.c doprnt.c sh.c sh.char.c sh.dir.c sh.dol.c sh.err.c \
 	sh.exec.c sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c \
 	sh.init.c sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c \
 	sh.sem.c sh.set.c sh.time.c
-OBJS=	alloc.o doprnt.o sh.o sh.char.o sh.dir.o sh.dol.o sh.err.o \
-	sh.exec.o sh.exp.o sh.file.o sh.func.o sh.glob.o sh.hist.o \
-	sh.init.o sh.lex.o sh.misc.o sh.parse.o sh.print.o sh.proc.o \
-	sh.sem.o sh.set.o sh.time.o
+MAN1=	csh.0
+MLINKS=	csh.1 limit.1 csh.1 alias.1 csh.1 bg.1 csh.1 dirs.1 csh.1 fg.1 \
+	csh.1 foreach.1 csh.1 history.1 csh.1 jobs.1 csh.1 popd.1 \
+	csh.1 pushd.1 csh.1 rehash.1 csh.1 repeat.1 csh.1 suspend.1 \
+	csh.1 stop.1 csh.1 source.1
 
-# Special massaging of C files for sharing of strings
-.c.o:
-	${CC} -E ${CFLAGS} $*.c | xstr -c -
-	@${CC} -c ${CFLAGS} x.c
-	@mv -f x.o $*.o
-	@rm -f x.c
-
-all: csh
+.include <bsd.prog.mk>
 
-# strings.o must be last since it can change when previous files compile
-csh: ${OBJS} strings.o
-	${CC} ${CFLAGS} ${OBJS} strings.o -o $@
+csh:	strings.o
+OBJS+=	strings.o
 
 # strings.o, sh.init.o, and sh.char.o are specially processed to be shared
-strings.o: strings
+strings.o: ${OBJS:Nstrings.o}
 	xstr
-	${CC} -c -R xs.c
-	mv -f xs.o strings.o
-	rm -f xs.c
+	${CC} ${.INCLUDES} ${CFLAGS} -c -R xs.c -o ${.TARGET}
+	@rm -f xs.c
 
 sh.char.o sh.init.o:
-	${CC} -E ${CFLAGS} $*.c | xstr -c -
-	${CC} ${CFLAGS} -c -R x.c
-	mv -f x.o $*.o
-	rm -f x.c
-
-clean:
-	rm -f ${OBJS} core csh strings strings.o x.c x.o xs.c xs.o
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 csh ${DESTDIR}/bin/csh
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-	rm -f ${DESTDIR}/usr/man/cat1/limit.0
-	ln ${DESTDIR}/usr/man/cat1/csh.0 ${DESTDIR}/usr/man/cat1/limit.0
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags:
-	ctags ${SRCS}
+	${CC} -E ${.INCLUDES} ${CFLAGS} ${.IMPSRC} | xstr -c -
+	@${CC} ${.INCLUDES} ${CFLAGS} -c -R x.c -o ${.TARGET}
+	@rm -f x.c
diff --git a/usr/src/bin/date/Makefile b/usr/src/bin/date/Makefile
index 626b5cb462..2bc0aadf8e 100644
--- a/usr/src/bin/date/Makefile
+++ b/usr/src/bin/date/Makefile
@@ -1,48 +1,7 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	date.c
-OBJS=
-MAN=	date.0
+PROG=	date
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 
-all: date
-
-date: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c -lutil
-
-clean:
-	rm -f ${OBJS} core date
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 date ${DESTDIR}/bin/date
-	install -c -o bin -g bin -m 444 date.0 ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/dd/Makefile b/usr/src/bin/dd/Makefile
index 4c400d949b..0acbbb2586 100644
--- a/usr/src/bin/dd/Makefile
+++ b/usr/src/bin/dd/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	dd.c
-OBJS=
-MAN=	dd.0
+PROG=	dd
 
-all: dd
-
-dd: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core dd
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 dd ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/df/Makefile b/usr/src/bin/df/Makefile
index efb6af2ef8..0c4e87bd31 100644
--- a/usr/src/bin/df/Makefile
+++ b/usr/src/bin/df/Makefile
@@ -1,48 +1,8 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O -DCOMPAT_43
-LIBC=	/lib/libc.a
-SRCS=	df.c
-OBJS=
-MAN=	df.0
+PROG=	df
+CFLAGS+=-DCOMPAT_43
+BINGRP=	operator
+BINMODE=2555
 
-all: df
-
-df: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core df
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g operator -m 2755 df ${DESTDIR}/bin/df
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/echo/Makefile b/usr/src/bin/echo/Makefile
index 32c7edc2b5..5b05d5895a 100644
--- a/usr/src/bin/echo/Makefile
+++ b/usr/src/bin/echo/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.3 (Berkeley) %G%
-#
+#	@(#)Makefile	5.4 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	echo.c
-OBJS=
-MAN=	echo.0
+PROG=	echo
 
-all: echo
-
-echo: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core echo
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 echo ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/ed/Makefile b/usr/src/bin/ed/Makefile
index 3c2af3761b..e4f403ccf6 100644
--- a/usr/src/bin/ed/Makefile
+++ b/usr/src/bin/ed/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	ed.c
-OBJS=
-MAN=	ed.0
+PROG=	ed
 
-all: ed
-
-ed: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core ed
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 ed ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/expr/Makefile b/usr/src/bin/expr/Makefile
index 5cc4804e22..aa3e65a477 100644
--- a/usr/src/bin/expr/Makefile
+++ b/usr/src/bin/expr/Makefile
@@ -1,48 +1,7 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+PROG=	expr
 SRCS=	expr.c
-OBJS=	expr.o
-MAN=	expr.0
+CLEANFILES=	expr.c
 
-all: expr
-
-expr: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS}
-
-clean:
-	rm -f ${OBJS} expr.c core expr
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 expr ${DESTDIR}/usr/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/hostname/Makefile b/usr/src/bin/hostname/Makefile
index 8c4fdb6ca9..2373081c7e 100644
--- a/usr/src/bin/hostname/Makefile
+++ b/usr/src/bin/hostname/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	hostname.c
-OBJS=
-MAN=	hostname.0
+PROG=	hostname
 
-all: hostname
-
-hostname: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core hostname
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 hostname ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 hostname.0 ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/kill/Makefile b/usr/src/bin/kill/Makefile
index c2e92358cd..97a430e548 100644
--- a/usr/src/bin/kill/Makefile
+++ b/usr/src/bin/kill/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	kill.c
-OBJS=
-MAN=	kill.0
+PROG=	kill
 
-all: kill
-
-kill: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core kill
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 kill ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/ls/Makefile b/usr/src/bin/ls/Makefile
index 536cfb9d8d..cc084f22aa 100644
--- a/usr/src/bin/ls/Makefile
+++ b/usr/src/bin/ls/Makefile
@@ -1,48 +1,8 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-OBJS=	cmp.o ls.o print.o util.o
-MAN=	ls.0
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 
-all: ls
-
-ls: ${LIBC} ${OBJS}
-	${CC} -o $@ ${CFLAGS} ${OBJS}
-
-clean:
-	rm -f ${OBJS} core ls
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 ls ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/mkdir/Makefile b/usr/src/bin/mkdir/Makefile
index 13b3641bd1..e094ff5049 100644
--- a/usr/src/bin/mkdir/Makefile
+++ b/usr/src/bin/mkdir/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	mkdir.c
-OBJS=
-MAN=	mkdir.0
+PROG=	mkdir
 
-all: mkdir
-
-mkdir: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core mkdir
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 mkdir ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/mv/Makefile b/usr/src/bin/mv/Makefile
index baee351234..1dac6df3d6 100644
--- a/usr/src/bin/mv/Makefile
+++ b/usr/src/bin/mv/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.3 (Berkeley) %G%
-#
+#	@(#)Makefile	5.4 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	mv.c
-OBJS=
-MAN=	mv.0
+PROG=	mv
 
-all: mv
-
-mv: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core mv
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 mv ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/ps/Makefile b/usr/src/bin/ps/Makefile
index fd169d5bec..a273161b0e 100644
--- a/usr/src/bin/ps/Makefile
+++ b/usr/src/bin/ps/Makefile
@@ -1,48 +1,10 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS= ps.c devname.c attime.c
-OBJS= ps.o devname.o attime.o
-MAN=	ps.0
+PROG=	ps
+SRCS=	ps.c devname.c attime.c proc_compare.c
+DPADD=	${LIBMATH} ${LIBUTIL}
+LDADD=	-lm -lutil
+BINGRP=	kmem
+BINMODE=2555
 
-all: ps
-
-ps: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS} -lm -lutil
-
-clean:
-	rm -f ${OBJDIR}*.o core ps
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g kmem -m 2755 ps ${DESTDIR}/bin/ps
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/pwd/Makefile b/usr/src/bin/pwd/Makefile
index f68ef88cba..3302585823 100644
--- a/usr/src/bin/pwd/Makefile
+++ b/usr/src/bin/pwd/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	pwd.c
-OBJS=
-MAN=	pwd.0
+PROG=	pwd
 
-all: pwd
-
-pwd: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core pwd
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 pwd ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/rcp/Makefile b/usr/src/bin/rcp/Makefile
index 0c502a6495..ab73b5b195 100644
--- a/usr/src/bin/rcp/Makefile
+++ b/usr/src/bin/rcp/Makefile
@@ -1,49 +1,12 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) 9/20/88
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O -DKERBEROS
-LIBC=	/lib/libc.a
+PROG=	rcp
 SRCS=	rcp.c krcmd.c kcmd.c
-OBJS=	rcp.o krcmd.o kcmd.o
-MAN=	rcp.0
-VPATH=	/usr/src/usr.bin/rlogin/kcmd:
-
-all: rcp
-
-rcp: ${LIBC} ${OBJS}
-	${CC} -o $@ ${CFLAGS} ${OBJS} -lkrb -ldes
-
-clean:
-	rm -f ${OBJS} core rcp
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o root -g bin -m 4755 rcp ${DESTDIR}/bin/rcp
-	install -c -o bin -g bin -m 444 rcp.0 ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+CFLAGS+=-DKERBEROS
+DPADD=	${LIBKRB} ${LIBDES}
+LDADD=	-lkrb -ldes
+BINOWN=	root
+BINMODE=4555
+.PATH:	${.CURDIR}/../../usr.bin/rlogin
+
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/rm/Makefile b/usr/src/bin/rm/Makefile
index d625c467d9..0cb7de9faf 100644
--- a/usr/src/bin/rm/Makefile
+++ b/usr/src/bin/rm/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	rm.c
-OBJS=
-MAN=	rm.0
+PROG=	rm
 
-all: rm
-
-rm: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core rm
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 rm ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/rmail/Makefile b/usr/src/bin/rmail/Makefile
new file mode 100644
index 0000000000..c350479b6a
--- /dev/null
+++ b/usr/src/bin/rmail/Makefile
@@ -0,0 +1,5 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	rmail
+
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/rmdir/Makefile b/usr/src/bin/rmdir/Makefile
index a23147b7c1..491a6bb2e7 100644
--- a/usr/src/bin/rmdir/Makefile
+++ b/usr/src/bin/rmdir/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	rmdir.c
-OBJS=
-MAN=	rmdir.0
+PROG=	rmdir
 
-all: rmdir
-
-rmdir: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core rmdir
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 rmdir ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/sleep/Makefile b/usr/src/bin/sleep/Makefile
index 00cfeff022..67e0ce0e83 100644
--- a/usr/src/bin/sleep/Makefile
+++ b/usr/src/bin/sleep/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	sleep.c
-OBJS=
-MAN=	sleep.0
+PROG=	sleep
 
-all: sleep
-
-sleep: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core sleep
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 sleep ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/stty/Makefile b/usr/src/bin/stty/Makefile
index 7862c3a219..8afe93dcb3 100644
--- a/usr/src/bin/stty/Makefile
+++ b/usr/src/bin/stty/Makefile
@@ -1,48 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	stty.c
-OBJS=
-MAN=	stty.0
+PROG=	stty
 
-all: stty
-
-stty: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core stty
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 stty ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/bin/sync/Makefile b/usr/src/bin/sync/Makefile
index dd40d856f4..5f2c8ad98b 100644
--- a/usr/src/bin/sync/Makefile
+++ b/usr/src/bin/sync/Makefile
@@ -1,48 +1,6 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	sync.c
-OBJS=
-MAN=	sync.0
+PROG=	sync
+MAN8=	sync.0
 
-all: sync
-
-sync: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core sync
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 sync ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/Makefile b/usr/src/games/Makefile
index 4bc7cd65de..3e24253840 100644
--- a/usr/src/games/Makefile
+++ b/usr/src/games/Makefile
@@ -1,35 +1,10 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.13 (Berkeley) %G%
-#
-DESTDIR=
+#	@(#)Makefile	5.14 (Berkeley) %G%
 
-SUBDIR=	adventure arithmetic atc backgammon battlestar bcd \
-	boggle canfield cribbage dm doctor factor fish \
-	fortune gnuchess hack hangman hunt larn mille monop number \
-	phantasia quiz rain robots rogue sail snake trek wargames \
-	worm worms wump games.${MACHINE}
+# don't compile: adventure dungeon hunt warp
+SUBDIR=	arithmetic atc backgammon/backgammon backgammon/teachgammon \
+	battlestar bcd boggle caesar canfield \
+	chess ching cribbage dm factor fish fortune hack hangman larn \
+	mille monop morse number phantasia pom ppt primes quiz rain robots \
+	rogue sail snake trek wargames worm worms wump
 
-all clean cleandir depend install lint tags: FRC
-	@-for i in ${SUBDIR}; do \
-		(echo "==> $$i"; \
-		    cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} $@); done
-
-${SUBDIR}: FRC
-	cd $@; make ${MFLAGS} DESTDIR=${DESTDIR}
-
-FRC:
+.include <bsd.subdir.mk>
diff --git a/usr/src/games/Makefile.inc b/usr/src/games/Makefile.inc
new file mode 100644
index 0000000000..c717028f5d
--- /dev/null
+++ b/usr/src/games/Makefile.inc
@@ -0,0 +1,9 @@
+#	@(#)Makefile.inc	5.1 (Berkeley) %G%
+
+BINOWN?=	games
+.if defined(HIDEGAME)
+BINDIR?=	/usr/games/hide
+BINMODE?=	4700
+.else
+BINDIR?=	/usr/games
+.endif
diff --git a/usr/src/games/adventure/Makefile b/usr/src/games/adventure/Makefile
index 4eb0fd596a..e72d3f7102 100644
--- a/usr/src/games/adventure/Makefile
+++ b/usr/src/games/adventure/Makefile
@@ -1,54 +1,20 @@
-#
-# Copyright (c) 1988 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	4.11 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	done.c init.c io.c main.c save.c subr.c vocab.c wizard.c
-OBJS=	done.o init.o io.o main.o save.o subr.o vocab.o wizard.o
-MAN=	adventure.0
-
-all: adventure
+#	@(#)Makefile	4.12 (Berkeley) %G%
 
-adventure: ${OBJS} ${LIBC}
-	${CC} -n ${CFLAGS} ${OBJS} -lcompat
-	./a.out
+PROG=	adventure
+MAN6=	adventure.0
+SRCS=	done.c init.c io.c main.c save.c subr.c vocab.c wizard.c
+DPADD=	${LIBCOMPAT}
+LDADD=	-lcompat
+.PATH:	${.CURDIR}
+HIDEGAME=hidegame
 
 save.o: save.c			# vax C optimizer bug - infinite loop
-	${CC} -c save.c
-
-clean:
-	rm -f ${OBJS} core adventure a.out
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o games -g bin -m 4700 adventure \
-		${DESTDIR}/usr/games/hide/adventure
-	(cd ${DESTDIR}/usr/games; rm -f adventure; ln -s dm adventure; \
-		chown games.bin adventure)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
+	${CC} -c ${.CURDIR}/save.c
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+beforeinstall:
+	cp ${.CURDIR}/glorkz .
+	mv adventure adventure.out
+	./adventure.out
+	rm -f adventure.out
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/arithmetic/Makefile b/usr/src/games/arithmetic/Makefile
index 1b02bbfb7a..32c3caea03 100644
--- a/usr/src/games/arithmetic/Makefile
+++ b/usr/src/games/arithmetic/Makefile
@@ -1,48 +1,7 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	arithmetic.c
-OBJS=
-MAN=	arithmetic.0
+PROG=	arithmetic
+MAN6=	arithmetic.0
+HIDEGAME=hidegame
 
-all: arithmetic
-
-arithmetic: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core arithmetic
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 arithmetic ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/atc/Makefile b/usr/src/games/atc/Makefile
index de92f9cc97..3bf37e229d 100644
--- a/usr/src/games/atc/Makefile
+++ b/usr/src/games/atc/Makefile
@@ -1,13 +1,15 @@
+#	@(#)Makefile	5.6 (Berkeley) %G%
+
 PROG=	atc
 CFLAGS+=-DBSD -I${.CURDIR}
-SRCLIBS=/usr/lib/libl.a ${LIBM} ${LIBTERM} ${LIBCURSES} ${LIBCOMPAT}
-LDFILES=-ll -lm -lcurses -ltermcap -lcompat
 SRCS=	extern.c grammar.c graphics.c input.c lex.c list.c log.c \
 	main.c tunable.c update.c
-HIDEGAME=hidegame
 MAN6=	atc.0
-CLEANFILES=grammar.c y.tab.h lex.c
+DPADD=	${usr/lib/libl.a ${LIBM} ${LIBTERM} ${LIBCURSES} ${LIBCOMPAT}
+LDADD=	-ll -lm -lcurses -ltermcap -lcompat
 GAMES=	ATC_scores Game_List Killer crossover default easy game_2
+CLEANFILES=grammar.c y.tab.h lex.c
+HIDEGAME=hidegame
 
 beforeinstall: 
 	(cd ${.CURDIR}/games; install -c -o ${BINOWN} -g ${BINGRP} -m 400 \
diff --git a/usr/src/games/backgammon/backgammon/Makefile b/usr/src/games/backgammon/backgammon/Makefile
index 155dacaa2c..a08a453ff6 100644
--- a/usr/src/games/backgammon/backgammon/Makefile
+++ b/usr/src/games/backgammon/backgammon/Makefile
@@ -1,64 +1,14 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.15 (Berkeley) %G%
-#
-LIBC=	/lib/libc.a
-LIBS=	-ltermlib
-CFLAGS=	-O -DV7
-SRCS=	allow.c board.c check.c data.c extra.c fancy.c init.c main.c move.c \
-	odds.c one.c save.c subs.c table.c teach.c text.c ttext1.c ttext2.c \
-	tutor.c version.c
-BSRCS=	allow.c board.c check.c extra.c fancy.c init.c main.c move.c \
-	odds.c one.c save.c subs.c table.c text.c version.c
-BOBJS=	allow.o board.o check.o extra.o fancy.o init.o main.o move.o \
-	odds.o one.o save.o subs.o table.o text.o version.o
-TSRCS=	allow.c board.c check.c data.c fancy.c init.c odds.c one.c save.c \
-	subs.c table.c teach.c ttext1.c ttext2.c tutor.c
-TOBJS=	allow.o board.o check.o data.o fancy.o init.o odds.o one.o save.o \
-	subs.o table.o teach.o ttext1.o ttext2.o tutor.o
-MAN=	backgammon.0
-
-all: backgammon teachgammon
-
-backgammon: ${BOBJS} ${LIBC}
-	${CC} -o $@ ${BOBJS} ${LIBS} -lcompat
-
-teachgammon: ${TOBJS} ${LIBC}
-	${CC} -o $@ ${TOBJS} ${LIBS} -lcompat
-
-clean:
-	rm -f ${TOBJS} ${BOBJS} core teachgammon backgammon
+#	@(#)Makefile	5.16 (Berkeley) %G%
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o games -g bin -m 700 backgammon ${DESTDIR}/usr/games/hide
-	install -s -o games -g bin -m 700 teachgammon ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f backgammon; ln -s dm backgammon; chown games.bin backgammon)
-	(cd ${DESTDIR}/usr/games; rm -f teachgammon; ln -s dm teachgammon; chown games.bin teachgammon)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${BRCS}
-	lint ${CFLAGS} ${TSRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+PROG=	backgammon
+CFLAGS+=-DV7 -I${.CURDIR}/../common_source
+SRCS=	allow.c board.c check.c extra.c fancy.c init.c main.c move.c \
+	odds.c one.c save.c subs.c table.c text.c version.c
+MAN6=	backgammon.0
+DPADD=	${LIBTERM} ${LIBCOMPAT}
+LDADD=	-ltermcap -lcompat
+.PATH:	${.CURDIR}/../common_source
+HIDEGAME=hidegame
+
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/usr/src/games/backgammon/teachgammon/Makefile b/usr/src/games/backgammon/teachgammon/Makefile
new file mode 100644
index 0000000000..6db4c897e0
--- /dev/null
+++ b/usr/src/games/backgammon/teachgammon/Makefile
@@ -0,0 +1,15 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	teachgammon
+CFLAGS+=-DV7 -I${.CURDIR}/../common_source
+SRCS=	allow.c board.c check.c data.c fancy.c init.c odds.c one.c save.c \
+	subs.c table.c teach.c ttext1.c ttext2.c tutor.c
+DPADD=	${LIBTERM} ${LIBCOMPAT}
+LDADD=	-ltermcap -lcompat
+HIDEGAME=hidegame
+NOMAN=	noman
+
+.PATH:	${.CURDIR}/../common_source
+
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/usr/src/games/battlestar/Makefile b/usr/src/games/battlestar/Makefile
index 8807977c6d..1a8893bfbd 100644
--- a/usr/src/games/battlestar/Makefile
+++ b/usr/src/games/battlestar/Makefile
@@ -1,53 +1,12 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.4 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-OBJS=	battlestar.o com1.o com2.o com3.o com4.o com5.o com6.o com7.o \
-	init.o cypher.o getcom.o parse.o room.o save.o fly.o misc.o \
-	globals.o dayfile.o nightfile.o dayobjs.o nightobjs.o words.o
+#	@(#)Makefile	5.5 (Berkeley) %G%
+
+PROG=	battlestar
 SRCS=	battlestar.c com1.c com2.c com3.c com4.c com5.c com6.c com7.c \
 	init.c cypher.c getcom.c parse.c room.c save.c fly.c misc.c \
 	globals.c dayfile.c nightfile.c dayobjs.c nightobjs.c words.c
-MAN=	battlestar.0
-
-all: battlestar
-
-battlestar: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS} -lcurses -ltermlib -lcompat
-
-clean:
-	rm -f ${OBJS} core battlestar
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o games -g bin -m 4700 battlestar ${DESTDIR}/usr/games/hide/battlestar
-	install -c -o games -g bin -m 600 /dev/null ${DESTDIR}/usr/games/lib/battlestar.log
-	(cd ${DESTDIR}/usr/games; rm -f battlestar; ln -s dm battlestar; chown games.bin battlestar)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+MAN6=	battlestar.0
+DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermlib -lcompat
+HIDEGAME=hidegame
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/bcd/Makefile b/usr/src/games/bcd/Makefile
index 53c84b9f85..b80a46944f 100644
--- a/usr/src/games/bcd/Makefile
+++ b/usr/src/games/bcd/Makefile
@@ -1,51 +1,9 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	bcd.c morse.c ppt.c
-OBJS=
-MAN=	bcd.0
+PROG=	bcd
+MAN6=	bcd.0
+MLINKS=	bcd.6 morse.6 bcd.6 ppt.6
+HIDEGAME=hidegame
 
-all: bcd morse ppt
+.include <bsd.prog.mk>
 
-bcd morse ppt: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core bcd morse ppt
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 bcd morse ppt ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-	rm -f ${DESTDIR}/usr/man/cat6/morse.0 ${DESTDIR}/usr/man/cat6/ppt.0
-	ln ${DESTDIR}/usr/man/cat6/bcd.0 ${DESTDIR}/usr/man/cat6/morse.0
-	ln ${DESTDIR}/usr/man/cat6/bcd.0 ${DESTDIR}/usr/man/cat6/ppt.0
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
diff --git a/usr/src/games/caesar/Makefile b/usr/src/games/caesar/Makefile
index d27dbcbbf2..c27a863f6e 100644
--- a/usr/src/games/caesar/Makefile
+++ b/usr/src/games/caesar/Makefile
@@ -1,51 +1,9 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	caesar.c
-OBJS=
-MAN=	caesar.0
-
-all: caesar
-
-caesar: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c -lm
-
-clean:
-	rm -f ${OBJS} core caesar
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 caesar ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-	rm -f ${DESTDIR}/usr/man/cat6/rot13
-	ln ${DESTDIR}/usr/man/cat6/${MAN} ${DESTDIR}/usr/man/cat6/rot13.0
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+PROG=	caesar
+MAN6=	caesar.0
+DPADD=	${LIBM}
+LDADD=	-lm
+MLINKS=	caesar.6 rot13.6
 
+.include <bsd.prog.mk>
diff --git a/usr/src/games/canfield/canfield/Makefile b/usr/src/games/canfield/canfield/Makefile
index 55678f659d..a9a9b91d34 100644
--- a/usr/src/games/canfield/canfield/Makefile
+++ b/usr/src/games/canfield/canfield/Makefile
@@ -1,57 +1,10 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.5 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-CSRCS=	canfield.c
-CFSRCS=	cfscores.c
-MAN=	canfield.0
+#	@(#)Makefile	5.6 (Berkeley) %G%
 
-all: canfield cfscores
+PROG=	canfield
+MAN6=	canfield.0
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermcap -lcompat
+SUBDIR=	cfscores
+HIDEGAME=hidegame
 
-canfield: ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${CSRCS} -lcurses -ltermcap -lcompat
-
-cfscores: ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${CFSRCS}
-
-clean:
-	rm -f core canfield cfscores
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${CSRCS} ${CFSRCS}
-
-install: ${MAN}
-	install -s -o games -g bin -m 700 canfield ${DESTDIR}/usr/games/hide
-	install -s -o games -g bin -m 700 cfscores ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f canfield; ln -s dm canfield; chown games.bin canfield)
-	(cd ${DESTDIR}/usr/games; rm -f cfscores; ln -s dm cfscores; chown games.bin cfscores)
-	-[ -f ${DESTDIR}/usr/games/lib/cfscores ] || install -c -o games -g bin -m 600 /dev/null ${DESTDIR}/usr/games/lib/cfscores
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-	rm -f ${DESTDIR}/usr/man/cat6/cfscores.0
-	ln ${DESTDIR}/usr/man/cat6/canfield.0 ${DESTDIR}/usr/man/cat6/cfscores.0
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${CSRCS}
-	lint ${CFLAGS} ${CFSRCS}
-
-tags: ${SRCS}
-	ctags ${CSRCS} ${CFSRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/canfield/cfscores/Makefile b/usr/src/games/canfield/cfscores/Makefile
new file mode 100644
index 0000000000..449413c8e7
--- /dev/null
+++ b/usr/src/games/canfield/cfscores/Makefile
@@ -0,0 +1,9 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	cfscores
+CFLAGS+=-I${.CURDIR}/..
+NOMAN=	noman
+HIDEGAME=hidegame
+
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/usr/src/games/chess/Makefile b/usr/src/games/chess/Makefile
index 9859db21ef..278016e48c 100644
--- a/usr/src/games/chess/Makefile
+++ b/usr/src/games/chess/Makefile
@@ -1,70 +1,15 @@
-#
-# Makefile for CHESS
-#
-# Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc.
-#
-# This file is part of CHESS.
-#
-# CHESS is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY.  No author or distributor
-# accepts responsibility to anyone for the consequences of using it
-# or for whether it serves any particular purpose or works at all,
-# unless he says so in writing.  Refer to the CHESS General Public
-# License for full details.
-#
-# Everyone is granted permission to copy, modify and redistribute
-# CHESS, but only under the conditions described in the
-# CHESS General Public License.   A copy of this license is
-# supposed to have been given to you along with CHESS so you
-# can know your rights and responsibilities.  It should be in a
-# file named COPYING.  Among other things, the copyright notice
-# and this notice must be preserved on all copies.
-#
-#
-# gnuchess will be the alpha-display version (with curses/termcap)
-# gnuchessr will be the non-display version (for dumb terminals and
-#    for use with SUN's chesstool and X-window's xchess.
-#    To use with latter, add -DCHESSTOOL to the gnuchess.o/nondsp.o
-#    compilation lines (e.g. cc -O -DCHESSTOOL ...)
-#
-NEW=move.o
-CFLAGS= -O -DNEWMOVE=12
-all : gnuchess #gnuchessr
-MAN=	chess.0
+#	@(#)Makefile	5.4 (Berkeley) %G%
 
-gnuchess: gnuchess.o uxdsp.o $(NEW)
-	$(CC) $(CFLAGS) -o gnuchess gnuchess.o uxdsp.o $(NEW) \
-		-lcurses -ltermlib -lcompat
+PROG=	chess
+SRCS=	gnuchess.c uxdsp.c move.c
+CFLAGS+=-DNEWMOVE=12
+MAN6=	chess.0
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermlib -lcompat
+HIDEGAME=hidegame
 
-gnuchessr: gnuchess.o nondsp.o $(NEW)
-	$(CC) $(CFLAGS) -o gnuchessr gnuchess.o nondsp.o $(NEW) -lcompat
-
-gnuchess.o: gnuchess.c
-	$(CC) $(CFLAGS) -c gnuchess.c
-
-move.o: move.c
-	$(CC) $(CFLAGS) -c move.c
-
-uxdsp.o: uxdsp.c
-	$(CC) $(CFLAGS) -c uxdsp.c
-
-nondsp.o: nondsp.c
-	$(CC) $(CFLAGS) -c nondsp.c
-
-distribution:
-	tar cf - gnuchess.h gnuchess.c move.h move.c uxdsp.c nondsp.c Xchess gnuchess.book DOCUMENTATION Makefile > gnuchess.tar
-	compress gnuchess.tar
-
-install: ${MAN}
-	install -s -o games -g bin -m 4700 gnuchess ${DESTDIR}/usr/games/hide/chess
-	(cd ${DESTDIR}/usr/games; rm -f chess; ln -s dm chess; chown games.bin chess)
-	install -c -o bin -g bin -m 444 gnuchess.book /usr/games/lib
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-#	cp gnuchessr /usr/games/gnuchess.chesstool
-#	cp gnuchess /usr/games/gnuchess
-#	cp gnuchess.book /usr/games/lib/gnuchess.book
-
-clean:
-	-rm gnuchess gnuchessr *.o
+beforeinstall: 
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/gnuchess.book \
+	    ${DESTDIR}/usr/share/games
 
+.include <bsd.prog.mk>
diff --git a/usr/src/games/ching/Makefile b/usr/src/games/ching/Makefile
index 4f0348778e..c0f4f3e404 100644
--- a/usr/src/games/ching/Makefile
+++ b/usr/src/games/ching/Makefile
@@ -1,50 +1,13 @@
-#
-# Copyright (c) 1988 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	cno.c phx.c
-OBJS=
-MAN=	ching.0
+SUBDIR=	cno phx
 
-all: cno phx
+all: ching.0
 
-cno phx: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
+beforeinstall:
+	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	    ${.CURDIR}/ching.sh ${DESTDIR}/usr/games/ching
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/hexagrams \
+	    ${.CURDIR}/macros ${DESTDIR}/usr/share/games/ching
 
-clean:
-	rm -f ${OBJS} core cno phx
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -c -o bin -g bin -m 755 ching.sh ${DESTDIR}/usr/games/ching
-	-[ -d ${DESTDIR}/usr/games/ching.d ] || mkdir ${DESTDIR}/usr/games/ching.d
-	install -s -o bin -g bin -m 755 cno phx ${DESTDIR}/usr/games/ching.d
-	install -c -o bin -g bin -m 444 hexagrams macros ${DESTDIR}/usr/games/ching.d
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/ching/cno/Makefile b/usr/src/games/ching/cno/Makefile
new file mode 100644
index 0000000000..b0c818ea97
--- /dev/null
+++ b/usr/src/games/ching/cno/Makefile
@@ -0,0 +1,8 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	ching.cno
+BINDIR=	/usr/games
+CFLAGS+=-I${.CURDIR}/..
+NOMAN=	noman
+
+.include <bsd.prog.mk>
diff --git a/usr/src/games/ching/phx/Makefile b/usr/src/games/ching/phx/Makefile
new file mode 100644
index 0000000000..fca7a21367
--- /dev/null
+++ b/usr/src/games/ching/phx/Makefile
@@ -0,0 +1,8 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	ching.phx
+CFLAGS+=-I${.CURDIR}/..
+BINDIR=	/usr/games
+NOMAN=	noman
+
+.include <bsd.prog.mk>
diff --git a/usr/src/games/cribbage/Makefile b/usr/src/games/cribbage/Makefile
index 8d1fb1ea4b..58918a39b4 100644
--- a/usr/src/games/cribbage/Makefile
+++ b/usr/src/games/cribbage/Makefile
@@ -1,59 +1,14 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.10 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-LIBS=	-lcurses -ltermlib
-HDRS=	cribbage.h deck.h cribcur.h
-SRCS=	extern.c crib.c support.c cards.c score.c io.c
-OBJS=	extern.o crib.o support.o cards.o score.o io.o
-TOBJS=	test.o cards.o score.o io.o extern.o
-MAN=	cribbage.0
+#	@(#)Makefile	5.11 (Berkeley) %G%
 
-all: cribbage crib.instr
+PROG=	cribbage
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermlib -lcompat
+SRCS=	extern.c crib.c cards.c instr.c io.c score.c support.c
+MAN6=	cribbage.0
+HIDEGAME=hidegame
 
-cribbage: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} -lcompat
+beforeinstall: 
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/cribbage.n \
+	    ${DESTDIR}/usr/share/games/cribbage.instr
 
-test: ${TOBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${TOBJS} ${LIBS}
-
-crib.instr: cribbage.n macro
-	nroff cribbage.n > crib.instr
-
-clean:
-	rm -f ${OBJS} core crib.instr cribbage test
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -o games -g bin -m 400 crib.instr ${DESTDIR}/usr/games/lib/crib.instr
-	install -s -o games -g bin -m 4700 cribbage ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f cribbage; ln -s dm cribbage; \
-	    chown games.bin cribbage)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/dm/Makefile b/usr/src/games/dm/Makefile
index 8ad68cda1c..0a40fc2f0c 100644
--- a/usr/src/games/dm/Makefile
+++ b/usr/src/games/dm/Makefile
@@ -1,50 +1,13 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.4 (Berkeley) %G%
-#
-# -DLOG		log games in /usr/adm
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	dm.c
-OBJS=
-MAN=	dm.0 dm.config.0
+#	@(#)Makefile	5.5 (Berkeley) %G%
 
-all: dm
+# -DLOG		log games
+PROG=	dm
+MAN8=	dm.0
+MAN5=	dm.config.0
+BINGRP=	kmem
+BINMODE=6555
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 
-dm: ${LIBC}
-	${CC} -o $@ ${CFLAGS} dm.c
+.include <bsd.prog.mk>
 
-clean:
-	rm -f core dm
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o games -g kmem -m 6755 dm ${DESTDIR}/usr/games
-#	install -c -o games -g bin -m 444 dm.config ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 dm.0 ${DESTDIR}/usr/man/cat8
-	install -c -o bin -g bin -m 444 dm.config.0 ${DESTDIR}/usr/man/cat5
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
diff --git a/usr/src/games/factor/Makefile b/usr/src/games/factor/Makefile
index bc2c530479..b4a7cacc2f 100644
--- a/usr/src/games/factor/Makefile
+++ b/usr/src/games/factor/Makefile
@@ -1,54 +1,9 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.5 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-FSRCS=	factor.c pr_tbl.c
-FOBJS=	factor.o pr_tbl.o
-PSRCS=	primes.c pr_tbl.c pattern.c
-POBJS=	primes.o pr_tbl.o pattern.o
-MAN=	factor.0
+#	@(#)Makefile	5.6 (Berkeley) %G%
 
-all: factor primes
+PROG=	factor
+SRCS=	factor.c pr_tbl.c
+CFLAGS+=-I${.CURDIR}/../primes
+MAN6=	factor.0
+.PATH:	${.CURDIR}/../primes
 
-factor: ${LIBC} ${FOBJS}
-	${CC} -o $@ ${CFLAGS} ${FOBJS}
-
-primes: ${LIBC} ${POBJS}
-	${CC} -o $@ ${CFLAGS} ${POBJS} -lm
-
-clean:
-	rm -f ${FOBJS} ${POBJS} core factor primes
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 factor primes ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-	rm -f ${DESTDIR}/usr/man/cat6/primes.0
-	ln ${DESTDIR}/usr/man/cat6/${MAN} ${DESTDIR}/usr/man/cat6/primes.0
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/fish/Makefile b/usr/src/games/fish/Makefile
index 9dd79e5ee5..b1c3d9bf5a 100644
--- a/usr/src/games/fish/Makefile
+++ b/usr/src/games/fish/Makefile
@@ -1,48 +1,8 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	fish.c
-OBJS=
-MAN=	fish.0
+PROG=	fish
+DPADD=	${LIBCOMPAT}
+LDADD=	-lcompat
+HIDEGAME=hidegame
 
-all: fish
-
-fish: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c -lcompat
-
-clean:
-	rm -f ${OBJS} core fish
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 fish ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/fortune/Makefile b/usr/src/games/fortune/Makefile
index 96c9069032..d60da73583 100644
--- a/usr/src/games/fortune/Makefile
+++ b/usr/src/games/fortune/Makefile
@@ -1,72 +1,48 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	1.8 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	fortune.c strfile.c unstr.c
-OBJS=
-MAN=	fortune.0
+#	@(#)Makefile	5.1 (Berkeley) %G%
 
-all: fortune strfile # unstr
+PROGS=	fortune strfile unstr
+SRCS=	fortune.c strfile.c unstr.c
+MAN6=	fortune.0
+BINOWN=	games
+DATFILES=fortunes.dat fortunes-o.dat startrek.dat zippy.dat
+.PATH:	${.CURDIR} ${.CURDIR}/datfiles
 
-fortune: ${LIBC}
-	${CC} ${CFLAGS} -o $@ $@.c
+all: ${PROGS} ${MAN6} ${DATFILES}
 
-strfile: ${LIBC}
-	${CC} ${CFLAGS} -o $@ $@.c
+${PROGS}: ${LIBC} ${.PREFIX}.c
+	${CC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${.PREFIX}.c
 
-unstr: ${LIBC}
-	${CC} ${CFLAGS} -o $@ $@.c
+${DATFILES}: ${.TARGET:R}
+	./strfile -rs ${.CURDIR}/datfiles/${.TARGET:R} ${.TARGET}
 
 clean:
-	rm -f fortune strfile unstr core *.dat
+	rm -f ${PROGS} core *.dat
 
 cleandir: clean
-	rm -f ${MAN} tags .depend
+	rm -f ${MAN6} tags .depend
 
 depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o games -g bin -m 4755 fortune ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 fortune.0 ${DESTDIR}/usr/man/cat6
-	./strfile -rs fortunes
-	./strfile -rs startrek
-	./strfile -rs zippy
-	install -c -o bin -g bin -m 444 fortunes startrek zippy \
+	mkdep -p ${CFLAGS} ${.ALLSRC}
+
+install:
+	install ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} fortune \
+	    ${DESTDIR}/usr/games
+	install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} fortune.0 \
+	    ${DESTDIR}/usr/share/man/cat6
+	(cd ${.CURDIR}/datfiles; install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    ${DATFILES:R} ${DESTDIR}/usr/share/games/fortune)
+	install -o ${BINOWN} -g ${BINGRP} -m 444 ${DATFILES} \
 	    ${DESTDIR}/usr/share/games/fortune
-	install -o bin -g bin -m 444 fortunes.dat startrek.dat zippy.dat \
-	    ${DESTDIR}/usr/share/games/fortune
-#	./strfile -rsx noobscene
-#	install -c -o bin -g bin -m 444 noobscene \
-#	    ${DESTDIR}/usr/share/games/fortune/fortunes-o
-#	install -o bin -g bin -m 444 noobscene.dat \
-#	    ${DESTDIR}/usr/share/games/fortune/fortunes-o.dat
-	./strfile -rsx fortunes-o.rot
-	install -c -o bin -g bin -m 444 fortunes-o.rot \
-	    ${DESTDIR}/usr/share/games/fortune/fortunes-o
-	install -o bin -g bin -m 444 fortunes-o.rot.dat \
-	    ${DESTDIR}/usr/share/games/fortune/fortunes-o.dat
 
 lint: ${SRCS}
-	lint ${CFLAGS} fortune.c
-	lint ${CFLAGS} strfile.c
-	lint ${CFLAGS} unstr.c
+	cd ${.CURDIR}; lint ${CFLAGS} ${LINTFLAGS} fortune.c
+	cd ${.CURDIR}; lint ${CFLAGS} ${LINTFLAGS} strfile.c
+	cd ${.CURDIR}; lint ${CFLAGS} ${LINTFLAGS} unstr.c
 
 tags: ${SRCS}
-	ctags ${SRCS}
+	cd ${.CURDIR}; ctags fortune.c
+	cd ${.CURDIR}; ctags strfile.c
+	cd ${.CURDIR}; ctags unstr.c
+	cd ${.CURDIR}; sort -o tags tags
+
+.include <bsd.prog.mk>
diff --git a/usr/src/games/hack/Makefile b/usr/src/games/hack/Makefile
index 5554e8a20b..7d3c9bbc37 100644
--- a/usr/src/games/hack/Makefile
+++ b/usr/src/games/hack/Makefile
@@ -1,24 +1,6 @@
-#
-# Copyright (c) 1988 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.8 (Berkeley) %G%
-#
-# Hack or Quest Makefile.
+#	@(#)Makefile	5.9 (Berkeley) %G%
 
-CFLAGS=	-O
+PROG=	hack
 SRCS=	alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
 	hack.do.c hack.do_name.c hack.do_wear.c hack.dog.c hack.eat.c \
 	hack.end.c hack.engrave.c hack.fight.c hack.invent.c hack.ioctl.c \
@@ -30,53 +12,24 @@ SRCS=	alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
 	hack.timeout.c hack.topl.c hack.track.c hack.trap.c hack.tty.c \
 	hack.u_init.c hack.unix.c hack.vault.c hack.version.c hack.wield.c \
 	hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c
-OBJS=	alloc.o hack.Decl.o hack.apply.o hack.bones.o hack.o hack.cmd.o \
-	hack.do.o hack.do_name.o hack.do_wear.o hack.dog.o hack.eat.o \
-	hack.end.o hack.engrave.o hack.fight.o hack.invent.o hack.ioctl.o \
-	hack.lev.o hack.main.o hack.makemon.o hack.mhitu.o hack.mklev.o \
-	hack.mkmaze.o hack.mkobj.o hack.mkshop.o hack.mon.o hack.monst.o \
-	hack.o_init.o hack.objnam.o hack.options.o hack.pager.o hack.potion.o \
-	hack.pri.o hack.read.o hack.rip.o hack.rumors.o hack.save.o \
-	hack.search.o hack.shk.o hack.shknam.o hack.steal.o hack.termcap.o \
-	hack.timeout.o hack.topl.o hack.track.o hack.trap.o hack.tty.o \
-	hack.u_init.o hack.unix.o hack.vault.o hack.version.o hack.wield.o \
-	hack.wizard.o hack.worm.o hack.worn.o hack.zap.o rnd.o
-MAN=	hack.0
-
-all: hack
-
-hack: ${OBJS} ${LIBC}
-	${CC} -o $@ ${OBJS} -ltermcap -lcompat
-
-makedefs: makedefs.c
-	${CC} ${CFLAGS} -o $@ $@.c
+MAN6=	hack.0
+DPADD=	${LIBTERM} ${LIBCOMPAT}
+LDADD=	-ltermcap -lcompat
+HIDEGAME=hidegame
 
 hack.onames.h: makedefs def.objects.h
-	makedefs > hack.onames.h
-
-install: ${MAN}
-	install -s -o games -g bin -m 4700 hack ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f hack; ln -s dm hack; chown games.bin hack)
-	-[ -d ${DESTDIR}/usr/games/lib/hackdir ] || mkdir ${DESTDIR}/usr/games/lib/hackdir
-	chmod 700 ${DESTDIR}/usr/games/lib/hackdir
-	chown games.bin ${DESTDIR}/usr/games/lib/hackdir
-	install -c -o games -g bin -m 666 /dev/null ${DESTDIR}/usr/games/lib/hackdir/perm
-	install -c -o games -g bin -m 666 /dev/null ${DESTDIR}/usr/games/lib/hackdir/record
-	install -c -o games -g bin -m 666 hh ${DESTDIR}/usr/games/lib/hackdir/hh
-	rm -f ${DESTDIR}/usr/games/lib/hackdir/bones*
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
+	makedefs ${.CURDIR}/def.objects.h > hack.onames.h
 
-clean:
-	rm -f ${OBJS} hack makedefs
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS} makedefs.c
-
-lint: ${SRCS}
-	lint ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+makedefs: makedefs.c
+	${CC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${.PREFIX}.c
+
+beforeinstall: 
+	install -c -o ${BINOWN} -g ${BINGRP} -m 666 /dev/null \
+	    ${DESTDIR}/var/games/hackdir/perm
+	install -c -o ${BINOWN} -g ${BINGRP} -m 666 /dev/null \
+	    ${DESTDIR}/var/games/hackdir/record
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/help \
+	    ${.CURDIR}/hh ${DESTDIR}/var/games/hackdir
+	rm -f ${DESTDIR}/var/games/hackdir/bones*
+
+.include <bsd.prog.mk>
diff --git a/usr/src/games/hangman/Makefile b/usr/src/games/hangman/Makefile
index 886f691d2d..5772cfcfbe 100644
--- a/usr/src/games/hangman/Makefile
+++ b/usr/src/games/hangman/Makefile
@@ -1,50 +1,13 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.6 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.7 (Berkeley) %G%
+
+PROG=	hangman
 SRCS=	endgame.c extern.c getguess.c getword.c main.c playgame.c \
 	prdata.c prman.c prword.c setup.c
-OBJS=	endgame.o extern.o getguess.o getword.o main.o playgame.o \
-	prdata.o prman.o prword.o setup.o
-MAN=	hangman.0
-
-all: hangman
-
-hangman: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS} -lcurses -ltermlib -lcompat
-
-clean:
-	rm -f ${OBJS} core hangman
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
+MAN6=	hangman.0
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermlib -lcompat
+HIDEGAME=hidegame
 
-install: ${MAN}
-	install -s -o games -g bin -m 700 hangman ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f hangman; ln -s dm hangman; chown games.bin hangman)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
+.include <bsd.prog.mk>
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
 
-tags: ${SRCS}
-	ctags ${SRCS}
diff --git a/usr/src/games/larn/Makefile b/usr/src/games/larn/Makefile
index 44a5fcd70f..4a858bb36f 100644
--- a/usr/src/games/larn/Makefile
+++ b/usr/src/games/larn/Makefile
@@ -1,41 +1,7 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.7 (Berkeley) %G%
-#
-# Configuration options
-#  
-#  LARNHOME is the directory where the larn data files will be installed.
-#  BINDIR is the directory where the larn binary will be installed.
+#	@(#)Makefile	5.8 (Berkeley) %G%
 
-LARNHOME=	/usr/games/lib/larnfiles
-BINDIR=		/usr/games
-
-# Available compile time options:
-# WIZID=xxx
-#	This is the userid (or playerid) of the wizard.  Default is zero
-#	(superuser), which disables all wizard functions.  Players must
-#	have this userid (or playerid) in order to become the non-scoring
-#	wizard player.  Definition of WIZID to non-zero will enable the
-#	special wizard debugging commands.  For root to become wizard, use
-#	WIZID= -1.
 # EXTRA
 #	Incorporates code to gather additional performance statistics
-# TIMECHECK
-#	Incorporates code to disable play during working hours (8-5)
 # SYSV
 #	Use system III/V (instead of V7) type ioctl calls
 # BSD
@@ -53,8 +19,6 @@ BINDIR=		/usr/games
 #	checkpoints (again if enabled in the .larnopts file).  This usually
 #	avoids pauses in larn while the checkpointing is being done (on
 #	large machines).
-# SAVEINHOME
-#	Put save files in users HOME instead of LARNHOME the as default
 # VER
 #	This is the version of the software, example:  12
 # SUBVER
@@ -86,44 +50,19 @@ BINDIR=		/usr/games
 #	used to delay for effect when casting missile type spells.
 # NOLOG
 #	Turn off logging.
-#
-
-OPTIONS = -DBSD -DVER=12 -DSUBVER=0 -DWIZID=-7 -DSAVEINHOME -DNONAP -DNOLOG
 
+PROG=	larn
+CFLAGS+=-DBSD -DVER=12 -DSUBVER=0 -DNONAP
 SRCS=	main.c object.c create.c tok.c display.c global.c data.c io.c \
 	monster.c store.c diag.c help.c config.c nap.c bill.c scores.c \
 	signal.c moreobj.c movem.c regen.c fortune.c savelev.c
-OBJS=	main.o object.o create.o tok.o display.o global.o data.o io.o \
-	monster.o store.o diag.o help.o config.o nap.o bill.o scores.o \
-	signal.o moreobj.o movem.o regen.o fortune.o savelev.o
-
-CFLAGS= -O ${OPTIONS} -DLARNHOME=\"${LARNHOME}/\"
-
-all: larn
-
-larn: ${OBJS} ${LIBC}
-	${CC} ${CFLAGS} ${OBJS} -o $@ -ltermcap -lcompat
-
-install: ${MAN}
-	-[ -d ${DESTDIR}/usr/games/lib/larnfiles ] || mkdir ${DESTDIR}/usr/games/lib/larnfiles
-	chmod 700 ${DESTDIR}/usr/games/lib/larnfiles
-	chown games.src ${DESTDIR}/usr/games/lib/larnfiles
-	install -s -o games -g bin -m 4700 larn ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f larn; ln -s dm larn; chown games.bin larn)
-	install -c -o games -g bin -m 444 larnmaze larnopts lfortune \
-		larn.help ${DESTDIR}/usr/games/lib/larnfiles
-
-clean:
-	rm -f ${OBJS} core larn
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
+DPADD=	${LIBTERM} ${LIBCOMPAT}
+LDADD=	-ltermcap -lcompat
+HIDEGAME=hidegame
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+beforeinstall:
+	(cd ${.CURDIR}/datfiles; install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    larnmaze larnopts lfortune larn.help \
+	    ${DESTDIR}/usr/share/games/larn)
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/mille/Makefile b/usr/src/games/mille/Makefile
index 7ded14a3ed..27162b9ebf 100644
--- a/usr/src/games/mille/Makefile
+++ b/usr/src/games/mille/Makefile
@@ -1,60 +1,12 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.9 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.10 (Berkeley) %G%
+
+PROG=	mille
 SRCS=	comp.c end.c extern.c init.c mille.c misc.c move.c print.c \
-	roll.c save.c table.c types.c varpush.c
-MSRCS=	comp.c end.c extern.c init.c mille.c misc.c move.c print.c \
 	roll.c save.c types.c varpush.c
-MOBJS=	comp.o end.o extern.o init.o mille.o misc.o move.o print.o \
-	roll.o save.o types.o varpush.o
-TSRCS=	table.c extern.c
-TOBJS=	table.o extern.o
-MAN=	mille.0
-
-all: mille
-
-mille: ${MOBJS} ${LIBC}
-	${CC} ${CFLAGS} -o $@ ${MOBJS} -lcurses -ltermlib -lcompat
-
-table: ${TOBJS} ${LIBC}
-	${CC} ${CFLAGS} -o $@ ${TOBJS}
-
-clean:
-	rm -f ${OBJS} ${TOBJS} ${MOBJS} core mille table
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o games -g bin -m 700 mille ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f mille; ln -s dm mille; chown games.bin mille)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermlib -lcompat
+MAN6=	mille.0
+HIDEGAME=hidegame
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${MSRCS}
-	lint ${CFLAGS} ${TSRCS}
+.include <bsd.prog.mk>
 
-tags: ${SRCS}
-	ctags ${MSRCS}
-	ctags -a ${TSRCS}
-	sort -o tags tags
diff --git a/usr/src/games/monop/Makefile b/usr/src/games/monop/Makefile
index d5864b4f14..74395b378b 100644
--- a/usr/src/games/monop/Makefile
+++ b/usr/src/games/monop/Makefile
@@ -1,64 +1,24 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.4 (Berkeley) %G%
-#
-# Nifty foo monopoly maker
-#	Program:  Ken Arnold
-#	Makefile:  K.S.
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-MSRCS=	monop.c cards.c execute.c getinp.c houses.c jail.c misc.c morg.c \
-	print.c prop.c rent.c roll.c spec.c trade.c
-MOBJS=	monop.o cards.o execute.o getinp.o houses.o jail.o misc.o morg.o \
-	print.o prop.o rent.o roll.o spec.o trade.o
-ISRCS=	initdeck.c
-IOBJS=	initdeck.o
-MAN=	monop.0
-
-all: monop initdeck cards.pck
-
-monop: ${MOBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${MOBJS} -lcompat
+#	@(#)Makefile	5.5 (Berkeley) %G%
 
-initdeck: ${IOBJS}
-	${CC} ${CFLAGS} -o $@ ${IOBJS}
-
-cards.pck:
-	./initdeck
-
-clean:
-	rm -f ${IOBJS} ${MOBJS} core monop initdeck cards.pck
+PROG=	monop
+SRCS=	monop.c cards.c execute.c getinp.c houses.c jail.c misc.c morg.c \
+	print.c prop.c rent.c roll.c spec.c trade.c
+MAN6=	monop.0
+DPADD=	${LIBCOMPAT}
+LDADD=	-lcompat
+HIDEGAME=hidegame
+CLEANFILES+=initdeck cards.pck
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
+all: cards.pck
 
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${MSRCS} ${ISRCS}
+cards.pck: initdeck
+	./initdeck ${.CURDIR}/cards.inp
 
-install: ${MAN}
-	install -o games -g bin -m 400 cards.pck ${DESTDIR}/usr/games/lib
-	install -s -o games -g bin -m 700 monop ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f monop; ln -s dm monop; chown games.bin monop)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
+initdeck: initdeck.c
+	${CC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/initdeck.c
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${MSRCS}
-	lint ${CFLAGS} ${ISRCS}
+beforeinstall:
+	install -o ${BINOWN} -g ${BINGRP} -m 444 cards.pck \
+	    ${DESTDIR}/usr/share/games
 
-tags: ${SRCS}
-	ctags ${MSRCS} ${ISRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/morse/Makefile b/usr/src/games/morse/Makefile
new file mode 100644
index 0000000000..298c33cb20
--- /dev/null
+++ b/usr/src/games/morse/Makefile
@@ -0,0 +1,8 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	morse
+NOMAN=	noman
+HIDEGAME=hidegame
+
+.include <bsd.prog.mk>
+
diff --git a/usr/src/games/number/Makefile b/usr/src/games/number/Makefile
index 0f13f37e2f..d03d66d4a1 100644
--- a/usr/src/games/number/Makefile
+++ b/usr/src/games/number/Makefile
@@ -1,48 +1,6 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	number.c
-OBJS=
-MAN=	number.0
+PROG=	number
+MAN6=	number.0
 
-all: number
-
-number: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core number
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 number ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/phantasia/Makefile b/usr/src/games/phantasia/Makefile
index bcd0a1fff6..4e1c2c3088 100644
--- a/usr/src/games/phantasia/Makefile
+++ b/usr/src/games/phantasia/Makefile
@@ -1,96 +1,30 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# This code is derived from software contributed to Berkeley by
-# Edward Estes.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.8 (Berkeley) %G%
-#
-# PLOTDEVICE is used for plotting the map.
-# Change as appropriate.
-PLOTDEVICE =	> /dev/tty
+#	@(#)Makefile	5.9 (Berkeley) %G%
 
-# The following are program constants which are implementation dependent.
-#
-# WIZARD is the login of the one who will clean up things.
-# UID is the uid of game wizard.
-# define OK_TO_PLAY to restrict playing access at certain times.
-#	Also see function ok_to_play() in main.c, and tailor to your own needs.
-# define ENEMY to include code for checking of a 'hit list' of resricted 
-#	accounts.  The list of logins goes in the file 'enemy'.
-# SHELL is the default shell for shell escapes.  If SHELL is not defined,
-#	shell escapes are not enabled.
-
-CFLAGS=	-O -DWIZARD=\"root\" -DUID=0 -DENEMY -DBSD42
-LIBC=	/lib/libc.a
+PROG=	phantasia
+CFLAGS+=-DBSD42
 SRCS=	main.c fight.c io.c interplayer.c gamesupport.c misc.c phantglobs.c
-OBJS=	main.o fight.o io.o interplayer.o gamesupport.o misc.o phantglobs.o
-MAN=	phantasia.0
+MAN6=	phantasia.0
+DPADD=	${LIBM} ${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lm -lcurses -ltermlib -lcompat
+HIDEGAME=hidegame
 
-# Make documentation.
-# The flags below on tbl and nroff are to make a line printable version.
-.6.0:
-	tbl -TX phantasia.6 | /usr/man/manroff > phantasia.0
+phantasia.0: phantasia.6
+	tbl -TX ${.CURDIR}/phantasia.6 | nroff -h -man > ${.TARGET}
 
-all: phantasia setup
+all: setup
 
-phantasia: ${OBJS} ${LIBC}
-	${CC} ${OBJS} -o $@ -lm -lcurses -ltermlib -lcompat
+setup: phantglobs.o setup.o monsters.asc ${LIBC} ${LIBM} 
+	${CC} phantglobs.o setup.o -o ${.TARGET} -lm
 
-# Make the initialization program.
-setup: phantglobs.o setup.o monsters.asc ${LIBC}
-	${CC} phantglobs.o setup.o -o $@ -lm -lcurses -ltermlib
+beforeinstall:
+	(cd ${.CURDIR}; obj/setup)
+	chown games.bin /var/games/phantasia/*
 
-install: ${MAN}
-	-[ -d ${DESTDIR}/usr/games/lib/phantasia ] || mkdir ${DESTDIR}/usr/games/lib/phantasia
-	chmod 700 /usr/games/lib/phantasia
-	chown games.bin /usr/games/lib/phantasia
-	install -s -o games -g bin -m 4700 phantasia ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f phantasia; ln -s dm phantasia; chown games.bin phantasia)
-	install -c -o games -g bin -m 400 phantasia.0 ${DESTDIR}/usr/games/lib/phantasia/phant.help
-	install -c -o bin -g bin -m 444 phantasia.0 ${DESTDIR}/usr/man/cat6
-	./setup
-	chown games.bin /usr/games/lib/phantasia/*
+# Make Phantasia map.  Change the map commands reflect your installation.
+# PLOTDEVICE is used for plotting the map.  Change as appropriate.
 
-# Make Phantasia map.
-# Change the map commands reflect your installation.
-# Pre-System III installations may use 'plot' instead of 'tplot'.
 map: map.c
-	${CC} -O map.c -lplot -o $@
-	map | tplot ${PLOTDEVICE}
-
-# Convert old character file to new format.
-# 'convert' is meant to be run only once.
-# PLUS = PHANTPLUS for conversion from 3.3.1+.
-convert: convert.c oldplayer.h phantstruct.h
-	${CC} ${CFLAGS} ${PLUS} convert.c ${LDFLAGS} -o convert
-	convert
-	@echo "New data is in newcharacs."
-
-clean:
-	rm -f *.o core phantasia phant.help phantasia.0 setup
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+	${CC} -O ${.CURDIR}/map.c -lplot -o ${.TARGET}
+	./map | plot > /dev/tty
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/pom/Makefile b/usr/src/games/pom/Makefile
new file mode 100644
index 0000000000..1b63027aae
--- /dev/null
+++ b/usr/src/games/pom/Makefile
@@ -0,0 +1,8 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	pom
+MAN6=	pom.0
+DPADD=	${LIBM}
+LDADD=	-lm
+
+.include <bsd.prog.mk>
diff --git a/usr/src/games/ppt/Makefile b/usr/src/games/ppt/Makefile
new file mode 100644
index 0000000000..976f5781d2
--- /dev/null
+++ b/usr/src/games/ppt/Makefile
@@ -0,0 +1,8 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	ppt
+NOMAN=	noman
+HIDEGAME=hidegame
+
+.include <bsd.prog.mk>
+
diff --git a/usr/src/games/primes/Makefile b/usr/src/games/primes/Makefile
new file mode 100644
index 0000000000..90334f5bf5
--- /dev/null
+++ b/usr/src/games/primes/Makefile
@@ -0,0 +1,9 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	primes
+SRCS=	pattern.c pr_tbl.c primes.c
+NOMAN=	noman
+DPADD=	${LIBM}
+LDADD=	-lm
+
+.include <bsd.prog.mk>
diff --git a/usr/src/games/quiz/Makefile b/usr/src/games/quiz/Makefile
index 3c918f5fc6..b83a86628d 100644
--- a/usr/src/games/quiz/Makefile
+++ b/usr/src/games/quiz/Makefile
@@ -1,56 +1,15 @@
-#
-# Copyright (c) 1987 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	4.7 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	quiz.c
-OBJS=
-MAN=	quiz.0
+#	@(#)Makefile	4.8 (Berkeley) %G%
+
+PROG=	quiz
+MAN6=	quiz.0
 CATS=	africa america areas arith asia babies bard chinese collectives \
 	ed elements europe greek inca index latin locomotive midearth morse \
 	murders poetry posneg pres province seq-easy seq-hard sexes sov \
 	spell state trek ucc
+HIDEGAME=hidegame
 
-all: quiz
-
-quiz: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core quiz
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	-[ -d ${DESTDIR}/usr/games/lib/quiz.k ] || mkdir ${DESTDIR}/usr/games/lib/quiz.k
-	chmod 700 ${DESTDIR}/usr/games/lib/quiz.k
-	chown games.bin ${DESTDIR}/usr/games/lib/quiz.k
-	cd quiz.k; install -c -o games -g bin -m 400 ${CATS} ${DESTDIR}/usr/games/lib/quiz.k
-	install -s -o games -g bin -m 700 quiz ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f quiz; ln -s dm quiz; chown games.bin quiz)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+beforeinstall:
+	(cd ${.CURDIR}/datfiles; install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    ${CATS} ${DESTDIR}/usr/share/games/quiz.db)
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/rain/Makefile b/usr/src/games/rain/Makefile
index 61195213b5..01572d6f14 100644
--- a/usr/src/games/rain/Makefile
+++ b/usr/src/games/rain/Makefile
@@ -1,48 +1,8 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	rain.c
-OBJS=
-MAN=	rain.0
+PROG=	rain
+MAN6=	rain.0
+DPADD=	${LIBTERM} ${LIBCOMPAT}
+LDADD=	-ltermcap -lcompat
 
-all: rain
-
-rain: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c -ltermcap -lcompat
-
-clean:
-	rm -f ${OBJS} core rain
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 rain ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/robots/Makefile b/usr/src/games/robots/Makefile
index 2b942a3b10..627d9fd929 100644
--- a/usr/src/games/robots/Makefile
+++ b/usr/src/games/robots/Makefile
@@ -1,52 +1,16 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.9 (Berkeley) %G%
-#
-DEFS=	-DMAX_PER_UID=5
-CFLAGS=	-O ${DEFS}
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.10 (Berkeley) %G%
+
+PROG=	robots
+CFLAGS+=-DMAX_PER_UID=5
 SRCS=	extern.c init_field.c main.c make_level.c move.c move_robs.c \
 	play_level.c query.c rnd_pos.c score.c flush_in.c
-OBJS=	extern.o init_field.o main.o make_level.o move.o move_robs.o \
-	play_level.o query.o rnd_pos.o score.o flush_in.o
-MAN=	robots.0
-
-all: robots
-
-robots: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS} -lcurses -ltermlib -lcompat
-
-clean:
-	rm -f ${OBJS} core robots
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o games -g bin -m 4700 robots ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f robots; ln -s dm robots; chown games.bin robots)
-	install -c -o games -g bin -m 600 /dev/null ${DESTDIR}/usr/games/lib/robots_roll
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
+MAN6=	robots.0
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermlib -lcompat
+HIDEGAME=hidegame
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+beforeinstall:
+	install -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+	    ${DESTDIR}/var/games/robots_roll
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/rogue/Makefile b/usr/src/games/rogue/Makefile
index 23b165ee67..f1bc119c5d 100644
--- a/usr/src/games/rogue/Makefile
+++ b/usr/src/games/rogue/Makefile
@@ -1,52 +1,13 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.6 (Berkeley) %G%
-#
-CFLAGS=	-O -DUNIX -DUNIX_BSD4_2
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.7 (Berkeley) %G%
+
+PROG=	rogue
+CFLAGS+=-DUNIX -DUNIX_BSD4_2
 SRCS=	curses.c hit.c init.c inventory.c level.c machdep.c main.c \
 	message.c monster.c move.c object.c pack.c play.c random.c ring.c \
 	room.c save.c score.c spec_hit.c throw.c trap.c use.c zap.c
-OBJS=	curses.o hit.o init.o inventory.o level.o machdep.o main.o \
-	message.o monster.o move.o object.o pack.o play.o random.o ring.o \
-	room.o save.o score.o spec_hit.o throw.o trap.o use.o zap.o
-MAN=	rogue.0
-
-all: rogue
-
-rogue: ${OBJS} ${LIBC}
-	${CC} ${OBJS} -o $@ -lcurses -ltermlib -lcompat
-
-clean:
-	rm -f ${OBJS} core rogue
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o games -g bin -m 4700 rogue ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f rogue; ln -s dm rogue; chown games.bin rogue)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermlib -lcompat
+HIDEGAME=hidegame
+MAN6=	rogue.0
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/sail/Makefile b/usr/src/games/sail/Makefile
index 8179797842..67b96730ea 100644
--- a/usr/src/games/sail/Makefile
+++ b/usr/src/games/sail/Makefile
@@ -1,53 +1,12 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.9 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.10 (Berkeley) %G%
+
+PROG=	sail
 SRCS=	main.c pl_main.c pl_1.c pl_2.c pl_3.c pl_4.c pl_5.c pl_6.c pl_7.c \
 	dr_main.c dr_1.c dr_2.c dr_3.c dr_4.c dr_5.c lo_main.c \
 	assorted.c game.c globals.c misc.c parties.c sync.c version.c
-OBJS=	main.o pl_main.o pl_1.o pl_2.o pl_3.o pl_4.o pl_5.o pl_6.o pl_7.o \
-	dr_main.o dr_1.o dr_2.o dr_3.o dr_4.o dr_5.o lo_main.o \
-	assorted.o game.o globals.o misc.o parties.o sync.o version.o
-MAN=	sail.0
-
-all: sail
-
-sail: ${OBJS} ${LIBC}
-	${CC} -o $@ ${OBJS} -lcurses -ltermlib -lcompat
-
-clean:
-	rm -f ${OBJS} core sail
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -c -o games -g bin -m 600 /dev/null ${DESTDIR}/usr/games/lib/saillog
-	install -s -o games -g bin -m 4700 sail ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f sail; ln -s dm sail; chown games.bin sail)
-	install -c -o bin -g bin -m 444 sail.0 ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+MAN6=	sail.0
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermlib -lcompat
+HIDEGAME=hidegame
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/snake/snake/Makefile b/usr/src/games/snake/snake/Makefile
index 014b5f4d94..2247a8210f 100644
--- a/usr/src/games/snake/snake/Makefile
+++ b/usr/src/games/snake/snake/Makefile
@@ -1,57 +1,11 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.9 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS1=	snake.c move.c
-OBJS1=	snake.o move.o
-SRCS2=	snscore.c
-OBJS2=	snscore.o
-MAN=	snake.0
+#	@(#)Makefile	5.10 (Berkeley) %G%
 
-all: snake snscore
+PROG=	snake
+SRCS=	snake.c move.c
+MAN6=	snake.0
+DPADD=	${LIBM} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lm -ltermcap -lcompat
+SUBDIR=	snscore
+HIDEGAME=hidegame
 
-snake: ${OBJS1} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS1} -lm -ltermcap -lcompat
-
-snscore: ${OBJS2} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS2}
-
-clean:
-	rm -f ${OBJS1} ${OBJS2} core snake snscore
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS1} ${SRCS2}
-
-install: ${MAN}
-	install -s -o games -g bin -m 4700 snake ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f snake; ln -s dm snake; chown games.bin snake)
-	install -s -o games -g bin -m 700 snscore ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f snscore; ln -s dm snscore; chown games.bin snscore)
-	-[ -s ${DESTDIR}/usr/games/lib/snakerawscores ] || install -c -o games -g bin -m 600 /dev/null ${DESTDIR}/usr/games/lib/snakerawscores
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS1}
-	lint ${CFLAGS} ${SRCS2}
-
-tags: ${SRCS}
-	ctags ${SRCS1} ${SRCS2}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/snake/snscore/Makefile b/usr/src/games/snake/snscore/Makefile
new file mode 100644
index 0000000000..964d0176b6
--- /dev/null
+++ b/usr/src/games/snake/snscore/Makefile
@@ -0,0 +1,9 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	snscore
+CFLAGS+=-I${.CURDIR}/..
+NOMAN=	noman
+HIDEGAME=hidegame
+
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/usr/src/games/trek/Makefile b/usr/src/games/trek/Makefile
index f87b861bcf..c29da95968 100644
--- a/usr/src/games/trek/Makefile
+++ b/usr/src/games/trek/Makefile
@@ -1,62 +1,17 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.7 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.8 (Berkeley) %G%
+
+PROG=	trek
 SRCS=	abandon.c attack.c autover.c capture.c check_out.c checkcond.c \
 	compkl.c computer.c damage.c damaged.c dcrept.c destruct.c \
 	dock.c dumpgame.c dumpme.c dumpssradio.c events.c externs.c \
 	getcodi.c getpar.c help.c impulse.c initquad.c kill.c klmove.c \
 	lose.c lrscan.c main.c move.c nova.c out.c phaser.c play.c ram.c \
-	ranf.c rest.c schedule.c score.c setup.c setwarp.c shell.c \
+	ranf.c rest.c schedule.c score.c setup.c setwarp.c \
 	shield.c snova.c srscan.c systemname.c torped.c utility.c \
 	visual.c warp.c win.c cgetc.c
-OBJS=	abandon.o attack.o autover.o capture.o check_out.o checkcond.o \
-	compkl.o computer.o damage.o damaged.o dcrept.o destruct.o \
-	dock.o dumpgame.o dumpme.o dumpssradio.o events.o externs.o \
-	getcodi.o getpar.o help.o impulse.o initquad.o kill.o klmove.o \
-	lose.o lrscan.o main.o move.o nova.o out.o phaser.o play.o ram.o \
-	ranf.o rest.o schedule.o score.o setup.o setwarp.o shell.o \
-	shield.o snova.o srscan.o systemname.o torped.o utility.o \
-	visual.o warp.o win.o cgetc.o
-MAN=	trek.0
-
-all: trek
-
-trek: ${OBJS} ${LIBC}
-	${CC} ${CFLAGS} -o $@ ${OBJS} -lm -lcompat
-
-clean:
-	rm -f ${OBJS} core trek
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o games -g bin -m 700 trek ${DESTDIR}/usr/games/hide
-	(cd ${DESTDIR}/usr/games; rm -f trek; ln -s dm trek; chown games.bin trek)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+MAN6=	trek.0
+DPADD=	${LIBM} ${LIBCOMPAT}
+LDADD=	-lm -lcompat
+HIDEGAME=hidegame
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/wargames/Makefile b/usr/src/games/wargames/Makefile
index 87ab58a53d..050caf0255 100644
--- a/usr/src/games/wargames/Makefile
+++ b/usr/src/games/wargames/Makefile
@@ -1,24 +1,9 @@
-#
-# Copyright (c) 1988 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.1 (Berkeley) %G%
-#
-MAN=
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
 all wargames clean cleandir depend lint tags:
 
-install: ${MAN}
-	install -c -o bin -g bin -m 755 wargames.sh ${DESTDIR}/usr/games/wargames
+install:
+	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} wargames.sh \
+	    ${DESTDIR}/usr/games/wargames
+
+.include <bsd.own.mk>
diff --git a/usr/src/games/worm/Makefile b/usr/src/games/worm/Makefile
index ffcfe44c28..0ee0bd64db 100644
--- a/usr/src/games/worm/Makefile
+++ b/usr/src/games/worm/Makefile
@@ -1,48 +1,9 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	worm.c
-OBJS=
-MAN=	worm.0
+PROG=	worm
+MAN6=	worm.0
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermcap -lcompat
+HIDEGAME=hidegame
 
-all: worm
-
-worm: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c -lcurses -ltermcap -lcompat
-
-clean:
-	rm -f ${OBJS} core worm
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 worm ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/worms/Makefile b/usr/src/games/worms/Makefile
index 43c78ca3f4..19bf03ad2d 100644
--- a/usr/src/games/worms/Makefile
+++ b/usr/src/games/worms/Makefile
@@ -1,48 +1,8 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	worms.c
-OBJS=
-MAN=	worms.0
+PROG=	worms
+MAN6=	worms.0
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermcap -lcompat
 
-all: worms
-
-worms: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c -lcurses -ltermcap -lcompat
-
-clean:
-	rm -f ${OBJS} core worms
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 worms ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/games/wump/Makefile b/usr/src/games/wump/Makefile
index 68b3ca4d70..8167a0f995 100644
--- a/usr/src/games/wump/Makefile
+++ b/usr/src/games/wump/Makefile
@@ -1,49 +1,11 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.3 (Berkeley) %G%
-#
+#	@(#)Makefile	5.4 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	wump.c
-OBJS=
-MAN=	wump.0
+PROG=	wump
+MAN6=	wump.0
+HIDEGAME=hidegame
 
-all: wump
+beforeinstall:
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/wump.info \
+	    ${DESTDIR}/usr/share/games
 
-wump: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core wump
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 wump ${DESTDIR}/usr/games
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-	install -c -o bin -g bin -m 444 wump.info ${DESTDIR}/usr/share/games
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/include/Makefile b/usr/src/include/Makefile
index 8053268501..c411624869 100644
--- a/usr/src/include/Makefile
+++ b/usr/src/include/Makefile
@@ -1,81 +1,71 @@
-#
-# Copyright (c) 1988 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.29 (Berkeley) %G%
+#	@(#)Makefile	5.30 (Berkeley) %G%
 #
 # Doing a make install builds /usr/include
 #
-# Define SHARED to indicate whether you want symbolic links to the
-# system source (``symlinks''), or a separate copy (``copies'');
-# (latter useful in environments where it's not possible to keep
-# /sys publicly readable)
-#
-# The ``rm -rf''s used below are safe because rm doesn't follow
-# symbolic links.
+# The ``rm -rf''s used below are safe because rm doesn't follow symbolic
+# links.
 #
-DESTDIR=
+all clean cleandir depend lint tags:
+
 SUBDIRS=arpa pascal protocols
 STD=	a.out.h ar.h assert.h bitstring.h cencode.h ctype.h curses.h ndbm.h \
-	dirent.h disktab.h fcntl.h fstab.h fts.h glob.h grp.h limits.h math.h \
-	memory.h mp.h netdb.h nlist.h paths.h pcc.h pwd.h ranlib.h regexp.h \
-	resolv.h setjmp.h sgtty.h stab.h stdarg.h stdio.h string.h strings.h \
-	struct.h sysexits.h time.h ttyent.h tzfile.h unistd.h utmp.h \
-	varargs.h vfont.h
-SYSLINKS=	errno.h signal.h syslog.h termios.h
-MCHLINKS=	float.h frame.h
+	dirent.h disktab.h fcntl.h fstab.h fts.h glob.h grp.h kvm.h limits.h \
+	math.h memory.h mp.h netdb.h nlist.h paths.h pcc.h pwd.h ranlib.h \
+	regexp.h resolv.h setjmp.h sgtty.h stab.h stdarg.h stdio.h string.h \
+	strings.h struct.h sysexits.h time.h ttyent.h tzfile.h unistd.h \
+	utmp.h varargs.h vfont.h
+LMCH=	float.h frame.h
+LSYS=	errno.h signal.h syslog.h termios.h
 
-SYSDIRS=	sys net netimp netinet netns ufs nfs
-TAHOEDIRS=	tahoe tahoemath tahoevba tahoeif
-VAXDIRS=	vax vaxmba vaxuba vaxif
-SHARED=	symlinks
-TAGSFILE=tags
+DIRS=	sys net netimp netinet netiso netns ufs nfs
+.if (${MACHINE} == "tahoe")
+DIRS+=	tahoe tahoemath tahoevba tahoeif
+.elif (${MACHINE} == "vax")
+DIRS+=	vax vaxmba vaxuba vaxif
+.endif
 
-all:
+# Define SHARED to indicate whether you want symbolic links to the system
+# source (``symlinks''), or a separate copy (``copies''); (latter useful
+# in environments where it's not possible to keep /sys publicly readable)
+# SHARED=	copies
+SHARED=	symlinks
 
 install: ${SHARED}
-	-for i in ${STD}; do \
-		cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-		    install -c -m 444 $$i ${DESTDIR}/usr/include/$$i; \
+	@echo installing ${STD}
+	@-for i in ${STD}; do \
+		cmp -s $$i ${DESTDIR}/usr/Xinclude/$$i || \
+		    install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		    ${DESTDIR}/usr/include/$$i; \
 	done
-	-for i in ${SUBDIRS}; do \
+	@echo installing ${SUBDIRS}
+	@-for i in ${SUBDIRS}; do \
 		if [ ! -d ${DESTDIR}/usr/include/$$i ]; \
 		then \
 			mkdir ${DESTDIR}/usr/include/$$i; \
 		fi; \
+		chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/$$i; \
+		chmod 755 ${DESTDIR}/usr/include/$$i; \
 		(cd $$i; for j in *.[ih]; do \
-			cmp -s $$j ${DESTDIR}/usr/include/$$i/$$j || \
-			install -c -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \
+			cmp -s $$j ${DESTDIR}/usr/Xinclude/$$i/$$j || \
+			install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
+			    ${DESTDIR}/usr/include/$$i/$$j; \
 		done); \
 	done
-	-cmp -s Makefile.install ${DESTDIR}/usr/include/Makefile || \
-	    install -c -m 444 Makefile.install ${DESTDIR}/usr/include/Makefile
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 Makefile.install \
+	    ${DESTDIR}/usr/include/Makefile
 	rm -f ${DESTDIR}/usr/include/machine
 	ln -s ./${MACHINE} ${DESTDIR}/usr/include/machine
-	-for i in ${SYSLINKS}; do \
+	@echo installing ${LSYS}
+	@-for i in ${LSYS}; do \
 		rm -f ${DESTDIR}/usr/include/$$i; \
 		ln -s sys/$$i ${DESTDIR}/usr/include/$$i; \
 	done
-	-for i in ${MCHLINKS}; do \
+	@echo installing ${LMCH}
+	@-for i in ${LMCH}; do \
 		rm -f ${DESTDIR}/usr/include/$$i; \
 		ln -s machine/$$i ${DESTDIR}/usr/include/$$i; \
 	done
 
-symlinks: ${MACHINE}.symlinks
-
-tahoe.symlinks:
 		rm -rf ${DESTDIR}/usr/include/$$i; \
 		if [ ! -s ${DESTDIR}/usr/include/$$i ]; \
 		then \
@@ -85,40 +75,9 @@ tahoe.symlinks:
 		fi; \
 	done
 
-vax.symlinks:
-		rm -rf ${DESTDIR}/usr/include/$$i; \
-		if [ ! -s ${DESTDIR}/usr/include/$$i ]; \
-		then \
-			ln -s /sys/$$i ${DESTDIR}/usr/include/$$i; \
-		else \
-			echo ${DESTDIR}/usr/include/$$i not removed; \
-		fi; \
-	done
-
-copies: ${MACHINE}.copies
-
-tahoe.copies:
 		rm -rf ${DESTDIR}/usr/include/$$i; \
 		cd /sys; \
 		tar cf - $$i/*.h | (cd ${DESTDIR}/usr/include; tar xpfB -); \
 	done
 
-vax.copies:
-	-for i in ${SYSDIRS} ${VAXDIRS}; do \
-		rm -rf ${DESTDIR}/usr/include/$$i; \
-		cd /sys; \
-		tar cf - $$i/*.h | (cd ${DESTDIR}/usr/include; tar xpfB -); \
-	done
-
-tags:
-	cwd=/usr/include; \
-	for i in ${STD} ${LINKS}; do \
-		ctags -a -f ${TAGSFILE} $$cwd/$$i; \
-	done
-
-clean:
-
-cleandir: clean
-	rm -f tags
-
-depend:
+.include <bsd.own.mk>
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index 0b1c075e28..193c552d46 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -1,36 +1,6 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.17 (Berkeley) %G%
-#
+#	@(#)Makefile	5.18 (Berkeley) %G%
 
-SUBDIR=	libF77 libI77 libU77 libc libcurses libdbm \
-	libg libln libm libmp libpc libplot libtermlib libutil liby sunrpc
+SUBDIR=	csu libF77 libI77 libU77 libc libcurses libcompat libdbm libln \
+	libm libmp libpc libplot librpc libterm libutil liby
 
-all clean cleandir depend lint tags: FRC
-	@-for i in ${SUBDIR}; do \
-		(echo "==> $$i"; \
-		    cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} $@); done
-
-install: FRC
-	@-for i in ${SUBDIR}; do \
-		(echo "==> $$i"; \
-		    cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} $@); done
-
-${SUBDIR}: FRC
-	cd $@; make ${MFLAGS} DESTDIR=${DESTDIR}
-
-FRC:
+.include <bsd.subdir.mk>
diff --git a/usr/src/lib/csu/tahoe/Makefile b/usr/src/lib/csu/tahoe/Makefile
index 18027acf51..cc5ced3356 100644
--- a/usr/src/lib/csu/tahoe/Makefile
+++ b/usr/src/lib/csu/tahoe/Makefile
@@ -1,75 +1,43 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.8 (Berkeley) %G%
-#
-DEFS=	-DLIBC_SCCS
-CFLAGS=	-O ${DEFS}
-CSRCS=	gmon.c mon.c
-ASRCS=	crt0.s  mcrt0.s
+#	@(#)Makefile	5.9 (Berkeley) %G%
+
+CFLAGS=	-O -DLIBC_SCCS
 OBJS=	crt0.o mcrt0.o gcrt0.o
-TAGSFILE=tags
 
 .s.o:
-	${AS} -o $*.o $*.s
-	ld -x -r $*.o
-	mv ${OBJDIR}a.out ${OBJDIR}$*.o
+	${AS} -o ${.TARGET} ${.IMPSRC}
+	@${LD} -x -r ${.TARGET}
+	@mv a.out ${.TARGET}
 
 all: ${OBJS}
 
 mcrt0.o: moncrt0.o mon.o
-	ld -x -r -o $@ moncrt0.o mon.o
+	${LD} -x -r -o ${.TARGET} moncrt0.o mon.o
 
 gcrt0.o: moncrt0.o gmon.o
-	ld -x -r -o $@ moncrt0.o gmon.o
+	${LD} -x -r -o ${.TARGET} ${.ALLSRC}
 
 moncrt0.o: mcrt0.s
-	${AS} -o $@ mcrt0.s
+	${AS} -o ${.TARGET} ${.ALLSRC}
 
-mon.o: mon.c
-	${CC} -S ${CFLAGS} mon.c
-	ex - mon.s < mon.ex
-	${AS} -o $@ mon.s
+mon.o: mon.c mon.ex
+	${CC} -S ${CFLAGS} ${.IMPSRC}
+	ex - mon.s < ${.CURDIR}/mon.ex
+	${AS} -o ${.TARGET} mon.s
 	rm -f mon.s
 
-gmon.o: gmon.c
-	${CC} -S ${CFLAGS} gmon.c
-	ex - gmon.s < mon.ex
+gmon.o: gmon.c mon.ex
+	${CC} -S ${CFLAGS} ${.IMPSRC}
+	ex - gmon.s < ${.CURDIR}/mon.ex
 	${AS} -o $@ gmon.s
 	rm -f gmon.s
 
 install:
-	install -o bin -g bin -m 444 crt0.o ${DESTDIR}/usr/lib/crt0.o
-	install -o bin -g bin -m 444 mcrt0.o ${DESTDIR}/usr/lib/mcrt0.o
-	install -o bin -g bin -m 444 gcrt0.o ${DESTDIR}/usr/lib/gcrt0.o
-
-clean:
-	rm -f ${OBJDIR}*.o ${OBJDIR}a.out core
+	install -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	    ${DESTDIR}/usr/lib
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
+cleandir clean:
+	rm -f ${OBJS} core a.out
 
-tags:
-	cwd=`pwd`; \
-	for i in ${CSRCS}; do \
-		ctags -a -f ${TAGSFILE} $$cwd/$$i; \
-	done
-	(P=`pwd`; \
-	egrep "^ENTRY(.*)|^SYSCALL(.*)" ${ASRCS} | sed \
-"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 $$P/\1 /^\2(\3\4$$/;" \
-		>> ${TAGSFILE})
+depend lint tags:
 
-depend:
+.include <bsd.own.mk>
diff --git a/usr/src/lib/csu/vax/Makefile b/usr/src/lib/csu/vax/Makefile
index dc81347c8c..765a6c3652 100644
--- a/usr/src/lib/csu/vax/Makefile
+++ b/usr/src/lib/csu/vax/Makefile
@@ -1,87 +1,51 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.11 (Berkeley) %G%
-#
-#	crt0	Normal C run time startoff
-#	mcrt0	C run time start off for profiling, ``prof'' conventions
-#	gcrt0	C run time start off for profiling, ``gprof'' conventions
-#
-DEFS=-DLIBC_SCCS
-SRCS=	crt0.c mon.c gmon.c
-OBJS=	crt0.o mcrt0.o gcrt0.o mon.o gmon.o
-TAGSFILE=tags
+#	@(#)Makefile	5.12 (Berkeley) %G%
 
-all: ${OBJS}
+CFLAGS=	-O -DLIBC_SCCS
+OBJS=	crt0.o mcrt0.o gcrt0.o
 
-install:
-	install -o bin -g bin -m 444 crt0.o ${DESTDIR}/usr/lib/crt0.o
-	install -o bin -g bin -m 444 mcrt0.o ${DESTDIR}/usr/lib/mcrt0.o
-	install -o bin -g bin -m 444 gcrt0.o ${DESTDIR}/usr/lib/gcrt0.o
+all: ${OBJS}
 
 crt0.o: crt0.c
-	${CC} -S ${DFLAGS} -DCRT0 crt0.c
+	${CC} -S -DCRT0 ${.ALLSRC}
 	${CPP} crt0.s > x.s
-	as -o x.o x.s
-	ld -x -r -o crt0.o x.o
-	rm -f x.s ${OBJDIR}x.o crt0.s
+	${AS} -o x.o x.s
+	${LD} -x -r -o ${.TARGET} x.o
+	rm -f x.s x.o crt0.s
 
 moncrt0.o: crt0.c
-	${CC} -S ${DFLAGS} -DMCRT0 crt0.c
+	${CC} -S -DMCRT0 ${.ALLSRC}
 	${CPP} crt0.s > x.s
-	as -o x.o x.s
-	ld -x -r -o moncrt0.o x.o
-	rm -f x.s ${OBJDIR}x.o crt0.s
-
-gcrt0.o: moncrt0.o gmon.o
-	ld -x -r -o gcrt0.o moncrt0.o gmon.o
+	${AS} -o x.o x.s
+	${LD} -x -r -o ${.TARGET} x.o
+	rm -f x.s x.o crt0.s
 
 mcrt0.o: moncrt0.o mon.o
-	ld -x -r -o mcrt0.o moncrt0.o mon.o
+	${LD} -x -r -o ${.TARGET} moncrt0.o mon.o
+
+gcrt0.o: moncrt0.o gmon.o
+	${LD} -x -r -o ${.TARGET} moncrt0.o gmon.o
 
 mon.o: mon.c mon.ex
-	${CC} -S ${DEFS} ${DFLAGS} mon.c
-	ex - mon.s < mon.ex
-	as -o x.o mon.s
-	ld -x -r -o mon.o x.o
-	rm -f ${OBJDIR}x.o mon.s
+	${CC} -S ${DEFS} ${.IMPSRC}
+	ex - mon.s < ${.CURDIR}/mon.ex
+	${AS} -o x.o mon.s
+	${LD} -x -r -o ${.TARGET} x.o
+	rm -f x.o mon.s
 
 gmon.o: gmon.c gmon.h gmon.ex
-	${CC} -S ${DEFS} ${DFLAGS} gmon.c
-	ex - gmon.s < gmon.ex
-	as -o x.o gmon.s
-	ld -x -r -o gmon.o x.o
-	rm -f ${OBJDIR}x.o gmon.s
+	${CC} -S ${DEFS} ${.IMPSRC}
+	ex - gmon.s < ${.CURDIR}/gmon.ex
+	${AS} -o x.o gmon.s
+	${LD} -x -r -o ${.TARGET} x.o
+	rm -f x.o gmon.s
 
-clean:
-	rm -f ${OBJDIR}*.o ${OBJDIR}a.out core
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
+install:
+	install -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	    ${DESTDIR}/usr/lib
 
-lint:	crt0.c
-	lint crt0.c -DMCRT0
-	lint crt0.c -DGCRT0
-	lint crt0.c -DCRT0
+cleandir clean:
+	rm -f ${OBJS} gmon.o mon.o moncrt0.o core a.out
 
-depend:
-	mkdep ${CFLAGS} ${SRCS}
+depend lint tags:
 
-tags:
-	cwd=`pwd`; \
-	for i in ${SRCS}; do \
-		ctags -a -f ${TAGSFILE} $$cwd/$$i; \
-	done
+.include <bsd.own.mk>
diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile
index 2933ca7adf..62297b8894 100644
--- a/usr/src/lib/libc/Makefile
+++ b/usr/src/lib/libc/Makefile
@@ -1,120 +1,288 @@
+#	@(#)Makefile	4.37 (Berkeley) %G%
 #
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	4.36 (Berkeley) %G%
+# All library objects contain sccsid strings by default; they may be
+# excluded as a space-saving measure.  To produce a library that does
+# not contain these strings, delete -DLIBC_SCCS and -DSYSLIBC_SCCS
+# from CFLAGS below.  To remove these strings from just the system call
+# stubs, remove just -DSYSLIBC_SCCS from CFLAGS.
+LIB=c
+CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS
+AINC=	-I${.CURDIR}/${MACHINE} -I${.CURDIR}/sys/${MACHINE}
 
-# The C run-time startup code is machine dependent and found in csu.
+.PATH:	${.CURDIR}/gen/${MACHINE} ${.CURDIR}/gen ${.CURDIR}/gen/regexp \
+	${.CURDIR}/sys/${MACHINE} ${.CURDIR}/sys \
+	${.CURDIR}/stdio/${MACHINE} ${.CURDIR}/stdio \
+	${.CURDIR}/net/${MACHINE} ${.CURDIR}/net \
+	${.CURDIR}/string/${MACHINE} ${.CURDIR}/string \
+	${.CURDIR}/sys5/${MACHINE} ${.CURDIR}/sys5 \
+	${.CURDIR}/compat-43/${MACHINE} ${.CURDIR}/compat-43
 
-# The system has two monitoring schemes, utilizing either ``prof''
-# or ``gprof''. DFLMON determines the default profiler; mon.o
-# specifies that ``prof'' is the default, gmon.o specifies that
-# ``gprof'' is the default.
-#DFLMON=	gmon.o
-DFLMON=		mon.o
+# compat-43 sources
+SRCS=	creat.c killpg.c sigcompat.c
 
-# All library objects contain sccsid strings by default; they may be
-# excluded as a space-saving measure.  To produce a library that does
-# not contain these strings, remove -DLIBC_SCCS and -DSYSLIBC_SCCS
-# from DEFS below.  To remove these strings from just the system call
-# stubs, remove -DSYSLIBC_SCCS from DEFS below.
-#DEFS=
-DEFS="-DLIBC_SCCS -DSYSLIBC_SCCS"
-
-CSU=	csu
-ROOTOBJDIR=/usr/${OBJDIR}
-SRCDIR=	compat-43 gen net stdio string sys sys5
-SUBDIR=	${CSU} ${SRCDIR}
-TAGSFILE=tags
-TPATH=`pwd`/${TAGSFILE}
-
-all: library ${SUBDIR}
-	cd library; ls *.o | sort > t1; \
-	ar cr libc.a `lorder \`cat t1\` | tsort` ../csu/${MACHINE}/${DFLMON}; \
-	ar ma findiop.o libc.a exit.o; \
-	ar ma exit.o libc.a fakcu.o; \
-	rm -f t1
-	cd profiled; ls *.o | sort > t1; \
-	ar cr libc_p.a `lorder \`cat t1\` | tsort` ../csu/${MACHINE}/${DFLMON}; \
-	ar ma findiop.o libc_p.a exit.o; \
-	ar ma exit.o libc_p.a fakcu.o; \
-	rm -f t1
-
-library:
-	@echo 'must "make dirs" or "make links"'; exit 1
-
-dirs:
-	rm -rf library
-	mkdir library
-	rm -rf profiled
-	mkdir profiled
-	for i in ${SRCDIR} ${CSU}/${MACHINE}; \
-		do (cd $$i; make ${MFLAGS} clean; \
-		rm -rf profiled obj; \
-		mkdir profiled); done
-
-links:
-	-if [ ! -d ${ROOTOBJDIR}lib/libc/library ]; then \
-		mkdir -p ${ROOTOBJDIR}lib/libc/library; fi
-	rm -rf library
-	ln -s ${ROOTOBJDIR}lib/libc/library library
-	-if [ ! -d ${ROOTOBJDIR}lib/libc/profiled ]; then \
-		mkdir -p ${ROOTOBJDIR}lib/libc/profiled; fi
-	rm -rf profiled
-	ln -s ${ROOTOBJDIR}lib/libc/profiled profiled
-	for i in ${SRCDIR} ${CSU}/${MACHINE}; \
-		do (cd $$i; make ${MFLAGS} clean; \
-		rm -rf profiled obj; \
-		if [ ! -d ${ROOTOBJDIR}lib/libc/$$i ]; then \
-			mkdir -p ${ROOTOBJDIR}lib/libc/$$i; fi; \
-		ln -s ${ROOTOBJDIR}lib/libc/$$i obj; \
-		if [ ! -d ${ROOTOBJDIR}lib/libc/$$i/profiled ]; then \
-			mkdir -p ${ROOTOBJDIR}lib/libc/$$i/profiled; fi; \
-		ln -s ${ROOTOBJDIR}lib/libc/$$i/profiled profiled); done
-
-${SUBDIR}: FRC
-	cd $@; make ${MFLAGS} DEFS=${DEFS}
-
-clean:
-	for i in ${SUBDIR}; \
-		do (cd $$i; make ${MFLAGS} clean); done
-	rm -rf library/libc.a profiled/libc_p.a
-
-cleandir: clean
-	for i in ${SUBDIR}; \
-		do (cd $$i; make ${MFLAGS} cleandir); done
-
-depend:
-	for i in ${SUBDIR}; \
-		do (cd $$i; make ${MFLAGS} DEFS=${DEFS} $@); done
-
-install: tags
-	install -o bin -g bin -m 644 library/libc.a ${DESTDIR}/usr/lib/libc.a
-	ranlib ${DESTDIR}/usr/lib/libc.a
-	install -o bin -g bin -m 644 profiled/libc_p.a ${DESTDIR}/usr/lib/libc_p.a
-	ranlib ${DESTDIR}/usr/lib/libc_p.a
-	for i in ${SUBDIR}; \
-		do (cd $$i; make DEFS=${DEFS} $@); done
-	install -o bin -g bin -m 444 ${TAGSFILE} ${DESTDIR}/usr/libdata
-
-tags:
-	for i in ${SUBDIR}; do \
-		(cd $$i; make TAGSFILE=tags tags); done
-	rm -f tags
-	for i in ${SUBDIR}; do \
-		cat $$i/tags >> tags; done
-	sort -o tags tags
-
-FRC:
+MAN2+=	creat.0 killpg.0 sigblock.0 sigpause.0 sigsetmask.0 sigvec.0
+
+# gen sources
+SRCS+=	_setjmp.s abort.c abs.s alarm.c alloca.s calloc.c cencode.c \
+	clock.c closedir.c crypt.c ctime.c ctype_.c difftime.c \
+	disklabel.c errlst.c execvp.c fabs.s fakcu.c fstab.c \
+	genbuildname.c getenv.c getgrent.c getlogin.c getmntinfo.c \
+	getpass.c getpwent.c getttyent.c getusershell.c getwd.c \
+	initgroups.c insque.s isatty.c isctype.c ldexp.s \
+	malloc.c modf.s nargs.s ndbm.c nice.c nlist.c opendir.c pause.c \
+	perror.c popen.c psignal.c qsort.c random.c readdir.c regerror.c \
+	regex.c regexp.c remove.c remque.s scandir.c seekdir.c setegid.c \
+	setenv.c seteuid.c setgid.c setjmp.s setjmperr.c setmode.c \
+	setrgid.c setruid.c setuid.c siglist.c signal.c sleep.c syslog.c \
+	system.c telldir.c termios.c time.c timezone.c ttyname.c \
+	ttyslot.c ualarm.c udiv.s urem.s usleep.c valloc.c wait.c \
+	wait3.c waitpid.c
+
+.if (${MACHINE} == "tahoe")
+SRCS+=	frexp.c
+.elif (${MACHINE} == "vax")
+SRCS+=	frexp.s
+.endif
+
+MAN3+=	abort.0 alarm.0 cencode.0 clock.0 crypt.0 ctime.0 ctype.0 \
+	directory.0 execvp.0 frexp.0 genbuildname.0 getdiskbyname.0 \
+	getenv.0 getfsent.0 getgrent.0 getlogin.0 getmntinfo.0 \
+	getpass.0 getpwent.0 getttyent.0 getusershell.0 getwd.0 \
+	initgroups.0 insque.0 malloc.0 ndbm.0 nice.0 nlist.0 \
+	pause.0 perror.0 popen.0 psignal.0 qsort.0 random.0 regex.0 \
+	regexp.0 scandir.0 setjmp.0 setmode.0 setuid.0 siginterrupt.0 \
+	signal.0 sleep.0 syslog.0 system.0 time.0 ttyname.0 ualarm.0 \
+	usleep.0 valloc.0
+
+MLINKS=	crypt.3 encrypt.3 crypt.3 setkey.3
+MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \
+	ctime.3 localtime.3 ctime.3 timezone.3 ctime.3 tzset.3
+MLINKS+=ctype.3 toascii.3 ctype.3 tolower.3 ctype.3 toupper.3 \
+	ctype.3 isalnum.3 ctype.3 isalpha.3 ctype.3 isascii.3 \
+	ctype.3 iscntrl.3 ctype.3 isdigit.3 ctype.3 isgraph.3 \
+	ctype.3 islower.3 ctype.3 isprint.3 ctype.3 ispunct.3 \
+	ctype.3 isspace.3 ctype.3 isupper.3 ctype.3 isxdigit.3
+MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \
+	directory.3 readdir.3 directory.3 rewinddir.3 directory.3 seekdir.3 \
+	directory.3 telldir.3
+MLINKS+=execvp.3 execle.3 execvp.3 execlp.3 execvp.3 exect.3 \
+	execvp.3 execv.3 execvp.3 execve.3 execvp.3 execl.3 \
+	execvp.3 exec.3
+MLINKS+=frexp.3 ldexp.3 frexp.3 modf.3
+MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3
+MLINKS+=getfsent.3 endfsent.3 getfsent.3 getfsfile.3 getfsent.3 getfsspec.3 \
+	getfsent.3 getfstype.3 getfsent.3 setfsent.3
+MLINKS+=getgrent.3 endgrent.3 getgrent.3 setgroupent.3 getgrent.3 getgrgid.3 \
+	getgrent.3 getgrnam.3 getgrent.3 setgrent.3 getgrent.3 setgrfile.3
+MLINKS+=getpwent.3 endpwent.3 getpwent.3 setpassent.3 getpwent.3 getpwnam.3 \
+	getpwent.3 getpwuid.3 getpwent.3 setpwent.3 getpwent.3 setpwfile.3
+MLINKS+=getttyent.3 endttyent.3 getttyent.3 getttynam.3 getttyent.3 setttyent.3
+MLINKS+=getusershell.3 endusershell.3 getusershell.3 setusershell.3
+MLINKS+=insque.3 remque.3
+MLINKS+=malloc.3 alloca.3 malloc.3 calloc.3 malloc.3 free.3 malloc.3 realloc.3
+MLINKS+=ndbm.3 dbm_clearerr.3 ndbm.3 dbm_close.3 ndbm.3 dbm_delete.3 \
+	ndbm.3 dbm_error.3 ndbm.3 dbm_fetch.3 ndbm.3 dbm_firstkey.3 \
+	ndbm.3 dbm_nextkey.3 ndbm.3 dbm_open.3 ndbm.3 dbm_store.3
+MLINKS+=perror.3 strerror.3 perror.3 sys_errlist.3 perror.3 sys_nerr.3
+MLINKS+=popen.3 pclose.3
+MLINKS+=psignal.3 sys_siglist.3
+MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3
+MLINKS+=regex.3 re_comp.3 regex.3 re_exec.3 regexp.3 regcomp.3 \
+	regexp.3 regexec.3 regexp.3 regsub.3 regexp.3 regerror.3
+MLINKS+=scandir.3 alphasort.3
+MLINKS+=setjmp.3 _longjmp.3 setjmp.3 _setjmp.3 setjmp.3 longjmp.3
+MLINKS+=setuid.3 setegid.3 setuid.3 seteuid.3 setuid.3 setgid.3 \
+	setuid.3 setrgid.3 setuid.3 setruid.3
+MLINKS+=syslog.3 closelog.3 syslog.3 openlog.3 syslog.3 setlogmask.3 \
+	syslog.3 vsyslog.3
+MLINKS+=ttyname.3 isatty.3 ttyname.3 ttyslot.3
+MLINKS+=setmode.3 getmode.3
+
+# net sources
+SRCS+=	gethostnamadr.c getnetbyaddr.c getnetbyname.c getnetent.c \
+	getproto.c getprotoent.c getprotoname.c getservbyname.c \
+	getservbyport.c getservent.c herror.c htonl.s htons.s \
+	inet_addr.c inet_lnaof.c inet_makeaddr.c inet_netof.c \
+	inet_network.c inet_ntoa.c iso_addr.c ns_addr.c ns_ntoa.c \
+	ntohl.s ntohs.s rcmd.c recv.c res_comp.c res_debug.c res_init.c \
+	res_mkquery.c res_query.c res_send.c send.c sethostent.c
+
+MAN3+=	byteorder.0 gethostbyname.0 getnetent.0 getprotoent.0 getservent.0 \
+	inet.0 ns.0 rcmd.0 resolver.0 \
+
+MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
+	byteorder.3 ntohs.3
+MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
+	gethostbyname.3 sethostent.3 gethostbyname.3 sethostfile.3 \
+	gethostbyname.3 gethostent.3 gethostbyname.3 herror.3
+MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
+	getnetent.3 getnetbyname.3 getnetent.3 setnetent.3
+MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \
+	getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3
+MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \
+	getservent.3 getservbyport.3 getservent.3 setservent.3
+MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_lnaof.3 \
+	inet.3 inet_makeaddr.3 inet.3 inet_netof.3 inet.3 inet_network.3 \
+	inet.3 inet_ntoa.3 inet.3 network.3 inet.3 ntoa.3
+MLINKS+=ns.3 ns_addr.3 ns.3 ns_ntoa.3
+MLINKS+=rcmd.3 rresvport.3 rcmd.3 ruserok.3
+
+# stdio sources
+SRCS+=	clrerr.c doprnt.c doscan.c exit.c fdopen.c fgetc.c filbuf.c \
+	findiop.c flsbuf.c fopen.c fprintf.c fputc.c fread.c freopen.c \
+	fseek.c ftell.c fwrite.c getchar.c gets.c getw.c printf.c \
+	putchar.c putw.c rew.c scanf.c setbuf.c setbuffer.c sprintf.c \
+	ungetc.c vfprintf.c vprintf.c vsprintf.c
+
+.if (${MACHINE} == "vax")
+SRCS+=	fgets.s fputs.s puts.s
+.else
+SRCS+=	fgets.c fputs.c puts.c
+.endif
+
+MAN3+=	exit.0 fclose.0 ferror.0 fgets.0 fopen.0 fread.0 fseek.0 getc.0 \
+	gets.0 printf.0 putc.0 puts.0 scanf.0 setbuf.0 stdio.0 ungetc.0 \
+
+MLINKS+=fclose.3 fflush.3
+MLINKS+=ferror.3 clearerr.3 ferror.3 feof.3 ferror.3 fileno.3
+MLINKS+=fopen.3 fdopen.3 fopen.3 freopen.3
+MLINKS+=fread.3 fwrite.3
+MLINKS+=fseek.3 ftell.3 fseek.3 rewind.3
+MLINKS+=getc.3 fgetc.3 getc.3 getchar.3 getc.3 getw.3
+MLINKS+=printf.3 fprintf.3 printf.3 sprintf.3 printf.3 vfprintf.3 \
+	printf.3 vprintf.3 printf.3 vsprintf.3
+MLINKS+=putc.3 fputc.3 putc.3 putchar.3 putc.3 putw.3
+MLINKS+=puts.3 fputs.3
+MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3
+MLINKS+=setbuf.3 setbuffer.3 setbuf.3 setlinebuf.3
+
+# string sources
+SRCS+=	atof.s atoi.c atol.c bcmp.s bcopy.s bzero.s ffs.s fnmatch.c \
+	mktemp.c strcasecmp.c strcat.s strcmp.s strcpy.s strerror.c \
+	strftime.c strlen.s strmode.c strncat.s strncmp.s strncpy.s swab.c
+
+.if (${MACHINE} == "vax")
+SRCS+=	index.s rindex.s
+.else
+SRCS+=	index.c rindex.c
+.endif
+
+MAN3+=	atof.0 bstring.0 fnmatch.0 glob.0 mktemp.0 strftime.0 string.0 \
+	strmode.0 strtok.0 swab.0 \
+
+MLINKS+=atof.3 atoi.3 atof.3 atol.3
+MLINKS+=bstring.3 bcmp.3 bstring.3 bcopy.3 bstring.3 bzero.3 \
+	bstring.3 ffs.3
+MLINKS+=string.3 index.3 string.3 rindex.3 string.3 strcat.3 \
+	string.3 strcmp.3 string.3 strcpy.3 string.3 strlen.3 \
+	string.3 strncat.3 string.3 strncmp.3 string.3 strcasecmp.3 \
+	string.3 strncasecmp.3 string.3 strncpy.3
+MLINKS+=strtok.3 strsep.3
+MLINKS+=glob.3 globfree.3
+MLINKS+=mktemp.3 mkstemp.3
+
+# sys sources
+SRCS+=	Ovadvise.s Ovfork.s _exit.s _getlogin.s accept.s access.s \
+	acct.s adjtime.s async_daemon.s bind.s brk.s cerror.s chdir.s \
+	chflags.s chmod.s chown.s chroot.s close.s connect.s dup.s \
+	dup2.s execl.s execle.s exect.s execv.s execve.s fchdir.s \
+	fchflags.s fchmod.s fchown.s fcntl.s flock.s fork.s fstat.s \
+	fstatfs.s fsync.s ftruncate.s getdirentries.s getdtablesize.s \
+	getegid.s geteuid.s getfh.s getfsstat.s getgid.s getgroups.s \
+	gethostid.s gethostname.s getitimer.s getkerninfo.s \
+	getpagesize.s getpeername.s getpgrp.s getpid.s getppid.s \
+	getpriority.s getrlimit.s getrusage.s getsockname.s getsockopt.s \
+	gettimeofday.s getuid.s ioctl.s kill.s ktrace.s link.s listen.s \
+	lseek.s lstat.s mkdir.s mkfifo.s mknod.s mmap.s mount.s nfssvc.s \
+	open.s pipe.s profil.s ptrace.s quotactl.s read.s readlink.s \
+	readv.s reboot.s recvfrom.s recvmsg.s rename.s rmdir.s sbrk.s \
+	select.s sendmsg.s sendto.s setgroups.s sethostid.s \
+	sethostname.s setitimer.s setlogin.s setpgrp.s setpriority.s \
+	setregid.s setreuid.s setrlimit.s setsid.s \
+	setsockopt.s settimeofday.s shutdown.s sigaction.s sigpending.s \
+	sigprocmask.s sigreturn.s sigstack.s sigsuspend.s socket.s \
+	socketpair.s stat.s statfs.s swapon.s symlink.s sync.s syscall.s \
+	truncate.s umask.s unlink.s unmount.s utimes.s vhangup.s \
+	wait4.s write.s writev.s
+
+MAN2+=	accept.0 access.0 acct.0 adjtime.0 async_daemon.0 bind.0 brk.0 \
+	chdir.0 chflags.0 chmod.0 chown.0 chroot.0 close.0 connect.0 \
+	dup.0 execve.0 exit.0 fcntl.0 flock.0 fork.0 fsync.0 \
+	getdirentries.0 getdtablesize.0 getfh.0 getfsstat.0 getgid.0 \
+	getgroups.0 gethostid.0 gethostname.0 getitimer.0 getlogin.0 \
+	getpagesize.0 getpeername.0 getpgrp.0 getpid.0 getpriority.0 \
+	getrlimit.0 getrusage.0 getsockname.0 getsockopt.0 \
+	gettimeofday.0 getuid.0 intro.0 ioctl.0 kill.0 link.0 listen.0 \
+	lseek.0 mkdir.0 mkfifo.0 mknod.0 mount.0 nfssvc.0 open.0 pipe.0 \
+	profil.0 ptrace.0 quotactl.0 read.0 readlink.0 reboot.0 recv.0 \
+	rename.0 rmdir.0 select.0 send.0 setgroups.0 setpgrp.0 \
+	setregid.0 setreuid.0 shutdown.0 sigreturn.0 \
+	sigstack.0 socket.0 socketpair.0 stat.0 statfs.0 swapon.0 \
+	symlink.0 sync.0 syscall.0 truncate.0 umask.0 unlink.0 utimes.0 \
+	vfork.0 vhangup.0 wait.0 write.0
+
+MLINKS+=brk.2 sbrk.2
+MLINKS+=dup.2 dup2.2
+MLINKS+=chdir.2 fchdir.2
+MLINKS+=chflags.2 fchflags.2
+MLINKS+=chmod.2 fchmod.2
+MLINKS+=chown.2 fchown.2
+MLINKS+=getgid.2 getegid.2
+MLINKS+=gethostid.2 sethostid.2
+MLINKS+=gethostname.2 sethostname.2
+MLINKS+=getitimer.2 setitimer.2
+MLINKS+=getlogin.2 setlogin.2
+MLINKS+=getpid.2 getppid.2
+MLINKS+=getpriority.2 setpriority.2
+MLINKS+=getrlimit.2 setrlimit.2
+MLINKS+=getsockopt.2 setsockopt.2
+MLINKS+=gettimeofday.2 settimeofday.2
+MLINKS+=getuid.2 geteuid.2
+MLINKS+=intro.2 errno.2
+MLINKS+=lseek.2 seek.2
+MLINKS+=mount.2 unmount.2
+MLINKS+=read.2 readv.2
+MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2
+MLINKS+=send.2 sendmsg.2 send.2 sendto.2
+MLINKS+=stat.2 fstat.2 stat.2 lstat.2
+MLINKS+=statfs.2 fstatfs.2
+MLINKS+=truncate.2 ftruncate.2
+MLINKS+=wait.2 wait3.2 wait.2 wait4.2 wait.2 waitpid.2
+MLINKS+=write.2 writev.2
+
+# sys5 sources
+SRCS+=	bsearch.c fts.c getopt.c memccpy.c memchr.c memcmp.c memcpy.c \
+	memset.c putenv.c strcspn.c strdup.c strpbrk.c strsep.c strspn.c \
+	strtok.c strtol.c strtoul.c tmpnam.c
+
+.if (${MACHINE} == "vax")
+SRCS+=	strchr.s strrchr.s
+.else
+SRCS+=	strchr.c strrchr.c
+.endif
+
+MAN3+=	bsearch.0 compat-sys5.0 fts.0 getopt.0
+
+MLINKS+=compat-sys5.3 memccpy.3 compat-sys5.3 memchr.3 \
+	compat-sys5.3 memcmp.3 compat-sys5.3 memcpy.3 \
+	compat-sys5.3 memset.3 compat-sys5.3 strchr.3 \
+	compat-sys5.3 strcspn.3 compat-sys5.3 strpbrk.3 \
+	compat-sys5.3 strrchr.3 compat-sys5.3 strspn.3 \
+	compat-sys5.3 strdup.3 compat-sys5.3 strtol.3 \
+	compat-sys5.3 tmpnam.3 compat-sys5.3 tmpfile.3 \
+	compat-sys5.3 tempnam.3
+
+errlst.o:
+	${CC} -S ${CFLAGS} ${.IMPSRC}
+	ed - < ${.CURDIR}/gen/:errfix errlst.s
+	${AS} -o errlst.o errlst.s
+	cp errlst.o errlst.po
+	rm -f errlst.s
+
+beforeinstall:
+	ar ma findiop.o libc.a exit.o
+	ar ma exit.o libc.a fakcu.o
+	ar ma findiop.po libc_p.a exit.po
+	ar ma exit.po libc_p.a fakcu.po
+
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libcompat/Makefile b/usr/src/lib/libcompat/Makefile
index a030e2d821..087ceeed35 100644
--- a/usr/src/lib/libcompat/Makefile
+++ b/usr/src/lib/libcompat/Makefile
@@ -1,63 +1,25 @@
-#
-# Copyright (c) 1989 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.1 (Berkeley) %G%
-
-# All library objects contain sccsid strings by default; they may be
-# excluded as a space-saving measure.  To produce a library that does
-# not contain these strings, remove -DLIBC_SCCS and -DSYSLIBC_SCCS
-# from DEFS below.  To remove these strings from just the system call
-# stubs, remove -DSYSLIBC_SCCS from DEFS below.
-#DEFS=
-DEFS="-DLIBC_SCCS -DSYSLIBC_SCCS"
-
-SUBDIR=	4.1 4.3
-TAGSFILE=tags
-
-all: ${SUBDIR}
-
-${SUBDIR}: FRC
-	cd $@; make ${MFLAGS} DEFS=${DEFS}
-
-clean:
-	for i in ${SUBDIR}; \
-		do (cd $$i; make ${MFLAGS} clean); done
-	rm -rf libcompat.a libcompat_p.a library profiled
-
-cleandir: clean
-	for i in ${SUBDIR}; \
-		do (cd $$i; make ${MFLAGS} cleandir); done
-
-depend tags:
-	for i in ${SUBDIR}; \
-		do (cd $$i; make ${MFLAGS} DEFS=${DEFS} $@); done
-
-install: tags
-	rm -rf library profiled
-	mkdir library profiled
-	for i in ${SUBDIR}; \
-		do (cd $$i; make ${MFLAGS} DEFS=${DEFS} $@); done
-	ls library/*.o | sort -t/ +1 > t1
-	ar cr libcompat.a `lorder \`cat t1\` | tsort` csu/${MACHINE}/${DFLMON}
-	ls profiled/*.o | sort -t/ +1 > t1
-	ar cr libcompat_p.a `lorder \`cat t1\` | tsort` csu/${MACHINE}/${DFLMON}
-	rm -rf t1 library profiled
-	install -o bin -g bin -m 644 libcompat.a ${DESTDIR}/usr/lib
-	ranlib ${DESTDIR}/lib/libcompat.a
-	install -o bin -g bin -m 644 libcompat_p.a ${DESTDIR}/usr/lib
-	ranlib ${DESTDIR}/usr/lib/libcompat_p.a
-
-FRC:
+#	@(#)Makefile	5.2 (Berkeley) %G%
+
+LIB=compat
+CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS
+
+.PATH:	${.CURDIR}/4.1/${MACHINE} ${.CURDIR}/4.1 \
+	${.CURDIR}/4.3/${MACHINE} ${.CURDIR}/4.3
+
+# compat 4.1 sources
+SRCS=	ftime.c getpw.c gtty.c rand.c reset.c stty.c tell.c times.c \
+	utime.c vlimit.c vtimes.c
+
+MAN3+=	ftime.0 getpw.0 rand.0 stty.0 times.0 utime.0 vlimit.0 vtimes.0
+
+MLINKS+=rand.3 srand.3
+MLINKS+=stty.3 gtty.3
+
+# compat 4.3 sources
+SRCS+=	ecvt.c gcvt.c lsearch.c rexec.c ruserpass.c sibuf.c sobuf.c strout.c
+
+MAN3+=	ecvt.0 lsearch.0 rexec.0
+
+MLINKS+=ecvt.3 fcvt.3 ecvt.3 gcvt.3
+
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libcurses/Makefile b/usr/src/lib/libcurses/Makefile
index 6e6e48c56e..0efc35f893 100644
--- a/usr/src/lib/libcurses/Makefile
+++ b/usr/src/lib/libcurses/Makefile
@@ -1,72 +1,12 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.8 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.9 (Berkeley) %G%
+
+LIB=	curses
 SRCS=	addbytes.c addch.c addstr.c box.c clear.c clrtobot.c clrtoeol.c \
 	cr_put.c cr_tty.c curses.c delch.c deleteln.c delwin.c endwin.c \
 	erase.c fullname.c getch.c getstr.c idlok.c id_subwins.c initscr.c \
 	insch.c insertln.c longname.c move.c mvprintw.c mvscanw.c mvwin.c \
 	newwin.c overlay.c overwrite.c printw.c putchar.c refresh.c scanw.c \
 	scroll.c toucholap.c standout.c touchwin.c tstp.c unctrl.c
-OBJS=	addbytes.o addch.o addstr.o box.o clear.o clrtobot.o clrtoeol.o \
-	cr_put.o cr_tty.o curses.o delch.o deleteln.o delwin.o endwin.o \
-	erase.o fullname.o getch.o getstr.o idlok.o id_subwins.o initscr.o \
-	insch.o insertln.o longname.o move.o mvprintw.o mvscanw.o mvwin.o \
-	newwin.o overlay.o overwrite.o printw.o putchar.o refresh.o scanw.o \
-	scroll.o toucholap.o standout.o touchwin.o tstp.o unctrl.o
-MAN=	curses.0
-
-.c.o:
-	@${CC} -c -pg ${CFLAGS} $*.c
-	@ld -x -o profiled/$*.o -r $*.o
-	${CC} ${CFLAGS} -c $*.c
-	@ld -x -r $*.o
-	@mv a.out $*.o
-
-all: libcurses.a libcurses_p.a
-
-libcurses.a libcurses_p.a: ${OBJS}
-	@echo building normal libcurses
-	@ar cu libcurses.a ${OBJS}
-	ranlib libcurses.a
-	@echo building profiled libcurses
-	@cd profiled; ar cu ../libcurses_p.a ${OBJS}
-	ranlib libcurses_p.a
-
-clean:
-	rm -f ${OBJS} profiled/*.o libcurses.a libcurses_p.a
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat3
-	install -o bin -g bin -m 644 libcurses.a ${DESTDIR}/usr/lib
-	ranlib -t ${DESTDIR}/usr/lib/libcurses.a
-	install -o bin -g bin -m 644 libcurses_p.a ${DESTDIR}/usr/lib
-	ranlib -t ${DESTDIR}/usr/lib/libcurses_p.a
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+MAN3=	curses.0
 
-tags: ${SRCS}
-	ctags -dt ${SRCS} curses.h
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libm/Makefile b/usr/src/lib/libm/Makefile
index cece7c3e90..933508c9f9 100644
--- a/usr/src/lib/libm/Makefile
+++ b/usr/src/lib/libm/Makefile
@@ -1,20 +1,4 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	1.11 (Berkeley) %G%
+#	@(#)Makefile	1.12 (Berkeley) %G%
 #
 # This high quality math library is intended to run on either a VAX in
 # D_floating format or a machine that conforms to the IEEE standard 754
@@ -23,118 +7,82 @@
 # WARNING: On machines other than the ones mentioned above, run the original
 # Version 7 math library, if nothing better is available.
 #
-# MACHINE indicates the type of floating point hardware you are using; legal
-# values are:
+# HARDWARE indicates the type of floating point hardware you are using;
+# we use MACHINE because we don't have anything better.
+# Current legal values are:
 #
 # vax		- for the VAX D_floating format, the default.
 # tahoe		- for the TAHOE double format.
 # national	- for those IEEE machines whose floating point implementation
 #		  has similar byte ordering as the NATIONAL 32016 with 32081.
 # ieee		- for other IEEE machines, we hope.
-#
-CFLAGS=	-O -D${MACHINE}
-LIBC=	/lib/libc.a
-SUBDIR=	vax tahoe national common ieee
-#
-# Files comprising the standard Math library;
-# actually there are more under ${MACHINE}/ subdirectory.
-#
-SRCS=	acosh.c asincos.c asinh.c atan.c atanh.c cosh.c erf.c \
-	exp.c exp__E.c expm1.c floor.c fmod.c lgamma.c j0.c j1.c jn.c \
-	log.c log10.c log1p.c log__L.c pow.c sinh.c tanh.c
-OBJS=	acosh.o asincos.o asinh.o atan.o atanh.o cosh.o erf.o \
-	exp.o exp__E.o expm1.o floor.o fmod.o lgamma.o j0.o j1.o jn.o \
-	log.o log10.o log1p.o log__L.o pow.o sinh.o tanh.o 
-MAN=	abs.0 asinh.0 erf.0 exp.0 floor.0 hypot.0 ieee.0 infnan.0 j0.0 \
-	lgamma.0 math.0 sin.0 sinh.0 sqrt.0
-MDIR=	${DESTDIR}/usr/man/cat3
 
-.c.o:
-####	generate additional code for profiling (-p)
-	${CC} -p ${CFLAGS} -c $*.c
-####	generate relocation bits (-r) & preserve symbols that begin with L (-X)
-	-ld -X -r $*.o
-	mv a.out profiled/$*.o
-	${CC} ${CFLAGS} -c $*.c
-####	generate relocation bits (-r) but don't preserve local symbols (-x)
-	-ld -x -r $*.o
-	mv a.out $*.o
+LIB=	m
+HARDWARE=${MACHINE}
+CFLAGS+=-D${HARDWARE} -I${.CURDIR}/common_source
+.PATH:	${.CURDIR}/common_source
 
-all: libm.a libm_p.a
+SRCS=	acosh.c asincos.c asinh.c atan.c atanh.c cosh.c erf.c exp.c \
+	exp__E.c expm1.c floor.c fmod.c lgamma.c j0.c j1.c jn.c log.c \
+	log10.c log1p.c log__L.c pow.c sinh.c tanh.c
 
-libm.a libm_p.a: ${OBJS} more.${MACHINE}
-	@echo building normal libm
-	@ar cru libm.a ${OBJS}
-	ranlib libm.a
-	@echo building profiled libm
-	@cd profiled; ar cru ../libm_p.a ${OBJS}
-	ranlib libm_p.a
+MAN3+=	abs.0 asinh.0 erf.0 exp.0 floor.0 hypot.0 ieee.0 infnan.0 j0.0 \
+	lgamma.0 math.0 sin.0 sinh.0 sqrt.0
 
-more.ieee: FRC
-	for i in common ieee; do (cd $$i; make ${MFLAGS}); done
+MLINKS+=asinh.3 acosh.3 asinh.3 atanh.3
+MLINKS+=erf.3 erfc.3
+MLINKS+=exp.3 expm1.3 exp.3 log.3 exp.3 log10.3 exp.3 log1p.3 exp.3 pow.3
+MLINKS+=floor.3 fabs.3 floor.3 ceil.3 floor.3 rint.3
+MLINKS+=hypot.3 cabs.3
+MLINKS+=ieee.3 copysign.3 ieee.3 drem.3 ieee.3 finite.3 ieee.3 logb.3 \
+	ieee.3 scalb.3
+MLINKS+=j0.3 j1.3 j0.3 jn.3 j0.3 y0.3 j0.3 y1.3 j0.3 yn.3
+MLINKS+=lgamma.3 gamma.3
+MLINKS+=sin.3 tan.3 sin.3 acos.3 sin.3 asin.3 sin.3 atan.3 sin.3 atan2.3 \
+	sin.3 cos.3
+MLINKS+=sinh.3 cosh.3
 
-more.national: FRC
-	for i in common national; do (cd $$i; make ${MFLAGS}); done
+.if $(HARDWARE) == "ieee"
+.PATH:	${.CURDIR}/common ${.CURDIR}/ieee
+SRCS+=	atan2.c sincos.c tan.c				# common
+SRCS+=	cabs.c cbrt.c support.c				# ieee
+.endif
 
-more.tahoe: FRC
-	for i in common tahoe; do (cd $$i; make ${MFLAGS}); done
+.if $(HARDWARE) == "national"
+.PATH:	${.CURDIR}/common ${.CURDIR}/national
+SRCS+=	atan2.c sincos.c tan.c				# common
+SRCS+=	cabs.c cbrt.c sqrt.s support.s			# national
+.endif
 
-more.vax: FRC
-	cd vax; make "CFLAGS=${CFLAGS}"
+.if $(HARDWARE) == "tahoe"
+.PATH:	${.CURDIR}/common ${.CURDIR}/tahoe
+SRCS+=	atan2.c sincos.c tan.c				# common
+SRCS+=	cabs.s cbrt.s sqrt.s support.s infnan.s		# tahoe
+.endif
 
-clean: 
-	rm -f ${OBJS} profiled/*.o core libm.a libm_p.a
-	for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
+.if $(HARDWARE) == "vax"
+.PATH:	${.CURDIR}/vax
+SRCS+=	atan2.s cabs.s cbrt.s sqrt.s sincos.s tan.s \
+	argred.s support.s infnan.s			# vax
+.endif
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
+# can't use the standard mkdep, because there are some .s files that
+# are using '#' as a comment indicator and cpp thinks it's an undefined
+# control.
 
-depend: 
-	mkdep ${CFLAGS} ${SRCS}
-	for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} depend); done
+depend: ${SRCS}
+	mkdep ${CFLAGS:M-[ID]*} ${.ALLSRC:M*.c}
 
-install: ${MAN}
-	install -o bin -g bin -m 444 libm.a ${DESTDIR}/usr/lib/libm.a
-	ranlib -t ${DESTDIR}/usr/lib/libm.a
-	install -o bin -g bin -m 444 libm_p.a ${DESTDIR}/usr/lib/libm_p.a
-	ranlib -t ${DESTDIR}/usr/lib/libm_p.a
-	install -c -o bin -g bin -m 444 ${MAN} ${MDIR}
-	rm -f ${MDIR}/acosh.0; ln ${MDIR}/asinh.0 ${MDIR}/acosh.0
-	rm -f ${MDIR}/atanh.0; ln ${MDIR}/asinh.0 ${MDIR}/atanh.0
-	rm -f ${MDIR}/erfc.0; ln ${MDIR}/erf.0 ${MDIR}/erfc.0
-	rm -f ${MDIR}/expm1.0; ln ${MDIR}/exp.0 ${MDIR}/expm1.0
-	rm -f ${MDIR}/log.0; ln ${MDIR}/exp.0 ${MDIR}/log.0
-	rm -f ${MDIR}/log10.0; ln ${MDIR}/exp.0 ${MDIR}/log10.0
-	rm -f ${MDIR}/log1p.0; ln ${MDIR}/exp.0 ${MDIR}/log1p.0
-	rm -f ${MDIR}/pow.0; ln ${MDIR}/exp.0 ${MDIR}/pow.0
-	rm -f ${MDIR}/fabs.0; ln ${MDIR}/floor.0 ${MDIR}/fabs.0
-	rm -f ${MDIR}/ceil.0; ln ${MDIR}/floor.0 ${MDIR}/ceil.0
-	rm -f ${MDIR}/rint.0; ln ${MDIR}/floor.0 ${MDIR}/rint.0
-	rm -f ${MDIR}/cabs.0; ln ${MDIR}/hypot.0 ${MDIR}/cabs.0
-	rm -f ${MDIR}/copysign.0; ln ${MDIR}/ieee.0 ${MDIR}/copysign.0
-	rm -f ${MDIR}/drem.0; ln ${MDIR}/ieee.0 ${MDIR}/drem.0
-	rm -f ${MDIR}/finite.0; ln ${MDIR}/ieee.0 ${MDIR}/finite.0
-	rm -f ${MDIR}/logb.0; ln ${MDIR}/ieee.0 ${MDIR}/logb.0
-	rm -f ${MDIR}/scalb.0; ln ${MDIR}/ieee.0 ${MDIR}/scalb.0
-	rm -f ${MDIR}/j1.0; ln ${MDIR}/j0.0 ${MDIR}/j1.0
-	rm -f ${MDIR}/jn.0; ln ${MDIR}/j0.0 ${MDIR}/jn.0
-	rm -f ${MDIR}/y0.0; ln ${MDIR}/j0.0 ${MDIR}/y0.0
-	rm -f ${MDIR}/y1.0; ln ${MDIR}/j0.0 ${MDIR}/y1.0
-	rm -f ${MDIR}/yn.0; ln ${MDIR}/j0.0 ${MDIR}/yn.0
-	rm -f ${MDIR}/gamma.0; ln ${MDIR}/lgamma.0 ${MDIR}/gamma.0
-	rm -f ${MDIR}/tan.0; ln ${MDIR}/sin.0 ${MDIR}/tan.0
-	rm -f ${MDIR}/acos.0; ln ${MDIR}/sin.0 ${MDIR}/acos.0
-	rm -f ${MDIR}/asin.0; ln ${MDIR}/sin.0 ${MDIR}/asin.0
-	rm -f ${MDIR}/atan.0; ln ${MDIR}/sin.0 ${MDIR}/atan.0
-	rm -f ${MDIR}/atan2.0; ln ${MDIR}/sin.0 ${MDIR}/atan2.0
-	rm -f ${MDIR}/cos.0; ln ${MDIR}/sin.0 ${MDIR}/cos.0
-	rm -f ${MDIR}/cosh.0; ln ${MDIR}/sinh.0 ${MDIR}/cosh.0
+.include <bsd.lib.mk>
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+.s.o:
+	${AS} -o ${.TARGET} ${.IMPSRC}
+	@${LD} -x -r ${.TARGET}
+	@mv a.out ${.TARGET}
 
-tags: ${SRCS}
-	ctags ${SRCS}
-	for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} tags); done
+.s.po:
+	sed -f ${.CURDIR}/${HARDWARE}/mcount.sed ${.IMPSRC} | \
+	    ${AS} -o ${.TARGET}
+	@${LD} -X -r ${.TARGET}
+	@mv a.out ${.TARGET}
 
-FRC:
diff --git a/usr/src/lib/libmp/Makefile b/usr/src/lib/libmp/Makefile
index 00bb8b8dd2..474475ba97 100644
--- a/usr/src/lib/libmp/Makefile
+++ b/usr/src/lib/libmp/Makefile
@@ -1,52 +1,7 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	4.5 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	pow.c gcd.c msqrt.c mdiv.c mout.c mult.c madd.c util.c
-OBJS=	pow.o gcd.o msqrt.o mdiv.o mout.o mult.o madd.o util.o
-MAN=	mp.0
-
-all: libmp.a
-
-libmp.a: ${OBJS}
-	@echo building normal libmp
-	@ar cr $@ ${OBJS}
-	ranlib libmp.a
-
-clean:
-	rm -f ${OBJS} core libmp.a
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
+#	@(#)Makefile	5.1 (Berkeley) %G%
 
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -o bin -g bin -m 644 libmp.a ${DESTDIR}/usr/lib/libmp.a
-	ranlib -t ${DESTDIR}/usr/lib/libmp.a
-	install -c -o bin -g bin -m 444 mp.0 ${DESTDIR}/usr/man/cat3
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+LIB=	mp
+SRCS=	pow.c gcd.c msqrt.c mdiv.c mout.c mult.c madd.c util.c
+MAN3=	mp.0
 
-FRC:
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/Makefile b/usr/src/lib/libplot/Makefile
index e65c931245..b35eba9e62 100644
--- a/usr/src/lib/libplot/Makefile
+++ b/usr/src/lib/libplot/Makefile
@@ -1,110 +1,6 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	4.14 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-ALL=	libf77plot libplot lib300 lib300s lib4013 lib4014 lib450 libvt0 \
-	libplotaed libplotbg libplotdumb libplotgigi libplot2648 libplot7221 \
-	libplotimagen libplotgrn
-SUBDIRS=tf77 plot t4013 t4014 t300 t300s t450 vt0 aed bitgraph dumb gigi \
-	hp2648 hp7221 imagen grn
-MAN=	plot.0
-MDIR=	${DESTDIR}/usr/man/cat3
+#	@(#)Makefile	4.15 (Berkeley) %G%
 
-all: ${ALL}
+SUBDIR=	aed bitgraph dumb f77plot gigi grn hp2648 hp7221 imagen plot \
+	t300 t300s t4013 t4014 t450 vt0
 
-libf77plot: FRC
-	cd tf77; make ${MFLAGS}
-
-libplot: FRC
-	cd plot; make ${MFLAGS}
-
-lib4013: FRC
-	cd t4013; make ${MFLAGS}
-
-lib4014: FRC
-	cd t4014; make ${MFLAGS}
-
-lib300: FRC
-	cd t300; make ${MFLAGS}
-
-lib300s: FRC
-	cd t300s; make ${MFLAGS}
-
-lib450: FRC
-	cd t450; make ${MFLAGS}
-
-libvt0: FRC
-	cd vt0; make ${MFLAGS}
-
-libplotaed: FRC
-	cd aed; make ${MFLAGS}
-
-libplotbg: FRC
-	cd bitgraph; make ${MFLAGS}
-
-libplotdumb: FRC
-	cd dumb; make ${MFLAGS}
-
-libplotgigi: FRC
-	cd gigi; make ${MFLAGS}
-
-libplot2648: FRC
-	cd hp2648; make ${MFLAGS}
-
-libplot7221: FRC
-	cd hp7221; make ${MFLAGS}
-
-libplotimagen: FRC
-	cd imagen; make ${MFLAGS}
-
-libplotgrn: FRC
-	cd grn; make ${MFLAGS}
-
-clean:
-	rm -f ${ALL} core
-	for i in ${SUBDIRS}; do \
-		(cd $$i; make ${MFLAGS} clean); \
-	done
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend lint tags: FRC
-	for i in ${SUBDIRS}; do \
-		(cd $$i; make ${MFLAGS} $@); done
-
-install: ${MAN}
-	for i in ${ALL}; do \
-		install -o bin -g bin -m 644 $$i ${DESTDIR}/usr/lib/$$i.a; \
-		ranlib ${DESTDIR}/usr/lib/$$i.a; \
-	done
-	install -c -o bin -g bin -m 444 plot.0 ${DESTDIR}/usr/man/cat3
-	rm -f ${MDIR}/arc.0; ln ${MDIR}/plot.0 ${MDIR}/arc.0
-	rm -f ${MDIR}/circle.0; ln ${MDIR}/plot.0 ${MDIR}/circle.0
-	rm -f ${MDIR}/cont.0; ln ${MDIR}/plot.0 ${MDIR}/cont.0
-	rm -f ${MDIR}/erase.0; ln ${MDIR}/plot.0 ${MDIR}/erase.0
-	rm -f ${MDIR}/label.0; ln ${MDIR}/plot.0 ${MDIR}/label.0
-	rm -f ${MDIR}/line.0; ln ${MDIR}/plot.0 ${MDIR}/line.0
-	rm -f ${MDIR}/linemod.0; ln ${MDIR}/plot.0 ${MDIR}/linemod.0
-	rm -f ${MDIR}/move.0; ln ${MDIR}/plot.0 ${MDIR}/move.0
-	rm -f ${MDIR}/openpl.0; ln ${MDIR}/plot.0 ${MDIR}/openpl.0
-	rm -f ${MDIR}/point.0; ln ${MDIR}/plot.0 ${MDIR}/point.0
-	rm -f ${MDIR}/space.0; ln ${MDIR}/plot.0 ${MDIR}/space.0
-
-FRC:
+.include <bsd.subdir.mk>
diff --git a/usr/src/lib/libplot/aed/Makefile b/usr/src/lib/libplot/aed/Makefile
index 1855d3058e..9792540161 100644
--- a/usr/src/lib/libplot/aed/Makefile
+++ b/usr/src/lib/libplot/aed/Makefile
@@ -1,78 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.2	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.3 (Berkeley) %G%
+
+LIB=	plotaed
 SRCS=	arc.c box.c circle.c close.c cont.c dot.c erase.c label.c \
 	line.c linemod.c move.c open.c point.c space.c subr.c
-OBJS=	arc.o box.o circle.o close.o cont.o dot.o erase.o label.o \
-	line.o linemod.o move.o open.o point.o space.o subr.o
-
-all: ../libplotaed
-
-../libplotaed: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c
-box.o: box.c
-circle.o: circle.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-circle.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-circle.o: /usr/include/sys/ttydev.h
-close.o: close.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-close.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-close.o: /usr/include/sys/ttydev.h
-cont.o: cont.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-cont.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-cont.o: /usr/include/sys/ttydev.h
-dot.o: dot.c
-erase.o: erase.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-erase.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-erase.o: /usr/include/sys/ttydev.h
-label.o: label.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-label.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-label.o: /usr/include/sys/ttydev.h
-line.o: line.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-line.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-line.o: /usr/include/sys/ttydev.h
-linemod.o: linemod.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-linemod.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-linemod.o: /usr/include/sys/ttydev.h
-move.o: move.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-move.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-move.o: /usr/include/sys/ttydev.h
-open.o: open.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-open.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-open.o: /usr/include/sys/ttydev.h
-point.o: point.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-point.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-point.o: /usr/include/sys/ttydev.h
-space.o: space.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-space.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-space.o: /usr/include/sys/ttydev.h
-subr.o: subr.c aed.h /usr/include/stdio.h /usr/include/sgtty.h
-subr.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-subr.o: /usr/include/sys/ttydev.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/bitgraph/Makefile b/usr/src/lib/libplot/bitgraph/Makefile
index 1cfd35c56f..8673948dd1 100644
--- a/usr/src/lib/libplot/bitgraph/Makefile
+++ b/usr/src/lib/libplot/bitgraph/Makefile
@@ -1,55 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.2	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.3 (Berkeley) %G%
+
+LIB=	plotbg
 SRCS=	box.c circle.c arc.c cont.c dot.c erase.c line.c linemod.c point.c \
 	label.c move.c open.c close.c space.c
-OBJS=	box.o circle.o arc.o cont.o dot.o erase.o line.o linemod.o point.o \
-	label.o move.o open.o close.o space.o
-
-all: ../libplotbg
-
-../libplotbg: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-box.o: box.c
-circle.o: circle.c
-arc.o: arc.c bg.h /usr/include/stdio.h /usr/include/math.h
-cont.o: cont.c bg.h /usr/include/stdio.h /usr/include/math.h
-dot.o: dot.c
-erase.o: erase.c bg.h /usr/include/stdio.h /usr/include/math.h
-line.o: line.c bg.h /usr/include/stdio.h /usr/include/math.h
-linemod.o: linemod.c
-point.o: point.c
-label.o: label.c
-move.o: move.c bg.h /usr/include/stdio.h /usr/include/math.h
-open.o: open.c /usr/include/signal.h bg.h /usr/include/stdio.h
-open.o: /usr/include/math.h
-close.o: close.c /usr/include/signal.h bg.h /usr/include/stdio.h
-close.o: /usr/include/math.h
-space.o: space.c bg.h /usr/include/stdio.h /usr/include/math.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/f77plot/Makefile b/usr/src/lib/libplot/f77plot/Makefile
index e96bf43a2e..1a8720840c 100644
--- a/usr/src/lib/libplot/f77plot/Makefile
+++ b/usr/src/lib/libplot/f77plot/Makefile
@@ -1,53 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.2	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.3 (Berkeley) %G%
+
+LIB=	f77plot
 SRCS=	arc.c box.c circle.c clospl.c cont.c dot.c erase.c label.c \
 	line.c linemd.c move.c open.c point.c space.c
-OBJS=	arc.o box.o circle.o clospl.o cont.o dot.o erase.o label.o \
-	line.o linemd.o move.o open.o point.o space.o
-
-all: ../libf77plot
-
-../libf77plot: ${OBJS}
-	ar cu $@ `lorder ${OBJS} | tsort`
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c
-box.o: box.c
-circle.o: circle.c
-clospl.o: clospl.c
-cont.o: cont.c
-dot.o: dot.c
-erase.o: erase.c
-label.o: label.c
-line.o: line.c
-linemd.o: linemd.c
-move.o: move.c
-open.o: open.c
-point.o: point.c
-space.o: space.c
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/gigi/Makefile b/usr/src/lib/libplot/gigi/Makefile
index 030e0699b8..2a07998b8f 100644
--- a/usr/src/lib/libplot/gigi/Makefile
+++ b/usr/src/lib/libplot/gigi/Makefile
@@ -1,55 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.2	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.3 (Berkeley) %G%
+
+LIB=	plotgigi
 SRCS=	arc.c box.c circle.c close.c cont.c dot.c erase.c label.c \
 	line.c linemod.c move.c open.c point.c space.c
-OBJS=	arc.o box.o circle.o close.o cont.o dot.o erase.o label.o \
-	line.o linemod.o move.o open.o point.o space.o
-
-all: ../libplotgigi
-
-../libplotgigi: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c gigi.h /usr/include/stdio.h /usr/include/math.h
-box.o: box.c
-circle.o: circle.c gigi.h /usr/include/stdio.h /usr/include/math.h
-close.o: close.c /usr/include/signal.h gigi.h /usr/include/stdio.h
-close.o: /usr/include/math.h
-cont.o: cont.c gigi.h /usr/include/stdio.h /usr/include/math.h
-dot.o: dot.c
-erase.o: erase.c gigi.h /usr/include/stdio.h /usr/include/math.h
-label.o: label.c gigi.h /usr/include/stdio.h /usr/include/math.h
-line.o: line.c gigi.h /usr/include/stdio.h /usr/include/math.h
-linemod.o: linemod.c gigi.h /usr/include/stdio.h /usr/include/math.h
-move.o: move.c gigi.h /usr/include/stdio.h /usr/include/math.h
-open.o: open.c /usr/include/signal.h gigi.h /usr/include/stdio.h
-open.o: /usr/include/math.h
-point.o: point.c gigi.h /usr/include/stdio.h /usr/include/math.h
-space.o: space.c gigi.h /usr/include/stdio.h /usr/include/math.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/grn/Makefile b/usr/src/lib/libplot/grn/Makefile
index 5f6885188e..156082e85d 100644
--- a/usr/src/lib/libplot/grn/Makefile
+++ b/usr/src/lib/libplot/grn/Makefile
@@ -1,54 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	6.2	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	6.3 (Berkeley) %G%
+
+LIB=	plotgrn
 SRCS=	arc.c box.c circle.c close.c cont.c dot.c erase.c label.c \
 	line.c linemod.c move.c open.c point.c space.c subr.c
-OBJS=	arc.o box.o circle.o close.o cont.o dot.o erase.o label.o \
-	line.o linemod.o move.o open.o point.o space.o subr.o
-
-all: ../libplotgrn
-
-../libplotgrn: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c grnplot.h /usr/include/stdio.h
-box.o: box.c
-circle.o: circle.c grnplot.h /usr/include/stdio.h
-close.o: close.c grnplot.h /usr/include/stdio.h
-cont.o: cont.c grnplot.h /usr/include/stdio.h
-dot.o: dot.c
-erase.o: erase.c grnplot.h /usr/include/stdio.h
-label.o: label.c grnplot.h /usr/include/stdio.h
-line.o: line.c grnplot.h /usr/include/stdio.h
-linemod.o: linemod.c grnplot.h /usr/include/stdio.h
-move.o: move.c grnplot.h /usr/include/stdio.h
-open.o: open.c grnplot.h /usr/include/stdio.h
-point.o: point.c grnplot.h /usr/include/stdio.h
-space.o: space.c grnplot.h /usr/include/stdio.h
-subr.o: subr.c grnplot.h /usr/include/stdio.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/hp2648/Makefile b/usr/src/lib/libplot/hp2648/Makefile
index a2c45b6d67..b25f370f6e 100644
--- a/usr/src/lib/libplot/hp2648/Makefile
+++ b/usr/src/lib/libplot/hp2648/Makefile
@@ -1,58 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.2	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.3 (Berkeley) %G%
+
+LIB=	plot2648
 SRCS=	arc.c box.c circle.c close.c cont.c dot.c erase.c label.c \
 	line.c linemod.c move.c open.c point.c space.c subr.c
-OBJS=	arc.o box.o circle.o close.o cont.o dot.o erase.o label.o \
-	line.o linemod.o move.o open.o point.o space.o subr.o
-
-all: ../libplot2648
-
-../libplot2648: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c hp2648.h /usr/include/stdio.h
-box.o: box.c
-circle.o: circle.c hp2648.h /usr/include/stdio.h
-close.o: close.c hp2648.h /usr/include/stdio.h
-cont.o: cont.c hp2648.h /usr/include/stdio.h
-dot.o: dot.c
-erase.o: erase.c hp2648.h /usr/include/stdio.h
-label.o: label.c hp2648.h /usr/include/stdio.h
-line.o: line.c hp2648.h /usr/include/stdio.h
-linemod.o: linemod.c hp2648.h /usr/include/stdio.h
-move.o: move.c hp2648.h /usr/include/stdio.h
-open.o: open.c /usr/include/sgtty.h /usr/include/sys/ioctl.h
-open.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h hp2648.h
-open.o: /usr/include/stdio.h
-point.o: point.c hp2648.h /usr/include/stdio.h
-space.o: space.c hp2648.h /usr/include/stdio.h
-subr.o: subr.c /usr/include/sgtty.h /usr/include/sys/ioctl.h
-subr.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h hp2648.h
-subr.o: /usr/include/stdio.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/hp7221/Makefile b/usr/src/lib/libplot/hp7221/Makefile
index a9d5d40146..02eab145a6 100644
--- a/usr/src/lib/libplot/hp7221/Makefile
+++ b/usr/src/lib/libplot/hp7221/Makefile
@@ -1,56 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.2	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.3 (Berkeley) %G%
+
+LIB=	plot7221
 SRCS=	arc.c box.c circle.c close.c cont.c dot.c erase.c label.c \
 	line.c linemod.c move.c open.c point.c space.c subr.c
-OBJS=	arc.o box.o circle.o close.o cont.o dot.o erase.o label.o \
-	line.o linemod.o move.o open.o point.o space.o subr.o
-
-all: ../libplot7221
-
-../libplot7221: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c hp7221.h /usr/include/stdio.h /usr/include/math.h
-box.o: box.c
-circle.o: circle.c hp7221.h /usr/include/stdio.h /usr/include/math.h
-close.o: close.c /usr/include/signal.h hp7221.h /usr/include/stdio.h
-close.o: /usr/include/math.h
-cont.o: cont.c hp7221.h /usr/include/stdio.h /usr/include/math.h
-dot.o: dot.c
-erase.o: erase.c
-label.o: label.c hp7221.h /usr/include/stdio.h /usr/include/math.h
-line.o: line.c hp7221.h /usr/include/stdio.h /usr/include/math.h
-linemod.o: linemod.c hp7221.h /usr/include/stdio.h /usr/include/math.h
-move.o: move.c hp7221.h /usr/include/stdio.h /usr/include/math.h
-open.o: open.c /usr/include/signal.h hp7221.h /usr/include/stdio.h
-open.o: /usr/include/math.h
-point.o: point.c hp7221.h /usr/include/stdio.h /usr/include/math.h
-space.o: space.c hp7221.h /usr/include/stdio.h /usr/include/math.h
-subr.o: subr.c hp7221.h /usr/include/stdio.h /usr/include/math.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/imagen/Makefile b/usr/src/lib/libplot/imagen/Makefile
index da78a5e417..9c21e22824 100644
--- a/usr/src/lib/libplot/imagen/Makefile
+++ b/usr/src/lib/libplot/imagen/Makefile
@@ -1,58 +1,10 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.5	(Berkeley)	%G%
-#
+#	@(#)Makefile	5.6 (Berkeley) %G%
+
+LIB=	plotimagen
 # DEFRES == default printer resolution dpi
-CFLAGS=	-O -DDEFRES=240
-LIBC=	/lib/libc.a
+CFLAGS+=-DDEFRES=240
 SRCS=	arc.c box.c charset.c circle.c close.c cont.c dot.c \
 	erase.c label.c line.c linemod.c move.c open.c point.c \
 	scale.c space.c
-OBJS=	arc.o box.o charset.o circle.o close.o cont.o dot.o \
-	erase.o label.o line.o linemod.o move.o open.o point.o \
-	scale.o space.o
-
-all: ../libplotimagen
-
-../libplotimagen: ${OBJS}
-	ar cr $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c
-box.o: box.c
-charset.o: charset.c imp.h /usr/include/stdio.h
-circle.o: circle.c
-close.o: close.c imp.h /usr/include/stdio.h imPcodes.h
-cont.o: cont.c /usr/include/stdio.h imp.h /usr/include/stdio.h
-dot.o: dot.c
-erase.o: erase.c imPcodes.h imp.h /usr/include/stdio.h
-label.o: label.c imPcodes.h imp.h /usr/include/stdio.h
-line.o: line.c imp.h /usr/include/stdio.h imPcodes.h
-linemod.o: linemod.c imp.h /usr/include/stdio.h
-move.o: move.c imp.h /usr/include/stdio.h
-open.o: open.c imPcodes.h imp.h /usr/include/stdio.h
-point.o: point.c
-scale.o: scale.c
-space.o: space.c
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/plot/Makefile b/usr/src/lib/libplot/plot/Makefile
index d7451b109b..848b22c104 100644
--- a/usr/src/lib/libplot/plot/Makefile
+++ b/usr/src/lib/libplot/plot/Makefile
@@ -1,54 +1,11 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	4.3	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	4.4 (Berkeley) %G%
+
+LIB=	plot
 SRCS=	arc.c box.c circle.c close.c cont.c dot.c erase.c label.c \
 	line.c linmod.c move.c open.c point.c putsi.c space.c
-OBJS=	arc.o box.o circle.o close.o cont.o dot.o erase.o label.o \
-	line.o linmod.o move.o open.o point.o putsi.o space.o
-
-all: ../libplot
-
-../libplot: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c /usr/include/stdio.h
-box.o: box.c
-circle.o: circle.c /usr/include/stdio.h
-close.o: close.c /usr/include/stdio.h
-cont.o: cont.c /usr/include/stdio.h
-dot.o: dot.c /usr/include/stdio.h
-erase.o: erase.c /usr/include/stdio.h
-label.o: label.c /usr/include/stdio.h
-line.o: line.c /usr/include/stdio.h
-linmod.o: linmod.c /usr/include/stdio.h
-move.o: move.c /usr/include/stdio.h
-open.o: open.c
-point.o: point.c /usr/include/stdio.h
-putsi.o: putsi.c /usr/include/stdio.h
-space.o: space.c /usr/include/stdio.h
+MAN3=	plot.0
+MLINKS+=plot.3 arc.3 plot.3 circle.3 plot.3 cont.3 plot.3 erase.3 \
+	plot.3 label.3 plot.3 line.3 plot.3 linemod.3 plot.3 move.3 \
+	plot.3 openpl.3 plot.3 point.3 plot.3 space.3
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/t300/Makefile b/usr/src/lib/libplot/t300/Makefile
index 040a6d4a65..57364d3ac1 100644
--- a/usr/src/lib/libplot/t300/Makefile
+++ b/usr/src/lib/libplot/t300/Makefile
@@ -1,60 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	4.4	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	4.5 (Berkeley) %G%
+
+LIB=	300
 SRCS=	arc.c box.c circle.c close.c dot.c erase.c label.c \
 	line.c linmod.c move.c open.c point.c space.c subr.c
-OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
-	line.o linmod.o move.o open.o point.o space.o subr.o
-
-all: ../lib300
-
-../lib300: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c
-box.o: box.c
-circle.o: circle.c
-close.o: close.c /usr/include/stdio.h
-dot.o: dot.c
-erase.o: erase.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-erase.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-label.o: label.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-label.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-line.o: line.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-line.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-linmod.o: linmod.c
-move.o: move.c
-open.o: open.c /usr/include/sgtty.h /usr/include/sys/ioctl.h
-open.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-point.o: point.c
-space.o: space.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-space.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-subr.o: subr.c /usr/include/stdio.h con.h /usr/include/sgtty.h
-subr.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-subr.o: /usr/include/sys/ttydev.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/t300s/Makefile b/usr/src/lib/libplot/t300s/Makefile
index caf1c9c1d2..64cfafc6f5 100644
--- a/usr/src/lib/libplot/t300s/Makefile
+++ b/usr/src/lib/libplot/t300s/Makefile
@@ -1,61 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	4.4	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	4.5 (Berkeley) %G%
+
+LIB=	300s
 SRCS=	arc.c box.c circle.c close.c dot.c erase.c label.c \
 	line.c linmod.c move.c open.c point.c space.c subr.c
-OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
-	line.o linmod.o move.o open.o point.o space.o subr.o
-
-all: ../lib300s
-
-../lib300s: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c
-box.o: box.c
-circle.o: circle.c
-close.o: close.c /usr/include/stdio.h
-dot.o: dot.c
-erase.o: erase.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-erase.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-label.o: label.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-label.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-line.o: line.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-line.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-linmod.o: linmod.c
-move.o: move.c
-open.o: open.c /usr/include/sgtty.h /usr/include/sys/ioctl.h
-open.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-point.o: point.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-point.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-space.o: space.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-space.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-subr.o: subr.c /usr/include/stdio.h con.h /usr/include/sgtty.h
-subr.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-subr.o: /usr/include/sys/ttydev.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/t4013/Makefile b/usr/src/lib/libplot/t4013/Makefile
index 542d6a966b..789a73676a 100644
--- a/usr/src/lib/libplot/t4013/Makefile
+++ b/usr/src/lib/libplot/t4013/Makefile
@@ -1,53 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.2	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	5.3 (Berkeley) %G%
+
+LIB=	4013
 SRCS=	arc.c box.c circle.c close.c dot.c erase.c label.c \
 	line.c linemod.c move.c open.c point.c space.c subr.c
-OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
-	line.o linemod.o move.o open.o point.o space.o subr.o
-
-all: ../lib4013
-
-../lib4013: ${OBJS}
-	ar cu $@ `lorder ${OBJS} | tsort`
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c
-box.o: box.c
-circle.o: circle.c
-close.o: close.c /usr/include/stdio.h
-dot.o: dot.c
-erase.o: erase.c
-label.o: label.c
-line.o: line.c
-linemod.o: linemod.c
-move.o: move.c
-open.o: open.c
-point.o: point.c
-space.o: space.c
-subr.o: subr.c /usr/include/stdio.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/t4014/Makefile b/usr/src/lib/libplot/t4014/Makefile
index b7d90a6c77..2b7a6587a3 100644
--- a/usr/src/lib/libplot/t4014/Makefile
+++ b/usr/src/lib/libplot/t4014/Makefile
@@ -1,53 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	4.6	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	4.7 (Berkeley) %G%
+
+LIB=	4014
 SRCS=	arc.c box.c circle.c close.c dot.c erase.c label.c \
 	line.c linemod.c move.c open.c point.c space.c subr.c
-OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
-	line.o linemod.o move.o open.o point.o space.o subr.o
-
-all: ../lib4014
-
-../lib4014: ${OBJS}
-	ar cu $@ `lorder ${OBJS} | tsort`
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c
-box.o: box.c
-circle.o: circle.c
-close.o: close.c /usr/include/stdio.h
-dot.o: dot.c
-erase.o: erase.c
-label.o: label.c
-line.o: line.c
-linemod.o: linemod.c
-move.o: move.c
-open.o: open.c
-point.o: point.c
-space.o: space.c
-subr.o: subr.c /usr/include/stdio.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/t450/Makefile b/usr/src/lib/libplot/t450/Makefile
index 7258beba8f..1281098cc2 100644
--- a/usr/src/lib/libplot/t450/Makefile
+++ b/usr/src/lib/libplot/t450/Makefile
@@ -1,60 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	4.4	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	4.5 (Berkeley) %G%
+
+LIB=	450
 SRCS=	arc.c box.c circle.c close.c dot.c erase.c label.c \
 	line.c linmod.c move.c open.c point.c space.c subr.c
-OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
-	line.o linmod.o move.o open.o point.o space.o subr.o
-
-all: ../lib450
-
-../lib450: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c
-box.o: box.c
-circle.o: circle.c
-close.o: close.c /usr/include/stdio.h
-dot.o: dot.c
-erase.o: erase.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-erase.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-label.o: label.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-label.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-line.o: line.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-line.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-linmod.o: linmod.c
-move.o: move.c
-open.o: open.c /usr/include/sgtty.h /usr/include/sys/ioctl.h
-open.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-point.o: point.c
-space.o: space.c con.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-space.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-subr.o: subr.c /usr/include/stdio.h con.h /usr/include/sgtty.h
-subr.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-subr.o: /usr/include/sys/ttydev.h
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libplot/vt0/Makefile b/usr/src/lib/libplot/vt0/Makefile
index a24356abf2..2e3fd87278 100644
--- a/usr/src/lib/libplot/vt0/Makefile
+++ b/usr/src/lib/libplot/vt0/Makefile
@@ -1,53 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	4.4	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
+#	@(#)Makefile	4.5 (Berkeley) %G%
+
+LIB=	vt0
 SRCS=	arc.c box.c circle.c close.c dot.c erase.c label.c \
 	line.c linmod.c move.c open.c point.c space.c subr.c
-OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
-	line.o linmod.o move.o open.o point.o space.o subr.o
-
-all: ../libvt0
-
-../libvt0: ${OBJS}
-	ar cu $@ ${OBJS}
-
-clean: FRC
-	rm -f ${OBJS} core
-
-depend: FRC
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: FRC
-	lint ${CFLAGS} ${SRCS}
-
-tags: FRC
-	ctags ${SRCS}
-
-install:
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-arc.o: arc.c
-box.o: box.c
-circle.o: circle.c
-close.o: close.c
-dot.o: dot.c
-erase.o: erase.c
-label.o: label.c
-line.o: line.c
-linmod.o: linmod.c
-move.o: move.c
-open.o: open.c
-point.o: point.c
-space.o: space.c
-subr.o: subr.c
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/librpc/rpc/Makefile b/usr/src/lib/librpc/rpc/Makefile
index 3e2bdb66a9..4d511c1210 100644
--- a/usr/src/lib/librpc/rpc/Makefile
+++ b/usr/src/lib/librpc/rpc/Makefile
@@ -1,132 +1,29 @@
-#
-# 	Makefile	1.3	85/02/08
-#
-DESTDIR=
-
-SRC=	auth_none.c auth_unix.c authunix_prot.c \
-	clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c clnt_udp.c \
-	pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c pmap_rmt.c \
-	rpc_prot.c \
-	svc.c svc_auth.c svc_auth_unix.c svc_raw.c svc_simple.c \
-	svc_tcp.c svc_udp.c xdr.c xdr_array.c xdr_float.c xdr_mem.c xdr_rec.c \
-	xdr_reference.c xdr_stdio.c
-
-OBJ=	auth_none.o auth_unix.o authunix_prot.o clnt_perror.o clnt_raw.o\
-	clnt_simple.o clnt_tcp.o clnt_udp.o \
-	pmap_clnt.o pmap_getmaps.o pmap_getport.o pmap_prot.o pmap_rmt.o \
-	rpc_prot.o \
-	svc.o svc_auth.o svc_auth_unix.o svc_raw.o svc_simple.o \
-	svc_tcp.o svc_udp.o xdr.o xdr_array.o xdr_float.o xdr_mem.o xdr_rec.o \
-	xdr_reference.o xdr_stdio.o
-INC=	auth.h auth_unix.h clnt.h pmap_clnt.h\
-	pmap_prot.h rpc.h rpc_msg.h svc.h svc_auth.h types.h xdr.h
-
-MAN=	portmap.0 rpcinfo.0
-
-CFLAGS= -O -I.
-
-.c.o:
-	${CC} ${CFLAGS} -c $*.c
-	@-ld -x -r $*.o
-	@mv a.out $*.o
-	@${CC} -p -c ${CFLAGS} $*.c
-	@-ld -X -r $*.o
-	@mv a.out profiled/$*.o
-
-all: rpclib portmap rpcinfo ${MAN}
-
-portmap: portmap.o
-	${CC} $(CFLAGS) portmap.o rpclib -o portmap
-
-rpcinfo: rpcinfo.o
-	${CC} $(CFLAGS) rpcinfo.o rpclib -o rpcinfo
-
-rpclib rpclib_p: ${OBJ}
-	@echo "building profiled rpclib"
-	@cd profiled; ar cru ../rpclib_p ${OBJ}
-	@echo "building normal rpclib"
-	@ar cru rpclib ${OBJ}
-	ranlib rpclib
-
-rpcinfo.0: doc/rpcinfo.8
-	nroff -man -h doc/rpcinfo.8 > rpcinfo.0
-
-portmap.0: doc/portmap.8c
-	nroff -man -h doc/portmap.8c > portmap.0
-
-install: all
-	-mkdir ${DESTDIR}/usr/include/rpc && \
-		chmod 755 ${DESTDIR}/usr/include/rpc
-	-for i in *.h; do \
-		(install -c -m 444 $$i ${DESTDIR}/usr/include/rpc) done
-	install rpclib ${DESTDIR}/usr/lib/librpc.a
-	ranlib ${DESTDIR}/usr/lib/librpc.a
-	install -s portmap ${DESTDIR}/usr/sbin/portmap
-	install -c -o bin -g bin -m 444 portmap.0 ${DESTDIR}/usr/share/man/cat8
-#	install -s rpcinfo ${DESTDIR}/usr/sbin/rpcinfo
-#	install -c -o bin -g bin -m 444 rpcinfo.0 ${DESTDIR}/usr/share/man/cat8
-
-tags: $(SRC) $(KSRC) $(INC)
-	ctags -tw $(SRC) $(KSRC) $(INC)
-
-ref: tags
-	sed 's,	/.*,,' tags | \
-	awk ' { printf("%-26s%-16s%s\n", $$1, $$2, $$3) }' > ref
-
-lint:
-	lint -bnuvx $(SRC)
-
-print:
-	pr $(INC) $(SRC) $(KSRC) | lpr -Pvp
-
-clean:
-	rm -f $(OBJ) librpc.a linted made profiled/*.o portmap.o rpcinfo.o
-
-cleandir: clean
-	rm -f $(MAN) tags .depend
-
-depend:
-	@-grep '^#include' $(SRC) | grep -v '<' | grep -v '../' | \
-	sed 's/:[^"]*"\([^"]*\)".*/: \1/' | sed 's/\.[cs]:/.o:/' | \
-	awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \
-		else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
-		       else rec = rec " " $$2 } } \
-	      END { print rec } ' >> makedep
-	@echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-	@echo '$$r makedep' >>eddep
-	@echo 'w' >>eddep
-	@cp Makefile makefile.bak
-	@ed - Makefile < eddep
-	@rm eddep makedep makefile.bak
-
-
-
-# DO NOT DELETE THIS LINE
-
-auth_none.o: types.h xdr.h auth.h
-auth_unix.o: types.h xdr.h auth.h auth_unix.h
-authunix_prot.o: types.h xdr.h auth.h auth_unix.h
-clnt_perror.o: types.h xdr.h auth.h clnt.h rpc_msg.h
-clnt_raw.o: types.h xdr.h auth.h clnt.h rpc_msg.h
-clnt_tcp.o: types.h xdr.h auth.h clnt.h rpc_msg.h pmap_clnt.h
-clnt_udp.o: types.h xdr.h auth.h clnt.h rpc_msg.h pmap_clnt.h
-pmap_clnt.o: types.h xdr.h auth.h clnt.h rpc_msg.h pmap_prot.h pmap_clnt.h
-pmap_getmaps.o: types.h xdr.h auth.h clnt.h rpc_msg.h pmap_prot.h pmap_clnt.h
-pmap_getport.o: types.h xdr.h auth.h clnt.h rpc_msg.h pmap_prot.h pmap_clnt.h
-pmap_prot.o: types.h xdr.h pmap_prot.h
-pmap_rmt.o: types.h xdr.h auth.h clnt.h rpc_msg.h pmap_prot.h pmap_clnt.h
-rpc_prot.o: types.h xdr.h auth.h clnt.h rpc_msg.h
-svc.o: types.h xdr.h auth.h clnt.h rpc_msg.h svc.h svc_auth.h
-svc_auth.o: types.h xdr.h auth.h clnt.h rpc_msg.h svc.h svc_auth.h
-svc_auth_unix.o: types.h xdr.h auth.h clnt.h rpc_msg.h svc.h auth_unix.h
-svc_auth_unix.o: svc_auth.h
-svc_raw.o: types.h xdr.h auth.h clnt.h rpc_msg.h svc.h
-svc_tcp.o: types.h xdr.h auth.h clnt.h rpc_msg.h svc.h
-svc_udp.o: types.h xdr.h auth.h clnt.h rpc_msg.h svc.h
-xdr.o: types.h xdr.h
-xdr_array.o: types.h xdr.h
-xdr_float.o: types.h xdr.h
-xdr_mem.o: types.h xdr.h
-xdr_rec.o: types.h xdr.h
-xdr_reference.o: types.h xdr.h
-xdr_stdio.o: types.h xdr.h
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+LIB=	rpc
+CFLAGS+=-I${.CURDIR}
+SRCS=	auth_none.c auth_unix.c authunix_prot.c clnt_perror.c clnt_raw.c \
+	clnt_simple.c clnt_tcp.c clnt_udp.c pmap_clnt.c pmap_getmaps.c \
+	pmap_getport.c pmap_prot.c pmap_rmt.c rpc_prot.c svc.c svc_auth.c \
+	svc_auth_unix.c svc_raw.c svc_simple.c svc_tcp.c svc_udp.c xdr.c \
+	xdr_array.c xdr_float.c xdr_mem.c xdr_rec.c xdr_reference.c \
+	xdr_stdio.c
+HDRS=	auth.h auth_unix.h clnt.h pmap_clnt.h pmap_prot.h rpc.h rpc_msg.h \
+	svc.h svc_auth.h types.h xdr.h
+MAN8=	portmap.0
+.PATH: ${.CURDIR} ${.CURDIR}/doc
+
+all: portmap
+
+portmap: portmap.c
+	${CC} ${CFLAGS} ${.CURDIR}/portmap.c librpc.a -o ${.TARGET}
+
+beforeinstall: hdrs
+	install ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} portmap \
+	    ${DESTDIR}/usr/sbin/portmap
+
+hdrs: ${HDRS}
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.ALLSRC} \
+	    ${DESTDIR}/usr/include/rpc
+
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libterm/Makefile b/usr/src/lib/libterm/Makefile
index 262a7f6afe..4d79316162 100644
--- a/usr/src/lib/libterm/Makefile
+++ b/usr/src/lib/libterm/Makefile
@@ -1,79 +1,13 @@
-#
-# Copyright (c) 1987 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.8 (Berkeley) %G%
-#
-CFLAGS=	-O -DCM_N -DCM_GT -DCM_B -DCM_D
-LIBC=	/lib/libc.a
-SRCS=	termcap.c tgoto.c tputs.c
-OBJS=	termcap.o tgoto.o tputs.o
-MAN=	termcap.0
-MDIR=	${DESTDIR}/usr/man/cat3
-
-.c.o:
-	${CC} ${CFLAGS} -c -p $*.c
-	ld -x -r -o profiled/$*.o $*.o
-	${CC} ${CFLAGS} -c $*.c
-	ld -X -r $*.o
-	mv a.out $*.o
-
-all: termcap.a termcap_p.a
-
-termcap.a termcap_p.a: ${OBJS}
-	@echo building normal termcap
-	@ar cr termcap.a ${OBJS}
-	ranlib termcap.a
-	@echo building profiled termcap
-	@cd profiled; ar cr ../termcap_p.a ${OBJS}
-	ranlib termcap_p.a
-
-test:
-	${CC} ${CFLAGS} -o tc1 tc1.c termcap.a
-	${CC} ${CFLAGS} -o tc2 tc2.c termcap.a
-	${CC} ${CFLAGS} -o tc3 tc3.c termcap.a
+#	@(#)Makefile	5.9 (Berkeley) %G%
 
-clean:
-	rm -f ${OBJS} core profiled/*.o termcap.a termcap_p.a
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend:
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -o bin -g bin -m 644 termcap.a ${DESTDIR}/usr/lib/libtermcap.a
-	ranlib -t ${DESTDIR}/usr/lib/libtermcap.a
-	rm -f ${DESTDIR}/usr/lib/libtermlib.a
-	ln ${DESTDIR}/usr/lib/libtermcap.a ${DESTDIR}/usr/lib/libtermlib.a
-	install -o bin -g bin -m 644 termcap_p.a \
-	    ${DESTDIR}/usr/lib/libtermcap_p.a
-	ranlib -t ${DESTDIR}/usr/lib/libtermcap_p.a
-	rm -f ${DESTDIR}/usr/lib/libtermlib_p.a
-	ln ${DESTDIR}/usr/lib/libtermcap_p.a ${DESTDIR}/usr/lib/libtermlib_p.a
-	install -c -o bin -g bin -m 444 termcap.0 ${DESTDIR}/usr/man/cat3
-	rm -f ${MDIR}/tgetent.0; ln ${MDIR}/termcap.0 ${MDIR}/tgetent.0
-	rm -f ${MDIR}/tgetflag.0; ln ${MDIR}/termcap.0 ${MDIR}/tgetflag.0
-	rm -f ${MDIR}/tgetnum.0; ln ${MDIR}/termcap.0 ${MDIR}/tgetnum.0
-	rm -f ${MDIR}/tgetstr.0; ln ${MDIR}/termcap.0 ${MDIR}/tgetstr.0
-	rm -f ${MDIR}/tgoto.0; ln ${MDIR}/termcap.0 ${MDIR}/tgoto.0
-	rm -f ${MDIR}/tputs.0; ln ${MDIR}/termcap.0 ${MDIR}/tputs.0
+LIB=	termcap
+CFLAGS+=-DCM_N -DCM_GT -DCM_B -DCM_D
+SRCS=	termcap.c tgoto.c tputs.c
 
-lint:
-	lint ${CFLAGS} ${SRCS}
+MAN3=	termcap.0
+MLINKS=	termcap.3 tgetent.3 termcap.3 tgetflag.3 termcap.3 tgetnum.3 \
+	termcap.3 tgetstr.3 termcap.3 tgoto.3 termcap.3 tputs.3
+LINKS=	${DESTDIR}/usr/lib/libtermcap.a ${DESTDIR}/usr/lib/libtermlib.a \
+	${DESTDIR}/usr/lib/libtermcap_p.a ${DESTDIR}/usr/lib/libtermlib_p.a
 
-tags:
-	ctags ${SRCS}
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/libutil/Makefile b/usr/src/lib/libutil/Makefile
index de3ac55c8f..a5347d7d30 100644
--- a/usr/src/lib/libutil/Makefile
+++ b/usr/src/lib/libutil/Makefile
@@ -1,65 +1,8 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.4 (Berkeley) %G%
-#
+#	@(#)Makefile	5.5 (Berkeley) %G%
 
-DEFS=	-DLIBC_SCCS
-CFLAGS=	-O ${DEFS}
-SRCS=	login.c logout.c logwtmp.c kvm.c pwcache.c
-OBJS=	login.o logout.o logwtmp.o kvm.o pwcache.o
-MAN=	pwcache.0
-MDIR=	${DESTDIR}/usr/man/cat3
+LIB=	util
+CFLAGS+=-DLIBC_SCCS
+SRCS=	getloadavg.c login.c logout.c logwtmp.c kvm.c pwcache.c
+MAN3=	pwcache.0
 
-.c.o:
-	@${CC} -p ${CFLAGS} -c $*.c
-	@-ld -X -o profiled/$*.o -r $*.o
-	${CC} ${CFLAGS} -c $*.c
-	@-ld -x -r $*.o
-	@mv a.out $*.o
-
-all: libutil.a libutil_p.a llib-lutil.ln
-
-libutil.a libutil_p.a: ${OBJS}
-	@echo building normal libutil
-	@ar cu libutil.a ${OBJS}
-	ranlib libutil.a
-	@echo building profiled libutil
-	@cd profiled; ar cu ../libutil_p.a ${OBJS}
-	ranlib libutil_p.a
-
-llib-lutil.ln: ${SRCS}
-	lint -Cutil ${CFLAGS} ${SRCS}
-
-clean:
-	rm -f ${OBJS} profiled/*.o libutil.a libutil_p.a
-
-cleandir: clean
-	rm -f .depend
-
-depend:
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -o bin -g bin -m 644 libutil.a ${DESTDIR}/usr/lib
-	ranlib -t ${DESTDIR}/usr/lib/libutil.a
-	install -o bin -g bin -m 644 libutil_p.a ${DESTDIR}/usr/lib
-	ranlib -t ${DESTDIR}/usr/lib/libutil_p.a
-	install -o bin -g bin -m 644 llib-lutil.ln ${DESTDIR}/usr/libexec/lint
-	install -c -o bin -g bin -m 444 ${MAN} ${MDIR}
-
-tags:
-	ctags ${SRCS}
+.include <bsd.lib.mk>
diff --git a/usr/src/lib/liby/Makefile b/usr/src/lib/liby/Makefile
index b65824a8f3..3c2d5666f2 100644
--- a/usr/src/lib/liby/Makefile
+++ b/usr/src/lib/liby/Makefile
@@ -1,48 +1,6 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.3 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	libmai.c libzer.c
-OBJS=	libmai.o libzer.o
-
-all: liby.a
-
-liby.a: ${OBJS}
-	@echo building normal liby
-	@ar cr $@ ${OBJS}
-	ranlib liby.a
-
-clean:
-	rm -f ${OBJS} core liby.a
+#	@(#)Makefile	5.4 (Berkeley) %G%
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -o bin -g bin -m 644 liby.a ${DESTDIR}/usr/lib/liby.a
-	ranlib -t ${DESTDIR}/usr/lib/liby.a
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+LIB=	y
+SRCS=	libmai.c libzer.c
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.lib.mk>
diff --git a/usr/src/libexec/Makefile b/usr/src/libexec/Makefile
index f599c709fc..b26121f967 100644
--- a/usr/src/libexec/Makefile
+++ b/usr/src/libexec/Makefile
@@ -1,33 +1,7 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-# not current working
-# pcc
-SUBDIR=	c2 comsat fingerd ftpd getNAME getty makekey \
-	rexecd rlogind rshd talkd telnetd tftpd
+# not currently compilable: pcc
+SUBDIR=	bugfiler c2 comsat delivermail fingerd ftpd getNAME getty makekey \
+	rexecd rlogind rshd talkd telnetd tftpd uucpd
 
-all clean cleandir depend install lint tags: FRC
-	@-for i in ${SUBDIR}; do \
-		(echo "==> $$i"; \
-		    cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} $@); done
-
-${SUBDIR}: FRC
-	cd $@; make ${MFLAGS} DESTDIR=${DESTDIR}
-
-FRC:
+.include <bsd.subdir.mk>
diff --git a/usr/src/libexec/Makefile.inc b/usr/src/libexec/Makefile.inc
new file mode 100644
index 0000000000..ab5c5bbbbf
--- /dev/null
+++ b/usr/src/libexec/Makefile.inc
@@ -0,0 +1,3 @@
+#	@(#)Makefile.inc	5.1 (Berkeley) %G%
+
+BINDIR?=	/usr/libexec
diff --git a/usr/src/libexec/bugfiler/Makefile b/usr/src/libexec/bugfiler/Makefile
index cb10f2e201..846b4c697a 100644
--- a/usr/src/libexec/bugfiler/Makefile
+++ b/usr/src/libexec/bugfiler/Makefile
@@ -1,51 +1,15 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.14 (Berkeley) %G%
-#
-CFLAGS=	-O -I.
-LIBC=	/lib/libc.a
+PROG=	bugfiler
+CFLAGS+=-I${.CURDIR}
 SRCS=	bugfiler.c error.c gethead.c process.c redist.c reply.c
-OBJS=	bugfiler.o error.o gethead.o process.o redist.o reply.o
+BINOWN=	root
+BINMODE=4555
 MAN1=	sendbug.0
 MAN8=	bugfiler.0
 
-all: bugfiler
+beforeinstall:
+	install -c -o bin -g ${BINGRP} -m ${BINMODE} \
+	    ${.CURDIR}/sendbug.sh ${DESTDIR}/usr/bin/sendbug
+	install -c -o bin -g ${BINGRP} -m 444 ${.CURDIR}/bugformat \
+	    ${DESTDIR}/usr/share/misc
 
-bugfiler: ${OBJS} ${LIBC}
-	${CC} ${CFLAGS} -o $@ ${OBJS}
-
-clean:
-	rm -f ${OBJS} core bugfiler
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN1} ${MAN8}
-	install -s -o root -g bin -m 4755 bugfiler ${DESTDIR}/usr/libexec
-	install -c -o bin -g bin -m 755 sendbug.sh ${DESTDIR}/usr/bin/sendbug
-	install -c -o bin -g bin -m 644 bugformat ${DESTDIR}/usr/share/misc
-	install -c -o bin -g bin -m 444 ${MAN1} ${DESTDIR}/usr/man/cat1
-	install -c -o bin -g bin -m 444 ${MAN8} ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/comsat/Makefile b/usr/src/libexec/comsat/Makefile
index 6a1ae105c1..2566f41842 100644
--- a/usr/src/libexec/comsat/Makefile
+++ b/usr/src/libexec/comsat/Makefile
@@ -1,48 +1,6 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	comsat.c
-OBJS=
-MAN=	comsat.0
+PROG=	comsat
+MAN8=	comsat.0
 
-all: comsat
-
-comsat: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core comsat
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 comsat ${DESTDIR}/usr/libexec
-	install -c -o bin -g bin -m 444 comsat.0 ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/fingerd/Makefile b/usr/src/libexec/fingerd/Makefile
index 3c2a9e8005..84685598be 100644
--- a/usr/src/libexec/fingerd/Makefile
+++ b/usr/src/libexec/fingerd/Makefile
@@ -1,48 +1,6 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	fingerd.c
-OBJS=
-MAN=	fingerd.0
+PROG=	fingerd
+MAN8=	fingerd.0
 
-all: fingerd
-
-fingerd: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core fingerd
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 fingerd ${DESTDIR}/usr/libexec
-	install -c -o bin -g bin -m 444 fingerd.0 ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/ftpd/Makefile b/usr/src/libexec/ftpd/Makefile
index 57da252b94..baeabb702b 100644
--- a/usr/src/libexec/ftpd/Makefile
+++ b/usr/src/libexec/ftpd/Makefile
@@ -1,51 +1,12 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.11 (Berkeley) %G%
-#
-CFLAGS=	-O -I../../../usr.bin/ftp -DSETPROCTITLE
-LIBC=	/lib/libc.a
-SRCS=	ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c
-OBJS=	ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o
-MAN=	ftpd.0
-
-all: ftpd
+#	@(#)Makefile	5.12 (Berkeley) %G%
 
-ftpd: ${OBJS} ${LIBC}
-	${CC} -o $@ ${OBJS}
+PROG=	ftpd
+CFLAGS+=-I${.CURDIR}/../../../usr.bin/ftp -DSETPROCTITLE
+SRCS=	ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c
+CLEANFILES+=ftpcmd.c
 
 vers.o: ftpd.c ftpcmd.y
-	sh newvers.sh
+	sh ${.CURDIR}/newvers.sh
 	${CC} ${CFLAGS} -c vers.c
 
-clean:
-	rm -f ${OBJS} ftpd core ftpcmd.c
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 ftpd ${DESTDIR}/usr/libexec
-	install -c -o bin -g bin -m 755 ftpd.0 ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/getNAME/Makefile b/usr/src/libexec/getNAME/Makefile
index 617f55aad0..c1c2897c62 100644
--- a/usr/src/libexec/getNAME/Makefile
+++ b/usr/src/libexec/getNAME/Makefile
@@ -1,47 +1,6 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	getNAME.c
-OBJS=
-MAN=
+PROG=	getNAME
+NOMAN=	noman
 
-all: getNAME
-
-getNAME: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core getNAME
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 getNAME ${DESTDIR}/usr/libexec
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/getty/Makefile b/usr/src/libexec/getty/Makefile
index 662bdb5e75..54c48edc8c 100644
--- a/usr/src/libexec/getty/Makefile
+++ b/usr/src/libexec/getty/Makefile
@@ -1,50 +1,12 @@
-#
-# Copyright (c) 1987 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.6 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	main.c init.c subr.c gettytab.c get_date.c
-OBJS=	main.o init.o subr.o gettytab.o get_date.o
-MAN=	getty.0 gettytab.0 ttys.0
-
-all: getty
-
-getty: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS}
-
-clean:
-	rm -f ${OBJS} core getty
+#	@(#)Makefile	5.7 (Berkeley) %G%
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 getty ${DESTDIR}/usr/libexec
-	install -c -o bin -g bin -m 444 gettytab ${DESTDIR}/etc/gettytab
-	install -c -o bin -g bin -m 444 gettytab.0 ttys.0 \
-	    ${DESTDIR}/usr/man/cat5
-	install -c -o bin -g bin -m 444 getty.0 ${DESTDIR}/usr/man/cat8
+PROG=	getty
+SRCS=	main.c init.c subr.c gettytab.c get_date.c
+MAN5=	gettytab.0 ttys.0
+MAN8=	getty.0
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+beforeinstall:
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/gettytab \
+	    ${DESTDIR}/etc/gettytab
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/mail.local/Makefile b/usr/src/libexec/mail.local/Makefile
new file mode 100644
index 0000000000..55b3c6434c
--- /dev/null
+++ b/usr/src/libexec/mail.local/Makefile
@@ -0,0 +1,7 @@
+#	@(#)Makefile	5.1 (Berkeley) %G%
+
+PROG=	delivermail
+BINOWN=	root
+BINMODE=4555
+
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/makekey/Makefile b/usr/src/libexec/makekey/Makefile
index 0ea14fa584..df73647930 100644
--- a/usr/src/libexec/makekey/Makefile
+++ b/usr/src/libexec/makekey/Makefile
@@ -1,48 +1,6 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	makekey.c
-OBJS=
-MAN=	makekey.0
+PROG=	makekey
+MAN8=	makekey.0
 
-all: makekey
-
-makekey: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core makekey
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 makekey ${DESTDIR}/usr/libexec
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/rexecd/Makefile b/usr/src/libexec/rexecd/Makefile
index dbe95037a8..98294323dd 100644
--- a/usr/src/libexec/rexecd/Makefile
+++ b/usr/src/libexec/rexecd/Makefile
@@ -1,48 +1,6 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	rexecd.c
-OBJS=
-MAN=	rexecd.0
+PROG=	rexecd
+MAN8=	rexecd.0
 
-all: rexecd
-
-rexecd: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core rexecd
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 rexecd ${DESTDIR}/usr/libexec
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/rlogind/Makefile b/usr/src/libexec/rlogind/Makefile
index 66a0a79016..c506e6cfb5 100644
--- a/usr/src/libexec/rlogind/Makefile
+++ b/usr/src/libexec/rlogind/Makefile
@@ -1,49 +1,11 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.7 (Berkeley) %G%
-#
+#	@(#)Makefile	5.8 (Berkeley) %G%
 
-CFLAGS=	-O -DKERBEROS
-LIBC=	/lib/libc.a
+PROG=	rlogind
+CFLAGS+=-DKERBEROS
 SRCS=	rlogind.c des_rw.c
-OBJS=	des_rw.o
-MAN=	rlogind.0
-VPATH=	../../usr.bin/rlogin/des
+MAN8=	rlogind.0
+DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES}
+LDADD=	-lutil -lkrb -ldes
+.PATH: ${.CURDIR}/../../usr.bin/rlogin
 
-all: rlogind
-
-rlogind: ${LIBC} ${OBJS}
-	${CC} -o $@ ${CFLAGS} $@.c ${OBJS} -lutil -lkrb -ldes
-
-clean:
-	rm -f ${OBJS} core rlogind
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 rlogind ${DESTDIR}/usr/libexec
-	install -c -o bin -g bin -m 444 rlogind.0 ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/rshd/Makefile b/usr/src/libexec/rshd/Makefile
index ff381a56df..3b1025716a 100644
--- a/usr/src/libexec/rshd/Makefile
+++ b/usr/src/libexec/rshd/Makefile
@@ -1,49 +1,11 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.3 (Berkeley) 5/9/89
-#
+#	@(#)Makefile	5.5 (Berkeley) %G%
 
-CFLAGS=	-O -DKERBEROS
-LIBC=	/lib/libc.a
-SRCS=	rshd.c
-OBJS=	rshd.o des_rw.o
-MAN=	rshd.0
-VPATH=	../../usr.bin/rlogin/des
+PROG=	rshd
+CFLAGS+=-DKERBEROS
+SRCS=	rshd.c des_rw.c
+MAN8=	rshd.0
+DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES}
+LDADD=	-lutil -lkrb -ldes
+.PATH: ${.CURDIR}/../../usr.bin/rlogin
 
-all: rshd
-
-rshd: ${LIBC} ${OBJS}
-	${CC} -o $@ ${OBJS} ${CFLAGS} -lutil -lkrb -ldes
-
-clean:
-	rm -f core rshd ${OBJS}
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o root -g bin -m 755 rshd ${DESTDIR}/usr/libexec/rshd
-	install -c -o bin -g bin -m 444 rshd.0 ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/talkd/Makefile b/usr/src/libexec/talkd/Makefile
index 715b1ab315..f68418b83c 100644
--- a/usr/src/libexec/talkd/Makefile
+++ b/usr/src/libexec/talkd/Makefile
@@ -1,47 +1,7 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.9 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	talkd.c announce.c process.c table.c print.c
-OBJS=	talkd.o announce.o process.o table.o print.o
-MAN=	talkd.0
-
-all: talkd
-
-talkd: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS}
-
-clean:
-	rm -f ${OBJS} core talkd
+#	@(#)Makefile	5.10 (Berkeley) %G%
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 talkd ${DESTDIR}/usr/libexec/ntalkd
-	install -c -o bin -g bin -m 444 talkd.0 ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+PROG=	ntalkd
+SRCS=	talkd.c announce.c process.c table.c print.c
+MAN8=	talkd.0
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/telnetd/Makefile b/usr/src/libexec/telnetd/Makefile
index d8bcd4a41e..5baa4d7b51 100644
--- a/usr/src/libexec/telnetd/Makefile
+++ b/usr/src/libexec/telnetd/Makefile
@@ -1,90 +1,12 @@
-#
-# Copyright (c) 1988 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.7 (Berkeley) %G%
-#
-
-DEFINES= -DNEED_GETTOS
-LIBC=	/lib/libc.a
-# 4.4BSD
-#		LIBS= -lutil -ltermcap
-#		GETTYOBJ= get_date.o gettytab.o
-#		GETTYSRC= get_date.c gettytab.c
-#		LIBEXEC=${DESTDIR}/usr/libexec
-#		VPATH=../getty
-#			or
-#		VPATH=/usr/src/libexec/getty
-#
-# 4.3BSD	LIBS= -ltermcap
-#		GETTYOBJ= get_date.o gettytab.o
-#		GETTYSRC= get_date.c gettytab.c
-#		LIBEXEC=${DESTDIR}/etc
-#		VPATH=../getty
-#			or
-#		VPATH=/usr/src/etc/getty
-#
-# Cray UNICOS
-#		LIBS= -lnet -lcurses
-#		GETTYOBJ=
-#		GETTYSRC=
-#		LIBEXEC=${DESTDIR}/etc
-
-LIBS=	-lutil -ltermcap
-GETTYOBJ= get_date.o gettytab.o
-GETTYSRC= get_date.c gettytab.c
-LIBEXEC=${DESTDIR}/usr/libexec
-VPATH=	../getty
-
-SRC1=	telnetd.c state.c termstat.c slc.c sys_term.c utility.c global.c
-OBJ1=	telnetd.o state.o termstat.o slc.o sys_term.o utility.o global.o
-
-OBJS=	${OBJ1} ${GETTYOBJ}
-SRCS=	${SRC1} ${GETTYSRC}
-
-MAN=	telnetd.0
-CFLAGS=	-O ${DEFINES}
-
-#
-# These next three lines are not needed in 4.4BSD
-#
-#.SUFFIXES: .0 .8
-#.8.0:
-#	nroff -man -h $< > $@
-
-
-all: telnetd
-
-telnetd: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS}
-
-clean:
-	rm -f ${OBJS} core telnetd
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 telnetd ${LIBEXEC}
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+#	@(#)Makefile	5.8 (Berkeley) %G%
+
+PROG=	telnetd
+CFLAGS+=-DNEED_GETTOS
+SRCS=	get_date.c gettytab.c global.c slc.c state.c sys_term.c telnetd.c \
+	termstat.c utility.c
+DPADD=	${LIBUTIL} ${LIBTERM}
+LDADD=	-lutil -ltermcap
+MAN8=	telnetd.0
+.PATH:	${.CURDIR}/../getty
+
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/tftpd/Makefile b/usr/src/libexec/tftpd/Makefile
index fdf3c890ca..5ec7e269ff 100644
--- a/usr/src/libexec/tftpd/Makefile
+++ b/usr/src/libexec/tftpd/Makefile
@@ -1,48 +1,8 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.9 (Berkeley) %G%
-#
-VPATH=	../../usr.bin/tftp
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	tftpd.c tftpsubs.c
-OBJS=	tftpd.o tftpsubs.o
-MAN=	tftpd.0
-
-all: tftpd
-
-tftpd: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS}
-
-clean:
-	rm -f ${OBJS} core tftpd
+#	@(#)Makefile	5.10 (Berkeley) %G%
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 tftpd ${DESTDIR}/usr/libexec
-	install -c -o bin -g bin -m 444 tftpd.0 ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+PROG=	tftpd
+SRCS=	tftpd.c tftpsubs.c
+MAN8=	tftpd.0
+.PATH:	${.CURDIR}/../../usr.bin/tftp
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/libexec/uucpd/Makefile b/usr/src/libexec/uucpd/Makefile
index c59a812088..0e6bb5f612 100644
--- a/usr/src/libexec/uucpd/Makefile
+++ b/usr/src/libexec/uucpd/Makefile
@@ -1,49 +1,8 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	uucpd.c
-OBJS=
-MAN=
+PROG=	uucpd
+BINOWN=	uucp
+BINMODE=500
+NOMAN=	noman
 
-all: uucpd
-
-uucpd: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core uucpd
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o uucp -g bin -m 700 uucpd ${DESTDIR}/usr/libexec
-	@echo "Don't forget to fork off uucpd in rc.local"
-	@echo "	if you're not running inetd."
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/old/adb/Makefile b/usr/src/old/adb/Makefile
index fdce20a6df..202b35ec4a 100644
--- a/usr/src/old/adb/Makefile
+++ b/usr/src/old/adb/Makefile
@@ -1,33 +1,5 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.6 (Berkeley) %G%
-#
-all depend clean cleandir lint tags: FRC
-	cd adb.${MACHINE}; make ${MFLAGS} DESTDIR=${DESTDIR} $@
+#	@(#)Makefile	5.7 (Berkeley) %G%
 
-SCRIPTDIR=	/usr/libdata/adb
+SUBDIR=	adb common_scripts scripts
 
-install:
-	rm -rf ${DESTDIR}/${SCRIPTDIR}
-	mkdir ${DESTDIR}/${SCRIPTDIR}
-	chown bin.bin ${DESTDIR}/${SCRIPTDIR}
-	chmod 755 ${DESTDIR}/${SCRIPTDIR}
-	cd adb.${MACHINE}; make ${MFLAGS} DESTDIR=${DESTDIR} $@
-	cd scripts; make ${MFLAGS} DESTDIR=${DESTDIR} $@
-	cd scripts.${MACHINE}; make ${MFLAGS} DESTDIR=${DESTDIR} $@
-
-FRC:
+.include <bsd.subdir.mk>
diff --git a/usr/src/old/adb/adb.tahoe/Makefile b/usr/src/old/adb/adb.tahoe/Makefile
index b2c1f651f3..41ab0ffd4b 100644
--- a/usr/src/old/adb/adb.tahoe/Makefile
+++ b/usr/src/old/adb/adb.tahoe/Makefile
@@ -1,53 +1,15 @@
-#
-# Copyright (c) 1988 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.4 (Berkeley) %G%
-#
-CFLAGS=	-I../adb -I. -O
-VPATH=	../adb
-LIBC=	/lib/libc.a
-SRCS=	access.c command.c expr.c format.c main.c output.c pcs.c print.c \
-	setup.c strings.c sym.c kstack.c machdep.c opset.c optab.c rodata.c
-OBJS=	access.o command.o expr.o format.o main.o output.o pcs.o print.o \
-	setup.o strings.o sym.o kstack.o machdep.o opset.o optab.o rodata.o
-MAN=	adb.0
+#	@(#)Makefile	5.5 (Berkeley) %G%
 
-all: adb
+PROG=	adb
+SRCS=	access.c command.c expr.c format.c kstack.c machdep.c main.c \
+	opset.c optab.c output.c pcs.c print.c rodata.c setup.c \
+	strings.c sym.c
+.PATH: ${.CURDIR}/../common_source
 
-adb: ${OBJS} ${LIBC}
-	${CC} -o $@ ${OBJS}
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../common_source
 
 optab.o rodata.o strings.o:
-	${CC} ${CFLAGS} -c -R $<
+	${CC} ${CFLAGS} -R -c ${.IMPSRC}
 
-clean:
-	rm -f ${OBJS} core adb
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 adb ${DESTDIR}/bin/adb
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/usr/src/old/adb/adb.vax/Makefile b/usr/src/old/adb/adb.vax/Makefile
index b68ef162f1..5f93ec7b75 100644
--- a/usr/src/old/adb/adb.vax/Makefile
+++ b/usr/src/old/adb/adb.vax/Makefile
@@ -1,59 +1,22 @@
-#
-# Copyright (c) 1988 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.5 (Berkeley) %G%
-#
-LIBC=	/lib/libc.a
-AS=	../../../pgrm/as/as.vax
-VPATH=	../adb
-CFLAGS=	-I. -I../adb -I${AS} -O
+#	@(#)Makefile	5.6 (Berkeley) %G%
+
+PROG=	adb
 SRCS=	access.c command.c expr.c format.c kstack.c machdep.c main.c \
 	opset.c optab.c output.c pcs.c print.c rodata.c setup.c strings.c \
 	sym.c
-OBJS=	access.o command.o expr.o format.o kstack.o machdep.o main.o \
-	opset.o optab.o output.o pcs.o print.o rodata.o setup.o strings.o \
-	sym.o
-MAN=	adb.0
+ASPATH=	../../../pgrm/as.vax
+.PATH:	${.CURDIR}/../common_source
 
-all: adb
+CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../common_source -I${.CURDIR}/${ASPATH}
 
-adb: ${OBJS} ${LIBC}
-	${CC} -o $@ ${OBJS}
+optab.o: instrs.adb
 
 optab.o rodata.o strings.o:
-	${CC} ${CFLAGS} -c -R $<
-
-instrs.adb: ${AS}/instrs
-	(echo FLAVOR ADB; cat ${AS}/instrs) | awk -f ${AS}/instrs > instrs.adb
-
-clean:
-	rm -f ${OBJS} core adb
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 adb ${DESTDIR}/bin/adb
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
+	${CC} ${CFLAGS} -R -c ${.IMPSRC}
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+INSTR=${.CURDIR}/${ASPATH}/instrs
+instrs.adb: ${INSTR}
+	(echo FLAVOR ADB; cat ${INSTR}) | awk -f ${INSTR} > ${.TARGET}
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/usr/src/old/adb/common_scripts/Makefile b/usr/src/old/adb/common_scripts/Makefile
index cda55d2e91..b41c75eccf 100644
--- a/usr/src/old/adb/common_scripts/Makefile
+++ b/usr/src/old/adb/common_scripts/Makefile
@@ -1,33 +1,19 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.5 (Berkeley) %G%
-#
+#	@(#)Makefile	5.6 (Berkeley) %G%
+
 LIST=	buf callout callout.next clist clist.nxt dino dir dir.nxt \
-	dmap file filsys findinode findinode.nxt findproc host.nxt hosts \
-	hosts.nxt hosttable idp ifaddr ifnet ifrw imp in_ifaddr inode inpcb \
-	iovec ipreass ipreass.nxt mact mact.nxt mbstat mbuf mbuf.nxt \
-	mbufchain mbufs mbufs.nxt mount nameidata nspcb nsrtentry packetchain \
-	protosw quota rawcb route rtentry rusage setproc setproc.done socket \
-	spp sppcb stat tcpcb tcpip tcpreass tcpreass.nxt text traceall \
-	traceall.nxt u u.all ubadev uio un unpcb urppcb vtimes why
+	dmap file filsys findinode findinode.nxt findproc host.nxt \
+	hosts hosts.nxt hosttable idp ifaddr ifnet ifrw imp in_ifaddr \
+	inode inpcb iovec ipreass ipreass.nxt mact mact.nxt mbstat \
+	mbuf mbuf.nxt mbufchain mbufs mbufs.nxt mount nameidata \
+	nspcb nsrtentry packetchain protosw quota rawcb route rtentry \
+	rusage setproc setproc.done socket spp sppcb stat tcpcb tcpip \
+	tcpreass tcpreass.nxt text traceall traceall.nxt tty termios \
+	u u.all ubadev uio un unpcb urppcb vtimes why
 
-all:
+all clean cleandir depend lint tags:
 
-install: FRC
-	install -c -o bin -g bin -m 444 ${LIST} ${DESTDIR}/usr/libdata/adb
+install:
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${LIST} \
+	    ${DESTDIR}/usr/libdata/adb
 
-clean depend lint tags FRC:
+.include <bsd.own.mk>
diff --git a/usr/src/old/adb/scripts.tahoe/Makefile b/usr/src/old/adb/scripts.tahoe/Makefile
index 7a47eff19f..c7b395e8ff 100644
--- a/usr/src/old/adb/scripts.tahoe/Makefile
+++ b/usr/src/old/adb/scripts.tahoe/Makefile
@@ -1,26 +1,11 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.4 (Berkeley) %G%
-#
-LIST=	dirblk findproc.nxt frame pcb proc setproc.nxt trapframe tty
+#	@(#)Makefile	5.5 (Berkeley) %G%
 
-all:
+LIST=	dirblk findproc.nxt frame pcb proc setproc.nxt trapframe
 
-install: FRC
-	install -c -o bin -g bin -m 444 ${LIST} ${DESTDIR}/usr/libdata/adb
+all clean cleandir depend lint tags:
 
-clean depend lint tags FRC:
+install:
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${LIST} \
+	    ${DESTDIR}/usr/libdata/adb
+
+.include <bsd.own.mk>
diff --git a/usr/src/old/adb/scripts.vax/Makefile b/usr/src/old/adb/scripts.vax/Makefile
index 3da9dde2da..0bc31445f0 100644
--- a/usr/src/old/adb/scripts.vax/Makefile
+++ b/usr/src/old/adb/scripts.vax/Makefile
@@ -1,29 +1,13 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.4 (Berkeley) %G%
-#
+#	@(#)Makefile	5.5 (Berkeley) %G%
+
 LIST=	dirblk dmcstats findproc.nxt frame ifuba ifubinfo ifxmt \
 	mba_device mba_hd pcb proc setproc.nxt stacktrace trapframe \
-	tty ubahd
-
-all:
+	ubahd
 
-install: FRC
-	install -c -o bin -g bin -m 444 ${LIST} ${DESTDIR}/usr/libdata/adb
+all clean cleandir depend lint tags:
 
-clean depend lint tags FRC:
+install:
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${LIST} \
+	    ${DESTDIR}/usr/libdata/adb
 
+.include <bsd.own.mk>
diff --git a/usr/src/old/boggle/Makefile b/usr/src/old/boggle/Makefile
index 7c78b3eef5..b2045555f9 100644
--- a/usr/src/old/boggle/Makefile
+++ b/usr/src/old/boggle/Makefile
@@ -1,52 +1,20 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.12 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	comp.c boggle.c
-MAN=	boggle.0
+#	@(#)Makefile	5.13 (Berkeley) %G%
 
-all: boggle bogdict
+PROG=	boggle
+MAN6=	boggle.0
+DPADD=	${LIBCOMPAT}
+LDADD=	-lcompat
+HIDEGAME=hidegame
 
-bogdict: comp sfile
-	sed -f sfile /usr/share/dict/words | uniq | ./comp >bogdict
+all: bogdict
 
-boggle comp: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c -lcompat
+bogdict: /usr/share/dict/words comp sfile
+	sed -f ${.CURDIR}/sfile /usr/share/dict/words | uniq | ./comp >bogdict
 
-clean:
-	rm -f ${OBJS} core comp boggle bogdict
+beforeinstall:
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 bogdict \
+	    ${DESTDIR}/usr/share/games
+comp:
+	${CC} -O ${.CURDIR}/comp.c -o ${.TARGET}
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o games -g bin -m 4700 boggle ${DESTDIR}/usr/games/hide/boggle
-	install -o games -g bin -m 400 bogdict ${DESTDIR}/usr/games/lib/bogdict
-	(cd ${DESTDIR}/usr/games; rm -f boggle; ln -s dm boggle; chown games.bin boggle)
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat6
-
-lint: ${SRCS}
-	lint ${CFLAGS} comp.c
-	lint ${CFLAGS} boggle.c
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/old/enpload/Makefile b/usr/src/old/enpload/Makefile
index bbaaacc608..ce95a821e9 100644
--- a/usr/src/old/enpload/Makefile
+++ b/usr/src/old/enpload/Makefile
@@ -1,48 +1,14 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.5 (Berkeley) %G%
-#
+#	@(#)Makefile	5.6 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	enpload.c
-MAN=	enpload.0
+PROG=	enpload
+MAN8=	enpload.0
 
-all: enpload
+install:
+	install ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} enpload \
+	    ${DESTDIR}${BINDIR}
+	install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} ${MAN8} \
+	    ${DESTDIR}${MANDIR}8/tahoe
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/enpcode \
+	    ${DESTDIR}/etc
 
-enpload: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core enpload
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 enpload ${DESTDIR}/sbin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8/tahoe
-	install -c -o bin -g bin -m 444 enpcode ${DESTDIR}/etc
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/old/lex/libln/Makefile b/usr/src/old/lex/libln/Makefile
index 16925b8d6a..8ef909209f 100644
--- a/usr/src/old/lex/libln/Makefile
+++ b/usr/src/old/lex/libln/Makefile
@@ -1,50 +1,8 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	4.4 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	allprint.c main.c reject.c yyless.c yywrap.c
-OBJS=	allprint.o main.o reject.o yyless.o yywrap.o
-
-all: libln.a
-
-libln.a: ${OBJS}
-	@echo building normal libln
-	@ar rc $@ ${OBJS}
-	ranlib libln.a
-
-clean:
-	rm -f ${OBJS} core libln.a
+#	@(#)Makefile	4.5 (Berkeley) %G%
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -o bin -g bin -m 644 libln.a ${DESTDIR}/usr/lib/libln.a
-	ranlib -t ${DESTDIR}/usr/lib/libln.a
-	rm -f ${DESTDIR}/usr/lib/libl.a
-	ln ${DESTDIR}/usr/lib/libln.a ${DESTDIR}/usr/lib/libl.a
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+LIB=	ln
+SRCS=	allprint.c main.c reject.c yyless.c yywrap.c
+LINKS=	${DESTDIR}/usr/lib/libln.a ${DESTDIR}/usr/lib/libl.a \
+	${DESTDIR}/usr/lib/libln_p.a ${DESTDIR}/usr/lib/libl_p.a
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.lib.mk>
diff --git a/usr/src/old/libndbm/Makefile b/usr/src/old/libndbm/Makefile
index 369ce27d74..980d3c2db7 100644
--- a/usr/src/old/libndbm/Makefile
+++ b/usr/src/old/libndbm/Makefile
@@ -1,63 +1,13 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.6 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	dbm.c
-OBJS=	dbm.o
-MAN=	dbm.0
-MDIR=	${DESTDIR}/usr/man/cat3
-
-all: libdbm.a libdbm_p.a
-
-libdbm.a: dbm.c
-	${CC} -c ${CFLAGS} dbm.c
-	ld -r -o libdbm.a -x dbm.o
-	rm -f dbm.o
-
-libdbm_p.a: dbm.c
-	${CC} -p -c ${CFLAGS} dbm.c
-	ld -r -o libdbm_p.a -X dbm.o
-	rm -f dbm.o
+#	@(#)Makefile	5.7 (Berkeley) %G%
 
-clean:
-	rm -f ${OBJS} core libdbm.a libdbm_p.a
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -o bin -g bin -m 644 libdbm.a ${DESTDIR}/usr/lib/libdbm.a
-	install -o bin -g bin -m 644 libdbm_p.a ${DESTDIR}/usr/lib/libdbm_p.a
-	install -c -o bin -g bin -m 444 dbm.h ${DESTDIR}/usr/include/dbm.h
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat3
-	rm -f ${MDIR}/dbminit.0; ln ${MDIR}/dbm.0 ${MDIR}/dbminit.0
-	rm -f ${MDIR}/delete.0; ln ${MDIR}/dbm.0 ${MDIR}/delete.0
-	rm -f ${MDIR}/fetch.0; ln ${MDIR}/dbm.0 ${MDIR}/fetch.0
-	rm -f ${MDIR}/firstkey.0; ln ${MDIR}/dbm.0 ${MDIR}/firstkey.0
-	rm -f ${MDIR}/nextkey.0; ln ${MDIR}/dbm.0 ${MDIR}/nextkey.0
-	rm -f ${MDIR}/store.0; ln ${MDIR}/dbm.0 ${MDIR}/store.0
+LIB=	dbm
+SRCS=	dbm.c
+MAN3=	dbm.0
+MLINKS+=dbm.3 dbminit.3 dbm.3 delete.3 dbm.3 fetch.3 dbm.3 firstkey.3 \
+	dbm.3 nextkey.3 dbm.3 store.3
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+beforeinstall:
+	install -c -o ${BINOWN} -g ${BINGRP} -m ${MANMODE} ${.CURDIR}/dbm.h \
+	    ${DESTDIR}/usr/include/dbm.h
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.lib.mk>
diff --git a/usr/src/old/pcc/c2.tahoe/Makefile b/usr/src/old/pcc/c2.tahoe/Makefile
index ed3b38a0d3..3e467c45fa 100644
--- a/usr/src/old/pcc/c2.tahoe/Makefile
+++ b/usr/src/old/pcc/c2.tahoe/Makefile
@@ -1,44 +1,10 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	1.5	(Berkeley)	%G%
-#
-DESTDIR=
-CFLAGS=	-O
-SRCS=	c20.c c21.c c22.c c23.c
-OBJS=	c20.o c21.o c22.o c23.o
-
-all: c2
-
-c2: ${OBJS} ${LIBC}
-	${CC} -o $@ ${OBJS}
-
-c23.o:  c23.c
-	${CC} ${CFLAGS} -R -c c23.c
+#	@(#)Makefile	5.1 (Berkeley) %G%
 
-c2.h:	tokens
-	grep -n '^' tokens>toks
-	( echo '/tokens/+1;/^$$/-1d'; \
-	echo '/tokens/r toks'; \
-	echo '/tokens/+1;/^$$/-1s/^\([0-9]*\):\([A-Z][A-Z0-9]*\)/#define \2	\1/'; \
-	echo 'w'; \
-	echo 'q'; \
-	) | ed - c2.h
-	rm toks
-
-clean:
-	rm -f *.o *.s c2
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 c2 ${DESTDIR}/usr/libexec/c2
+PROG=	c2
+SRCS=	c20.c c21.c c22.c c23.c
+NOMAN=	noman
 
-tags: ${SRCS}
-	ctags ${SRCS}
+c23.o:
+	${CC} ${CFLAGS} -R -c ${.IMPSRC}
 
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/old/pcc/c2.vax/Makefile b/usr/src/old/pcc/c2.vax/Makefile
index 3ed697ec80..4916d1e29e 100644
--- a/usr/src/old/pcc/c2.vax/Makefile
+++ b/usr/src/old/pcc/c2.vax/Makefile
@@ -1,41 +1,16 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	4.9	(Berkeley)	%G%
-#
-CFLAGS=	-DCOPYCODE -DC2 -O
-ASDIR=	../../../pgrm/as/as.${MACHINE}
-SRCS=	c20.c c21.c c22.c
-OBJS=	c20.o c21.o c22.o
-
-all: c2
+#	@(#)Makefile	4.10 (Berkeley) %G%
 
-c2: ${OBJS} ${LIBC}
-	${CC} -o $@ ${OBJS}
+PROG=	c2
+SRCS=	c20.c c21.c c22.c
+CFLAGS+=-DCOPYCODE -DC2
+ASDIR=	${.CURDIR}/../../pgrm/as.${MACHINE}
+NOMAN=	noman
 
-c22.o: c22.c c2.h instrs.c2
-	${CC} ${CFLAGS} -R -c c22.c
+c22.o: instrs.c2
+	${CC} ${CFLAGS} -R -c ${.IMPSRC}
 
 instrs.c2: ${ASDIR}/instrs
-	(echo FLAVOR C2 ; cat ${ASDIR}/instrs) | awk -f ${ASDIR}/instrs > instrs.c2
-
-clean:
-	rm -f *.o *.s c2
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-install: ${MAN}
-	install -o bin -g bin -m 755 -s c2 ${DESTDIR}/usr/libexec/c2
-
-tags: ${SRCS}
-	ctags ${SRCS}
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+	(echo FLAVOR C2 ; cat ${ASDIR}/instrs) | \
+	    awk -f ${ASDIR}/instrs > instrs.c2
 
+.include <bsd.prog.mk>
diff --git a/usr/src/old/sh/Makefile b/usr/src/old/sh/Makefile
index 089df47922..05b55f54e6 100644
--- a/usr/src/old/sh/Makefile
+++ b/usr/src/old/sh/Makefile
@@ -1,60 +1,13 @@
-#
-# Copyright (c) 1987 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	4.11 (Berkeley) %G%
-#
-#
-CFLAGS=	-O -w
-LIBC=	/lib/libc.a
+#	@(#)Makefile	4.12 (Berkeley) %G%
+
+PROG=	sh
+CFLAGS+=-w
 SRCS=	setbrk.c builtin.c blok.c stak.c cmd.c fault.c main.c word.c \
 	string.c name.c args.c xec.c service.c error.c io.c print.c \
 	macro.c expand.c ctype.c msg.c
-OBJS=	setbrk.o builtin.o blok.o stak.o cmd.o fault.o main.o word.o \
-	string.o name.o args.o xec.o service.o error.o io.o print.o \
-	macro.o expand.o ctype.o msg.o
-MAN=	cd.0 intro.0 sh.0 wait.0
-
-all: sh
-
-sh: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS} -lcompat
-
-clean:
-	rm -f ${OBJS} core sh
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 sh ${DESTDIR}/bin/sh
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-	rm -f ${DESTDIR}/usr/man/cat1/case.0
-	rm -f ${DESTDIR}/usr/man/cat1/for.0
-	rm -f ${DESTDIR}/usr/man/cat1/if.0
-	rm -f ${DESTDIR}/usr/man/cat1/while.0
-	ln ${DESTDIR}/usr/man/cat1/sh.0 ${DESTDIR}/usr/man/cat1/case.0
-	ln ${DESTDIR}/usr/man/cat1/sh.0 ${DESTDIR}/usr/man/cat1/for.0
-	ln ${DESTDIR}/usr/man/cat1/sh.0 ${DESTDIR}/usr/man/cat1/if.0
-	ln ${DESTDIR}/usr/man/cat1/sh.0 ${DESTDIR}/usr/man/cat1/while.0
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+MAN1=	cd.0 intro.0 sh.0 wait.0
+DPADD=	${LIBCOMPAT}
+LDADD=	-lcompat
+MLINKS=	sh.1 case.1 sh.1 for.1 sh.1 if.1 sh.1 while.1
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/old/tar/Makefile b/usr/src/old/tar/Makefile
index 790378b799..0249920380 100644
--- a/usr/src/old/tar/Makefile
+++ b/usr/src/old/tar/Makefile
@@ -1,48 +1,7 @@
-#
-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.2 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	tar.c
-OBJS=
-MAN=	tar.0 tar5.0
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-all: tar
+PROG=	tar
+MAN1=	tar.0
+MAN5=	tar.format.0
 
-tar: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core tar
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 tar ${DESTDIR}/bin
-	install -c -o bin -g bin -m 444 tar.0 ${DESTDIR}/usr/man/cat1
-	install -c -o bin -g bin -m 444 tar5.0 ${DESTDIR}/usr/man/cat5/tar.0
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/old/test/Makefile b/usr/src/old/test/Makefile
index a0c1e6af35..4d237eed3b 100644
--- a/usr/src/old/test/Makefile
+++ b/usr/src/old/test/Makefile
@@ -1,50 +1,6 @@
-#
-# Copyright (c) 1988 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.2 (Berkeley) %G%
-#
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	test.c
-OBJS=
-MAN=	test.0
+PROG=	test
+LINKS=	${BINDIR}/test ${BINDIR}/[
 
-all: test
-
-test: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c
-
-clean:
-	rm -f ${OBJS} core test
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 test ${DESTDIR}/bin
-	rm -f ${DESTDIR}/bin/[
-	ln ${DESTDIR}/bin/test ${DESTDIR}/bin/[
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/sbin/Makefile.inc b/usr/src/sbin/Makefile.inc
new file mode 100644
index 0000000000..cff953fa6c
--- /dev/null
+++ b/usr/src/sbin/Makefile.inc
@@ -0,0 +1,3 @@
+#	@(#)Makefile.inc	5.1 (Berkeley) %G%
+
+BINDIR?=	/sbin
diff --git a/usr/src/sbin/XNSrouted/Makefile b/usr/src/sbin/XNSrouted/Makefile
index 4e34816208..5179c1d538 100644
--- a/usr/src/sbin/XNSrouted/Makefile
+++ b/usr/src/sbin/XNSrouted/Makefile
@@ -1,47 +1,6 @@
-#
-# Copyright (c) 1987 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.10 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-SRCS=	af.c if.c input.c main.c output.c startup.c tables.c timer.c trace.c
-OBJS=	af.o if.o input.o main.o output.o startup.o tables.o timer.o trace.o
-MAN=	XNSrouted.0
-
-all: XNSrouted
-
-XNSrouted: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS}
-
-clean:
-	rm -f ${OBJS} core XNSrouted
+#	@(#)Makefile	5.11 (Berkeley) %G%
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 XNSrouted ${DESTDIR}/usr/sbin
-	install -c -o bin -g bin -m 444 XNSrouted.0 ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+PROG=	XNSrouted
+SRCS=	af.c if.c input.c main.c output.c startup.c tables.c timer.c trace.c
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/sbin/mountd/Makefile b/usr/src/sbin/mountd/Makefile
index 85bd676198..20a3143fc5 100644
--- a/usr/src/sbin/mountd/Makefile
+++ b/usr/src/sbin/mountd/Makefile
@@ -1,48 +1,9 @@
-#
-# Copyright (c) 1989 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O -DNFS
-LIBC=	/lib/libc.a
-SRCS=	mountd.c
-OBJS=
-MAN=	mountd.0
+PROG=	mountd
+CFLAGS+=-DNFS
+MAN8=	mountd.0
+DPADD=	${LIBRPC}
+LDADD=	-lrpc
 
-all: mountd
-
-mountd: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c -lrpc
-
-clean:
-	rm -f ${OBJS} core mountd
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 mountd ${DESTDIR}/sbin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/sbin/nfsd/Makefile b/usr/src/sbin/nfsd/Makefile
index 52cca1a5ab..61d4123413 100644
--- a/usr/src/sbin/nfsd/Makefile
+++ b/usr/src/sbin/nfsd/Makefile
@@ -1,48 +1,9 @@
-#
-# Copyright (c) 1989 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation, advertising
-# materials, and other materials related to such redistribution and
-# use acknowledge that the software was developed by the University
-# of California, Berkeley.  The name of the University may not be
-# used to endorse or promote products derived from this software
-# without specific prior written permission.  THIS SOFTWARE IS PROVIDED
-# ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile	5.1 (Berkeley) %G%
-#
+#	@(#)Makefile	5.2 (Berkeley) %G%
 
-CFLAGS=	-O -DNFS
-LIBC=	/lib/libc.a
-SRCS=	nfsd.c
-OBJS=
-MAN=	nfsd.0
+PROG=	nfsd
+CFLAGS+=-DNFS
+MAN8=	nfsd.0
+DPADD=	${LIBRPC}
+LDADD=	-lrpc
 
-all: nfsd
-
-nfsd: ${LIBC}
-	${CC} -o $@ ${CFLAGS} $@.c -lrpc
-
-clean:
-	rm -f ${OBJS} core nfsd
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 nfsd ${DESTDIR}/sbin
-	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/sbin/routed/Makefile b/usr/src/sbin/routed/Makefile
index 37eec5bd6a..69ff84416d 100644
--- a/usr/src/sbin/routed/Makefile
+++ b/usr/src/sbin/routed/Makefile
@@ -1,63 +1,16 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)Makefile	5.10 (Berkeley) %G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-C2=	/usr/libexec/c2
-INLINE=	/sys/${MACHINE}/inline/inline
+PROG=	routed
 SRCS=	af.c if.c input.c main.c output.c startup.c tables.c timer.c \
 	trace.c inet.c
-OBJS=	af.o if.o input.o main.o output.o startup.o tables.o timer.o \
-	trace.o inet.o
-HDRS=	af.h defs.h interface.h table.h trace.h
-MAN=	routed.0
-
-all: routed
+MAN8=	routed.0
+SUBDIR=	query trace
+C2=	/usr/libexec/c2
+INLINE=	/sys/${MACHINE}/inline/inline
 
-routed: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS}
+.include <bsd.prog.mk>
 
 # The following can be deleted where not appropriate to use the kernel's
 # inline code expansions.
 .c.o:
-	${CC} -S ${CFLAGS} $*.c
-	${C2} $*.s | ${INLINE} | ${AS} -o $*.o
-	rm -f $*.s
-
-clean:
-	rm -f ${OBJS} core routed
-	(cd tools; make ${MFLAGS} clean)
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-	(cd tools; make ${MFLAGS} cleandir)
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-	(cd tools; make ${MFLAGS} depend)
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 routed ${DESTDIR}/usr/sbin
-	install -c -o bin -g bin -m 444 routed.0 ${DESTDIR}/usr/man/cat8
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${HDRS} ${SRCS}
-	(cd tools; make ${MFLAGS} tags)
+	${CC} -S ${CFLAGS} ${.CURDIR}/${.PREFIX}.c
+	@${C2} ${.PREFIX}.s | ${INLINE} | ${AS} -o ${.PREFIX}.o
+	@rm -f ${.PREFIX}.s
diff --git a/usr/src/share/Makefile.inc b/usr/src/share/Makefile.inc
new file mode 100644
index 0000000000..f4fae2ff7c
--- /dev/null
+++ b/usr/src/share/Makefile.inc
@@ -0,0 +1,3 @@
+#	@(#)Makefile.inc	5.1 (Berkeley) %G%
+
+BINDIR?=	/usr/share
diff --git a/usr/src/usr.bin/Makefile.inc b/usr/src/usr.bin/Makefile.inc
new file mode 100644
index 0000000000..50aafbc620
--- /dev/null
+++ b/usr/src/usr.bin/Makefile.inc
@@ -0,0 +1,3 @@
+#	@(#)Makefile.inc	5.1 (Berkeley) %G%
+
+BINDIR?=	/usr/bin
diff --git a/usr/src/usr.bin/f77/libF77/Makefile b/usr/src/usr.bin/f77/libF77/Makefile
index 52fe16a4e6..07cb9dda93 100644
--- a/usr/src/usr.bin/f77/libF77/Makefile
+++ b/usr/src/usr.bin/f77/libF77/Makefile
@@ -1,36 +1,6 @@
-#
-# Copyright (c) 1980 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.10 (Berkeley) %G%
-#
-# Makefile for f77 math & startup lib, libF77.a
+#	@(#)Makefile	5.11 (Berkeley) %G%
 
-CFLAGS=	-O
-FFLAGS=	-O
-DEST=	${DESTDIR}/usr/lib
-LIBRARY=libF77.a
-LIBRARY_P=libF77_p.a
-OPTIONS=-DUCBVAX
-OBJS=	abort_.o besj0_.o besj1_.o besjn_.o besy0_.o besy1_.o besyn_.o \
-	c_abs.o c_cos.o c_div.o c_exp.o c_log.o c_sin.o c_sqrt.o d_abs.o \
-	d_acos.o d_asin.o d_atan.o d_atn2.o d_cnjg.o d_cos.o d_cosh.o \
-	d_dim.o d_dprod.o d_exp.o d_imag.o d_int.o d_lg10.o d_log.o \
-	d_mod.o d_nint.o d_prod.o d_sign.o d_sin.o d_sinh.o d_tan.o \
-	d_tanh.o dbesj0_.o dbesj1_.o dbesjn_.o dbesy0_.o dbesy1_.o \
-	dbesyn_.o derf_.o derfc_.o ef1asc_.o ef1cmc_.o erf_.o erfc_.o \
-	exit_.o h_abs.o h_dim.o h_dnnt.o h_indx.o h_len.o h_mod.o h_nint.o \
-	h_sign.o hl_ge.o hl_gt.o hl_le.o hl_lt.o i_abs.o i_dim.o i_dnnt.o \
-	i_indx.o i_len.o i_mod.o i_nint.o i_sign.o l_ge.o l_gt.o l_le.o \
-	l_lt.o lnblnk_.o long_.o main.o pow_ci.o pow_dd.o pow_di.o pow_hh.o \
-	pow_ii.o pow_ri.o pow_zi.o pow_zz.o r_abs.o r_acos.o r_asin.o \
-	r_atan.o r_atn2.o r_cnjg.o r_cos.o r_cosh.o r_dim.o r_exp.o \
-	r_imag.o r_int.o r_lg10.o r_log.o r_mod.o r_nint.o r_sign.o r_sin.o \
-	r_sinh.o r_sqrt.o r_tan.o r_tanh.o rand_.o random_.o range.o \
-	rindex_.o s_cat.o s_cmp.o s_copy.o s_paus.o s_rnge.o s_stop.o \
-	short_.o signal_.o subout.o traper_.o trapov_.o trpfpe_.o z_cos.o \
-	z_div.o z_exp.o z_log.o z_sin.o z_sqrt.o
+LIB=	F77
 SRCS=	abort_.c besj0_.c besj1_.c besjn_.c besy0_.c besy1_.c besyn_.c \
 	c_abs.c c_cos.c c_div.c c_exp.c c_log.c c_sin.c c_sqrt.c d_abs.c \
 	d_acos.c d_asin.c d_atan.c d_atn2.c d_cnjg.c d_cos.c d_cosh.c \
@@ -50,77 +20,46 @@ SRCS=	abort_.c besj0_.c besj1_.c besjn_.c besy0_.c besy1_.c besyn_.c \
 	subout.c traper_.c trapov_.c trpfpe_.c z_cos.c z_div.c z_exp.c \
 	z_log.c z_sin.c z_sqrt.c
 
-all: Version ${LIBRARY} ${LIBRARY_P}
+LDADD=		Version.o
+CLEANFILES+=	Usef Version.o Version.c mkvers
 
-${LIBRARY}: ${OBJS}
-		@echo "Loading ${LIBRARY} ... "
-		@if [ -d obj ]; then cd obj; fi; \
-			ar cru ${LIBRARY} ${OBJS} Version; \
-			ranlib ${LIBRARY}
+all: Usef Version.o
 
-${LIBRARY_P}: ${OBJS}
-		@echo "Loading ${LIBRARY_P} ... "
-		@if [ -d obj ]; then cd obj; fi; \
-			cd profiled; ar cru ../${LIBRARY_P} ${OBJS} Version; \
-			ranlib ../${LIBRARY_P}
-
-Version: ${SRCS} obj/mkvers
-	@rm -f Version.c
-	./obj/mkvers ${LIBRARY} ${SRCS} > Version.c
+Version.o: Version.c
 	${CC} -c Version.c
-	mv -f obj/Version.o obj/Version
-	@rm -f profiled/Version
-	ln obj/Version profiled/Version
-
-mkvers: mkvers.c
-	@${CC} mkvers.c -o mkvers
 
-clean:
-	rm -f ${OBJS} obj/Usef profiled/*.o ${LIBRARY} ${LIBRARY_P} obj/mkvers
+Version.c: mkvers ${SRCS}
+	mkvers libF77.a ${.ALLSRC:M*.c} > ${.TARGET}
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend:
-	mkdep ${SRCS}
+mkvers: mkvers.c
+	${CC} ${CFLAGS} ${.CURDIR}/mkvers.c -o ${.TARGET}
 
-install: ${MAN}
-	install -o bin -g bin -m 644 ${LIBRARY} ${DEST}/${LIBRARY}
-	ranlib -t ${DEST}/${LIBRARY}
-	install -o bin -g bin -m 644 ${LIBRARY_P} ${DEST}/${LIBRARY_P}
-	ranlib -t ${DEST}/${LIBRARY_P}
+Usef: Usef.c
+	${CC} ${CFLAGS} ${.CURDIR}/Usef.c -o ${.TARGET}
 
-tags: ${SRCS}
-	ctags ${SRCS}
+trapov_.o trapov_.po: trapov_.c
+	${CC} -S -DUCBVAX ${.CURDIR}/trapov_.c
+	(echo "g/.set	L[0-9][0-9]*,0x0$$/s/0x0/0xf10/"; echo "x") | \
+	    ex - trapov_.s;
+	${AS} trapov_.s -o ${.TARGET}
+	rm -f trapov_.s
 
-trapov_.o: trapov_.c
-	${CC} -S $(OPTIONS) trapov_.c;
-	(echo "g/.set	L[0-9][0-9]*,0x0$$/s/0x0/0xf10/"; echo "x") \
-		| ex - trapov_.s;
-	as trapov_.s -o trapov_.o;
-	mv obj/trapov_.o profiled/trapov_.o
-	rm trapov_.s
-	${CC} -S $(OPTIONS) trapov_.c
-	(echo "g/.set	L[0-9][0-9]*,0x0$$/s/0x0/0xf10/"; echo "x") \
-		| ex - trapov_.s
-	as trapov_.s -o trapov_.o
-	rm trapov_.s
+.include <bsd.lib.mk>
 
-#	'Usef' is part of a kuldge to get around a bug in the C compiler.
-#	C (sec. 9.10 of C ref manual) should round the return value of
-#	functions of type float from double to float.  It doesn't, so f77
-#	truncates it losing a half bit of accuracy.  See file Test_float
-#	for a test.  When it is fixed, get rid of Usef & the extraneous stores
-#	in  pow_ri, r_dim, r_mod, r_nint .
+# 'Usef' is part of a kuldge to get around a bug in the C compiler.
+# C (sec. 9.10 of C ref manual) should round the return value of
+# functions of type float from double to float.  It doesn't, so f77
+# truncates it losing a half bit of accuracy.  See file Test_float
+# for a test.  When it is fixed, get rid of Usef & the extraneous
+# stores in pow_ri, r_dim, r_mod, r_nint.
 
-${OBJS}: Usef
+.c.o:
+	${CC} `Usef ${.PREFIX}` ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+	${LD} -x -r ${.TARGET}
+	mv a.out ${.TARGET}
 
-Usef: Usef.c
-	${CC} -O Usef.c -o Usef
+.c.po:
+	${CC} -p `Usef ${.PREFIX}` ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+	${LD} -x -r ${.TARGET}
+	mv a.out ${.TARGET}
 
-.c.o:
-	@${CC} -p `obj/Usef $*` ${CFLAGS} -c $*.c
-	@-ld -x -r -o profiled/$*.o $*.o
-	${CC} `obj/Usef $*` ${CFLAGS} -c $*.c
-	@-ld -x -r $*.o
-	@if [ -d obj ]; then cd obj; fi; mv a.out $*.o
diff --git a/usr/src/usr.bin/f77/libI77/Makefile b/usr/src/usr.bin/f77/libI77/Makefile
index 66bdef231e..36e1282ed8 100644
--- a/usr/src/usr.bin/f77/libI77/Makefile
+++ b/usr/src/usr.bin/f77/libI77/Makefile
@@ -1,90 +1,41 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.8	(Berkeley)	%G%
-#
-CFLAGS=	-O
-FFLAGS=	-O
-LIBC=	/lib/libc.a
-DEST=	$(DESTDIR)/usr/lib
-LIBRARY=	libI77.a
-LIBRARY_P=	libI77_p.a
+#	@(#)Makefile	5.9 (Berkeley) %G%
+
+LIB=	I77
 SRCS=	backspace.c c_dfe.c c_iio.c c_sfe.c close.c dofio.c dolio.c douio.c \
 	due.c endfile.c err.c f77_abort.c f_errlist.c fmt.c fmtlib.c \
 	inquire.c lread.c lwrite.c open.c rdfe.c rdfmt.c rewind.c rfi.c \
 	rsfe.c rsli.c rsnmle.c sue.c util.c wdfe.c wfi.c wrtfmt.c wsfe.c \
-	wsli.c wsnmle.c
-OBJS=	backspace.o c_dfe.o c_iio.o c_sfe.o close.o dofio.o dolio.o douio.o \
-	due.o endfile.o err.o f77_abort.o f_errlist.o fmt.o fmtlib.o \
-	inquire.o lread.o lwrite.o open.o rdfe.o rdfmt.o rewind.o rfi.o \
-	rsfe.o rsli.o rsnmle.o sue.o util.o wdfe.o wfi.o wrtfmt.o wsfe.o \
-	wsli.o wsnmle.o
-
-.c.o:
-	@${CC} -p ${CFLAGS} -c $*.c
-	@-ld -x -r $*.o
-	@mv a.out profiled/$*.o
-	${CC} ${CFLAGS} -c $*.c
-	@-ld -x -r $*.o
-	@mv a.out $*.o
+	wsli.c wsnmle.c 
 
-all: ${LIBRARY} ${LIBRARY_P} libI66.o
+LDADD=		Version.o
+CLEANFILES+=	Version.c Version.o libI66.o mkvers
 
-${LIBRARY}: ${OBJS} Version
-	@echo "Loading normal ${LIBRARY} ... "
-	@ar cru ${LIBRARY} ${OBJS} Version
-	ranlib ${LIBRARY}
+all: Version.o libI66.o
 
-${LIBRARY_P}: ${OBJS} Version
-	@echo "Loading profiled ${LIBRARY_P} ... "
-	@cd profiled; ar cru ../${LIBRARY_P} ${OBJS} Version
-	ranlib ${LIBRARY_P}
+Version.o: Version.c
+	${CC} -c Version.c
 
-Version: ${SRCS} mkvers
-	./mkvers ${LIBRARY} ${SRCS} > Version.c
-	$(CC) -c Version.c -o Version
-	@rm -f profiled/Version
-	ln Version profiled/Version
+Version.c: mkvers ${SRCS}
+	mkvers libI77.a ${.ALLSRC:M*.c} > ${.TARGET}
 
 mkvers: mkvers.c
-	${CC} mkvers.c -o $@
-
-f_errlist.o: f_errlist.c
-	${CC} ${CFLAGS} -c f_errlist.c
-	@rm -f profiled/f_errlist.o
-	ln f_errlist.o profiled/f_errlist.o
-
-clean:
-	rm -f ${OBJS} profiled/*.o core ${LIBRARY} ${LIBRARY_P} libI66.o mkvers
+	${CC} ${CFLAGS} ${.CURDIR}/mkvers.c -o ${.TARGET}
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
+f_errlist.o f_errlist.po: f_errlist.c
+	${CC} ${CFLAGS} -c ${.CURDIR}/f_errlist.c -o ${.TARGET}
 
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
+beforeinstall:
+	install -o ${BINOWN} -g ${BINGRP} -m ${LIBMODE} libI66.o \
+	    ${DESTDIR}/usr/lib/libI66.a
 
-install: ${MAN}
-	install -o bin -g bin -m 644 ${LIBRARY} ${DEST}/${LIBRARY}
-	ranlib -t ${DEST}/${LIBRARY}
-	install -o bin -g bin -m 644 ${LIBRARY_P} ${DEST}/${LIBRARY_P}
-	ranlib -t ${DEST}/${LIBRARY_P}
-	install -c -o bin -g bin -m 644 libI66.o ${DEST}/libI66.a
+.include <bsd.lib.mk>
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
-
-extract: FRC
-	@ar xo ${DEST}/${LIBRARY}; rm -f __.SYMDEF
-	@cd profiled; -ar xo ${DEST}/${LIBRARY_P}; rm -f __.SYMDEF
-
-update ${DEST}/${LIBRARY}: FRC
-	@-ar xo ${DEST}/${LIBRARY}
-	@cd profiled; -ar xo ${DEST}/${LIBRARY_P}
-	@make DEST=${DEST} all install clean
-
-FRC:
+.c.o:
+	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+	@${LD} -x -r ${.TARGET}
+	@mv a.out ${.TARGET}
+
+.c.po:
+	${CC} -p ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+	@${LD} -x -r ${.TARGET}
+	@mv a.out ${.TARGET}
diff --git a/usr/src/usr.bin/f77/libU77/Makefile b/usr/src/usr.bin/f77/libU77/Makefile
index 850e4b5fcc..2e216a389b 100644
--- a/usr/src/usr.bin/f77/libU77/Makefile
+++ b/usr/src/usr.bin/f77/libU77/Makefile
@@ -1,15 +1,6 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	5.4	(Berkeley)	%G%
-#
-CFLAGS=	-O
-LIBC=	/lib/libc.a
-DEST=	${DESTDIR}/usr/lib
-LIBRARY=	libU77.a
-LIBRARY_P=	libU77_p.a
+#	@(#)Makefile	5.5 (Berkeley) %G%
+
+LIB=	U77
 SRCS=	access_.c alarm_.c chdir_.c chmod_.c ctime_.c dtime_.c etime_.c \
 	f77lid_.c fdate_.c fgetc_.c fork_.c fputc_.c fseek_.c fstat_.c \
 	ftell_.c gerror_.c getarg_.c getc_.c getcwd_.c getenv_.c getgid_.c \
@@ -18,81 +9,41 @@ SRCS=	access_.c alarm_.c chdir_.c chmod_.c ctime_.c dtime_.c etime_.c \
 	lstat_.c ltime_.c malloc_.c perror_.c putc_.c qsort_.c rename_.c \
 	sleep_.c stat_.c symlnk_.c system_.c tapeio.c time_.c ttynam_.c \
 	unlink_.c wait_.c
-OBJS=	access_.o alarm_.o chdir_.o chmod_.o ctime_.o dtime_.o etime_.o \
-	f77lid_.o fdate_.o fgetc_.o fork_.o fputc_.o fseek_.o fstat_.o \
-	ftell_.o gerror_.o getarg_.o getc_.o getcwd_.o getenv_.o getgid_.o \
-	getlog_.o getpid_.o getuid_.o gmtime_.o hostnm_.o iargc_.o idate_.o \
-	ierrno_.o ioinit.o isatty_.o itime_.o kill_.o link_.o loc_.o \
-	lstat_.o ltime_.o malloc_.o perror_.o putc_.o qsort_.o rename_.o \
-	sleep_.o stat_.o symlnk_.o system_.o tapeio.o time_.o ttynam_.o \
-	unlink_.o wait_.o
-
-.c.o:
-	@${CC} -p ${CFLAGS} -c $*.c
-	@-ld -x -r $*.o
-	@mv a.out profiled/$*.o
-	${CC} ${CFLAGS} -c $*.c
-	@-ld -x -r $*.o
-	@mv a.out $*.o
 
-.f.o:
-	@${FC} -p ${FFLAGS} -c $*.f
-	@-ld -x -r $*.o
-	@mv a.out profiled/$*.o
-	${FC} ${FFLAGS} -c $*.f
-	@-ld -x -r $*.o
-	@mv a.out $*.o
-
-all: ${LIBRARY} ${LIBRARY_P}
+LDADD=		Version.o
+CLEANFILES+=	Version.o Version.c mkvers
 
-${LIBRARY}: ${OBJS} Version
-	@echo "Loading normal ${LIBRARY} ... "
-	@ar cru ${LIBRARY} ${OBJS} ioinit.f Version
-	ranlib ${LIBRARY}
+all: Version.o
 
-${LIBRARY_P}: ${OBJS} Version
-	@echo "Loading profiled ${LIBRARY_P} ... "
-	@cd profiled; ar cru ../${LIBRARY_P} ${OBJS} Version
-	ranlib ${LIBRARY_P}
+Version.o: Version.c
+	${CC} -c Version.c
 
-Version: ${SRCS} mkvers
-	@rm -f Version.c
-	./mkvers ${LIBRARY} ${SRCS} > Version.c
-	${CC} -c Version.c -o Version
-	@rm -f profiled/Version
-	ln Version profiled/Version
+Version.c: mkvers ${SRCS}
+	mkvers libU77.a ${.ALLSRC:M*.c} > ${.TARGET}
 
 mkvers: mkvers.c
-	${CC} mkvers.c -o $@
-
-clean:
-	rm -f ${OBJS} mkvers profiled/*.o core ${LIBRARY} ${LIBRARY_P}
+	${CC} ${CFLAGS} ${.CURDIR}/mkvers.c -o ${.TARGET}
 
-cleandir: clean
-	rm -f ${MAN} tags .depend
+.include <bsd.lib.mk>
 
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -o bin -g bin -m 644 ${LIBRARY} ${DEST}/${LIBRARY}
-	ranlib -t ${DEST}/${LIBRARY}
-	install -o bin -g bin -m 644 ${LIBRARY_P} ${DEST}/${LIBRARY_P}
-	ranlib -t ${DEST}/${LIBRARY_P}
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
-
-extract: FRC
-	@ar xo ${DEST}/${LIBRARY}; rm -f __.SYMDEF
-	@cd profiled; -ar xo ${DEST}/${LIBRARY_P}; rm -f __.SYMDEF
+.c.o:
+	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+	@${LD} -x -r ${.TARGET}
+	@mv a.out ${.TARGET}
 
-update ${DEST}/${LIBRARY}: FRC
-	@-ar xo ${DEST}/${LIBRARY}
-	@cd profiled; -ar xo ${DEST}/${LIBRARY_P}
-	@make DEST=${DEST} all install clean
+.c.po:
+	${CC} -p ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+	@${LD} -x -r ${.TARGET}
+	@mv a.out ${.TARGET}
 
-FRC:
+# Fortran compiler doesn't let you rename .o's, so we'll have to
+# rebuild the .o's each time.
+.f.o:
+	${FC} ${FFLAGS} -c ${.IMPSRC}
+	@${LD} -x -r ${.TARGET}
+	@mv a.out ${.TARGET}
+
+.f.po:
+	${FC} -p ${FFLAGS} -c ${.IMPSRC}
+	@${LD} -x -r ${.TARGET:S/.po/.o/}
+	@mv a.out ${.TARGET}
diff --git a/usr/src/usr.bin/pascal/libpc/Makefile b/usr/src/usr.bin/pascal/libpc/Makefile
index 77eb34306b..de68241e42 100644
--- a/usr/src/usr.bin/pascal/libpc/Makefile
+++ b/usr/src/usr.bin/pascal/libpc/Makefile
@@ -1,11 +1,6 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
-#
-#	@(#)Makefile	1.26	(Berkeley)	%G%
-#
-CFLAGS=	-O
+#	@(#)Makefile	1.27 (Berkeley) %G%
+
+LIB=	pc
 CMDS=	ACTFILE.c ADDT.c ARGV.c ASRT.c ASRTS.c ATAN.c BUFF.c CARD.c \
 	CASERNG.c CHR.c CLCK.c COS.c CTTOT.c DATE.c DEFNAME.c \
 	DFDISPOSE.c DISPOSE.c EXCEPT.c EXP.c EXPO.c FCALL.c FLUSH.c \
@@ -22,58 +17,5 @@ SYS=	ERROR.c GETNAME.c IOSYNC.c PCEXIT.c PCLOSE.c PCSTART.c \
 	blkclr.c blkcpy.c
 EXTN=	APPEND.c SEEK.c TELL.c
 SRCS=	${CMDS} ${SYS} ${EXTN}
-COBJS=	ACTFILE.o ADDT.o ARGV.o ASRT.o ASRTS.o ATAN.o BUFF.o CARD.o \
-	CASERNG.o CHR.o CLCK.o COS.o CTTOT.o DATE.o DEFNAME.o \
-	DFDISPOSE.o DISPOSE.o EXCEPT.o EXP.o EXPO.o FCALL.o FLUSH.o \
-	FNIL.o FRTN.o FSAV.o GET.o HALT.o IN.o INCT.o LINO.o \
-	LLIMIT.o LN.o MAX.o MULT.o NAM.o NEW.o NIL.o PACK.o\
-	PAGE.o PRED.o PUT.o RANDOM.o RANG4.o READ4.o READ8.o READC.o\
-	READE.o READLN.o RELEQ.o RELNE.o RELSGE.o RELSGT.o RELSLE.o\
-	RELSLT.o RELTGE.o RELTGT.o RELTLE.o RELTLT.o REMOVE.o RESET.o\
-	REWRITE.o ROUND.o RSNG4.o SCLCK.o SEED.o SIN.o SQRT.o STLIM.o\
-	SUBSC.o SUBSCZ.o SUBT.o SUCC.o TEOF.o TEOLN.o TIME.o TRUNC.o\
-	UNIT.o UNPACK.o VWRITEF.o WRITEC.o WRITEF.o WRITES.o WRITLN.o
-SYOBJ =	ERROR.o GETNAME.o IOSYNC.o PCEXIT.o PCLOSE.o PCSTART.o \
-	PFCLOSE.o PERROR.o PFLUSH.o PMFLUSH.o UNSYNC.o \
-	blkclr.o blkcpy.o
-EXOBJ =	APPEND.o SEEK.o TELL.o
-OBJS=	${COBJS} ${SYOBJ} ${EXOBJ}
-
-.c.o:
-	@${CC} -p ${CFLAGS} -c $*.c
-	@mv $@ tmp.o
-	@-ld -X -r -o profiled/$@ tmp.o
-	${CC} ${CFLAGS} -c $*.c
-	@mv $@ tmp.o
-	@-ld -x -r -o $@ tmp.o
-
-all: libpc libpc_p
-
-libpc libpc_p: ${OBJS}
-	@echo building normal libpc
-	@ar cru libpc ${OBJS}
-	ranlib libpc
-	@echo building profiled libpc
-	@cd profiled; ar cru ../libpc_p ${OBJS}
-	ranlib libpc_p
-
-clean:
-	rm -f ${OBJS} core libpc libpc_p profiled/*.o tmp tmp.o
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -o bin -g bin -m 644 libpc_p ${DESTDIR}/usr/lib/libpc_p.a
-	ranlib -t ${DESTDIR}/usr/lib/libpc_p.a
-	install -o bin -g bin -m 644 libpc ${DESTDIR}/usr/lib/libpc.a
-	ranlib -t ${DESTDIR}/usr/lib/libpc.a
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.lib.mk>
diff --git a/usr/src/usr.sbin/Makefile.inc b/usr/src/usr.sbin/Makefile.inc
new file mode 100644
index 0000000000..dda6325e3c
--- /dev/null
+++ b/usr/src/usr.sbin/Makefile.inc
@@ -0,0 +1,3 @@
+#	@(#)Makefile.inc	5.1 (Berkeley) %G%
+
+BINDIR?=	/usr/sbin
-- 
2.20.1