[src/trunk]: src/external/ibm-public/postfix/dist Resolve conflicts from last...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9ad3e81a5b8e
branches:  trunk
changeset: 783387:9ad3e81a5b8e
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Dec 18 09:10:32 2012 +0000

description:
Resolve conflicts from last import.

diffstat:

 external/ibm-public/postfix/dist/makedefs            |  2 ++
 external/ibm-public/postfix/dist/src/util/sys_defs.h |  4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 7e9727133643 -r 9ad3e81a5b8e external/ibm-public/postfix/dist/makedefs
--- a/external/ibm-public/postfix/dist/makedefs Tue Dec 18 09:01:39 2012 +0000
+++ b/external/ibm-public/postfix/dist/makedefs Tue Dec 18 09:10:32 2012 +0000
@@ -146,6 +146,8 @@
                ;;
   FreeBSD.8*)  SYSTYPE=FREEBSD8
                ;;
+  FreeBSD.9*)  SYSTYPE=FREEBSD9
+               ;;
   OpenBSD.2*)  SYSTYPE=OPENBSD2
                ;;
   OpenBSD.3*)  SYSTYPE=OPENBSD3
diff -r 7e9727133643 -r 9ad3e81a5b8e external/ibm-public/postfix/dist/src/util/sys_defs.h
--- a/external/ibm-public/postfix/dist/src/util/sys_defs.h      Tue Dec 18 09:01:39 2012 +0000
+++ b/external/ibm-public/postfix/dist/src/util/sys_defs.h      Tue Dec 18 09:10:32 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_defs.h,v 1.3 2011/11/09 19:06:34 tron Exp $        */
+/*     $NetBSD: sys_defs.h,v 1.4 2012/12/18 09:10:32 tron Exp $        */
 
 #ifndef _SYS_DEFS_H_INCLUDED_
 #define _SYS_DEFS_H_INCLUDED_
@@ -27,7 +27,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(OPENBSD5) \