beforeinstall -> SCRIPTS.

14 files changed, 56 insertions, 138 deletions

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 \