From b979f7222ad9bade13f010cd27e5bc6afab1681c Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 29 Jan 2001 11:34:21 +0000
Subject: Add automatic ${VARIABLE} handling for MESSAGE files. Convert most
 MESSAGE files to new syntax (${VARIABLE} gets replaced, not @VARIABLE@, nor
 @@VARIABLE@@). By default, substitutions are done for LOCALBASE, PKGNAME,
 PREFIX, X11BASE, X11PREFIX; additional patterns can be added via
 MESSAGE_SUBST. Clean up some packages while I'm there; add RCS tags to most
 MESSAGEs. Remove some uninteresting MESSAGEs.

---
 mail/procmail/Makefile    |  7 +------
 mail/procmail/pkg/MESSAGE | 10 +++++-----
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'mail/procmail')

diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 2bd2c613ab7..48e4ee1edfe 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/08/26 14:26:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/01/29 11:34:31 wiz Exp $
 # FreeBSD Id: Makefile,v 1.24 1997/05/14 14:40:34 ache Exp
 #
 
@@ -12,8 +12,6 @@ HOMEPAGE=	http://www.procmail.org/
 INSTALL_TARGET=	install-suid install.man
 MAKE_ENV=	SHELL=/bin/sh
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 post-patch:
 	${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h-orig
 	${SED} -e 's|@LOCALBASE@|${LOCALBASE}|g' < ${WRKSRC}/config.h-orig \
@@ -23,9 +21,6 @@ post-patch:
 		< ${WRKSRC}/man/procmail.man-orig \
 		> ${WRKSRC}/man/procmail.man
 
-pre-install:
-	${SED} -e 's,@PREFIX@,${PREFIX},g' ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/mail/procmail/pkg/MESSAGE b/mail/procmail/pkg/MESSAGE
index 16be21a6674..711a80abf6f 100644
--- a/mail/procmail/pkg/MESSAGE
+++ b/mail/procmail/pkg/MESSAGE
@@ -1,12 +1,12 @@
-$NetBSD: MESSAGE,v 1.3 2000/08/26 14:26:59 wiz Exp $
-
 =============================================================
+$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:31 wiz Exp $
+
 Please note the following:
 
-    - The system-wide procmailrc is expected in @PREFIX@/etc
-      (e.g. @PREFIX@/etc/procmailrc).
+    - The system-wide procmailrc is expected in ${PREFIX}/etc
+      (e.g. ${PREFIX}/etc/procmailrc).
 
     - The system-wide procmailrc directory is expected in
-      @PREFIX@/etc (e.g. @PREFIX@/etc/procmailrcs/*).
+      ${PREFIX}/etc (e.g. ${PREFIX}/etc/procmailrcs/*).
 
 =============================================================
-- 
cgit v1.2.3