OpenBSD.cf: don't include xorg.cf (leftover)

[oweals/cde.git] / cde / config / cf / FreeBSD.cf

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index d91827cd44139be3d795d13d014509c91d618244..e57082bae56a590d803efeb972c0a674f1b25109 100644 (file)
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -4,7 +4,7 @@ XCOMM platform:  $TOG: FreeBSD.cf /main/21 1997/10/05 20:42:34 kaleb $
 #define OSName                 DefaultOSName
 #endif
 #ifndef OSVendor
-#define OSVendor               Walnut Creek CD-ROM
+#define OSVendor               FreeBSD Foundation
 #endif
 #ifndef OSMajorVersion
 #define OSMajorVersion         DefaultOSMajorVersion
@@ -21,10 +21,17 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define HasBSD44Sockets                YES
 #define HasZlib                        YES
 
+#if OSMajorVersion >= 5
+#define CppCmd                 /usr/bin/cpp -traditional
+#define PreProcessCmd          /usr/bin/cpp -traditional
+#else
 #define CppCmd                 /usr/libexec/cpp -traditional
 #define PreProcessCmd          /usr/libexec/cpp -traditional
+#endif
 #undef  InstallCmd
 #define InstallCmd             /usr/bin/install
+#undef KornShell
+#define        KornShell               /usr/local/bin/ksh93
 
 #define UseGas                 YES
 #ifndef GccUsesGas
@@ -45,6 +52,19 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define HasGcc2               YES
 #endif
 
+/* For DtHelp TIFF processing routines. */
+#ifdef AMD64Architecture
+#define LSBBitOrder             YES
+#endif
+
+#ifdef ARMArchitecture
+#define LSBBitOrder             YES
+#endif
+
+#ifdef i386Architecture
+#define LSBBitOrder             YES
+#endif
+
 #define MkdirHierCmd           mkdir -p
 
 #define CcCmd gcc
@@ -52,12 +72,15 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define DefaultCCOptions       -pipe
 #endif
 
+#define CplusplusLibC          -lstdc++
+
 #if OSMajorVersion > 1
 #define ServerOSDefines                XFree86ServerOSDefines -DDDXTIME
 #define XawI18nDefines         -DUSE_XWCHAR_STRING
 #define HasMakefileSafeInclude YES
 #define IncludeMakefile(file)  @@# dependencies are in .depend
 #define DependFileName         .depend
+#if OSMajorVersion < 3
 #if OSMinorVersion < 2
 #ifndef ExtraLibraries
 #define ExtraLibraries         -lgnumalloc
@@ -66,6 +89,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #if OSTeenyVersion == 2
 #define HasSetUserContext      YES
 #endif
+#endif
 #ifndef ExtraLoadFlags
 /* 
  * This doesn't work the way it does on every other system. On FreeBSD it's
@@ -114,19 +138,30 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
 #ifndef DefaultGcc2i386Opt
 #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
-#define DefaultGcc2i386Opt -O2
+#define DefaultGcc2i386Opt -O2 -fno-strict-aliasing
 #endif
 #endif
 
 #ifdef i386Architecture
 # define OptimizedCDebugFlags DefaultGcc2i386Opt
 #else
-# define OptimizedCDebugFlags -O2
+# define OptimizedCDebugFlags -O2 -fno-strict-aliasing
+#endif
+
+#ifdef HasGcc2
+CXXDEPENDINCLUDE != CppCmd -x c++ -Wp,-v < /dev/null \
+                   2>&1 | sed -n 's/ \(.*[cg]++.*\)/-I\1/p'
+#define CplusplusDependIncludes        $(CXXDEPENDINCLUDE)
 #endif
 
 #define ServerExtraDefines     GccGasOption XFree86ServerDefines
 
 #define StandardDefines                -DCSRG_BASED
+#define StandardIncludes       -I/usr/local/include
+#define BuildLibPathVar                LD_LIBRARY_PATH
+
+#define DefaultUserPath                /bin:/usr/bin:/usr/local/bin:$(BINDIR)
+#define DefaultSystemPath      /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
 
 #define TroffCmd               groff -Tps
 #define SetTtyGroup            YES
@@ -141,8 +176,6 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define HasPlugin              YES
 #define VendorHasX11R6_3libXext        YES     /* XC or XFree86 3.3.1 */
 
-#include <bsdLib.rules>
+#define CDESharedRev           2
 
-#ifdef i386Architecture
-#include <xfree86.cf>
-#endif
+#include <bsdLib.rules>