cat ${PKGDIR}/MESSAGE in bsd.pkg.mk if it exists, don't do it in every

package Makefile.

12 files changed, 32 insertions, 29 deletions

diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index 6aae32aeb10..eb319762c6a 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/06/22 12:52:31 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/07/14 10:56:16 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp
 #
 
@@ -20,7 +20,4 @@ GNU_CONFIGURE=	yes
 do-build:
 	@${DO_NADA}
 
-post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 9308ed973fb..e42b676a9e5 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.115 1998/07/13 13:08:06 mycroft Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.116 1998/07/14 10:56:15 frueauf Exp $
 #
 # This file is in the public domain.
 #
@@ -569,16 +569,16 @@ IGNORE=	"is restricted: ${RESTRICTED}"
 IGNORE=	"uses X11, but ${X11BASE} not found"
 .elif defined(BROKEN)
 IGNORE=	"is marked as broken: ${BROKEN}"
-.elif defined(LICENSE)
-.ifdef ACCEPTABLE_LICENSES
-.for _lic in ${ACCEPTABLE_LICENSES}
-.if ${LICENSE} == "${_lic}"
+.elif defined(LICENCE)
+.ifdef ACCEPTABLE_LICENCES
+.for _lic in ${ACCEPTABLE_LICENCES}
+.if ${LICENCE} == "${_lic}"
 _ACCEPTABLE=	yes
 .endif
 .endfor	# _lic
-.endif	# ACCEPTABLE_LICENSES
+.endif	# ACCEPTABLE_LICENCES
 .ifndef _ACCEPTABLE
-IGNORE=	"Unacceptable license: ${LICENSE}"
+IGNORE=	"Unacceptable licence: ${LICENCE}"
 .endif
 .endif
 
@@ -1059,6 +1059,10 @@ _PORT_USE: .USE
 			fi;						\
 		done;							\
 	fi)
+.if exists(${PKGDIR}/MESSAGE)
+	@${ECHO_MSG} "===>   Please note the following:"
+	@${CAT} ${PKGDIR}/MESSAGE
+.endif
 .if !defined(NO_PKG_REGISTER)
 	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} fake-pkg
 .endif # NO_PKG_REGISTER
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 45d80bed964..9e01420aef8 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/07/13 17:56:27 tv Exp $
+# $NetBSD: Makefile,v 1.3 1998/07/14 10:56:16 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp
 #
 
@@ -31,6 +31,5 @@ do-install:
 	for file in cfgmaker convert indexmaker; do \
 		${INSTALL_SCRIPT} ${WRKSRC}/$$file ${PREFIX}/bin/mrtg$$file; \
 	done
-	@${CAT} ${PKGDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/nntpclnt/Makefile b/news/nntpclnt/Makefile
index 31cd58a87b5..e7291d9a249 100644
--- a/news/nntpclnt/Makefile
+++ b/news/nntpclnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/06/22 13:00:14 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/07/14 10:56:16 frueauf Exp $
 #
 
 DISTNAME=	nntpclnt-1.6.1
@@ -23,6 +23,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/libnntpclnt.a ${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/nntpclnt.3 ${PREFIX}/man/man3/
 	${INSTALL_DATA_DIR} ${PREFIX}/etc/nntp
-	${CAT} ${PKGDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 1ce41c243b8..cf2f0b4513a 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/07/01 15:56:35 tv Exp $
+# $NetBSD: Makefile,v 1.4 1998/07/14 10:56:16 frueauf Exp $
 #
 
 DISTNAME=	xpkgwedge-0.2
@@ -25,7 +25,11 @@ pre-extract:
 pre-configure:
 	@${CP} ${FILESDIR}/Imakefile ${FILESDIR}/xpkgwedge.def ${WRKSRC}
 
-post-install:
-	@${SED} -e s,@@PREFIX@@,${LOCALBASE}, ${PKGDIR}/MESSAGE
+pre-install:
+	@${SED} -e 's|@@PREFIX@@|${LOCALBASE}|g' < ${PKGDIR}/MESSAGE.pre \
+		> ${PKGDIR}/MESSAGE
+
+pre-clean:
+	@${RM} ${PKGDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/xpkgwedge/pkg/MESSAGE b/pkgtools/xpkgwedge/pkg/MESSAGE.pre
index f1f2442d940..f1f2442d940 100644
--- a/pkgtools/xpkgwedge/pkg/MESSAGE
+++ b/pkgtools/xpkgwedge/pkg/MESSAGE.pre
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 9ab6d8fb8d0..7270469cbec 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 1998/07/13 13:09:36 mycroft Exp $
+# $NetBSD: Makefile,v 1.31 1998/07/14 10:56:17 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -127,7 +127,6 @@ post-install:
 			-f ${SSH_CONF_DIR}/ssh_host_key -N ""; \
 	fi
 	${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd.sh
-	@${CAT} ${PKGDIR}/MESSAGE
 
 # Include <bsd.pkg.mk> here.  It is essential to have all the override
 # targets precede inclusion of this.
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index 29c999f15c0..eb8aafa46a6 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/06/22 13:09:50 agc Exp $
+# $NetBSD: Makefile,v 1.16 1998/07/14 10:56:16 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 23:55:31 asami Exp
 #
 
@@ -27,6 +27,5 @@ do-install:
 	 ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1
 	@[ -e /dev/scgx ] || ${LN} -fs /dev/cd0d /dev/scgx
-	@${CAT} ${PKGDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index 968793d2e05..37ba605aa8e 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/07/13 16:45:25 tv Exp $
+# $NetBSD: Makefile,v 1.4 1998/07/14 10:56:16 frueauf Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
@@ -27,6 +27,5 @@ do-build:
 
 do-install:
 	@cd ${WRKSRC} && ${PREFIX}/sbin/apxs -i mod_auth_cookie.so
-	@${CAT} ${PKGDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index 32302d2f2db..a956bfb44a5 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/07/04 09:19:08 mycroft Exp $
+# $NetBSD: Makefile,v 1.13 1998/07/14 10:56:16 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -33,6 +33,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${WRKSRC}/icons/*.xbm \
 			${WRKSRC}/icons/*.bitmap ${WRKSRC}/icons/*.icon \
 		${PREFIX}/lib/X11/fvwm2/pixmaps
-	@${CAT} ${PKGDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpkgwedge/Makefile b/x11/xpkgwedge/Makefile
index 1ce41c243b8..cf2f0b4513a 100644
--- a/x11/xpkgwedge/Makefile
+++ b/x11/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/07/01 15:56:35 tv Exp $
+# $NetBSD: Makefile,v 1.4 1998/07/14 10:56:16 frueauf Exp $
 #
 
 DISTNAME=	xpkgwedge-0.2
@@ -25,7 +25,11 @@ pre-extract:
 pre-configure:
 	@${CP} ${FILESDIR}/Imakefile ${FILESDIR}/xpkgwedge.def ${WRKSRC}
 
-post-install:
-	@${SED} -e s,@@PREFIX@@,${LOCALBASE}, ${PKGDIR}/MESSAGE
+pre-install:
+	@${SED} -e 's|@@PREFIX@@|${LOCALBASE}|g' < ${PKGDIR}/MESSAGE.pre \
+		> ${PKGDIR}/MESSAGE
+
+pre-clean:
+	@${RM} ${PKGDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpkgwedge/pkg/MESSAGE b/x11/xpkgwedge/pkg/MESSAGE.pre
index f1f2442d940..f1f2442d940 100644
--- a/x11/xpkgwedge/pkg/MESSAGE
+++ b/x11/xpkgwedge/pkg/MESSAGE.pre