From 357cd05f7af14d75e0f3b28ef0197afb116a4baa Mon Sep 17 00:00:00 2001
From: itetcu <itetcu@FreeBSD.org>
Date: Sat, 3 Apr 2010 09:08:15 +0000
Subject: - Update to 2.6.6

PR:		145097
Submitted by:	Sahil Tandon (maintainer)
---
 mail/postfix26/Makefile                          |  2 +-
 mail/postfix26/distinfo                          |  6 +++---
 mail/postfix26/files/patch-makedefs              | 10 ++++------
 mail/postfix26/files/patch-src::util::sys_defs.h | 17 ++++++++---------
 4 files changed, 16 insertions(+), 19 deletions(-)

(limited to 'mail')

diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 725557226a53..be481f85b4f1 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.6.5
+PORTVERSION=	2.6.6
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index 7e05b3fbe4f3..a65a5cef8d22 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.6.5.tar.gz) = 6b954cfb3eb6141dac1e773281211717
-SHA256 (postfix/postfix-2.6.5.tar.gz) = 5b5c8d3c98d7dffece1d30ed4dc1cfbd3220842fd626a324ce038d7d795e4102
-SIZE (postfix/postfix-2.6.5.tar.gz) = 3325444
+MD5 (postfix/postfix-2.6.6.tar.gz) = 2032102731aee48b4d1541962ecc0438
+SHA256 (postfix/postfix-2.6.6.tar.gz) = 03b08a4a93065ffd07b2abd1e461575215cc8e0ba90595145c0e2e86ea3f0a36
+SIZE (postfix/postfix-2.6.6.tar.gz) = 3327136
 MD5 (postfix/postfix-2.6.5-vda-ng.patch.gz) = 43e54d0a1a016b90d15a1bd231e6fa38
 SHA256 (postfix/postfix-2.6.5-vda-ng.patch.gz) = e1c04e9d268dc84832334997e1f593af9877dbd5030708280427a0dc4452e797
 SIZE (postfix/postfix-2.6.5-vda-ng.patch.gz) = 12435
diff --git a/mail/postfix26/files/patch-makedefs b/mail/postfix26/files/patch-makedefs
index 59dd2ccb8d95..8062f1ed6573 100644
--- a/mail/postfix26/files/patch-makedefs
+++ b/mail/postfix26/files/patch-makedefs
@@ -1,11 +1,9 @@
---- 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	2010-03-27 22:45:57.000000000 -0400
++++ makedefs	2010-03-27 22:46:29.000000000 -0400
+@@ -146,6 +146,8 @@
  		;;
-   FreeBSD.7*)	SYSTYPE=FREEBSD7
+   FreeBSD.8*)	SYSTYPE=FREEBSD8
  		;;
-+  FreeBSD.8*)	SYSTYPE=FREEBSD8
-+		;;
 +  FreeBSD.9*)	SYSTYPE=FREEBSD9
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
diff --git a/mail/postfix26/files/patch-src::util::sys_defs.h b/mail/postfix26/files/patch-src::util::sys_defs.h
index 61f5186e8693..ae573a599988 100644
--- a/mail/postfix26/files/patch-src::util::sys_defs.h
+++ b/mail/postfix26/files/patch-src::util::sys_defs.h
@@ -1,22 +1,21 @@
---- 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
-@@ -25,6 +25,7 @@
+--- src/util/sys_defs.h.orig	2010-03-27 22:48:21.000000000 -0400
++++ src/util/sys_defs.h	2010-03-27 22:49:57.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) \
-@@ -110,6 +111,11 @@
+@@ -111,7 +111,8 @@
  #define HAS_DUPLEX_PIPE			/* 4.1 breaks with kqueue(2) */
  #endif
  
+-#if __FreeBSD_version >= 800098		/* commit: r194262 */
 +#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \
 +    || __FreeBSD_version >= 800100
-+#define HAS_CLOSEFROM
-+#endif
-+
- /* OpenBSD version is year+month */
+ #define HAS_CLOSEFROM
+ #endif
  
- #if OpenBSD >= 199805			/* XXX */
-- 
cgit