- Fix data_directory. Backported from mail/postfix

4 files changed, 26 insertions, 5 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 978b64097933..bfdad5d92c8e 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	2.6-20080221
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -226,6 +227,7 @@ pre-install:
 do-install:
 	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
 		config_directory=${PREFIX}/etc/postfix \
+		data_directory=/var/db/postfix \
 		daemon_directory=${PREFIX}/libexec/postfix \
 		command_directory=${PREFIX}/sbin \
 		queue_directory=/var/spool/postfix \
diff --git a/mail/postfix-current/files/patch-conf::main.cf b/mail/postfix-current/files/patch-conf::main.cf
index a9cb3c360058..14976bcaa09c 100644
--- a/mail/postfix-current/files/patch-conf::main.cf
+++ b/mail/postfix-current/files/patch-conf::main.cf
@@ -1,6 +1,6 @@
---- conf/main.cf.orig	Mon Mar 27 15:58:38 2006
-+++ conf/main.cf	Mon Mar 27 15:59:02 2006
-@@ -33,13 +33,13 @@
+--- conf/main.cf.orig	2007-12-18 11:50:25.000000000 -0200
++++ conf/main.cf	2008-02-29 22:35:12.000000000 -0300
+@@ -33,19 +33,19 @@
  # The command_directory parameter specifies the location of all
  # postXXX commands.
  #
@@ -14,9 +14,16 @@
 -daemon_directory = /usr/libexec/postfix
 +daemon_directory = !!PREFIX!!/libexec/postfix
  
+ # The data_directory parameter specifies the location of Postfix-writable
+ # data files (caches, random numbers). This directory must be owned
+ # by the mail_owner account (see below).
+ #
+-data_directory = /var/lib/postfix
++data_directory = /var/db/postfix
+ 
  # QUEUE AND PROCESS OWNERSHIP
  #
-@@ -238,7 +238,7 @@
+@@ -244,7 +244,7 @@
  # 
  #mynetworks_style = class
  #mynetworks_style = subnet
@@ -25,7 +32,7 @@
  
  # Alternatively, you can specify the mynetworks list by hand, in
  # which case Postfix ignores the mynetworks_style setting.
-@@ -609,37 +609,37 @@
+@@ -615,37 +615,37 @@
  # sendmail_path: The full pathname of the Postfix sendmail command.
  # This is the Sendmail-compatible mail posting interface.
  # 
diff --git a/mail/postfix-current/files/patch-conf__postfix-files b/mail/postfix-current/files/patch-conf__postfix-files
new file mode 100644
index 000000000000..bbd19c09b38d
--- /dev/null
+++ b/mail/postfix-current/files/patch-conf__postfix-files
@@ -0,0 +1,11 @@
+--- conf/postfix-files.orig	2008-01-24 00:13:49.000000000 +0000
++++ conf/postfix-files	2008-02-29 20:53:24.000000000 +0000
+@@ -42,7 +42,7 @@
+ # permissions, so that running "make install" fixes any glitches.
+ #
+ $config_directory:d:root:-:755:u
+-$data_directory:d:$mail_owner:-:700:u
++$data_directory:d:$mail_owner:-:700:uc
+ $daemon_directory:d:root:-:755:u
+ $queue_directory:d:root:-:755:uc
+ $sample_directory:d:root:-:755:o
diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install
index 7cfbc061ce52..52e768d500cd 100644
--- a/mail/postfix-current/pkg-install
+++ b/mail/postfix-current/pkg-install
@@ -121,6 +121,7 @@ if [ x"$2" = xPOST-INSTALL ]; then
 
 	/bin/sh ${PKG_PREFIX}/libexec/postfix/post-install tempdir=/tmp \
 	config_directory=${PKG_PREFIX}/etc/postfix \
+	data_directory=/var/db/postfix \
 	daemon_directory=${PKG_PREFIX}/libexec/postfix \
 	command_directory=${PKG_PREFIX}/sbin \
 	queue_directory=/var/spool/postfix \