From 894bf93f4073ca5c4aa1a5d43ca86e57ad3a0a5e Mon Sep 17 00:00:00 2001
From: Sahil Tandon <sahil@FreeBSD.org>
Date: Sat, 11 Feb 2012 21:27:57 +0000
Subject: Modify pkg-install to handle situations in which
 /etc/mail/mailer.conf does not exist, e.g. when FreeBSD is built
 WITHOUT_MAILWRAPPER.

This commit only affects legacy Postfix releases,
as the latest stable and development ports already
perform this check.

Requested by:	miwi
---
 mail/postfix25/pkg-install          | 3 ++-
 mail/postfix26/files/pkg-install.in | 4 ++--
 mail/postfix27/files/pkg-install.in | 4 ++--
 mail/postfix28/files/pkg-install.in | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install
index 4d847638d846..d5e6e64c7e7e 100644
--- a/mail/postfix25/pkg-install
+++ b/mail/postfix25/pkg-install
@@ -10,6 +10,7 @@
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 BATCH=${BATCH:=no}
 POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
+MC=/etc/mail/mailer.conf
 
 if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
 	DEFAULT_REPLACE_MAILERCONF=n
@@ -152,7 +153,7 @@ replace() {
 	fi
 }
 
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
+if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then
 	if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
 		/bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
 		echo "#"						>	/etc/mail/mailer.conf
diff --git a/mail/postfix26/files/pkg-install.in b/mail/postfix26/files/pkg-install.in
index 29cdef068aad..7f9a1329fb4d 100644
--- a/mail/postfix26/files/pkg-install.in
+++ b/mail/postfix26/files/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/mail/postfix26/files/pkg-install.in,v 1.6 2011-07-30 01:34:51 sahil Exp $
+#	$FreeBSD: /tmp/pcvs/ports/mail/postfix26/files/pkg-install.in,v 1.7 2012-02-11 21:27:57 sahil Exp $
 #
 
 # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@@ -72,7 +72,7 @@ if [ "$2" = "POST-INSTALL" ]; then
 	upgrade-package
 fi
 
-if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
+if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then
 	egrep -q "^sendmail.*${PREFIX}/sbin/sendmail"    ${MC} && \
 	egrep -q "^send-mail.*${PREFIX}/sbin/sendmail"   ${MC} && \
 	egrep -q "^mailq.*${PREFIX}/sbin/sendmail"       ${MC} && \
diff --git a/mail/postfix27/files/pkg-install.in b/mail/postfix27/files/pkg-install.in
index b69a44a9d2f4..d32c125cf297 100644
--- a/mail/postfix27/files/pkg-install.in
+++ b/mail/postfix27/files/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/mail/postfix27/files/pkg-install.in,v 1.6 2011-07-30 01:34:53 sahil Exp $
+#	$FreeBSD: /tmp/pcvs/ports/mail/postfix27/files/pkg-install.in,v 1.7 2012-02-11 21:27:57 sahil Exp $
 #
 
 # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@@ -72,7 +72,7 @@ if [ "$2" = "POST-INSTALL" ]; then
 	upgrade-package
 fi
 
-if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
+if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then
 	egrep -q "^sendmail.*${PREFIX}/sbin/sendmail"    ${MC} && \
 	egrep -q "^send-mail.*${PREFIX}/sbin/sendmail"   ${MC} && \
 	egrep -q "^mailq.*${PREFIX}/sbin/sendmail"       ${MC} && \
diff --git a/mail/postfix28/files/pkg-install.in b/mail/postfix28/files/pkg-install.in
index 5a2f34911cb9..91011cc3301a 100644
--- a/mail/postfix28/files/pkg-install.in
+++ b/mail/postfix28/files/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/mail/postfix28/files/pkg-install.in,v 1.6 2012-02-07 01:41:44 sahil Exp $
+#	$FreeBSD: /tmp/pcvs/ports/mail/postfix28/files/pkg-install.in,v 1.7 2012-02-11 21:27:57 sahil Exp $
 #
 
 # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@@ -74,7 +74,7 @@ if [ "$2" = "POST-INSTALL" ]; then
 fi
 
 
-if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
+if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then
 	egrep -q "^sendmail.*${PREFIX}/sbin/sendmail"    ${MC} && \
 	egrep -q "^send-mail.*${PREFIX}/sbin/sendmail"   ${MC} && \
 	egrep -q "^mailq.*${PREFIX}/sbin/sendmail"       ${MC} && \
-- 
cgit v1.2.3