- Update to 2.4.14

- Fix build when WITH_SASLKRB5 is set on 8.0 & 9.0 which have the new Heimdal

PR:		145394
Submitted by:	Sahil Tandon <sahil___tandon.net>

4 files changed, 29 insertions, 23 deletions

diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index b26653a67013..60f7440a985a 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.4.13
+PORTVERSION=	2.4.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -126,7 +126,10 @@ POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
-POSTFIX_AUXLIBS+=	-lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
+.if ${OSVERSION} >= 800037
+KRB5_EXTR=		-lhx509
+.endif
+POSTFIX_AUXLIBS+=	-lkrb5 ${KRB5_EXTR} -lcrypto -lcrypt -lcom_err -lasn1 -lroken
 .endif
 
 .if defined(WITH_SASLKMIT)
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
index 872fad74bb74..733e054b9b28 100644
--- a/mail/postfix24/distinfo
+++ b/mail/postfix24/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.4.13.tar.gz) = a2e19384deeed77d83c94ad59f4051c3
-SHA256 (postfix/postfix-2.4.13.tar.gz) = 9fe936029cf151e8fd30fcd88cd965112a905c63808dd6ed01c5bb222d60f911
-SIZE (postfix/postfix-2.4.13.tar.gz) = 2938465
+MD5 (postfix/postfix-2.4.14.tar.gz) = fb2dde4d7db56e5a3fcc5b83cc93cd73
+SHA256 (postfix/postfix-2.4.14.tar.gz) = bcc109fa3da85fbeaa868840fab94e3523615b964cf7ab835b0c4498182abcc3
+SIZE (postfix/postfix-2.4.14.tar.gz) = 2939655
 MD5 (postfix/postfix-2.4.6-vda-ng.patch.gz) = 6090de66e36051357e37bb94a1eea342
 SHA256 (postfix/postfix-2.4.6-vda-ng.patch.gz) = 847e9c39bdbd92c912f71521ab4e5266d9baae749d135f220db9c8a5a13e8b3f
 SIZE (postfix/postfix-2.4.6-vda-ng.patch.gz) = 12244
diff --git a/mail/postfix24/files/patch-makedefs b/mail/postfix24/files/patch-makedefs
index 830a7e485d4a..16f3b9ee976a 100644
--- a/mail/postfix24/files/patch-makedefs
+++ b/mail/postfix24/files/patch-makedefs
@@ -1,14 +1,10 @@
---- makedefs.orig	2009-09-15 12:11:32.000000000 -0300
-+++ makedefs	2009-09-15 12:12:04.000000000 -0300
-@@ -130,6 +130,12 @@
+--- makedefs.orig	2010-04-04 17:17:26.000000000 -0400
++++ makedefs	2010-04-04 17:18:07.000000000 -0400
+@@ -134,6 +134,8 @@
  		;;
-   FreeBSD.6*)	SYSTYPE=FREEBSD6
+   FreeBSD.8*)	SYSTYPE=FREEBSD8
  		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD6
-+		;;
-+  FreeBSD.8*)	SYSTYPE=FREEBSD6
-+		;;
-+  FreeBSD.9*)	SYSTYPE=FREEBSD6
++  FreeBSD.9*)	SYSTYPE=FREEBSD9
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
diff --git a/mail/postfix24/files/patch-src__util__sys_defs.h b/mail/postfix24/files/patch-src__util__sys_defs.h
index 22119b906d2f..71c1e83ca75e 100644
--- a/mail/postfix24/files/patch-src__util__sys_defs.h
+++ b/mail/postfix24/files/patch-src__util__sys_defs.h
@@ -1,13 +1,20 @@
---- src/util/sys_defs.h.orig	2009-07-29 16:58:28.000000000 -0300
-+++ src/util/sys_defs.h	2009-07-29 16:59:15.000000000 -0300
-@@ -110,6 +110,10 @@
- #define HAS_DUPLEX_PIPE			/* 4.1 breaks with kqueue(2) */
+--- src/util/sys_defs.h.orig	2010-04-04 17:19:32.000000000 -0400
++++ src/util/sys_defs.h	2010-04-04 17:23:49.000000000 -0400
+@@ -25,7 +25,7 @@
+   */
+ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
+     || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
+-    || defined(FREEBSD8) \
++    || defined(FREEBSD8) || defined(FREEBSD9) \
+     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
+     || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
+     || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
+@@ -98,7 +98,7 @@
+ #define SOCKOPT_SIZE	socklen_t
  #endif
  
+-#if __FreeBSD_version >= 800107		/* safe; don't believe the experts */
 +#if (__FreeBSD_version >= 702104 && __FreeBSD_version < 800000) || (__FreeBSD_version >= 800099)
-+#define HAS_CLOSEFROM
-+#endif
-+
- /* OpenBSD version is year+month */
+ #define HAS_CLOSEFROM
+ #endif
  
- #if OpenBSD >= 199805			/* XXX */