be more friendly with mailwrapper(8) when installing sendmail.

XXX maybe we should install sendmail into /usr/pkg/somewhere, and let
the user edit /etc/mailer.conf?  I'm not really sure what is the best route.

4 files changed, 18 insertions, 9 deletions

diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 633ec0621cf..9fea8473237 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 1999/11/29 08:33:30 itojun Exp $
-# KAME $Id: Makefile,v 1.2 1999/11/29 08:33:30 itojun Exp $
+# $NetBSD: Makefile,v 1.3 1999/12/27 09:34:13 itojun Exp $
+# KAME $Id: Makefile,v 1.3 1999/12/27 09:34:13 itojun Exp $
 # Based on FreeBSD Id: Makefile,v 1.27 1999/04/03 08:25:18 itojun Exp
 #
 
@@ -44,6 +44,7 @@ post-patch:
 	@(cd ${_DISTDIR}; for i in ${SENDMAILPATCH}.patch.gz; do \
 		${GZCAT} $$i | ${PATCH} ${PATCH_SENDMAIL_ARGS}; \
 	done)
+	${CP} -f ${FILESDIR}/site.config ${WRKSRC_SENDMAIL}
 	${CP} -f ${FILESDIR}/site.config-v6.kame ${WRKSRC_SENDMAIL}
 
 post-build:
@@ -51,7 +52,7 @@ post-build:
 .if defined(USE_INET6) && ${USE_INET6} == YES
 	@(cd ${WRKSRC_SENDMAIL}; sh makesendmail -f site.config-v6.kame)
 .else
-	@(cd ${WRKSRC_SENDMAIL}; sh makesendmail )
+	@(cd ${WRKSRC_SENDMAIL}; sh makesendmail -f site.config)
 .endif
 
 post-install:
@@ -61,7 +62,10 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}; \
 	done
 .endif
-	@${SED} -e 's#/usr/local#${PREFIX}#' ${PKGDIR}/MESSAGE
+	@${SED} -e 's#/usr/pkg#${PREFIX}#' ${PKGDIR}/MESSAGE
+
+backup-sendmail:
+	(cd /usr/libexec/sendmail; ${MV} sendmail sendmail.dist)
 
 install-sendmail:
 	(cd ${WRKSRC_SENDMAIL}; sh makesendmail install)
diff --git a/mail/smtpfeed/files/site.config b/mail/smtpfeed/files/site.config
new file mode 100644
index 00000000000..a718e764770
--- /dev/null
+++ b/mail/smtpfeed/files/site.config
@@ -0,0 +1,2 @@
+define(`confLINKS', `')
+define(`confMBINDIR', ``/usr/libexec/sendmail'')
diff --git a/mail/smtpfeed/files/site.config-v6.kame b/mail/smtpfeed/files/site.config-v6.kame
index e5c7634f274..5d0e8b69fa9 100644
--- a/mail/smtpfeed/files/site.config-v6.kame
+++ b/mail/smtpfeed/files/site.config-v6.kame
@@ -1 +1,3 @@
 PREPENDDEF(`confENVDEF', ``-DNETINET6=1'')
+define(`confLINKS', `')
+define(`confMBINDIR', ``/usr/libexec/sendmail'')
diff --git a/mail/smtpfeed/pkg/MESSAGE b/mail/smtpfeed/pkg/MESSAGE
index c728f8e81b3..0862c5f41cb 100644
--- a/mail/smtpfeed/pkg/MESSAGE
+++ b/mail/smtpfeed/pkg/MESSAGE
@@ -1,5 +1,5 @@
 **************************************************************
-smtpfeed is installed into /usr/local/libexec/smtpfeed.
+smtpfeed is installed into /usr/pkg/libexec/smtpfeed.
 You'll need to perform 3 steps, (a) to (c), to make smtpfeed
 work:
 	(a) replace /etc/sendmail.cf
@@ -8,11 +8,12 @@ work:
 
 (a) depends on what kind of configuration tool you are using
 with sendmail.cf.  Read through documentation in
-/usr/local/share/doc/smtpfeed for details.
+/usr/pkg/share/doc/smtpfeed for details.
 (b) can be done by performing "make install-sendmail" in the
 port directory.
-WARNING: Existing sendmail will be overwritten right away!
-Backup by yourself for safety.
+WARNING: Existing sendmail (/usr/libexec/sendmail/sendmail) will be
+overwritten right away!  Backup by yourself for safety.
+"make backup-sendmail" would copy old one to sendmail.dist.
 (c) is the easiest of the three items; see file named INSTALL
-in /usr/local/share/doc/smtpfeed.
+in /usr/pkg/share/doc/smtpfeed.
 **************************************************************