From 855dcbc5531b20fecc190b54e5f6be4eb612df7b Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 7 Aug 2000 02:26:08 +0000
Subject: Fix install/deinstall problems.

---
 mail/exim/Makefile    | 3 ++-
 mail/exim/pkg/MESSAGE | 8 ++++----
 mail/exim/pkg/PLIST   | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'mail/exim')

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index d48926629a7..ecb42ea296b 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/08/04 14:55:09 ad Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/07 02:26:08 wiz Exp $
 
 DISTNAME=	exim-3.16
 CATEGORIES=	mail net
@@ -16,6 +16,7 @@ MESSAGE_FILE=	${WRKDIR}/MESSAGE
 pre-patch:
 	${MKDIR} ${WRKSRC}/Local
 	${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.netbsd
+	${SED} "s,@PREFIX@,${PREFIX}," < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 
 pre-configure:
 	${SED} -e 's:@PREFIX@:${PREFIX}:' \
diff --git a/mail/exim/pkg/MESSAGE b/mail/exim/pkg/MESSAGE
index 1cbc9e373dc..a8d22f9d61c 100644
--- a/mail/exim/pkg/MESSAGE
+++ b/mail/exim/pkg/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2000/08/04 14:55:10 ad Exp $
+$NetBSD: MESSAGE,v 1.2 2000/08/07 02:26:09 wiz Exp $
 
 To use exim, you will need to perform the following steps manually; it is
 inappropriate for this package to make the changes for you.
@@ -7,11 +7,11 @@ inappropriate for this package to make the changes for you.
 1. Add a `mail' user: mail:*:8:6::0:0:Mail subsystem:/var/mail:/sbin/nologin
 2. Set the correct ownership and permissions on the exim log directory:
    chown mail:mail /var/log/exim && chmod 750 /var/log/exim
-3. Read the documentation. Edit /usr/pkg/etc/exim/configure to taste.
+3. Read the documentation. Edit @PREFIX@/etc/exim/configure to taste.
 4. Back-up /etc/mailer.conf to /etc/mailer.conf.sendmail.
-   Copy /usr/pkg/etc/exim/mailer.conf.exim to /etc/mailer.conf.
+   Copy @PREFIX@/etc/exim/mailer.conf.exim to /etc/mailer.conf.
 5. Set sendmail=NO in /etc/rc.conf. Add the folllowing to /etc/rc.local:
-   echo -n ' exim'; /usr/pkg/etc/rc.d/exim.sh
+   echo -n ' exim'; @PREFIX@/etc/rc.d/exim.sh
 6. Configuring log rotation is dependant on personal taste and the version of
    NetBSD in use. See weekly.conf(5), newsyslog(8), exicyclog and eximstats.
 
diff --git a/mail/exim/pkg/PLIST b/mail/exim/pkg/PLIST
index 3a2dce574e0..d44375b3c18 100644
--- a/mail/exim/pkg/PLIST
+++ b/mail/exim/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/07/28 14:54:25 ad Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/08/07 02:26:09 wiz Exp $
 etc/exim/configure
 etc/exim/mailer.conf.exim
 etc/rc.d/exim.sh
@@ -114,6 +114,6 @@ sbin/exinext
 sbin/exiqsumm
 sbin/exiwhat
 man/man8/exim.8
-@unexec rmdir %D/etc/exim %D/share/doc/exim /var/log/exim 2>/dev/null || true
+@unexec rmdir /var/log/exim 2>/dev/null || true
 @dirrm etc/exim
 @dirrm share/doc/exim
-- 
cgit v1.2.3