Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/postfix/Makefile,v
retrieving revision 1.153
diff -u -r1.153 Makefile
--- Makefile	12 Jan 2010 17:32:35 -0000	1.153
+++ Makefile	17 Feb 2010 01:51:45 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.6.5
+PORTVERSION=	2.7.0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,7 +23,7 @@
 COMMENT=	A secure alternative to widely-used Sendmail
 
 VDAVERSION=	2.6.5
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-68-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/postfix/distinfo,v
retrieving revision 1.105
diff -u -r1.105 distinfo
--- distinfo	18 Sep 2009 13:05:53 -0000	1.105
+++ distinfo	17 Feb 2010 01:51:45 -0000
@@ -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.7.0.tar.gz) = df648f59421604e895cce56325f00bae
+SHA256 (postfix/postfix-2.7.0.tar.gz) = c5b232ae5e396107bc58aed4178cf6cfd0a75b9dcbbedb49d158eb71d6c91b75
+SIZE (postfix/postfix-2.7.0.tar.gz) = 3418064
 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
Index: files/patch-makedefs
===================================================================
RCS file: /home/ncvs/ports/mail/postfix/files/patch-makedefs,v
retrieving revision 1.9
diff -u -r1.9 patch-makedefs
--- files/patch-makedefs	14 Sep 2009 16:37:25 -0000	1.9
+++ files/patch-makedefs	17 Feb 2010 01:51:45 -0000
@@ -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-02-16 20:22:51.000000000 -0500
++++ makedefs	2010-02-16 20:23:42.000000000 -0500
+@@ -146,6 +146,8 @@
  		;;
-   FreeBSD.7*)	SYSTYPE=FREEBSD7
+   FreeBSD.8*)	SYSTYPE=FREEBSD8
  		;;
-+  FreeBSD.8*)	SYSTYPE=FREEBSD8
-+		;;
 +  FreeBSD.9*)	SYSTYPE=FREEBSD9
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
Index: files/patch-src::util::sys_defs.h
===================================================================
RCS file: /home/ncvs/ports/mail/postfix/files/patch-src::util::sys_defs.h,v
retrieving revision 1.6
diff -u -r1.6 patch-src::util::sys_defs.h
--- files/patch-src::util::sys_defs.h	14 Sep 2009 16:37:25 -0000	1.6
+++ files/patch-src::util::sys_defs.h	17 Feb 2010 01:51:46 -0000
@@ -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-02-16 20:15:11.000000000 -0500
++++ src/util/sys_defs.h	2010-02-16 20:19:41.000000000 -0500
+@@ -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 >= 800107		/* safe; don't believe the experts */
 +#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 */