From b9ad8c8635daa61851dae229097979424d740268 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Sat, 7 Apr 2001 11:21:35 +0000 Subject: [PATCH] beforeinstall -> SCRIPTS. --- games/caesar/Makefile | 5 +---- games/wargames/Makefile | 5 +---- gnu/libexec/uucp/uusched/Makefile | 15 +++++--------- gnu/libexec/uucp/uuto/Makefile | 15 +++++--------- gnu/usr.bin/cvs/contrib/Makefile | 7 +------ gnu/usr.bin/cvs/cvsbug/Makefile | 9 ++------ gnu/usr.bin/groff/afmtodit/Makefile | 6 +----- gnu/usr.bin/groff/eqn/Makefile | 13 ++++-------- gnu/usr.bin/groff/grog/Makefile | 17 ++++++--------- gnu/usr.bin/groff/nroff/Makefile | 7 +------ gnu/usr.bin/gzip/Makefile | 28 ++++++++----------------- gnu/usr.bin/man/Makefile.shprog | 30 --------------------------- gnu/usr.bin/man/apropos/Makefile | 20 ++++++++++++++---- gnu/usr.bin/man/catman/Makefile | 10 +++------ gnu/usr.bin/man/makewhatis/Makefile | 12 +++-------- gnu/usr.bin/send-pr/Makefile | 7 +------ kerberosIV/usr.bin/ksrvtgt/Makefile | 7 +------ libexec/save-entropy/Makefile | 7 +------ sbin/dhclient/Makefile | 8 +++---- sbin/nologin/Makefile | 7 +------ sbin/setkey/Makefile | 12 +++-------- usr.bin/c89/Makefile | 5 +---- usr.bin/locate/locate/Makefile | 10 ++++----- usr.bin/lorder/Makefile | 5 +---- usr.bin/mkdep/Makefile | 8 +++---- usr.bin/pagesize/Makefile | 5 +---- usr.bin/shar/Makefile | 5 +---- usr.bin/sockstat/Makefile | 5 +---- usr.bin/tput/Makefile | 6 ++---- usr.bin/vgrind/Makefile | 7 ++++--- usr.bin/whereis/Makefile | 5 +---- usr.bin/yacc/Makefile | 9 +++----- usr.sbin/adduser/Makefile | 10 ++------- usr.sbin/kbdmap/Makefile | 15 +++----------- usr.sbin/lpr/lp/Makefile | 6 ++---- usr.sbin/manctl/Makefile | 6 +----- usr.sbin/mergemaster/Makefile | 5 +---- usr.sbin/named.reload/Makefile | 14 +++++-------- usr.sbin/named.restart/Makefile | 12 ++++------- usr.sbin/nologin/Makefile | 7 +------ usr.sbin/periodic/Makefile | 7 +------ usr.sbin/pim6sd/Makefile | 5 +---- usr.sbin/pkg_install/update/Makefile | 5 +---- usr.sbin/pkg_install/version/Makefile | 5 +---- usr.sbin/setkey/Makefile | 12 +++-------- usr.sbin/spkrtest/Makefile | 5 +---- 46 files changed, 117 insertions(+), 314 deletions(-) delete mode 100644 gnu/usr.bin/man/Makefile.shprog diff --git a/games/caesar/Makefile b/games/caesar/Makefile index 48a843005d2e..e63f323cc06c 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 diff --git a/games/wargames/Makefile b/games/wargames/Makefile index 841f9d265f04..4f2a9df8c673 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 diff --git a/gnu/libexec/uucp/uusched/Makefile b/gnu/libexec/uucp/uusched/Makefile index 513902710b9a..ae643b011283 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 diff --git a/gnu/libexec/uucp/uuto/Makefile b/gnu/libexec/uucp/uuto/Makefile index 47a72ddf4d7f..2682611887de 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 diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile index 37805aa0a803..21a07ed6caad 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 7cb64d89d8c6..89fafc52100e 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 diff --git a/gnu/usr.bin/groff/afmtodit/Makefile b/gnu/usr.bin/groff/afmtodit/Makefile index aeb414a010a4..37bd3658d78a 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 diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile index 28efb09974ee..ed1b7f98971c 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 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 eb28285e34aa..d8304bef34f2 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} - -all: grog - -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} grog \ - ${DESTDIR}${BINDIR} - -.include "../Makefile.cfg" -.include +SCRIPTS= grog +MAN= grog.1 +CLEANFILES= ${SCRIPTS} ${MAN} grog: grog.sh sed -e 's/@g@/$(g)/g' ${.ALLSRC} > ${.TARGET} + +.include "../Makefile.cfg" +.include diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile index 9fe5f95eadec..231b482ace03 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 diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile index fc52f5642871..4088b2c2fd78 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 07fb1ed476aa..000000000000 --- 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 diff --git a/gnu/usr.bin/man/apropos/Makefile b/gnu/usr.bin/man/apropos/Makefile index de23d925f7e6..2f5244b6d6a8 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 -.include "../../Makefile.inc" -.include "../Makefile.shprog" +.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 diff --git a/gnu/usr.bin/man/catman/Makefile b/gnu/usr.bin/man/catman/Makefile index bd5ce9eb8f4b..047cc791f1d3 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 diff --git a/gnu/usr.bin/man/makewhatis/Makefile b/gnu/usr.bin/man/makewhatis/Makefile index d1960031dc4c..73eb9e09814b 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 diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile index 95dc518b2499..55aa5e6c6625 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 70b8438fb0e3..a1b65c31202d 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 .PATH: ${KRB4DIR}/appl/kauth diff --git a/libexec/save-entropy/Makefile b/libexec/save-entropy/Makefile index c3de2caaf45c..400bb9e6888c 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 - diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile index 8f257c54e9eb..602061639e64 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 diff --git a/sbin/nologin/Makefile b/sbin/nologin/Makefile index fae063bf6823..b1611c06f4c7 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 diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile index 1c5538ba2cb8..0ce9f7730a47 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 f2f9df09b1e9..8d96524f1736 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 diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile index 512c2178fcd9..37058a0aae1b 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 7741bcc1b245..61996824ef93 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 diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile index c94d0c3ab3c1..463466ca840a 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 diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile index aa202ee6bafd..6ca205d32252 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 diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile index 2532421b5a4e..9970eb5c3cef 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 diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile index 25377301ff96..6d7ac602b0a5 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 diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile index 441305c15fb7..143dc651e135 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 diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile index 2294fd707fe7..b9911d2c3263 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 0a87b6d04632..7461d9d7a92e 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 diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile index 55efd98c5ae0..e8b1024e82bb 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 diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile index 5a4db550d3e7..66eec824edec 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 diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile index 17413d3ed4e8..b2f660954f2d 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 diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile index df12501153cd..8876472e1220 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 diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile index 294dc5123aeb..9e0c12ecb9a9 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 diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile index c7e758cf0a39..d65784aa4281 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 diff --git a/usr.sbin/named.reload/Makefile b/usr.sbin/named.reload/Makefile index 514f8e567828..5cb467a19b4c 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 diff --git a/usr.sbin/named.restart/Makefile b/usr.sbin/named.restart/Makefile index 8c52d21de99b..e974bf8ae0ce 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 fae063bf6823..b1611c06f4c7 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 diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile index 612264026f53..875d078435ea 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 diff --git a/usr.sbin/pim6sd/Makefile b/usr.sbin/pim6sd/Makefile index a3db48d614f4..882973a78fcd 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 diff --git a/usr.sbin/pkg_install/update/Makefile b/usr.sbin/pkg_install/update/Makefile index 2e3888081133..73afa1fa4105 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 diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile index b9c4d1cf07c4..1a06d02f3077 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 1c5538ba2cb8..0ce9f7730a47 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 97a22682928c..e323c2c3630b 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