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

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

details:   https://anonhg.NetBSD.org/src/rev/8fc32fdfe112
branches:  trunk
changeset: 771108:8fc32fdfe112
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Nov 09 19:06:34 2011 +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 |  3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 245e97bf89c1 -r 8fc32fdfe112 external/ibm-public/postfix/dist/makedefs
--- a/external/ibm-public/postfix/dist/makedefs Wed Nov 09 18:58:43 2011 +0000
+++ b/external/ibm-public/postfix/dist/makedefs Wed Nov 09 19:06:34 2011 +0000
@@ -152,6 +152,8 @@
                ;;
   OpenBSD.4*)  SYSTYPE=OPENBSD4
                ;;
+  OpenBSD.5*)  SYSTYPE=OPENBSD5
+               ;;
   ekkoBSD.1*)  SYSTYPE=EKKOBSD1
                ;;
    NetBSD.1*)  SYSTYPE=NETBSD1
diff -r 245e97bf89c1 -r 8fc32fdfe112 external/ibm-public/postfix/dist/src/util/sys_defs.h
--- a/external/ibm-public/postfix/dist/src/util/sys_defs.h      Wed Nov 09 18:58:43 2011 +0000
+++ b/external/ibm-public/postfix/dist/src/util/sys_defs.h      Wed Nov 09 19:06:34 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_defs.h,v 1.2 2011/11/08 22:21:30 joerg Exp $       */
+/*     $NetBSD: sys_defs.h,v 1.3 2011/11/09 19:06:34 tron Exp $        */
 
 #ifndef _SYS_DEFS_H_INCLUDED_
 #define _SYS_DEFS_H_INCLUDED_
@@ -30,6 +30,7 @@
     || defined(FREEBSD8) \
     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
     || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
+    || defined(OPENBSD5) \
     || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
     || defined(NETBSD4) \
     || defined(EKKOBSD1)