beforeinstall -> SCRIPTS.

11 files changed, 22 insertions, 48 deletions

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>