beforeinstall -> SCRIPTS.

46 files changed, 116 insertions, 313 deletions

diff --git a/games/caesar/Makefile b/games/caesar/Makefile
index 48a8430..e63f323 100644
--- a/games/caesar/Makefile
+++ b/games/caesar/Makefile
@@ -4,13 +4,10 @@
 PROG=	caesar
 DPADD=	${LIBM}
 LDADD=	-lm
+SCRIPTS=rot13.sh
 MAN=	caesar.6
 MLINKS=	caesar.6 rot13.6
 
 CFLAGS+= -Wall
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/rot13.sh ${DESTDIR}${BINDIR}/rot13
-
 .include <bsd.prog.mk>
diff --git a/games/wargames/Makefile b/games/wargames/Makefile
index 841f9d2..4f2a9df 100644
--- a/games/wargames/Makefile
+++ b/games/wargames/Makefile
@@ -1,10 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+SCRIPTS=wargames.sh
 MAN=	wargames.6
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/wargames.sh ${DESTDIR}${BINDIR}/wargames
-
 .include <bsd.prog.mk>
diff --git a/gnu/libexec/uucp/uusched/Makefile b/gnu/libexec/uucp/uusched/Makefile
index 5139027..ae643b0 100644
--- a/gnu/libexec/uucp/uusched/Makefile
+++ b/gnu/libexec/uucp/uusched/Makefile
@@ -1,19 +1,14 @@
 # Makefile for uusched
 # $FreeBSD$
 
-BINDIR=		$(bindir)
-CLEANFILES+=	$(ONESHPROG)
-ONESHPROG=	uusched
+SCRIPTS=	uusched
 MAN=		uusched.8
+CLEANFILES+=	$(SCRIPTS)
 
-all: $(ONESHPROG)
+BINDIR=		$(bindir)
 
-$(ONESHPROG): $(ONESHPROG).in Makefile
+uusched: uusched.in
 	sed -e "s|@SBINDIR@|$(libxdir)|g" \
-		$(.ALLSRC:N*Makefile) > $(.TARGET)
-
-beforeinstall:
-	${INSTALL} -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \
-		$(ONESHPROG) $(DESTDIR)$(BINDIR)/$(ONESHPROG)
+		$(.ALLSRC) > $(.TARGET)
 
 .include <bsd.prog.mk>
diff --git a/gnu/libexec/uucp/uuto/Makefile b/gnu/libexec/uucp/uuto/Makefile
index 47a72dd..2682611 100644
--- a/gnu/libexec/uucp/uuto/Makefile
+++ b/gnu/libexec/uucp/uuto/Makefile
@@ -1,19 +1,14 @@
 # Makefile for uuto
 # $FreeBSD$
 
-BINDIR=		$(bindir)
-CLEANFILES+=	$(ONESHPROG)
-ONESHPROG=	uuto
+SCRIPTS=	uuto
 MAN=		uuto.1
+CLEANFILES+=	$(SCRIPTS)
 
-all: $(ONESHPROG)
+BINDIR=		$(bindir)
 
-$(ONESHPROG): $(ONESHPROG).in Makefile
+uuto: uuto.in
 	sed -e "s|@BINDIR@|$(bindir)|g" \
-		$(.ALLSRC:N*Makefile) > $(.TARGET)
-
-beforeinstall:
-	${INSTALL} -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \
-		$(ONESHPROG) $(DESTDIR)$(BINDIR)/$(ONESHPROG)
+		$(.ALLSRC) > $(.TARGET)
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
index 37805aa..21a07ed 100644
--- a/gnu/usr.bin/cvs/contrib/Makefile
+++ b/gnu/usr.bin/cvs/contrib/Makefile
@@ -16,13 +16,12 @@ SCRIPTS= clmerge cln_hist commit_prep cvs2vendor cvs_acls cvscheck \
 FILES=	 README cvscheck.man cvshelp.man descend.man intro.doc
 
 EXAMPDIR=	/usr/share/examples/cvs
+SCRIPTSDIR=	${EXAMPDIR}/contrib
 PERLPATH=	/usr/bin/perl
 CLEANFILES+=	$(SCRIPTS)
 
 .SUFFIXES: .sh .csh .pl
 
-all:	${SCRIPTS}
-
 .sh:
 	cp $< $@
 
@@ -34,10 +33,6 @@ all:	${SCRIPTS}
 
 
 beforeinstall:
-.for file in ${SCRIPTS}
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${file} ${DESTDIR}${EXAMPDIR}/contrib
-.endfor
 .for file in ${FILES}
 	cd ${.CURDIR} ; \
 		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
index 7cb64d8..89fafc5 100644
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ b/gnu/usr.bin/cvs/cvsbug/Makefile
@@ -7,14 +7,13 @@ MAINTAINER=	peter@FreeBSD.org
 .PATH:	${CVSDIR}/src
 .PATH:	${CVSDIR}/man
 
-MAN=	cvsbug.8
+SCRIPTS=	cvsbug
+MAN=		cvsbug.8
 
 CLEANFILES+= cvsbug ver
 
 .SUFFIXES: .sh
 
-all: cvsbug
-
 ver: version.c
 	echo > ${.TARGET} cvs-`sed < ${.ALLSRC} \
 		    -e '/version_string/!d' \
@@ -24,8 +23,4 @@ ver: version.c
 .sh: ver
 	sed -e "s,xVERSIONx,`cat ver`,g" ${.IMPSRC} > ${.TARGET}
 
-beforeinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		cvsbug ${DESTDIR}${BINDIR}/cvsbug
-
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/afmtodit/Makefile b/gnu/usr.bin/groff/afmtodit/Makefile
index aeb414a..37bd365 100644
--- a/gnu/usr.bin/groff/afmtodit/Makefile
+++ b/gnu/usr.bin/groff/afmtodit/Makefile
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
+SCRIPTS=	afmtodit.pl
 MAN=		afmtodit.1
-
 CLEANFILES+=	${MAN}
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${DIST_DIR}/afmtodit.pl ${DESTDIR}${BINDIR}/afmtodit
-
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index 28efb09..ed1b7f9 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -6,14 +6,12 @@ SRCS=		eqn.cc eqn_tab.h main.cc lex.cc \
 		script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
+SCRIPTS=	neqn
 MAN=		eqn.1 neqn.1
-CLEANFILES=	eqn.cc eqn_tab.h ${MAN} neqn y.tab.c y.tab.h
+CLEANFILES=	eqn.cc eqn_tab.h ${MAN} ${SCRIPTS} y.tab.c y.tab.h
 
-all: neqn
-
-beforeinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} neqn \
-	    ${DESTDIR}${BINDIR}
+neqn: neqn.sh
+	sed -e 's/@g@/${g}/g' ${.ALLSRC} > ${.TARGET}
 
 eqn_tab.h: eqn.cc
 
@@ -21,6 +19,3 @@ eqn_tab.h: eqn.cc
 .include <bsd.prog.mk>
 
 INCLUDES+=	-I${DIST_DIR} -I.
-
-neqn: ${DIST_DIR}/neqn.sh
-	sed -e 's/@g@/${g}/g' ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/groff/grog/Makefile b/gnu/usr.bin/groff/grog/Makefile
index eb28285..d8304be 100644
--- a/gnu/usr.bin/groff/grog/Makefile
+++ b/gnu/usr.bin/groff/grog/Makefile
@@ -1,16 +1,11 @@
 # $FreeBSD$
 
-MAN=	grog.1
-CLEANFILES= grog ${MAN}
+SCRIPTS=	grog
+MAN=		grog.1
+CLEANFILES=	${SCRIPTS} ${MAN}
 
-all: grog
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} grog \
-	    ${DESTDIR}${BINDIR}
+grog: grog.sh
+	sed -e 's/@g@/$(g)/g' ${.ALLSRC} > ${.TARGET}
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
-
-grog: grog.sh
-	sed -e 's/@g@/$(g)/g' ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile
index 9fe5f95..231b482 100644
--- a/gnu/usr.bin/groff/nroff/Makefile
+++ b/gnu/usr.bin/groff/nroff/Makefile
@@ -1,14 +1,9 @@
 # $FreeBSD$
 
+SCRIPTS=	nroff.sh psroff.sh
 MAN=		nroff.1 psroff.1
 
 CLEANFILES+=	${MAN}
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		$(DIST_DIR)/nroff.sh $(DESTDIR)$(BINDIR)/nroff
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		$(DIST_DIR)/psroff.sh $(DESTDIR)$(BINDIR)/psroff
-
 .include <../Makefile.cfg>
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile
index fc52f56..4088b2c 100644
--- a/gnu/usr.bin/gzip/Makefile
+++ b/gnu/usr.bin/gzip/Makefile
@@ -4,40 +4,30 @@
 PROG=	gzip
 SRCS=	gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
 	crypt.c lzw.c unlzw.c unlzh.c unpack.c getopt.c
-MAN=	gzexe.1 gzip.1 zdiff.1 zforce.1 zmore.1 znew.1
 CFLAGS+=-DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DDIRENT=1
-GREP_LIBZ?=	YES
-
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=	match.S
 CFLAGS+=-DASMV
 .endif
+SCRIPTS=gzexe zdiff zforce zmore znew
+MAN=	gzexe.1 gzip.1 zdiff.1 zforce.1 zmore.1 znew.1
 
-MLINKS= gzip.1 gunzip.1  gzip.1 zcat.1  gzip.1 gzcat.1
-MLINKS+= zdiff.1 zcmp.1
+NOSHARED?=yes
 
 LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip
 LINKS+= ${BINDIR}/gzip ${BINDIR}/gzcat
 LINKS+= ${BINDIR}/gzip ${BINDIR}/zcat
 LINKS+= ${BINDIR}/zdiff ${BINDIR}/zcmp
+MLINKS= gzip.1 gunzip.1 gzip.1 zcat.1 gzip.1 gzcat.1
+MLINKS+= zdiff.1 zcmp.1
+
+GREP_LIBZ?=	YES
 .if defined(GREP_LIBZ) && empty(GREP_LIBZ)
+SCRIPTS+=zgrep.getopt
+MAN+=	zgrep.1
 LINKS+= ${BINDIR}/zgrep ${BINDIR}/zegrep
 LINKS+= ${BINDIR}/zgrep ${BINDIR}/zfgrep
 MLINKS+= zgrep.1 zfgrep.1 zgrep.1 zegrep.1
-MAN+=	zgrep.1
-.endif
-
-NOSHARED?=yes
-ZGREP=zgrep.getopt
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	   ${.CURDIR}/zforce ${.CURDIR}/gzexe ${.CURDIR}/znew \
-	   ${.CURDIR}/zmore ${.CURDIR}/zdiff \
-	   ${DESTDIR}${BINDIR}
-.if defined(GREP_LIBZ) && empty(GREP_LIBZ)
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	   ${.CURDIR}/${ZGREP} ${DESTDIR}${BINDIR}/zgrep
 .endif
 
 match.o: ${.CURDIR}/match.S
diff --git a/gnu/usr.bin/man/Makefile.shprog b/gnu/usr.bin/man/Makefile.shprog
deleted file mode 100644
index 07fb1ed..0000000
--- a/gnu/usr.bin/man/Makefile.shprog
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-# This may become bsd.shprog.mk.  The general version would have to handle:
-# - arbitrary sed substitutions.
-# - programs without man pages.
-# - programs with man pages in sections other than section 1.
-
-MAN=	${SHPROG:S/$/.1/g}
-
-CLEANFILES+=	${SHPROG} ${MAN}
-
-all:	${SHPROG}
-
-.sh:
-	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
-	    -e 's,%pager%,${pager},' \
-		${.ALLSRC} > ${.TARGET}
-
-.SUFFIXES: .man .1
-.man.1:
-	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
-	    -e 's,%pager%,${pager},' -e 's,%troff%,${troff},' \
-	    -e 's,%manpath_config_file%,${manpath_config_file},' \
-		${.ALLSRC} > ${.TARGET}
-
-beforeinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${SHPROG} ${DESTDIR}${BINDIR}
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/man/apropos/Makefile b/gnu/usr.bin/man/apropos/Makefile
index de23d92..2f5244b 100644
--- a/gnu/usr.bin/man/apropos/Makefile
+++ b/gnu/usr.bin/man/apropos/Makefile
@@ -1,10 +1,22 @@
 # $FreeBSD$
 MAINTAINER= wosch
 
-SHPROG=	apropos
+SCRIPTS=apropos
+MAN=	apropos.1
+CLEANFILES+= ${SCRIPTS} ${MAN}
 
-MLINKS=	apropos.1 whatis.1
 LINKS=	${BINDIR}/apropos ${BINDIR}/whatis
+MLINKS=	apropos.1 whatis.1
+
+.sh:
+	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
+	    -e 's,%pager%,${pager},' \
+		${.ALLSRC} > ${.TARGET}
+
+apropos.1: apropos.man
+	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
+	    -e 's,%pager%,${pager},' -e 's,%troff%,${troff},' \
+	    -e 's,%manpath_config_file%,${manpath_config_file},' \
+		${.ALLSRC} > ${.TARGET}
 
-.include "../../Makefile.inc"
-.include "../Makefile.shprog"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/man/catman/Makefile b/gnu/usr.bin/man/catman/Makefile
index bd5ce9e..047cc79 100644
--- a/gnu/usr.bin/man/catman/Makefile
+++ b/gnu/usr.bin/man/catman/Makefile
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
-MAINTAINER= wosch
+MAINTAINER=	wosch
 
-
-MAN=	catman.1
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/catman.perl ${DESTDIR}${BINDIR}/catman
+SCRIPTS=	catman.perl
+MAN=		catman.1
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/man/makewhatis/Makefile b/gnu/usr.bin/man/makewhatis/Makefile
index d196003..73eb9e0 100644
--- a/gnu/usr.bin/man/makewhatis/Makefile
+++ b/gnu/usr.bin/man/makewhatis/Makefile
@@ -1,18 +1,12 @@
 # $FreeBSD$
 MAINTAINER= wosch
 
+SCRIPTS=makewhatis.perl makewhatis.local.sh
 MAN=	makewhatis.1 makewhatis.local.8
-MLINKS=	makewhatis.local.8 catman.local.8
 
 libexecdir=/usr/libexec
 LINKS=${libexecdir}/makewhatis.local ${libexecdir}/catman.local 
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/makewhatis.perl ${DESTDIR}${BINDIR}/makewhatis
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/makewhatis.local.sh \
-	    ${DESTDIR}${libexecdir}/makewhatis.local
-
+SCRIPTSDIR_makewhatis.local.sh=	${libexecdir}
+MLINKS=	makewhatis.local.8 catman.local.8
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
index 95dc518..55aa5e6 100644
--- a/gnu/usr.bin/send-pr/Makefile
+++ b/gnu/usr.bin/send-pr/Makefile
@@ -3,6 +3,7 @@
 # Makefile for building a standalone send-pr.
 #
 
+SCRIPTS=	send-pr
 MAN=		send-pr.1
 SUBMITTERS=	current-users
 RELEASE=	`uname -rsm`
@@ -14,8 +15,6 @@ SUBDIR+= doc
 LINKS=	${BINDIR}/send-pr ${BINDIR}/sendbug
 MLINKS=	send-pr.1 sendbug.1
 
-all: send-pr _SUBDIR
-
 send-pr:	send-pr.sh Makefile
 	sed -e 's,@DATADIR@,/etc,g' \
 	    -e 's/@DEFAULT_RELEASE@/$(RELEASE)/g' \
@@ -28,10 +27,6 @@ send-pr.el:	send-pr-el.in Makefile
 	    -e 's/"unknown"/"$(SUBMITTERS)"/g' \
 	    ${.ALLSRC:N*Makefile} > ${.TARGET}
 
-beforeinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		send-pr ${DESTDIR}${BINDIR}/send-pr
-
 # called from /usr/src/etc/Makefile 
 etc-gnats-freefall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 0644 \
diff --git a/kerberosIV/usr.bin/ksrvtgt/Makefile b/kerberosIV/usr.bin/ksrvtgt/Makefile
index 70b8438..a1b65c3 100644
--- a/kerberosIV/usr.bin/ksrvtgt/Makefile
+++ b/kerberosIV/usr.bin/ksrvtgt/Makefile
@@ -1,13 +1,8 @@
 # $FreeBSD$
 
+SCRIPTS=	ksrvtgt.in
 MAN=		${KRB4DIR}/man/ksrvtgt.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${KRB4DIR}/appl/kauth/ksrvtgt.in ${DESTDIR}${BINDIR}/ksrvtgt
-
-depend all:
-
 .include <bsd.prog.mk>
 
 .PATH:	${KRB4DIR}/appl/kauth
diff --git a/libexec/save-entropy/Makefile b/libexec/save-entropy/Makefile
index c3de2ca..400bb9e 100644
--- a/libexec/save-entropy/Makefile
+++ b/libexec/save-entropy/Makefile
@@ -1,10 +1,5 @@
 # $FreeBSD$
 
-NOMAN=	noman
-
-beforeinstall:
-	${INSTALL} -c -o operator -g operator -m 500 \
-	    ${.CURDIR}/save-entropy.sh ${DESTDIR}${BINDIR}/save-entropy
+SCRIPTS=	save-entropy.sh
 
 .include <bsd.prog.mk>
-
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 8f257c5..6020616 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -13,12 +13,10 @@ SRCS+=	alloc.c bpf.c conflex.c convert.c dispatch.c errwarn.c ethernet.c \
 CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR}
 CFLAGS+= -DCLIENT_PATH='"PATH=/sbin:/bin:/usr/sbin:/usr/bin"' -Dwarn=dhcp_warn
 
+SCRIPTS=	scripts/freebsd
+SCRIPTSNAME=	dhclient-script
+
 MAN=	dhclient.conf.5 dhclient.leases.5 dhcp-options.5
 MAN+=	dhclient.8 dhclient-script.8
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${DIST_DIR}/client/scripts/freebsd \
-	    ${DESTDIR}${BINDIR}/dhclient-script
-
 .include <bsd.prog.mk>
diff --git a/sbin/nologin/Makefile b/sbin/nologin/Makefile
index fae063b..b1611c0 100644
--- a/sbin/nologin/Makefile
+++ b/sbin/nologin/Makefile
@@ -1,12 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/22/94
 # $FreeBSD$
 
+SCRIPTS=nologin.sh
 MAN=	nologin.5 nologin.8
 
-nologin depend lint tags:
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/nologin.sh ${DESTDIR}${BINDIR}/nologin
-
 .include <bsd.prog.mk>
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index 1c5538b..0ce9f77 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -41,14 +41,6 @@ YFLAGS+=-d
 SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
 CFLAGS+=-I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey
 
-SCRIPTS=	scriptdump
-
-BINOWN  = root
-BINGRP  = bin
-BINMODE = 555
-
-all: ${PROG} scriptdump
-
 SRCS+=y.tab.h
 y.tab.h: parse.y
 CFLAGS+=-DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT -I.
@@ -56,8 +48,10 @@ DPADD+=	${LIBIPSEC}
 LDADD+=	-lipsec
 CLEANFILES+=	scriptdump y.tab.h
 
+SCRIPTS=scriptdump
 MAN=	setkey.8
-LOCALPREFIX=	/usr/local
+
+LOCALPREFIX=	/usr
 
 scriptdump: scriptdump.pl
 	sed -e 's#@LOCALPREFIX@#${LOCALPREFIX}#' < $> > scriptdump
diff --git a/usr.bin/c89/Makefile b/usr.bin/c89/Makefile
index f2f9df0..8d96524 100644
--- a/usr.bin/c89/Makefile
+++ b/usr.bin/c89/Makefile
@@ -1,9 +1,6 @@
 # $FreeBSD$
 
+SCRIPTS=c89.sh
 MAN=	c89.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	     ${.CURDIR}/c89.sh ${DESTDIR}${BINDIR}/c89
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 512c217..37058a0 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -4,16 +4,14 @@
 PROG=	locate
 SRCS=	util.c locate.c
 CFLAGS+= -I${.CURDIR} -DMMAP # -DDEBUG (print time) -O2 (10% faster)
+SCRIPTS=updatedb.sh mklocatedb.sh concatdb.sh
 MAN=	locate.1 locate.updatedb.8
-SCRIPTS= updatedb mklocatedb concatdb
-MLINKS+= locate.updatedb.8 updatedb.8
-
 
-beforeinstall:
+SCRIPTSDIR=	${LIBEXECDIR}
 .for script in ${SCRIPTS}
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-    	${.CURDIR}/${script}.sh ${DESTDIR}${LIBEXECDIR}/locate.${script}
+SCRIPTSNAME_${script}=	locate.${script:R}
 .endfor
+MLINKS+= locate.updatedb.8 updatedb.8
 
 # only /usr/src/etc/Makefile install files in /etc
 #	${INSTALL} -c -o root -g wheel -m 644 \
diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile
index 7741bcc..6199682 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -1,10 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+SCRIPTS=lorder.sh
 MAN=	lorder.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/lorder.sh ${DESTDIR}${BINDIR}/lorder
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile
index c94d0c3..463466c 100644
--- a/usr.bin/mkdep/Makefile
+++ b/usr.bin/mkdep/Makefile
@@ -1,10 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
-MAN=	mkdep.1
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/mkdep.gcc.sh ${DESTDIR}${BINDIR}/mkdep
+SCRIPTS=	mkdep.gcc.sh
+MAN=		mkdep.1
+SCRIPTSNAME=	mkdep
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile
index aa202ee..6ca205d 100644
--- a/usr.bin/pagesize/Makefile
+++ b/usr.bin/pagesize/Makefile
@@ -1,10 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/3/94
 # $FreeBSD$
 
+SCRIPTS=pagesize.sh
 MAN=	pagesize.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/pagesize.sh ${DESTDIR}${BINDIR}/pagesize
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile
index 2532421..9970eb5 100644
--- a/usr.bin/shar/Makefile
+++ b/usr.bin/shar/Makefile
@@ -1,10 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+SCRIPTS=shar.sh
 MAN=	shar.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/shar.sh ${DESTDIR}${BINDIR}/shar
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile
index 2537730..6d7ac60 100644
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@@ -1,10 +1,7 @@
 # $FreeBSD$
 
 MAINTAINER=	des@freebsd.org
+SCRIPTS=	sockstat.pl
 MAN=		sockstat.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/sockstat.pl ${DESTDIR}${BINDIR}/sockstat
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile
index 441305c..143dc65 100644
--- a/usr.bin/tput/Makefile
+++ b/usr.bin/tput/Makefile
@@ -1,12 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	tput
 DPADD=	${LIBTERMCAP}
 LDADD=	-ltermcap
+SCRIPTS=clear.sh
 MLINKS=	tput.1 clear.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/clear.sh ${DESTDIR}${BINDIR}/clear
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 2294fd7..b9911d2 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -3,9 +3,12 @@
 
 PROG=	vfontedpr
 SRCS=	regexp.c vfontedpr.c
+SCRIPTS=vgrind.sh
 MAN=	vgrind.1 vgrindefs.5
+
 BINDIR=	/usr/libexec
-BIN2DIR=/usr/bin
+SCRIPTSDIR=/usr/bin
+
 EXTRA=	vgrindefs.src.db
 CLEANFILES+=	${EXTRA}
 
@@ -15,8 +18,6 @@ ${EXTRA}: ${.CURDIR}/vgrindefs.src
 	cap_mkdb -f vgrindefs.src ${.CURDIR}/vgrindefs.src
 
 beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/vgrind.sh ${DESTDIR}${BIN2DIR}/vgrind
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/vgrindefs.src \
 	    ${DESTDIR}/usr/share/misc/vgrindefs
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
diff --git a/usr.bin/whereis/Makefile b/usr.bin/whereis/Makefile
index 0a87b6d..7461d9d 100644
--- a/usr.bin/whereis/Makefile
+++ b/usr.bin/whereis/Makefile
@@ -1,9 +1,6 @@
 # $FreeBSD$
 
+SCRIPTS=whereis.pl
 MAN=	whereis.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/whereis.pl ${DESTDIR}${BINDIR}/whereis
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 55efd98..e8b1024 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -4,12 +4,9 @@
 PROG=	yacc
 SRCS=	closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
 	skeleton.c symtab.c verbose.c warshall.c
+SCRIPTS=yyfix.sh
 MAN=	yacc.1 yyfix.1
-LINKS+=	${BINDIR}/yacc ${BINDIR}/byacc
-MLINKS+=yacc.1 byacc.1
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/yyfix.sh ${DESTDIR}${BINDIR}/yyfix
+LINKS=	${BINDIR}/yacc ${BINDIR}/byacc
+MLINKS=	yacc.1 byacc.1
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile
index 5a4db55..66eec82 100644
--- a/usr.sbin/adduser/Makefile
+++ b/usr.sbin/adduser/Makefile
@@ -2,13 +2,7 @@
 
 MAINTAINER= wosch
 
-SCRIPTS= adduser.perl rmuser.perl
-MAN=	 adduser.8    rmuser.8
-
-beforeinstall:
-.for script in ${SCRIPTS}
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/${script} ${DESTDIR}${BINDIR}/${script:R}
-.endfor
+SCRIPTS=adduser.perl rmuser.perl
+MAN=	adduser.8 rmuser.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile
index 17413d3..b2f6609 100644
--- a/usr.sbin/kbdmap/Makefile
+++ b/usr.sbin/kbdmap/Makefile
@@ -1,19 +1,10 @@
-# Makefile for kbdmap / vidfont
 # $FreeBSD$
 
 MAINTAINER= wosch
 
-
-SCRIPT=	${.CURDIR}/kbdmap.pl
+SCRIPTS=${.CURDIR}/kbdmap.pl
+MAN=	kbdmap.1
 LINKS=	${BINDIR}/kbdmap ${BINDIR}/vidfont
-MAN=   kbdmap.1
-MLINKS= kbdmap.1 vidfont.1
-
-all:
-	@echo -n
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${SCRIPT} ${DESTDIR}${BINDIR}/kbdmap
+MLINKS=	kbdmap.1 vidfont.1
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile
index df12501..8876472 100644
--- a/usr.sbin/lpr/lp/Makefile
+++ b/usr.sbin/lpr/lp/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-BINDIR=	/usr/bin
+SCRIPTS=lp.sh
 MAN=	lp.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	     ${.CURDIR}/lp.sh ${DESTDIR}${BINDIR}/lp
+BINDIR=	/usr/bin
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile
index 294dc51..9e0c12e 100644
--- a/usr.sbin/manctl/Makefile
+++ b/usr.sbin/manctl/Makefile
@@ -1,10 +1,6 @@
-# Makefile
 # $FreeBSD$
 
+SCRIPTS=manctl.sh
 MAN=	manctl.8
 
-beforeinstall: 
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${.CURDIR}/manctl.sh ${DESTDIR}${BINDIR}/manctl
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile
index c7e758c..d65784a 100644
--- a/usr.sbin/mergemaster/Makefile
+++ b/usr.sbin/mergemaster/Makefile
@@ -1,11 +1,8 @@
 # $FreeBSD$
 
 MAINTAINER=	dougb@FreeBSD.org
+SCRIPTS=	mergemaster.sh
 MAN=		mergemaster.8
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/mergemaster.sh ${DESTDIR}${BINDIR}/mergemaster
-
 .include <bsd.prog.mk>
 
diff --git a/usr.sbin/named.reload/Makefile b/usr.sbin/named.reload/Makefile
index 514f8e5..5cb467a1 100644
--- a/usr.sbin/named.reload/Makefile
+++ b/usr.sbin/named.reload/Makefile
@@ -2,18 +2,14 @@
 
 .include "${.CURDIR}/../named/Makefile.inc"
 
-MAN=	named.reload.8
-CLEANFILES+= named.reload
-
-all:	named.reload
-
-realinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    named.reload ${DESTDIR}${BINDIR}
+SCRIPTS=	named.reload
+MAN=		named.reload.8
+CLEANFILES+=	${SCRIPTS}
+SCRIPTSNAME=	${SCRIPTS}
 
 named.reload:	named.reload.sh ${BIND_DIR}/Makefile
 	sed -e "s|%INDOT%|${INDOT}|" \
 	    -e "s|%DESTSBIN%|${DESTSBIN}|" \
-	    < ${.CURDIR}/named.reload.sh > named.reload
+	    < ${.CURDIR}/named.reload.sh > ${.TARGET}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/named.restart/Makefile b/usr.sbin/named.restart/Makefile
index 8c52d21..e974bf8 100644
--- a/usr.sbin/named.restart/Makefile
+++ b/usr.sbin/named.restart/Makefile
@@ -2,14 +2,10 @@
 
 .include "${.CURDIR}/../named/Makefile.inc"
 
-MAN=	named.restart.8
-CLEANFILES+= named.restart
-
-all:	named.restart
-
-realinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    named.restart ${DESTDIR}${BINDIR}
+SCRIPTS=	named.restart
+MAN=		named.restart.8
+CLEANFILES+=	${SCRIPTS}
+SCRIPTSNAME=	${SCRIPTS}
 
 named.restart:	named.restart.sh ${BIND_DIR}/Makefile
 	sed -e "s|%INDOT%|${INDOT}|" \
diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile
index fae063b..b1611c0 100644
--- a/usr.sbin/nologin/Makefile
+++ b/usr.sbin/nologin/Makefile
@@ -1,12 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/22/94
 # $FreeBSD$
 
+SCRIPTS=nologin.sh
 MAN=	nologin.5 nologin.8
 
-nologin depend lint tags:
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/nologin.sh ${DESTDIR}${BINDIR}/nologin
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile
index 6122640..875d078 100644
--- a/usr.sbin/periodic/Makefile
+++ b/usr.sbin/periodic/Makefile
@@ -1,11 +1,6 @@
-# Makefile for periodic(8)
-#
 # $FreeBSD$
 
+SCRIPTS=periodic.sh
 MAN=	periodic.8
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${.CURDIR}/periodic.sh ${DESTDIR}${BINDIR}/periodic
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pim6sd/Makefile b/usr.sbin/pim6sd/Makefile
index a3db48d..882973a 100644
--- a/usr.sbin/pim6sd/Makefile
+++ b/usr.sbin/pim6sd/Makefile
@@ -89,11 +89,8 @@ CFLAGS+=-DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET -DHAVE_GETIFADDRS
 CFLAGS+=-DHAVE_STDARG_H
 DPADD=	${LIBY} ${LIBL}
 LDADD=	-ly -ll
+SCRIPTS=pim6stat
 
 MAN=	pim6stat.1 pim6sd.conf.5 pim6sd.8
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/pim6stat ${DESTDIR}${BINDIR}
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/update/Makefile b/usr.sbin/pkg_install/update/Makefile
index 2e38880..73afa1f 100644
--- a/usr.sbin/pkg_install/update/Makefile
+++ b/usr.sbin/pkg_install/update/Makefile
@@ -1,9 +1,6 @@
 # $FreeBSD$
 
+SCRIPTS=	pkg_update.pl
 MAN=		pkg_update.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/pkg_update.pl ${DESTDIR}${BINDIR}/pkg_update
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile
index b9c4d1c..1a06d02 100644
--- a/usr.sbin/pkg_install/version/Makefile
+++ b/usr.sbin/pkg_install/version/Makefile
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
 MAINTAINER=	bmah@FreeBSD.org
+SCRIPTS=	pkg_version.pl
 MAN=		pkg_version.1
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/pkg_version.pl ${DESTDIR}${BINDIR}/pkg_version
-
 test:
 	./test-pkg_version.sh
 
diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile
index 1c5538b..0ce9f77 100644
--- a/usr.sbin/setkey/Makefile
+++ b/usr.sbin/setkey/Makefile
@@ -41,14 +41,6 @@ YFLAGS+=-d
 SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
 CFLAGS+=-I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey
 
-SCRIPTS=	scriptdump
-
-BINOWN  = root
-BINGRP  = bin
-BINMODE = 555
-
-all: ${PROG} scriptdump
-
 SRCS+=y.tab.h
 y.tab.h: parse.y
 CFLAGS+=-DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT -I.
@@ -56,8 +48,10 @@ DPADD+=	${LIBIPSEC}
 LDADD+=	-lipsec
 CLEANFILES+=	scriptdump y.tab.h
 
+SCRIPTS=scriptdump
 MAN=	setkey.8
-LOCALPREFIX=	/usr/local
+
+LOCALPREFIX=	/usr
 
 scriptdump: scriptdump.pl
 	sed -e 's#@LOCALPREFIX@#${LOCALPREFIX}#' < $> > scriptdump
diff --git a/usr.sbin/spkrtest/Makefile b/usr.sbin/spkrtest/Makefile
index 97a2268..e323c2c 100644
--- a/usr.sbin/spkrtest/Makefile
+++ b/usr.sbin/spkrtest/Makefile
@@ -2,10 +2,7 @@
 
 MAINTAINER= wosch
 
+SCRIPTS=spkrtest.pl
 MAN=	spkrtest.8
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/spkrtest.pl ${DESTDIR}${BINDIR}/spkrtest
-
 .include <bsd.prog.mk>