This adds the basic config bits needed for OpenBSD.

Patch from Pascal Stumpf <Pascal.Stumpf@cubes.de>

Most is just copied from the existing imake installation in
/usr/X11R6.  Additionally:

* Allow overriding CDESharedRev, X11ProjectRoot and ProjectRoot
* Add a new define to be able to override MINCLUDESRC too

(this allows me to build CDE without symlinking any include directories)

diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf
index 3c57d219387c2ff3a33163faa12079a62384cd23..923dfae2287f28e29670679feec4ef33264295c4 100644 (file)
--- a/cde/config/cf/Imake.cf
+++ b/cde/config/cf/Imake.cf
@@ -51,6 +51,122 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 # undef i386
 #endif /* bsdi */
 
+#ifdef __OpenBSD__
+# undef __OpenBSD__
+# undef __NetBSD__
+# define OpenBSDArchitecture
+# define KOpenBSDArchitecture
+# define MacroIncludeFile <OpenBSD.cf>
+# define MacroFile OpenBSD.cf
+# ifdef __i386__
+#  define i386BsdArchitecture
+#  define i386Architecture
+#  undef i386
+# endif
+# if defined(__sparc__) || defined(sparc)
+#  if !defined(__arch64__)
+#   define SparcArchitecture
+#  else
+#   define Sparc64Architecture
+#  endif
+#  undef sparc
+#  undef sparc64
+# endif
+# if defined(__mips__) || defined(mips)
+#   define MipsArchitecture
+#   ifdef __LP64__
+#     define Mips64Architecture
+#   endif
+#   ifdef arc
+#     define ArcArchitecture
+#     undef arc
+#   endif
+#   ifdef sgi
+#     define SGIArchitecture
+#     undef sgi
+#   endif
+#   ifdef pmax
+#     define PmaxArchitecture
+#     undef pmax
+#   endif
+#   undef mips
+#   undef __mips__
+# endif
+# if defined(__alpha__) || defined(alpha)
+#   define AlphaArchitecture
+#   undef __alpha__
+#   undef alpha
+# endif
+# if defined(__amd64__) || defined(__x86_64__)
+#   define AMD64Architecture
+#   undef __amd64__
+#   undef __x86_64__
+#   undef amd64
+# endif
+# if defined(__arm__)
+#   define Arm32Architecture
+#   undef __arm__
+#   if defined(zaurus)
+#     undef zaurus
+#     define ZaurusArchitecture
+#   endif
+# endif
+# if defined(__mc68020__) || defined(mc68020)
+#  define Mc68020Architecture
+#  if defined(amiga)
+#   define AmigaArchitecture
+#   undef amiga
+#  endif
+#  if defined(hp300)
+#   define Hp300Architecture
+#   undef hp300
+#  endif
+#  if defined(mac68k)
+#    define Mac68kArchitecture
+#    undef mac68k
+#  endif
+#  if defined(mvme68k)
+#   define Mvme68kArchitecture
+#   undef mvme68k
+#  endif
+#  if defined(sun3) 
+#   define Sun3Architecture
+#   undef sun3
+#  endif
+#  undef mc68000
+# endif
+# if defined(__m88k__) || defined(m88k)
+#  define Mc88000Architecture
+#  undef m88k
+# endif
+# ifdef __powerpc__
+#  define PpcArchitecture
+#  undef __powerpc__
+#  undef __macppc__
+#  undef macppc
+# endif
+# ifdef __sh__
+#  undef __sh__
+#  define SuperHArchitecture
+# endif
+# ifdef __vax__
+#  undef vax
+#  undef __vax__
+#  define VaxArchitecture
+# endif
+# ifdef __hppa__
+#  ifndef HPArchitecture
+#   define HPArchitecture
+#  endif
+#  undef __hppa__
+# endif /* __hppa__ */
+#endif /* OpenBSD */
+
+/* Systems based on kernel of OpenBSD */
+#if defined(__OpenBSD_kernel__)
+#define KOpenBSDArchitecture
+#endif
+
 #ifdef __NetBSD__
 # define MacroIncludeFile <NetBSD.cf>
 # define MacroFile NetBSD.cf

diff --git a/cde/config/cf/Imake.tmpl b/cde/config/cf/Imake.tmpl
index 3338283f82f26e191a254a3f3a513920943cb4f3..080f4e96c13d8fa1c93379a16d9a8fdb7d0f0317 100644 (file)
--- a/cde/config/cf/Imake.tmpl
+++ b/cde/config/cf/Imake.tmpl
@@ -241,11 +241,7 @@ XCOMM the platform-specific parameters - edit site.def to change
 #define HasFortran             NO
 #endif
 #ifndef HasCplusplus
-#if HasGcc2ForCplusplus
 #define HasCplusplus           YES
-#else
-#define HasCplusplus           NO
-#endif
 #endif
 #ifndef HasNdbm
 #define HasNdbm                        NO

diff --git a/cde/config/cf/Motif.tmpl b/cde/config/cf/Motif.tmpl
index 6873de638637b6e8fbeea5b25df207f26bcd1d63..abde63c60a47710481806f951f46d9bf3c492420 100644 (file)
--- a/cde/config/cf/Motif.tmpl
+++ b/cde/config/cf/Motif.tmpl
@@ -442,12 +442,17 @@ TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC)
 /* MTOOLKITSRC  should be removed */
     MTOOLKITSRC = $(TOOLKITSRC)
 #if ImportMotif || UseInstalledMotif
-    MINCLUDESRC = $(MTOP)/include
         MDOCSRC = $(MTOP)/doc
         MLOCSRC = $(MTOP)/localized
 #else
-    MINCLUDESRC = $(MTOP)/exports/include
         MLOCSRC = $(MTOP)/exports/localized
+#endif
+#if defined(TopMotifInclude)
+    MINCLUDESRC = TopMotifInclude
+#elif ImportMotif || UseInstalledMotif
+    MINCLUDESRC = $(MTOP)/include
+#else
+    MINCLUDESRC = $(MTOP)/exports/include
 #endif
         MLIBSRC = $(MTOP)/lib
      MCLIENTSRC = $(MTOP)/clients

diff --git a/cde/config/cf/bsdLib.tmpl b/cde/config/cf/bsdLib.tmpl
index 1c1d610bb18a33e4cd25fcb8f6f0da724aadb9a1..29ff0d659393dc9eebf656e79a9b9f876b68ea52 100644 (file)
--- a/cde/config/cf/bsdLib.tmpl
+++ b/cde/config/cf/bsdLib.tmpl
@@ -13,3 +13,23 @@ XCOMM $XConsortium: bsdLib.tmpl /main/3 1996/09/28 16:09:25 rws $
 #ifndef SharedXmuReqs
 #define SharedXmuReqs $(LDPRELIBS) $(XTOOLONLYLIB) $(XONLYLIB)
 #endif
+
+#ifndef SharedXReqs
+# define SharedXReqs $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS)
+#endif
+
+#ifndef SharedXmReqs
+# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lc
+#endif
+
+#ifndef SharedTtReqs
+# define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB)
+#endif
+
+#ifndef SharedDtSvcReqs
+# define SharedDtSvcReqs $(LDPRELIBS) SharedXReqs $(CXXLIB)
+#endif
+
+#ifndef SharedCsaReqs
+# define SharedCsaReqs -lXt $(LDPOSTLIBS)
+#endif

diff --git a/cde/config/cf/cde.tmpl b/cde/config/cf/cde.tmpl
index 5dfa301bdfbdb13df80f75b909782e6f6124b53d..a627226e40e471242d29f1532a9da2b7c3b73262 100644 (file)
--- a/cde/config/cf/cde.tmpl
+++ b/cde/config/cf/cde.tmpl
@@ -35,7 +35,9 @@ XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $
 # endif
 #endif
 
+#ifndef CDESharedRev
 #define CDESharedRev           2.1
+#endif
 
 #ifndef SharedLibPam
 # define SharedLibPam          HasSharedLibraries

diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 2cdc401c47ae5401814d725e0e21332d3109bea4..9404bd93572d8a3b0728ff137c10665b303eff93 100644 (file)
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -66,13 +66,17 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 
 #ifdef AfterVendorCF
 
+#ifndef X11ProjectRoot
 # if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
 #  define X11ProjectRoot       /usr
 # else
 #  define X11ProjectRoot       /X11
 # endif
+#endif
 
+#ifndef ProjectRoot
 # define ProjectRoot   /usr/dt
+#endif
 
 #ifdef SunArchitecture
 # define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1

diff --git a/cde/programs/dtinfo/tools/config/Imake.cf b/cde/programs/dtinfo/tools/config/Imake.cf
index b1c2ac65ccfe124977ae01017058b8415c5e36b0..42c021d4b2bf1fe21696a914e8f794b9b3a0efb1 100644 (file)
--- a/cde/programs/dtinfo/tools/config/Imake.cf
+++ b/cde/programs/dtinfo/tools/config/Imake.cf
@@ -51,6 +51,122 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 # undef i386
 #endif /* bsdi */
 
+#ifdef __OpenBSD__
+# undef __OpenBSD__
+# undef __NetBSD__
+# define OpenBSDArchitecture
+# define KOpenBSDArchitecture
+# define MacroIncludeFile <OpenBSD.cf>
+# define MacroFile OpenBSD.cf
+# ifdef __i386__
+#  define i386BsdArchitecture
+#  define i386Architecture
+#  undef i386
+# endif
+# if defined(__sparc__) || defined(sparc)
+#  if !defined(__arch64__)
+#   define SparcArchitecture
+#  else
+#   define Sparc64Architecture
+#  endif
+#  undef sparc
+#  undef sparc64
+# endif
+# if defined(__mips__) || defined(mips)
+#   define MipsArchitecture
+#   ifdef __LP64__
+#     define Mips64Architecture
+#   endif
+#   ifdef arc
+#     define ArcArchitecture
+#     undef arc
+#   endif
+#   ifdef sgi
+#     define SGIArchitecture
+#     undef sgi
+#   endif
+#   ifdef pmax
+#     define PmaxArchitecture
+#     undef pmax
+#   endif
+#   undef mips
+#   undef __mips__
+# endif
+# if defined(__alpha__) || defined(alpha)
+#   define AlphaArchitecture
+#   undef __alpha__
+#   undef alpha
+# endif
+# if defined(__amd64__) || defined(__x86_64__)
+#   define AMD64Architecture
+#   undef __amd64__
+#   undef __x86_64__
+#   undef amd64
+# endif
+# if defined(__arm__)
+#   define Arm32Architecture
+#   undef __arm__
+#   if defined(zaurus)
+#     undef zaurus
+#     define ZaurusArchitecture
+#   endif
+# endif
+# if defined(__mc68020__) || defined(mc68020)
+#  define Mc68020Architecture
+#  if defined(amiga)
+#   define AmigaArchitecture
+#   undef amiga
+#  endif
+#  if defined(hp300)
+#   define Hp300Architecture
+#   undef hp300
+#  endif
+#  if defined(mac68k)
+#    define Mac68kArchitecture
+#    undef mac68k
+#  endif
+#  if defined(mvme68k)
+#   define Mvme68kArchitecture
+#   undef mvme68k
+#  endif
+#  if defined(sun3) 
+#   define Sun3Architecture
+#   undef sun3
+#  endif
+#  undef mc68000
+# endif
+# if defined(__m88k__) || defined(m88k)
+#  define Mc88000Architecture
+#  undef m88k
+# endif
+# ifdef __powerpc__
+#  define PpcArchitecture
+#  undef __powerpc__
+#  undef __macppc__
+#  undef macppc
+# endif
+# ifdef __sh__
+#  undef __sh__
+#  define SuperHArchitecture
+# endif
+# ifdef __vax__
+#  undef vax
+#  undef __vax__
+#  define VaxArchitecture
+# endif
+# ifdef __hppa__
+#  ifndef HPArchitecture
+#   define HPArchitecture
+#  endif
+#  undef __hppa__
+# endif /* __hppa__ */
+#endif /* OpenBSD */
+
+/* Systems based on kernel of OpenBSD */
+#if defined(__OpenBSD_kernel__)
+#define KOpenBSDArchitecture
+#endif
+
 #ifdef __NetBSD__
 # define MacroIncludeFile <NetBSD.cf>
 # define MacroFile NetBSD.cf

diff --git a/cde/programs/dtinfo/tools/config/cde.tmpl b/cde/programs/dtinfo/tools/config/cde.tmpl
index 5dfa301bdfbdb13df80f75b909782e6f6124b53d..a627226e40e471242d29f1532a9da2b7c3b73262 100644 (file)
--- a/cde/programs/dtinfo/tools/config/cde.tmpl
+++ b/cde/programs/dtinfo/tools/config/cde.tmpl
@@ -35,7 +35,9 @@ XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $
 # endif
 #endif
 
+#ifndef CDESharedRev
 #define CDESharedRev           2.1
+#endif
 
 #ifndef SharedLibPam
 # define SharedLibPam          HasSharedLibraries

diff --git a/cde/programs/dtinfo/tools/config/site.def b/cde/programs/dtinfo/tools/config/site.def
index 75ef9d1cfd531b632c78b7609cf7775d26dfd7ce..51a44d636185af5b392258b2b2d60fa38743b709 100644 (file)
--- a/cde/programs/dtinfo/tools/config/site.def
+++ b/cde/programs/dtinfo/tools/config/site.def
@@ -81,8 +81,12 @@ XCOMM site:  $TOG: site.def /main/26 1997/09/05 11:31:50 samborn $
 #  endif
 # endif
 
+#ifndef X11ProjectRoot
 # define X11ProjectRoot        /X11
+#endif
+#ifndef ProjectRoot
 # define ProjectRoot   /usr/dt
+#endif
 
 #endif /* AfterVendorCF */