Module Name: src
Committed By: tron
Date: Wed Nov 9 19:06:34 UTC 2011
Modified Files:
src/external/ibm-public/postfix/dist: makedefs
src/external/ibm-public/postfix/dist/src/util: sys_defs.h
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/src/util/sys_defs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/dist/makedefs
diff -u src/external/ibm-public/postfix/dist/makedefs:1.4 src/external/ibm-public/postfix/dist/makedefs:1.5
--- src/external/ibm-public/postfix/dist/makedefs:1.4 Sun Jul 31 10:05:03 2011
+++ src/external/ibm-public/postfix/dist/makedefs Wed Nov 9 19:06:34 2011
@@ -152,6 +152,8 @@ case "$SYSTEM.$RELEASE" in
;;
OpenBSD.4*) SYSTYPE=OPENBSD4
;;
+ OpenBSD.5*) SYSTYPE=OPENBSD5
+ ;;
ekkoBSD.1*) SYSTYPE=EKKOBSD1
;;
NetBSD.1*) SYSTYPE=NETBSD1
Index: src/external/ibm-public/postfix/dist/src/util/sys_defs.h
diff -u src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.2 src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.3
--- src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.2 Tue Nov 8 22:21:30 2011
+++ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Wed Nov 9 19:06:34 2011
@@ -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)
