beforeinstall -> SCRIPTS.

4 files changed, 22 insertions, 50 deletions

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>