Module Name: src
Committed By: tron
Date: Tue Dec 18 09:10:32 UTC 2012
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.5 -r1.6 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.3 -r1.4 \
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.5 src/external/ibm-public/postfix/dist/makedefs:1.6
--- src/external/ibm-public/postfix/dist/makedefs:1.5 Wed Nov 9 19:06:34 2011
+++ src/external/ibm-public/postfix/dist/makedefs Tue Dec 18 09:10:32 2012
@@ -146,6 +146,8 @@ case "$SYSTEM.$RELEASE" in
;;
FreeBSD.8*) SYSTYPE=FREEBSD8
;;
+ FreeBSD.9*) SYSTYPE=FREEBSD9
+ ;;
OpenBSD.2*) SYSTYPE=OPENBSD2
;;
OpenBSD.3*) SYSTYPE=OPENBSD3
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.3 src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.4
--- src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.3 Wed Nov 9 19:06:34 2011
+++ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Tue Dec 18 09:10:32 2012
@@ -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) \
