- Downgrade to 2.5.7 after repocopy

PR:		134711
Submitted by:	ohauer@gmx.de

5 files changed, 9 insertions, 192 deletions

diff --git a/mail/postfix25/files/patch-makedefs b/mail/postfix25/files/patch-makedefs
index 59dd2ccb8d95..ebe126e27096 100644
--- a/mail/postfix25/files/patch-makedefs
+++ b/mail/postfix25/files/patch-makedefs
@@ -1,6 +1,6 @@
---- makedefs.orig	2009-07-17 18:21:25.000000000 -0400
-+++ makedefs	2009-07-17 18:23:12.000000000 -0400
-@@ -144,6 +144,10 @@
+--- makedefs.orig	2009-09-27 22:18:56.000000000 -0400
++++ makedefs	2009-09-27 22:20:51.000000000 -0400
+@@ -132,6 +132,10 @@
  		;;
    FreeBSD.7*)	SYSTYPE=FREEBSD7
  		;;
diff --git a/mail/postfix25/files/patch-src::util::sys_defs.h b/mail/postfix25/files/patch-src::util::sys_defs.h
index 61f5186e8693..3a2995a1b20e 100644
--- a/mail/postfix25/files/patch-src::util::sys_defs.h
+++ b/mail/postfix25/files/patch-src::util::sys_defs.h
@@ -1,5 +1,5 @@
---- src/util/sys_defs.h.orig	2009-05-11 03:45:27.000000000 +0300
-+++ src/util/sys_defs.h	2009-07-22 21:26:44.208909929 +0300
+--- src/util/sys_defs.h.orig	2009-09-27 22:22:10.000000000 -0400
++++ src/util/sys_defs.h	2009-09-27 22:24:08.000000000 -0400
 @@ -25,6 +25,7 @@
    */
  #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
diff --git a/mail/postfix25/files/pkg-install.in b/mail/postfix25/files/pkg-install.in
deleted file mode 100644
index 9f75b2d3bd42..000000000000
--- a/mail/postfix25/files/pkg-install.in
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD: /tmp/pcvs/ports/mail/postfix25/files/Attic/pkg-install.in,v 1.3 2009-06-11 01:42:24 wxs Exp $
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-ETCDIR=${ETCDIR:=%%ETCDIR%%}
-DAEMONDIR=${DAEMONDIR:=%%DAEMONDIR%%}
-READMEDIR=${READMEDIR:=%%READMEDIR%%}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then
-      DEFAULT_REPLACE_MAILERCONF=n
-else
-      DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
-      NOLOGIN=/usr/sbin/nologin
-else
-      NOLOGIN=/sbin/nologin
-fi
-
-ask() {
-      local question default answer
-
-      question=$1
-      default=$2
-      if [ -z "${PACKAGE_BUILDING}" -a "${BATCH}" = "no" ]; then
-	      read -p "${question} [${default}]? " answer
-      fi
-      if [ -z "${answer}" ]; then
-	      answer=${default}
-      fi
-      echo ${answer}
-}
-
-yesno() {
-      local question default answer
-
-      question=$1
-      default=$2
-      while :; do
-	      answer=$(ask "${question}" "${default}")
-	      case "${answer}" in
-		      [Yy]*)	return 0;;
-		      [Nn]*)	return 1;;
-	      esac
-	      echo "Please answer yes or no."
-      done
-}
-
-if [ "$2" = "PRE-INSTALL" ]; then
-      USER=postfix
-      UID=125
-      GROUP=postfix
-      GID=125
-      GROUP2=maildrop
-      GID2=126
-
-      if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-	      echo "You already have a group \"${GROUP}\", so I will use it."
-      else
-	      if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
-		      echo "Added group \"${GROUP}\"."
-	      else
-		      echo "Adding group \"${GROUP}\" failed..."
-		      echo "Please create it, and try again."
-		      exit 1
-	      fi
-      fi
-
-      if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-	      echo "You already have a group \"${GROUP2}\", so I will use it."
-      else
-	      if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-		      echo "Added group \"${GROUP2}\"."
-	      else
-		      echo "Adding group \"${GROUP2}\" failed..."
-		      echo "Please create it, and try again."
-		      exit 1
-	      fi
-      fi
-
-      if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-	      echo "You already have a user \"${USER}\", so I will use it."
-      else
-	      if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
-		      echo "Added user \"${USER}\"."
-	      else
-		      echo "Adding user \"${USER}\" failed..."
-		      echo "Please create it, and try again."
-		      exit 1
-	      fi
-      fi
-
-      if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-	      echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-      else
-	      echo "You need user \"${USER}\" added to group \"mail\"."
-	      if yesno "Would you like me to add it" y; then
-		      /usr/sbin/pw groupmod mail -m ${USER} || exit
-		      echo "Done."
-	      else
-		      echo "Please create it, and try again."
-		      exit 1
-	      fi
-      fi
-fi
-
-if [ "$2" = "POST-INSTALL" ]; then
-	SAMPLES="main.cf master.cf" 
-	for file in $SAMPLES
-	do
-		if [ ! -f ${ETCDIR}/$file ]; then
-                	cp ${DAEMONDIR}/$file ${ETCDIR}/
-		fi
-	done
-
-      /bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
-	daemon_directory=${DAEMONDIR} \
-	html_directory=${READMEDIR} \
-	readme_directory=${READMEDIR} \
-	upgrade-package
-fi
-
-replace() {
-      local orig repl
-
-	orig=$1
-	repl=$2
-	if [ -e ${orig} ]; then
-		/bin/mv -f ${orig} ${orig}.OFF
-		/bin/chmod 0 ${orig}.OFF
-	fi
-	if [ -e ${repl} ]; then
-		/bin/ln -s ${repl} ${orig}
-	fi
-}
-
-if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; 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
-		echo -n "# Execute the Postfix sendmail program"	>>	/etc/mail/mailer.conf
-		echo ", named ${PREFIX}/sbin/sendmail"		>>	/etc/mail/mailer.conf
-		echo "#"						>>	/etc/mail/mailer.conf
-		echo "sendmail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
-		echo "send-mail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
-		echo "mailq		${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
-		echo "newaliases	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
-	fi
-fi
diff --git a/mail/postfix25/files/pkg-message.in b/mail/postfix25/files/pkg-message.in
deleted file mode 100644
index 5bd796f3d3b2..000000000000
--- a/mail/postfix25/files/pkg-message.in
+++ /dev/null
@@ -1,25 +0,0 @@
-To enable postfix startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the %%PREFIX%%/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix25/files/postfix.sh.in b/mail/postfix25/files/postfix.sh.in
index 04b59ff1ed2e..2b07d6c85c1d 100644
--- a/mail/postfix25/files/postfix.sh.in
+++ b/mail/postfix25/files/postfix.sh.in
@@ -25,10 +25,10 @@ rcvar=${name}_enable
 
 load_rc_config $name
 
-: ${postfix_enable:="NO"}
-: ${postfix_pidfile:="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname:="%%PREFIX%%/libexec/postfix/master"}
-: ${postfix_flags:=""}
+: ${postfix_enable="NO"}
+: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
+: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+: ${postfix_flags=""}
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop