From 2a66428bf6ef230ae4249ab1a9dae841b8685e88 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Tue, 25 Nov 2014 08:27:27 -0200
Subject: Modernize OPTIONS for postfix

---
 pkg_config.10.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 8bcf7617..e78946a2 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -422,7 +422,7 @@
 		<build_pbi>
 			<port>mail/postfix</port>
 		</build_pbi>
-		<build_options>WITH_PCRE=true;WITH_SPF=true;WITH_SASL2=true;WITH_TLS=true</build_options>
+		<build_options>postfix_SET_FORCE=PCRE SASL2 SPF TLS</build_options>
 	</package>
 	<package>
 		<name>Dansguardian</name>
-- 
cgit v1.2.3


From 1b5f6e531fe22e3e0d4477b9f0ef1ffa814ae7de Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Tue, 25 Nov 2014 10:16:41 -0200
Subject: Make postfix use wrapper binaries on PBIDIR/bin or PBIDIR/sbin
 instead of try to use regular binaries from PBIDIR/local/(s)bin. etc is also
 linked from PBIDIR to PBIDIR/local then it won't break anything. It helps
 ticket #4018

---
 config/postfix/postfix.inc             | 5 +----
 config/postfix/postfix_queue.php       | 6 +-----
 config/postfix/postfix_view_config.php | 6 +-----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index 99af671b..35087149 100755
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -37,10 +37,7 @@ require_once("globals.inc");
 
 $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
 if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) {
-	if ($pfs_version == 2.2)
-		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local");
-	else
-		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
+	define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
 } else {
 	define('POSTFIX_LOCALBASE','/usr/local');
 }
diff --git a/config/postfix/postfix_queue.php b/config/postfix/postfix_queue.php
index 6f8a7e19..1db2b8e2 100755
--- a/config/postfix/postfix_queue.php
+++ b/config/postfix/postfix_queue.php
@@ -34,12 +34,8 @@ $uname=posix_uname();
 if ($uname['machine']=='amd64')
         ini_set('memory_limit', '250M');
 
-$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
 if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) {
-	if ($pfs_version == 2.2)
-		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local");
-	else
-		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
+	define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
 } else {
 	define('POSTFIX_LOCALBASE','/usr/local');
 }
diff --git a/config/postfix/postfix_view_config.php b/config/postfix/postfix_view_config.php
index f50ae991..a844ce65 100644
--- a/config/postfix/postfix_view_config.php
+++ b/config/postfix/postfix_view_config.php
@@ -29,12 +29,8 @@
 */
 $shortcut_section = "postfix";
 require("guiconfig.inc");
-$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
 if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) {
-	if ($pfs_version == 2.2)
-		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local");
-	else
-		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
+	define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
 } else {
 	define('POSTFIX_LOCALBASE','/usr/local');
 }
-- 
cgit v1.2.3


From c1a92316095d36d6413bfe86f219902f78ed2692 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Tue, 25 Nov 2014 10:17:17 -0200
Subject: Bump postfix for 2.2 due to recent changes

---
 pkg_config.10.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index e78946a2..e8a8e6a2 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -415,7 +415,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,40622.0.html</pkginfolink>
 		<config_file>https://packages.pfsense.org/packages/config/postfix/postfix.xml</config_file>
 		<depends_on_package_pbi>postfix-2.11.3_2-##ARCH##.pbi</depends_on_package_pbi>
-		<version>2.11.3_2 pkg v.2.3.9</version>
+		<version>2.11.3_2 pkg v.2.4.0</version>
 		<status>Release</status>
 		<required_version>2.2</required_version>
 		<configurationfile>postfix.xml</configurationfile>
-- 
cgit v1.2.3