[cdesktopenv-devel] [PATCH] Introduction of BSDArchitecture

Ulrich Wilkens Sat, 19 Oct 2013 15:35:32 -0700


Hello,


I've made some changes in the Imakefiles because I'm tired of always
writing:
        #if defined(FreeBSDArchitecture) || \
            defined(OpenBSDArchitecture) || \
            defined(WhatsoeverBSDArchitecture)

This patch changes it to just:
        #if defined(BSDArchitecture)

The old names are still available but only used if there are differences
between the BSDs.
This is also a preparation for a NetBSD port that I have in the queue.


--
Ulrich Wilkens
Email: m...@uwilkens.de

>From c641478ac5175856bcf0391d512eab1c0348b1d0 Mon Sep 17 00:00:00 2001
From: Ulrich Wilkens <m...@uwilkens.de>
Date: Sat, 19 Oct 2013 23:55:59 +0200
Subject: [PATCH] Introduction of BSDArchitecture

---
 cde/config/cf/Imake.cf                                | 4 +++-
 cde/config/cf/Motif.tmpl                              | 2 +-
 cde/config/cf/site.def                                | 6 ++++--
 cde/doc/de_DE.ISO8859-1/Imakefile                     | 2 +-
 cde/doc/es_ES.ISO8859-1/Imakefile                     | 2 +-
 cde/doc/fr_FR.ISO8859-1/Imakefile                     | 2 +-
 cde/doc/it_IT.ISO8859-1/Imakefile                     | 2 +-
 cde/doc/ja_JP.dt-eucJP/Imakefile                      | 2 +-
 cde/lib/DtHelp/Imakefile                              | 8 +++-----
 cde/lib/DtSearch/Imakefile                            | 2 +-
 cde/lib/DtSearch/raima/Imakefile                      | 2 +-
 cde/lib/DtTerm/TermPrim/Imakefile                     | 6 +-----
 cde/programs/Imakefile                                | 4 +---
 cde/programs/dtcm/dtcm/Imakefile                      | 4 ++--
 cde/programs/dtfile/Imakefile                         | 2 +-
 cde/programs/dtinfo/dtinfo/src/Agents/Imakefile       | 3 +--
 cde/programs/dtinfo/dtinfo/src/Basic/Imakefile        | 3 +--
 cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile     | 3 +--
 cde/programs/dtinfo/dtinfo/src/Imakefile              | 8 ++++----
 cde/programs/dtinfo/dtinfo/src/Managers/Imakefile     | 3 +--
 cde/programs/dtinfo/dtinfo/src/Marks/Imakefile        | 3 +--
 cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile  | 3 +--
 cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile | 5 ++---
 cde/programs/dtinfo/dtinfo/src/Other/Imakefile        | 3 +--
 cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile  | 3 +--
 cde/programs/dtinfo/dtinfo/src/Query/Imakefile        | 3 +--
 cde/programs/dtinfo/dtinfo/src/Support/Imakefile      | 3 +--
 cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile     | 3 +--
 cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile     | 3 +--
 cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile     | 3 +--
 cde/programs/dtinfo/dtinfo/src/UAS/Test/Imakefile     | 3 +--
 cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile      | 3 +--
 cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile   | 2 +-
 cde/programs/dtinfo/dtinfogen/install/Imakefile       | 2 +-
 cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile      | 6 +++---
 cde/programs/dtinfo/mmdb/HardCopy/Imakefile           | 4 ++--
 cde/programs/dtinfo/mmdb/StyleSheet/Imakefile         | 4 ++--
 cde/programs/dtinfo/mmdb/dstr/Imakefile               | 2 +-
 cde/programs/dtinfo/mmdb/dti_excs/Imakefile           | 2 +-
 cde/programs/dtinfo/mmdb/hmphf/Imakefile              | 2 +-
 cde/programs/dtlogin/Imakefile                        | 4 +++-
 cde/programs/dtpdmd/Imakefile                         | 2 +-
 cde/programs/dtspcd/Imakefile                         | 3 +--
 cde/programs/localized/templates/French.tmpl          | 2 +-
 cde/programs/localized/templates/German.tmpl          | 2 +-
 cde/programs/localized/templates/Italian.tmpl         | 2 +-
 cde/programs/localized/templates/Spanish.tmpl         | 2 +-
 cde/programs/nsgmls/Imakefile                         | 2 +-
 48 files changed, 66 insertions(+), 85 deletions(-)

diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf
index 9e93abf..0631897 100644
--- a/cde/config/cf/Imake.cf
+++ b/cde/config/cf/Imake.cf
@@ -37,7 +37,6 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 # define MacroIncludeFile <bsd.cf>
 # define MacroFile bsd.cf
 # undef vax
-# define BSDArchitecture
 # define VaxArchitecture
 #endif /* vax */
 
@@ -54,6 +53,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 #ifdef __OpenBSD__
 # undef __OpenBSD__
 # undef __NetBSD__
+# define BSDArchitecture
 # define OpenBSDArchitecture
 # define KOpenBSDArchitecture
 # define MacroIncludeFile <OpenBSD.cf>
@@ -171,6 +171,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 # define MacroIncludeFile <NetBSD.cf>
 # define MacroFile NetBSD.cf
 # undef __NetBSD__
+# define BSDArchitecture
 # define NetBSDArchitecture
 # ifdef __i386__
 #  define i386BsdArchitecture
@@ -187,6 +188,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 # define MacroIncludeFile <FreeBSD.cf>
 # define MacroFile FreeBSD.cf
 # undef __FreeBSD__
+# define BSDArchitecture
 # define FreeBSDArchitecture
 # ifdef __i386__
 #  define i386BsdArchitecture
diff --git a/cde/config/cf/Motif.tmpl b/cde/config/cf/Motif.tmpl
index 8deebe9..66d41d2 100644
--- a/cde/config/cf/Motif.tmpl
+++ b/cde/config/cf/Motif.tmpl
@@ -590,7 +590,7 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
 /* check for existence of Dtinfo Motif Documents */
 #if defined(LinuxArchitecture)
       MOTIF_DOC = $(shell if test -f $(MDOCSRC)/C/guides/bookcase.bc; then 
echo -D_MOTIFDOC_; fi)
-#elif defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
+#elif defined(BSDArchitecture)
      MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo 
-D_MOTIFDOC_; fi
 #else
       MOTIF_DOC = -D_MOTIFDOC_
diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 54a3379..ec3b955 100644
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -79,7 +79,9 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 
mgreess $
 #endif
 
 #ifndef MotifProjectRoot
-# if defined(OpenBSDArchitecture)
+# if defined(FreeBSDArchitecture)
+#  define MotifProjectRoot     /usr/local
+# elif defined(OpenBSDArchitecture)
 #  define MotifProjectRoot     /usr/local
 # endif
 #endif
@@ -101,7 +103,7 @@ XCOMM build the DtXinerama support
 
 XCOMM Make sure you have installed the de_DE, es_ES, fr_FR and it_IT locales.
 XCOMM  or building non-C locales will cause build failures.
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 # define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 
it_IT.ISO8859-1
 #endif
 
diff --git a/cde/doc/de_DE.ISO8859-1/Imakefile 
b/cde/doc/de_DE.ISO8859-1/Imakefile
index e8090a8..1697c8c 100644
--- a/cde/doc/de_DE.ISO8859-1/Imakefile
+++ b/cde/doc/de_DE.ISO8859-1/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/3 1996/06/19 16:19:59 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || 
defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 XCOMM we cannot build guides on linux yet
 SUBDIRS = help 
 #else
diff --git a/cde/doc/es_ES.ISO8859-1/Imakefile 
b/cde/doc/es_ES.ISO8859-1/Imakefile
index 994d034..0fb6026 100644
--- a/cde/doc/es_ES.ISO8859-1/Imakefile
+++ b/cde/doc/es_ES.ISO8859-1/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/3 1996/06/19 16:32:32 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || 
defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 XCOMM we cannot build guides on linux yet
 SUBDIRS = help 
 #else
diff --git a/cde/doc/fr_FR.ISO8859-1/Imakefile 
b/cde/doc/fr_FR.ISO8859-1/Imakefile
index b6dfe70..2523bb5 100644
--- a/cde/doc/fr_FR.ISO8859-1/Imakefile
+++ b/cde/doc/fr_FR.ISO8859-1/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/3 1996/06/19 16:43:05 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || 
defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 XCOMM we cannot build guides on linux yet
 SUBDIRS = help 
 #else
diff --git a/cde/doc/it_IT.ISO8859-1/Imakefile 
b/cde/doc/it_IT.ISO8859-1/Imakefile
index c62ff2e..87323a2 100644
--- a/cde/doc/it_IT.ISO8859-1/Imakefile
+++ b/cde/doc/it_IT.ISO8859-1/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/3 1996/06/19 16:53:57 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || 
defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 XCOMM we cannot build guides on linux yet
 SUBDIRS = help 
 #else
diff --git a/cde/doc/ja_JP.dt-eucJP/Imakefile b/cde/doc/ja_JP.dt-eucJP/Imakefile
index b45fe15..f40c06e 100644
--- a/cde/doc/ja_JP.dt-eucJP/Imakefile
+++ b/cde/doc/ja_JP.dt-eucJP/Imakefile
@@ -3,7 +3,7 @@ XCOMM $TOG: Imakefile /main/5 1997/03/05 11:10:37 damon $
 #define PassCDebugFlags
 
 /* due to split-VOB setup, force help to come last in make Makefiles */
-#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || 
defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 XCOMM we cannot build guides on linux yet
 SUBDIRS = help
 BSUBDIRS = help 
diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index a33c704..8dbda1f 100644
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -13,7 +13,7 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 
drk $
 #define IHaveSubdirs
 #define PassCDebugFlags        /**/
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 SUBDIRS = il
 DONES = il/DONE
 #else
@@ -34,9 +34,7 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
 #endif
 
 INCLUDES = -I. -I./il -I./jpeg
-#if defined(OpenBSDArchitecture)
-INCLUDES += -I$(INCROOT)
-#endif
+
 DEFINES = -DDTLIB $(LOCAL_DEFINES) \
          -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
          -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@@ -155,7 +153,7 @@ JPEG_OBJS = \
         jpeg/jdinput.o      jpeg/jerror.o       jpeg/jutils.o
 
 SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS)
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS)
 #else
 OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS)
diff --git a/cde/lib/DtSearch/Imakefile b/cde/lib/DtSearch/Imakefile
index 91b66cc..5ba42b9 100644
--- a/cde/lib/DtSearch/Imakefile
+++ b/cde/lib/DtSearch/Imakefile
@@ -13,7 +13,7 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_OSF_SOURCE
 EXTRA_DEFINES = -DBYTE_SWAP
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 EXTRA_DEFINES = -DBYTE_SWAP
 #endif
 
diff --git a/cde/lib/DtSearch/raima/Imakefile b/cde/lib/DtSearch/raima/Imakefile
index f501ee8..a47c15b 100644
--- a/cde/lib/DtSearch/raima/Imakefile
+++ b/cde/lib/DtSearch/raima/Imakefile
@@ -23,7 +23,7 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE
 EXTRA_DEFINES = -D_XOPEN_SOURCE
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700
 #endif
 
diff --git a/cde/lib/DtTerm/TermPrim/Imakefile 
b/cde/lib/DtTerm/TermPrim/Imakefile
index a0a3b0e..04277ae 100644
--- a/cde/lib/DtTerm/TermPrim/Imakefile
+++ b/cde/lib/DtTerm/TermPrim/Imakefile
@@ -109,11 +109,7 @@ LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
 LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
 #endif
 
-#ifdef FreeBSDArchitecture
-LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c)
-#endif
-
-#ifdef OpenBSDArchitecture
+#ifdef BSDArchitecture
 LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c)
 #endif
 
diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile
index ef1abd6..84495b8 100644
--- a/cde/programs/Imakefile
+++ b/cde/programs/Imakefile
@@ -11,9 +11,7 @@ XCOMM some of these cannot be built on linux yet.
 XCOMM dtinfo
 #if defined(LinuxArchitecture)
 DTINFODIR = dtinfo
-#elif defined(OpenBSDArchitecture)
-DTINFODIR = dtinfo
-#elif defined(FreeBSDArchitecture)
+#elif defined(BSDArchitecture)
 DTINFODIR = dtinfo
 #else
 DTINFODIR = dtinfo
diff --git a/cde/programs/dtcm/dtcm/Imakefile b/cde/programs/dtcm/dtcm/Imakefile
index 9d508a5..e889c16 100644
--- a/cde/programs/dtcm/dtcm/Imakefile
+++ b/cde/programs/dtcm/dtcm/Imakefile
@@ -16,7 +16,7 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) 
DtClientLibs
        -DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
        $(ICONV_INBUF_DEFINE)
 
-#if defined(RsArchitecture) || defined(USLArchitecture) || 
defined(UXPArchitecture) || defined(LinuxArchitecture) || 
defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
+#if defined(RsArchitecture) || defined(USLArchitecture) || 
defined(UXPArchitecture) || defined(LinuxArchitecture) || 
defined(BSDArchitecture)
 TTY_LIBRARIES = $(LOCAL_LIBRARIES) 
 #elif defined(AlphaArchitecture)
 TTY_LIBRARIES = $(DTCMPLIB) $(CSALIB) $(DTSVCLIB) $(XTOOLLIB) $(XLIB)
@@ -32,7 +32,7 @@ EXTRA_LIBRARIES       = -lrpcsvc -lPW -ldiag
 EXTRA_LIBRARIES        = -lrpcsvc -lV3
 #endif
 
-#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
+#if defined(BSDArchitecture)
 EXTRA_LIBRARIES = -lcompat
 #endif
 
diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 279389c..abe6a40 100644
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -36,7 +36,7 @@ EXTRA_CCOPTIONS = -xF
 EXTRA_INCLUDES = -I/usr/include/freetype2
 #endif
 
-#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
+#if defined(BSDArchitecture)
 EXTRA_INCLUDES = -I$(XPROJECTROOT)/include/freetype2
 #endif
 
diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
index 5ea3c32..51ec0c1 100644
--- a/cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
@@ -26,8 +26,7 @@ make_msgs($(LIBNAME), $(MSGS))
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Basic/Imakefile
index 884a9d2..c86cbe9 100644
--- a/cde/programs/dtinfo/dtinfo/src/Basic/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Basic/Imakefile
@@ -27,8 +27,7 @@ SpecialCPlusPlusObjectRule(NodeDisplayDataTml.o 
NodeViewInfo.o,,$(LICENSE_L_INCL
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile
index 4abbd86..5fc3fbf 100644
--- a/cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile
@@ -24,8 +24,7 @@ make_libfiles($(LIBNAME), $(CLASSES))
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Imakefile
index b9dc503..e533020 100644
--- a/cde/programs/dtinfo/dtinfo/src/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Imakefile
@@ -42,9 +42,9 @@ SYS_LIBRARIES=-lm -liconv /usr/lib/libpthreads.a 
-blibpath:/usr/dt/lib:/X11/lib:
 SYS_LIBRARIES=-lm -lfs
 #elif defined(HPArchitecture)
 SYS_LIBRARIES=$(DYNAMIC) -lm
-#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#elif defined(LinuxArchitecture)
 SYS_LIBRARIES=-lm -L$(XPROJECTROOT)/lib
-#elif defined(OpenBSDArchitecture)
+#elif defined(BSDArchitecture)
 SYS_LIBRARIES=-lm -L$(XPROJECTROOT)/lib -L$(MPROJECTROOT)/lib
 #else
 SYS_LIBRARIES=-lm
@@ -313,7 +313,7 @@ all:: Prelude.h dfiles messages Dtinfo
 
 includes:: Prelude.h dfiles messages
 
-#if defined(HPArchitecture) ||defined (AIXArchitecture) || 
defined(UXPArchitecture) || (defined(SunArchitecture) && 
CplusplusCompilerMajorVersion < 4) || defined(AlphaArchitecture) || 
defined(USLArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(HPArchitecture) ||defined (AIXArchitecture) || 
defined(UXPArchitecture) || (defined(SunArchitecture) && 
CplusplusCompilerMajorVersion < 4) || defined(AlphaArchitecture) || 
defined(USLArchitecture) || defined(BSDArchitecture)
 # ifndef Dont_Use_Templates_Repository
 #  define Dont_Use_Templates_Repository
 UAS_INCLUDES=-I./UAS/Base
@@ -338,7 +338,7 @@ SpecialCPlusPlusObjectRule(Templates.o,,-ptf 
$(SUBDIR_TEMPL_INCLUDES))
 SpecialCPlusPlusExpandRule(Templates..c,,-ptf -DMakeOperatorNewPublic)
 #elif defined(DoLicenseManagement)
 SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(LICENSE_L_INCLUDES))
-#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SpecialCPlusPlusObjectRule(Templates.o,,$(SUBDIR_TEMPL_INCLUDES))
 SpecialCPlusPlusExpandRule(Templates..c,,-DMakeOperatorNewPublic)
 #else
diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
index 56e0564..38650b6 100644
--- a/cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
@@ -46,8 +46,7 @@ make_msgs($(LIBNAME), $(MSGS))
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/Marks/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Marks/Imakefile
index 50eab7c..a9b6a6e 100644
--- a/cde/programs/dtinfo/dtinfo/src/Marks/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Marks/Imakefile
@@ -21,8 +21,7 @@ make_libfiles($(LIBNAME), $(CLASSES))
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile
index 335e9f2..929e65a 100644
--- a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile
@@ -17,8 +17,7 @@ make_libfiles($(LIBNAME), $(CLASSES))
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
index 2e9e0cc..467fcb4 100644
--- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
@@ -33,7 +33,7 @@ dfiles:
 #ifdef UXPArchitecture
 SpecialCPlusPlusObjectRule(ORTemplates.o,, +Tall_tmpls -DEXPAND_TEMPLATES)
 SpecialCPlusPlusExpandRule(ORTemplates..c,ORTemplates.C,+Tall_tmpls 
-DEXPAND_TEMPLATES)
-#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SpecialCPlusPlusObjectRule(ORTemplates.o,,-DEXPAND_TEMPLATES)
 SpecialCPlusPlusExpandRule(ORTemplates..c,ORTemplates.C,-DEXPAND_TEMPLATES)
 #endif
@@ -51,8 +51,7 @@ RealLibrary($(LIBNAME),$(OBJS),$(LIBDIR))
 #else
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/Other/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Other/Imakefile
index 499ef5b..3d53633 100644
--- a/cde/programs/dtinfo/dtinfo/src/Other/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Other/Imakefile
@@ -21,8 +21,7 @@ make_msgs($(LIBNAME), $(MSGS))
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile
index f0c56e4..ee54e40 100644
--- a/cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile
@@ -18,8 +18,7 @@ OBJS=$(SRCS:.C=.o)
 
 make_libfiles($(LIBNAME), $(CLASSES))
 
-#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-    defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/Query/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Query/Imakefile
index beb330b..6699adf 100644
--- a/cde/programs/dtinfo/dtinfo/src/Query/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Query/Imakefile
@@ -38,8 +38,7 @@ make_msgs($(LIBNAME), $(MSGS))
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/Support/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Support/Imakefile
index 786629d..b0f5fce 100644
--- a/cde/programs/dtinfo/dtinfo/src/Support/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Support/Imakefile
@@ -21,8 +21,7 @@ make_libfiles($(LIBNAME), $(CLASSES))
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 NotSoSimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR), $(OTHEROBJS))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 NotSoSimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR), $(OTHEROBJS))
 #else
 NotSoSimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR), $(OTHEROBJS))
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile
index c87de53..f66be8d 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile
@@ -22,8 +22,7 @@ OBJS=$(SRCS:.C=.o)
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile
index 09c2939..7f9c548 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile
@@ -25,8 +25,7 @@ make_msgs($(LIBNAME), $(MSGS))
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile
index 3666e23..9df31c4 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile
@@ -29,8 +29,7 @@ OBJS=$(SRCS:.C=.o)
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
-#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-      defined(LinuxArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Test/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/UAS/Test/Imakefile
index 2d968a0..4d22426 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Test/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Test/Imakefile
@@ -36,8 +36,7 @@ PREF_LIB_OBJS = $(PREF_LIB_SRCS:.C=.o)
 
 make_libfiles($(LIBNAME),)
 
-#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-    defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(PREF_LIB_NAME), $(PREF_LIB_OBJS), $(LIBDIR))
 SimpleLibraryT(uasdrv, uasdrv.o,)
 #else
diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile 
b/cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile
index 1894211..593c3b1 100644
--- a/cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile
@@ -28,8 +28,7 @@ NormalLibraryObjectRule()
 
 INCLUDES=$(CDEINCLUDES) $(WWL_INCLUDES) $(EXCEPTIONS_INCLUDES)
 
-#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
-    defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile 
b/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
index 29ec75f..cfb5edc 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
@@ -290,7 +290,7 @@ SimpleCPlusPlusProgram(NodeParser, NodeParser.o 
libOLAFParse.a libOLAFParseT.a,$
 SimpleCPlusPlusProgram(NCFGen, NCFGen.o libOLAFParse.a libOLAFParseT.a,$(Libs) 
$(DTSVCLIB) $(TTLIB))
 SimpleCPlusPlusProgram(MixedGen, MixedGen.o RemoteId.o libOLAFParse.a 
libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
 SimpleCPlusPlusProgram(StyleUpdate, StyleUpdate.o libOLAFParse.a 
libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
-#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 TEMPLATE_OBJS = TKTemplate.o
 RealLibrary(OLAFParse,$(OBJS),$(LIBDIR))
 SimpleCPlusPlusProgram(NodeParser, NodeParser.o $(TEMPLATE_OBJS) 
libOLAFParse.a,$(Libs))
diff --git a/cde/programs/dtinfo/dtinfogen/install/Imakefile 
b/cde/programs/dtinfo/dtinfogen/install/Imakefile
index b89a575..0dcb327 100644
--- a/cde/programs/dtinfo/dtinfogen/install/Imakefile
+++ b/cde/programs/dtinfo/dtinfogen/install/Imakefile
@@ -206,7 +206,7 @@ ALL_MMDB_OBJS =     $(API_OBJS)             $(BTREE_OBJS) \
 
 #ifdef AIXArchitecture
 Libs=$(ALL_MMDB_OBJS) $(DTSVCLIB) $(TTLIB) $(MATH_LIB)
-#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 Libs=$(MMDB_LIBS) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(MATH_LIB)
 #else
 Libs=$(MMDB_LIBS) $(DTSVCLIB) $(TTLIB) $(MATH_LIB)
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile 
b/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
index e9120fc..6d29de4 100644
--- a/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
+++ b/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
@@ -181,13 +181,13 @@ ALL_MMDB_OBJS =   $(API_OBJS)             $(BTREE_OBJS) \
 
 #ifdef AIXArchitecture
 Libs = $(ALL_MMDB_OBJS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB)
-#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 Libs=$(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(XLIB)
 #else
 Libs = $(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB)
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(XLIB) 
$(MATH_LIB)
 #else
 Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(TTLIB) $(XLIB) $(MATH_LIB)
@@ -196,7 +196,7 @@ Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(TTLIB) 
$(XLIB) $(MATH_LIB)
 SimpleCPlusPlusProgram(dbdrv,main.o,$(Libs))
 SimpleCPlusPlusProgram(restore,restore.o,$(Libs))
 
-#if defined(USLArchitecture) || defined(LinuxArchitecture) || 
defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
+#if defined(USLArchitecture) || defined(LinuxArchitecture) || 
defined(BSDArchitecture)
 SimpleCPlusPlusProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))
 #else
 SimpleCProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))
diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile 
b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
index 689526f..372872b 100644
--- a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
+++ b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
@@ -45,7 +45,7 @@ CXXEXTRA_DEFINES = -ptr../templates
 CXXEXTRA_DEFINES = -Xo
 #endif
 
-#if defined(HPArchitecture) || defined(LinuxArchitecture) || 
defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) || 
!defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || defined(LinuxArchitecture) || 
defined(BSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || 
(CplusplusCompilerMajorVersion != 4)
 LinkSourceFile(TemplatesAutoNumber.C,$(DTMMDBSRC)/HardCopy)
 
 EXTRA_SRCS = TemplatesAutoNumber.C
@@ -71,7 +71,7 @@ LinkSourceFile(all_tmpls,$(DTMMDBSRC)/HardCopy)
 SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,+Tall_tmpls 
-DEXPAND_TEMPLATES)
 #elif defined(AlphaArchitecture)       
 SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-ptf -DEXPAND_TEMPLATES)
-#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-DEXPAND_TEMPLATES)
 
SpecialCPlusPlusExpandRule(TemplatesAutoNumber..c,TemplatesAutoNumber.C,-DEXPAND_TEMPLATES)
 #else
diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile 
b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
index 9093310..facee7e 100644
--- a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
+++ b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
@@ -93,7 +93,7 @@ NORMAL_SRCS = \
        VariableTable.C defParser.C             defToken.C \
        style.C         tokenStyle.C
 
-#if defined(HPArchitecture) || defined(LinuxArchitecture) || 
defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) || 
!defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || defined(LinuxArchitecture) || 
defined(BSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || 
(CplusplusCompilerMajorVersion != 4)
 LinkSourceFile(SSTemplates.C,$(DTMMDBSRC)/StyleSheet)
 
 TEMPLATE_SRCS = SSTemplates.C
@@ -111,7 +111,7 @@ LinkSourceFile(all_tmpls,$(DTMMDBSRC)/StyleSheet)
 SpecialCPlusPlusObjectRule(SSTemplates.o,,+Tall_tmpls -DEXPAND_TEMPLATES)
 #elif defined(AlphaArchitecture)
 SpecialCPlusPlusObjectRule(SSTemplates.o,,-ptf -DEXPAND_TEMPLATES)
-#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SpecialCPlusPlusObjectRule(SSTemplates.o,,-DEXPAND_TEMPLATES)
 SpecialCPlusPlusExpandRule(SSTemplates..c,SSTemplates.C,-DEXPAND_TEMPLATES)
 #else
diff --git a/cde/programs/dtinfo/mmdb/dstr/Imakefile 
b/cde/programs/dtinfo/mmdb/dstr/Imakefile
index 2335ba9..c3d1920 100644
--- a/cde/programs/dtinfo/mmdb/dstr/Imakefile
+++ b/cde/programs/dtinfo/mmdb/dstr/Imakefile
@@ -23,7 +23,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define CplusplusSource        YES
 DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
 #endif
 
diff --git a/cde/programs/dtinfo/mmdb/dti_excs/Imakefile 
b/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
index f2348d0..d4854da 100644
--- a/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
+++ b/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
@@ -25,7 +25,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 EXCEPTION_DEFINES  = -DHAS_TERMINATE
-#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
 #endif
 
diff --git a/cde/programs/dtinfo/mmdb/hmphf/Imakefile 
b/cde/programs/dtinfo/mmdb/hmphf/Imakefile
index b3bc5fa..daf3118 100644
--- a/cde/programs/dtinfo/mmdb/hmphf/Imakefile
+++ b/cde/programs/dtinfo/mmdb/hmphf/Imakefile
@@ -23,7 +23,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define CplusplusSource        YES
 DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
 #endif
 
diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 227a746..82b44df 100644
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -139,7 +139,7 @@ DEPXDMCPLIB =
 INCLUDES = -I/usr/include/freetype2
 #endif
 
-#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
+#if defined(BSDArchitecture)
 INCLUDES = -I$(XPROJECTROOT)/include/freetype2
 #endif
 
@@ -203,6 +203,8 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
 
 #if defined (SunArchitecture)
   NATIVEXBINDIR = /usr/openwin/bin
+#elif defined(FreeBSDArchitecture)
+  NATIVEXBINDIR = /usr/local/bin
 #elif defined(OpenBSDArchitecture)
   NATIVEXBINDIR = /usr/X11R6/bin
 #else
diff --git a/cde/programs/dtpdmd/Imakefile b/cde/programs/dtpdmd/Imakefile
index 1eaa2e1..84344d5 100644
--- a/cde/programs/dtpdmd/Imakefile
+++ b/cde/programs/dtpdmd/Imakefile
@@ -36,7 +36,7 @@ OBJS =        dispatch.o      dtpdmd.o        mailbox.o \
        manager.o       records.o       setup.o \
        util.o          nlmsg.o
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 /* On Linux, just use the system provided Xau */
 DEPXAUTHLIB =
 #endif
diff --git a/cde/programs/dtspcd/Imakefile b/cde/programs/dtspcd/Imakefile
index 3e7a433..7842f1c 100644
--- a/cde/programs/dtspcd/Imakefile
+++ b/cde/programs/dtspcd/Imakefile
@@ -24,8 +24,7 @@ LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
 SYS_LIBRARIES = -lm -lgen 
 #endif
 
-#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) \
-    || defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
        $(XMLIB) $(XTOOLLIB) $(XLIB)
 SYS_LIBRARIES = -lm
diff --git a/cde/programs/localized/templates/French.tmpl 
b/cde/programs/localized/templates/French.tmpl
index 0bc6c96..bcfa1b5 100644
--- a/cde/programs/localized/templates/French.tmpl
+++ b/cde/programs/localized/templates/French.tmpl
@@ -31,6 +31,6 @@ LANG=fr
 LANG=fr
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=fr_FR.ISO8859-1
 #endif
diff --git a/cde/programs/localized/templates/German.tmpl 
b/cde/programs/localized/templates/German.tmpl
index 53be70f..31eb54e 100644
--- a/cde/programs/localized/templates/German.tmpl
+++ b/cde/programs/localized/templates/German.tmpl
@@ -31,6 +31,6 @@ LANG=de
 LANG=de
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=de_DE.ISO8859-1
 #endif
diff --git a/cde/programs/localized/templates/Italian.tmpl 
b/cde/programs/localized/templates/Italian.tmpl
index 4e8f243..d8bdad2 100644
--- a/cde/programs/localized/templates/Italian.tmpl
+++ b/cde/programs/localized/templates/Italian.tmpl
@@ -31,6 +31,6 @@ LANG=it
 LANG=it
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=it_IT.ISO8859-1
 #endif
diff --git a/cde/programs/localized/templates/Spanish.tmpl 
b/cde/programs/localized/templates/Spanish.tmpl
index 69d1fb3..5cdd954 100644
--- a/cde/programs/localized/templates/Spanish.tmpl
+++ b/cde/programs/localized/templates/Spanish.tmpl
@@ -31,6 +31,6 @@ LANG=es
 LANG=es
 #endif
 
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || 
defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=es_ES.ISO8859-1
 #endif
diff --git a/cde/programs/nsgmls/Imakefile b/cde/programs/nsgmls/Imakefile
index 6e07d98..ac90c07 100644
--- a/cde/programs/nsgmls/Imakefile
+++ b/cde/programs/nsgmls/Imakefile
@@ -77,7 +77,7 @@ STLIBCENV =
 M4 = /bin/m4
 #endif
 
-#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || 
defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
 
 /*
  * put cpp directives here rather than in CXXDEFINES because
-- 
1.7.11.5

------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135031&iu=/4140/ostg.clktrk

_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

[cdesktopenv-devel] [PATCH] Introduction of BSDArchitecture

Reply via email to