Re: [cdesktopenv-devel] OpenBSD port

[Pascal S. <Pas...@cu...>]

On Wed, 08 Aug 2012 11:24:52 +0200, Pascal Stumpf wrote:
> On Tue, 07 Aug 2012 21:51:14 +0200, Pascal Stumpf wrote:
> > Ohai.
> > 
> > Just informing you guys that I'm currently working on an OpenBSD port.
> > Already got most stuff building and a shitload of patches (though mostly
> > just #ifdef's).  I'll probably start making a branch in a few days,
> > though this will need to be merged with the other porting efforts
> > (FreeBSD ...).
> > 
> > Cheers,
> > Pascal
> 
> So here's a patch with all the changes to make it compile on OpenBSD.
> It does not work yet, but I'd like to get this in as soon as possible to
> facilitate further work.
> 
> These are mostly #ifdef's, adapting to new standards (scope of var decls
> in for loops), at least one 64bit bug and a fix for istr_string if it is
> fed a NULL pointer.  The database file patches contain some stuff that
> is specific to my port (on github, openbsd-wip/x11/cde), but I think the
> whole install framework should be revisited anyway to something that
> respects $PREFIX (for fake installation) and doesn't hardcode shared
> library versions.
> 

Sorry, forgot to add some new files that are required.


diff --git a/cde/Imakefile b/cde/Imakefile
index 59f16e4..3cc2549 100644
--- a/cde/Imakefile
+++ b/cde/Imakefile
@@ -139,7 +139,6 @@ Everything.doc::
 
 NamedTargetSubdirs(install.doc,$(DOCSUBDIRS),"installing",DESTDIR=$(DESTDIR),install)
 NamedTargetSubdirs(install.man.doc,$(DOCSUBDIRS),"installing man pages",DESTDIR=$(DESTDIR),install.man)
-InstallLinkKitSubdirs($(DOCSUBDIRS))
 NamedCleanSubdirs(clean.doc,$(DOCSUBDIRS))
 NamedTagSubdirs(tags.doc,$(DOCSUBDIRS))
 MakeMakeSubdirs($(DOCSUBDIRS),Makefiles.doc)
diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
index 6e13dd0..9c90278 100755
--- a/cde/admin/IntegTools/dbTools/installCDE.src
+++ b/cde/admin/IntegTools/dbTools/installCDE.src
@@ -207,6 +207,9 @@ CleanDaemons()
       then
         stopsrc -s inetd >>$LOGFILE 2>&1
       fi
+    elif [ "$PLATFORM" = openbsd ]
+    then
+      true
     else    
       ps -ef | grep $i | grep -v grep >/tmp/tmppsout
       if [ -s /tmp/tmppsout ]
@@ -234,6 +237,9 @@ RestartInetd()
   elif [ "$PLATFORM" = "dec" ]
   then
     /usr/sbin/inetd
+  elif [ "$PLATFORM" = "openbsd" ]
+  then
+    true
   else
 #ifdef hpV4
     /usr/sbin/inetd 
@@ -537,6 +543,10 @@ XCOMM
   then
     PLATFORM="linux"
     PLATFORM_SCRIPT_DIR=""
+  elif [ $BUILDSYSTEM = "OpenBSD" ];
+  then
+    PLATFORM="openbsd"
+    PLATFORM_SCRIPT_DIR=""
   else			# Build system = HP
     PLATFORM=hp-ux
     PLATFORM_SCRIPT_DIR=hp
@@ -566,9 +576,6 @@ XCOMM
 
   unset TMPDIR
 
-  PATH=/bin:/usr/bin:/etc:/usr/bin/X11:
-  export PATH
-
   CLEANING="no"
   CLEANING_ETC="no"
   TARBALL="no"
@@ -872,9 +879,9 @@ XCOMM
     fi
   fi
 
-  INSTALL_LOCATION=CDE_INSTALLATION_TOP
-  CONFIGURE_LOCATION=CDE_CONFIGURATION_TOP
-  LOGFILES_LOCATION=CDE_LOGFILES_TOP
+  [ -z "$INSTALL_LOCATION" ] && INSTALL_LOCATION=CDE_INSTALLATION_TOP
+  [ -z "$CONFIGURE_LOCATION" ] && CONFIGURE_LOCATION=CDE_CONFIGURATION_TOP
+  [ -z "$LOGFILES_LOCATION" ] && LOGFILES_LOCATION=CDE_LOGFILES_TOP
 
   if [ -L $INSTALL_LOCATION -a "$CONFIGURE_ONLY" != "yes" ]
   then
diff --git a/cde/admin/IntegTools/post_install/Imakefile b/cde/admin/IntegTools/post_install/Imakefile
index 04669e0..f8e3d8d 100644
--- a/cde/admin/IntegTools/post_install/Imakefile
+++ b/cde/admin/IntegTools/post_install/Imakefile
@@ -19,6 +19,9 @@ PLATFORM = hp-ux
 PLATFORM = linux
 SUBDIRS = linux
 #endif
+#ifdef OpenBSDArchitecture
+PLATFORM = openbsd
+#endif
 #ifdef RsArchitecture
 PLATFORM = aix
 SUBDIRS = ibm
diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf
index 3c57d21..923dfae 100644
--- 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/Library.tmpl b/cde/config/cf/Library.tmpl
index 065c78e..4575d60 100644
--- a/cde/config/cf/Library.tmpl
+++ b/cde/config/cf/Library.tmpl
@@ -79,6 +79,7 @@ CDEBUGFLAGS = LibraryCDebugFlags
    CXXOPTIONS = LibraryCplusplusOptions
   STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
 CXXDEBUGFLAGS = LibraryCplusplusDebugFlags
+       CXXLIB = CplusplusLibC
 # if defined(LargePICTable) && LargePICTable
 #  ifdef LargePositionIndependentCplusplusFlags
   CXXPICFLAGS = LargePositionIndependentCplusplusFlags
diff --git a/cde/config/cf/Motif.tmpl b/cde/config/cf/Motif.tmpl
index 6873de6..abde63c 100644
--- a/cde/config/cf/Motif.tmpl
+++ b/cde/config/cf/Motif.tmpl
@@ -442,13 +442,18 @@ 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
        MDEMOSRC = $(MTOP)/demos
diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
new file mode 100644
index 0000000..f297896
--- /dev/null
+++ b/cde/config/cf/OpenBSD.cf
@@ -0,0 +1,1032 @@
+XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.100 2004/01/08 22:51:41 herrb Exp $
+XCOMM $XdotOrg: xc/config/cf/OpenBSD.cf,v 1.11 2005/06/15 20:03:51 idr Exp $
+XCOMM
+
+#ifndef OSName
+#define OSName			DefaultOSName OSBinaryType
+#endif
+#ifndef OSMajorVersion
+#define OSMajorVersion		DefaultOSMajorVersion
+#endif
+#ifndef OSMinorVersion
+#define OSMinorVersion		DefaultOSMinorVersion
+#endif
+#ifndef OSTeenyVersion
+#define OSTeenyVersion		DefaultOSTeenyVersion
+#endif
+
+#ifndef OSVendor
+#define	OSVendor	/**/
+#endif
+XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+
+#ifdef Ports
+
+#define BinDir			/usr/local/bin
+#define LibDir			/usr/local/lib/X11
+#define UsrLibDir		/usr/local/lib
+#define ManDirectoryRoot	/usr/local/man
+#define FontDir			/usr/local/lib/X11/fonts
+#define FontEncDir		/usr/local/lib/X11/fonts/encodings
+#define LdPreLib		-L/usr/X11R6/lib -L/usr/local/lib
+#define XpmLibDir		/usr/X11R6/lib
+#define XpmIncDir		/usr/X11R6/include
+#define ConfigDir		/usr/X11R6/lib/X11/config
+#define IncRoot			/usr/local/include
+#define TopXInclude		-I/usr/X11R6/include
+#define ImakeCmd		imake -DPorts
+#define DocDir			/usr/local/share/doc
+#define BuildHtmlManPages	NO
+
+#endif
+
+/*
+ * C library features
+ */
+#define HasPoll			YES
+#define HasNdbm         	YES
+#define HasPutenv       	YES
+#define HasSnprintf		YES
+#if OSMajorVersion == 2 && OSMinorVersion >= 4 || OSMajorVersion >= 3
+# define HasStrlcat		YES
+#endif
+#define HasBSD44Sockets 	YES
+#define Malloc0ReturnsNull	NO
+#define SetTtyGroup     	YES
+#define DBMLibrary		/**/
+#define HasLibCrypt		NO
+#define HasShm          	YES
+#define HasWChar32		YES
+#define HasMkstemp		YES
+#define HasSetProcTitle		YES
+#define HasZlib			YES
+#ifndef HasLibpng
+# define HasLibpng		NO
+#endif
+#ifndef HasKrbIV
+# if OSMajorVersion == 2 || OSMajorVersion == 3 && OSMinorVersion < 3
+#  define HasKrbIV		YES
+#  if OSMajorVersion == 2 && OSMinorVersion <= 8
+#   define KrbIVLibraries	-lkrb -lkafs -ldes
+#  endif
+# else
+   /* Kerberos IV was removed after OpenBSD 3.3 */
+#  define HasKrbIV		NO
+# endif
+#endif
+#define HasUsableFileMmap	YES
+#define HasShadowPasswd		NO
+#define IPv6SocketsAlsoIPv4	NO
+
+#define HasArc4Random		YES
+
+#define HasNCurses		YES
+#define NCursesLibName		-lcurses
+#if defined(TermcapLibrary)
+#undef TermcapLibrary
+#endif
+#define TermcapLibrary		-lcurses
+
+#define HasVarRun		YES
+#define HasVarDb		YES
+#define VarLibDir		VarDbDirectory
+
+#define InstallXloadSetGID	NO
+
+#ifndef HasIssetugid
+# if (OSMajorVersion >= 2)
+#  define HasIssetugid		YES
+# endif
+#endif
+
+#ifndef HasMktemp
+# if (OSMajorVersion > 2) || (OSMajorVersion == 2 && OSMinorVersion >= 1)
+#  define HasMktemp		YES
+# else
+#  define HasMktemp		NO
+# endif
+#endif
+
+/* OpenBSD >= 2.7 has getifaddrs() */
+#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 7)
+#define HasGetIfAddrs		YES
+#endif
+
+/* OpenBSD >= 2.8 has setusercontext() */
+#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 7)
+#define HasSetUserContext	YES
+#endif
+
+/* OpenBSD after 2.9 has BSD authentication */
+#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 9)
+# define HasBSDAuth		YES
+#endif
+
+/* OpenBSD 3.0 and later has getpeereid() */
+#if OSMajorVersion >= 3
+# define HasGetpeereid		YES
+#endif
+
+/* OpenBSD 3.0 has APM with kqueue interface */
+#if OSMajorVersion >= 3
+# define HasApmKqueue		YES
+#endif
+
+/* OpenBSD 3.0 has libusb, next versions have libusbhid */
+#if OSMajorVersion >= 3 
+# define HasLibUsb		YES
+# ifndef HasLibUsbHid
+#  if OSMajorVersion == 3 && OSMinorVersion > 0 || OSMajorVersion > 3
+#   define HasLibUsbHid		YES
+#   define UsbHidLib 		-lusbhid
+#  else
+#   define HasLibUsbHid		NO
+#   define UsbHidLib		-lusb
+#  endif
+# endif
+#endif
+
+/*
+ * Compiler Features
+ */
+#define GccUsesGas		YES
+#define UseGas			YES
+#define GnuCpp			YES
+
+#define UseGnuMalloc		NO
+
+#define NeedConstPrototypes	YES
+#define NeedFunctionPrototypes	YES
+#define NeedNestedPrototypes	YES
+#define NeedVarargsPrototypes	YES
+#define NeedWidePrototypes	NO
+
+#define MkdirHierCmd		mkdir -p
+
+#ifndef CppCmd
+#define CppCmd          	/usr/libexec/cpp
+#endif
+#define StandardCppOptions	-traditional
+#define StandardCppDefines	/**/
+#define PreProcessCmd   	CppCmd
+#define PreIncDir		DefaultGccIncludeDir
+
+#ifndef CcCmd
+#define CcCmd 			cc
+#endif
+#ifndef AsCmd
+#define AsCmd			cc -c -x assembler
+#endif
+#ifndef DefaultCCOptions
+#if defined(UseInstalled)
+   /* conform to OpenBSD's habits */
+#  define DefaultCCOptions	$(COPTS)
+#else
+#  ifdef  PpcArchitecture
+#    define DefaultCCOptions	-pipe -fsigned-char GccWarningOptions
+#  else
+#    define DefaultCCOptions 	-pipe GccWarningOptions
+#  endif
+#endif
+#endif
+
+#define GccGasOption 		-DGCCUSESGAS
+#define AsmDefines 		-DUSE_GAS
+
+/* UseElfFormat defaults to YES if __ELF__ set */
+#ifndef UseElfFormat
+# ifdef __ELF__
+#  undef __ELF__			/* other imake files shouldn't care */
+#  define UseElfFormat YES
+# else
+#  define UseElfFormat NO
+# endif
+#endif
+
+/*
+ * Increment shared libraries major numbers if using Gcc Stack Protector
+ * (This introduces an ABI change)
+ */
+#ifndef OverrideShlibRevs
+# define OverrideShlibRevs     ProPoliceSupport
+#endif
+
+#define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+
+
+#define	AdmDir			/var/log
+
+#define HasFlex			YES
+
+/* OpenBSD doesn't have gperf in the base install */
+#define DontRebuildGperfOutput	YES
+
+/*
+ * Make & install Features
+ */
+
+#define HasBsdMake		YES
+
+#define BuildCyrillicFonts	YES
+#define GzipFontCompression	YES
+#define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
+#define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
+
+#define InstUidFlags		-m 4755
+
+#ifdef  InstallCmd
+# undef  InstallCmd
+# define InstallCmd 		/usr/bin/install
+#endif
+
+#ifndef ExtraFilesToClean
+# define ExtraFilesToClean 	*.core
+#endif
+
+/*
+ * Documentation formatting
+ */
+#ifdef Ports
+# define NroffCmd		/usr/local/bin/nroff -Tascii -c
+# define TroffCmd		/usr/local/bin/nroff -Tps
+# define HTMLroffCmd		/usr/local/bin/nroff -Thtml
+# define NeqnCmd		/usr/local/bin/neqn -Tascii
+# define EqnCmd			/usr/local/bin/eqn -Tps
+# define TblCmd			/usr/local/bin/tbl
+#else
+# define NroffCmd		mandoc
+# define TroffCmd		mandoc -Tps
+# define HTMLroffCmd		mandoc -Thtml
+# define NeqnCmd		cat
+# define EqnCmd			cat
+# define TblCmd			cat
+#endif
+
+#define HasGroff		YES
+
+#ifndef HasCookieMaker
+#  define HasCookieMaker	YES
+#  define MkCookieCmd \
+	'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
+#endif
+
+
+/*
+ * Man pages need to be formatted when installed, so override the default
+ * imake rules.
+ */
+#define ManSuffix	1
+#define FileManSuffix	5
+
+#ifdef Ports
+
+#define ManSourcePath	$(MANPATH)/cat
+
+#define InstallManPageLongBase(file,destdir,dest)			@@\
+all:: file.0								@@\
+									@@\
+file.0:: file.$(MANNEWSUFFIX)						@@\
+	@if [ -f file.$(MANNEWSUFFIX) ]; \				@@\
+	then \								@@\
+	cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | \			@@\
+		$(NROFF) $(MANMACROS) | $(COL) > file.0; \		@@\
+	fi 								@@\
+									@@\
+install.man::                                                           @@\
+	MakeDir($(DESTDIR)destdir)					@@\
+	-@if [ -f file.0 ]; \						@@\
+	then \								@@\
+	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
+	fi								@@\
+									@@\
+clean::									@@\
+	RemoveFile(file.0)
+
+#define InstallManPageLong(file,destdir,dest)				@@\
+BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
+									@@\
+CppManTarget(file, $(EXTRAMANDEFS))					@@\
+									@@\
+InstallManPageLongBase(file,destdir,dest)
+
+#define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+BuildInstallHtmlManPage(file,dest,suffix)				@@\
+									@@\
+CppManTarget(file, $(EXTRAMANDEFS))					@@\
+									@@\
+InstallManPageLongBase(file,destdir,dest)
+
+#define InstallMultipleMan(list,dest)                                   @@\
+install.man:: 								@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
+	for i in list; do \                                             @@\
+	  (MNAME=`echo $$i | cut -f1 -d.`; \				@@\
+	  set -x; \							@@\
+	  cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \		@@\
+		| $(COL) > $${MNAME}.0; \				@@\
+	  $(INSTALL) -c $(INSTMANFLAGS) $${MNAME}.0 \			@@\
+			$(DESTDIR)dest/$${MNAME}.0; \			@@\
+	  $(RM) $${MNAME}.0); \						@@\
+	done
+
+#define InstallMultipleManSuffix(list,dest,suff)                        @@\
+install.man:: 								@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
+	for i in list; do \                                             @@\
+	  (set -x; \							@@\
+	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \	@@\
+		| $(COL) > $$i.0; \					@@\
+	  $(INSTALL) -c $(INSTMANFLAGS) $$i.0	 \			@@\
+		$(DESTDIR)dest/$$i.0; \					@@\
+	  $(RM) $$i.0 ); \						@@\
+	done
+
+#define InstallManPageAliasesBase(file,destdir,aliases)			@@\
+install.man:: 								@@\
+	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
+	for i in aliases; do \                                          @@\
+		(set -x; \						@@\
+		$(RM) $(DESTDIR)destdir/$$i.0;\  			@@\
+		(cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ 		@@\
+		); \							@@\
+	done
+
+#else /* Ports */
+
+#define InstallManPageAliasesBase(file,destdir,aliases)			@@\
+install.man::								@@\
+	@SUFFIX=${MANSUFFIX}; \						@@\
+	for i in aliases; do \						@@\
+		(set -x; \						@@\
+		$(RM) $(DESTDIR)destdir/$$i.*; \			@@\
+		(cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \		@@\
+		$$i.$${SUFFIX})); \					@@\
+	done
+
+#endif /* Ports */
+
+#define InstallManPageAliases(file,destdir,aliases)			@@\
+InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
+
+#define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+InstallHtmlManPageAliases(file,aliases,suffix)				@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
+
+
+/*
+ * InstallFontAliases - generate rules to install font aliases
+ *                      databases without comments for X11R5 servers
+ */
+#ifndef InstallFontAliasesNoComment
+#define InstallFontAliasesNoComment(dest)				@@\
+install:: fonts.alias							@@\
+	$(RM) _fonts.alias 						@@\
+	sed -e '/^!/d' -e '/^$$/d' < fonts.alias > _fonts.alias		@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTALLDATFLAGS) _fonts.alias \	@@\
+	$(DESTDIR)dest/fonts.alias					@@\
+	$(RM) _fonts.alias
+#endif /* InstallFontAliasesNoComment */
+
+/*
+ * OpenBSD specific Imake Config files
+ */
+#ifndef LocalConfigFiles
+#define LocalConfigFiles \
+	OpenBSDLib.rules OpenBSDLib.tmpl
+#endif
+
+/*
+ * Architecture specific sections - put all architecture dependent
+ * options and setting here into the correct section
+ */
+
+
+/*
+ * Definitions for the alpha architecture
+ */
+#ifdef AlphaArchitecture
+
+# if OSMajorVersion == 3 && OSMinorVersion > 1 || OSMajorVersion > 3
+#  define HasWeakSymbols		YES
+# endif
+
+/* XXX Xvfb currently causes a linker error: */
+/* XXX crtbegin.c(.fini+0x10): relocation truncated to fit: BRADDR text */
+# ifdef XVirtualFramebufferServer
+#  undef XVirtualFramebufferServer
+# endif
+# define XVirtualFramebufferServer	NO
+# ifdef XnestServer
+#  undef XnestServer
+# endif
+# define XnestServer	NO
+
+# if (OSMajorVersion < 3)
+#  define HasSharedLibraries	NO
+# endif
+
+# ifndef XorgServer
+#  if OSMajorVersion == 3 && OSMinorVersion >= 2 || OSMajorVersion > 3
+#    define XorgServer		YES
+#  else
+#    define XorgServer		NO
+#  endif
+# endif
+
+/* Definitions for building the XFree86 server */
+# if XorgServer
+#   ifndef HasNetBSDApertureDriver
+#     define HasNetBSDApertureDriver	YES
+#   endif
+#   define ServerOSDefines	XFree86ServerOSDefines  -DDDXOSINIT
+#   define ServerExtraDefines	GccGasOption -D_XSERVER64 XFree86ServerDefines
+#   define ServerExtraSysLibs	-lalpha
+#   ifndef DoLoadableServer
+#     define DoLoadableServer	YES
+#   endif
+#   define XF86OSCardDrivers	wsfb
+#   ifndef XFree86ConsoleDefines
+#     define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
+#   endif
+#   define UseMatroxHal		NO	/* Matrox HAL is i386 only */
+
+# endif /* XorgServer */
+
+# include <xorg.cf>
+
+#endif /* AlphaArchitecture */
+
+/*
+ * Definitions for the AMD64 architecture
+ */
+#ifdef AMD64Architecture
+
+# define HasWeakSymbols		YES
+
+# define XorgServer		YES
+
+# ifndef DoLoadableServer
+#  define DoLoadableServer	YES
+# endif
+
+# ifndef HasNetBSDApertureDriver
+#  define HasNetBSDApertureDriver	YES
+# endif
+
+# define HasAgpGart		YES
+
+# define ServerExtraSysLibs	-lamd64
+# define ServerExtraDefines	GccGasOption -D_XSERVER64 XFree86ServerDefines
+
+# ifndef XFree86ConsoleDefines
+#  define XFree86ConsoleDefines	-DWSCONS_SUPPORT -DPCVT_SUPPORT
+# endif
+
+# ifndef HasMMXSupport
+#   define HasMMXSupport	YES
+# endif
+
+# ifndef HasX86Support
+#  define HasX86Support		YES
+# endif
+/* # include <xorg.cf> */
+
+#endif /* AMD64Architecture */
+
+/*
+ * Definitions for the i386 architecture
+ */
+#ifdef i386Architecture
+
+# ifndef DoLoadableServer
+#  define DoLoadableServer	YES
+# endif
+
+/* Direct rendering (OpenBSD 3.3 and up). */ 
+# if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 2)
+#  ifndef BuildXF86DRI
+#   define BuildXF86DRI			NO
+#  endif 
+# endif 
+
+# define HasWeakSymbols		YES
+
+/* To use the NetBSD Aperture driver */
+# ifndef HasNetBSDApertureDriver
+#  define HasNetBSDApertureDriver	YES
+# endif
+
+/* 2.7 and later have support for setting MTRRs */
+# ifndef HasMTRRSupport
+#  if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 6)
+#   define HasMTRRSupport		YES
+#  else
+#   define HasMTRRSupport		NO
+#  endif
+# endif
+
+/* 
+ * agpgart support (OpenBSD 3.2 and up) 
+ */ 
+# if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 1)
+#  ifndef HasAgpGart 
+#   define HasAgpGart   YES 
+#  endif 
+# endif 
+ 
+
+# ifndef DefaultGcc2i386Opt
+#   if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
+      /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
+#     define DefaultGcc2i386Opt	-O2 GccAliasingArgs
+#   endif
+# endif
+# define OptimizedCDebugFlags	DefaultGcc2i386Opt
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraSysLibs	-li386
+# define LdPostLib		/**/
+# define ServerExtraDefines GccGasOption XFree86ServerDefines
+# ifndef XFree86ConsoleDefines
+#   define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
+# endif
+
+# define JoystickSupport	NO
+
+/* A hack to work around an optimization problem with gcc 2.95.2 */
+# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6)
+#  define GccOptBug295
+# endif
+
+/* No MMX support in OpenBSD/a.out gas */
+# ifndef HasMMXSupport
+#   define HasMMXSupport	UseElfFormat
+# endif
+
+/* for DRI */
+# ifndef HasX86Support
+#  define HasX86Support		UseElfFormat
+# endif
+
+# include <xorg.cf>
+
+#endif /* i386Architecture */
+
+
+/*
+ * Definitions for the m68k architecture (currently amiga, hp300,
+ * mac68k, mvme68k, sun3)
+ */
+#ifdef Mc68020Architecture
+
+/*
+ * Function CSE makes gas -k not recognize external function calls as lazily
+ * resolvable symbols, thus sometimes making ld.so report undefined symbol
+ * errors on symbols found in shared library members that would never be
+ * called.  Ask ni...@op... for details.
+ */
+
+# define PositionIndependentCFlags -fpic -fno-function-cse
+# define BuildGlxExt		NO
+# define BuildGLXLibrary	YES
+ 
+#endif /* Mc68020Architecture */
+
+
+/*
+ * Definitions for the amiga architecture
+ */
+#ifdef AmigaArchitecture
+
+# ifndef BuildServer
+#  define BuildServer		NO
+# endif
+
+# define ServerExtraDefines	-DXFree86Server
+
+# include <xorg.cf>
+
+#endif /* AmigaArchitecture */
+
+
+/*
+ * Definitions for the hp300 architecture
+ */
+#ifdef Hp300Architecture
+
+# ifndef BuildServer
+#  define BuildServer		NO
+# endif
+/* For the X11R5 server */
+# define CompressAllFonts	NO
+# define InstallFontAliases	InstallFontAliasesNoComment
+# define UseRgbTxt		NO
+# define UseRgb			YES
+
+# define ServerExtraDefines	-DXFree86Server
+
+#include <xorg.cf>
+
+#endif /* Hp300Architecture */
+
+
+/*
+ * Definitions for the mac68k architecture
+ */
+#ifdef Mac68kArchitecture
+
+# ifndef BuildServer
+#  define BuildServer		NO
+# endif
+
+# define ServerExtraDefines	-DXFree86Server
+
+# include <xorg.cf>
+
+#endif /* mac68kArchitecture */
+
+
+/*
+ * Definitions for the mvme68k architecture
+ */
+#ifdef Mvme68kArchitecture
+
+# ifndef BuildServer
+#  define BuildServer		NO
+# endif
+
+# define ServerExtraDefines	-DXFree86Server
+
+# include <xorg.cf>
+
+#endif /* Mvme68kArchitecture */
+
+
+/*
+ * Definitions for the sun3 architecture
+ */
+#ifdef Sun3Architecture
+
+# include <xf86.rules>
+
+# define ServerOSDefines       -DDDXOSINIT
+# define BootstrapCFlags       -Dsun3
+# define UnalignedReferencesAllowed	YES /* changes _XtCopyArgs() */
+# define ServerExtraDefines    GccGasOption -Dmc68000 -Dmc68020 \
+				-DXFree86Server -DINCLUDE_CG2_HEADER
+
+# ifndef Xsun24Server
+#  define Xsun24Server		NO
+# endif
+# ifndef XsunServer
+#  define XsunServer		YES
+# endif
+# ifndef XsunMonoServer
+#  define XsunMonoServer	NO
+# endif
+
+#define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
+
+#endif /* Sun3Architecture */
+
+
+/*
+ * Definitions for the mips architecture (currently sgi)
+ */
+#ifdef MipsArchitecture
+
+# define HasWeakSymbols		YES
+
+# define XorgServer		YES
+
+# if XorgServer
+#  ifndef DoLoadableServer
+#    define DoLoadableServer	YES
+#  endif
+#  define XF86CardDrivers	wsfb
+#  define XFree86ConsoleDefines -DWSCONS_SUPPORT
+# endif
+
+# include <xorg.cf>
+
+#endif /* MipsArchitecture */
+
+
+/*
+ * Definitions for the PowerPC architecture 
+ */
+#ifdef PpcArchitecture
+
+# define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
+# ifndef XFree86ConsoleDefines
+#   define XFree86ConsoleDefines	-DWSCONS_SUPPORT
+# endif
+
+# if OSMajorVersion == 3 && OSMinorVersion > 1 || OSMajorVersion > 3
+#  define HasWeakSymbols	YES
+# endif
+# ifndef GccWarningOptions
+#  if defined(XFree86Devel) && XFree86Devel
+#   define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
+			  -Wmissing-prototypes -Wmissing-declarations \
+			  -Wnested-externs
+#  else
+#   define GccWarningOptions -Wall -Wpointer-arith
+#  endif
+# endif
+
+# ifndef XorgServer
+#   define XorgServer		YES
+# endif
+
+/* Definitions for building the X server */
+# if XorgServer
+#   define ServerOSDefines	XFree86ServerOSDefines -DDDXOSINIT
+#   define ServerExtraDefines	GccGasOption XFree86ServerDefines
+#   ifndef DoLoadableServer
+#     define DoLoadableServer	YES
+#   endif
+#   define XF86OSCardDrivers	wsfb
+#   ifndef XF86CardDrivers
+#    define XF86CardDrivers	ati mga glint s3virge sis savage\
+				trident chips tdfx \
+				DevelDrivers vga \
+				XF86OSCardDrivers XF86ExtraCardDrivers
+#   endif
+#   ifndef DevelDrivers 
+#    define DevelDrivers nv
+#   endif
+
+# endif /* XorgServer */
+
+# include <xorg.cf>
+
+#endif /* PpcArchitecture */
+
+/*
+ * Definitions for the sparc architecture
+ */
+#ifdef SparcArchitecture
+
+# define BuildXF86MiscExt	NO
+# define BuildMITMiscExt	NO
+
+# if OSMajorVersion > 3 || OSMajorVersion == 3 && OSMinorVersion >= 2
+#  define HasWeakSymbols	YES
+#endif 
+
+# if OSMajorVersion == 2 || OSMajorVersion == 3 && OSMinorVersion < 2
+#  define ServerOSDefines 	-DDDXOSINIT
+#  define ServerExtraDefines	-DAVOID_GLYPHBLT -DPIXPRIV  -DXFree86Server \
+				DebugDefines -DINCLUDE_CG2_HEADER \
+				-DX_BYTE_ORDER=$(X_BYTE_ORDER)
+#  define XOrgServer		NO
+# else
+#  define XorgServer		YES
+# endif 
+
+# if !XorgServer
+
+#  ifndef Xsun24Server
+#   define Xsun24Server		YES
+#  endif
+#  ifndef XsunServer
+#   define XsunServer		YES
+#  endif
+#  ifndef XsunMonoServer
+#   define XsunMonoServer	YES
+#  endif
+#  ifndef InstallXserverSetUID
+#   define InstallXserverSetUID NO
+#  endif
+
+# else /* XF86Server */
+
+#  ifndef Xsun24Server
+#   define Xsun24Server		NO
+#  endif
+#  ifndef XsunServer
+#   define XsunServer		NO
+#  endif
+#  ifndef XsunMonoServer
+#   define XsunMonoServer	NO
+#  endif
+#  ifndef DoLoadableServer
+#    define DoLoadableServer	YES
+#  endif
+
+#  define XF86CardDrivers	wsfb
+#  define XFree86ConsoleDefines -DWSCONS_SUPPORT
+#  define BuildXInputExt	YES
+#  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+#  define ServerExtraDefines	GccGasOption XFree86ServerDefines
+
+# endif
+
+# define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
+
+# define BuildXF86VidModeExt	NO
+# define BuildXF86DGA		NO
+# ifndef BuildXInputExt
+#  define BuildXInputExt	NO
+# endif
+# include <xorg.cf>
+
+#endif /* SparcArchitecture */
+
+/*
+ * Definitions for the sparc64 architecture
+ */
+
+#ifdef Sparc64Architecture
+
+# if OSMajorVersion == 3 && OSMinorVersion > 1 || OSMajorVersion > 3
+#  define HasWeakSymbols	YES
+# endif
+
+# ifndef XorgServer
+#  define XorgServer		YES
+# endif
+
+# define ServerExtraDefines	GccGasOption -D_XSERVER64 XFree86ServerDefines
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXOSINIT
+# define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
+
+# if XorgServer
+#   ifndef DoLoadableServer
+#     define DoLoadableServer	YES
+#   endif
+#   define XF86OSCardDrivers	wsfb
+#   define XFree86ConsoleDefines -DWSCONS_SUPPORT
+# endif
+
+# include <xorg.cf>
+
+#endif /* Sparc64Architecture */
+
+/*
+ * Definitions for the vax architecture
+ */
+#ifdef VaxArchitecture
+
+# ifndef BuildServer
+#  define BuildServer		NO
+# endif
+
+/* For the X11R5 server */
+# define CompressAllFonts	NO
+# define InstallFontAliases	InstallFontAliasesNoComment
+# define UseRgbTxt		NO
+# define UseRgb			YES
+
+# define ServerExtraDefines	-DXFree86Server
+# define UnalignedReferencesAllowed YES
+# define HasSharedLibraries	NO
+# define HasDlopen		NO
+
+# define BuildGlxExt		NO
+# define BuildGLXLibrary	NO
+
+# include <xorg.cf>
+
+#endif /* VaxArchitecture */
+ 
+/* End or architecture specific section */
+
+/*
+ * Generic settings for all architectures
+ * which can be overridden by architecture specific sections above
+ */
+
+#ifndef StandardDefines
+# define StandardDefines	-DCSRG_BASED 
+#endif
+
+#if !defined(OptimizedCDebugFlags)
+# define OptimizedCDebugFlags	-O2
+#endif
+
+#ifndef ServerOSDefines
+#  define ServerOSDefines 	/**/
+#endif
+
+#ifndef ServerExtraDefines
+#  define ServerExtraDefines GccGasOption
+#endif
+
+#ifndef HasWeakSymbols
+# define HasWeakSymbols			NO
+#endif
+
+/*
+ * Multi-thread safe libs 
+ */	
+/* #if HasWeakSymbols == YES && (OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3)
+#  define HasPosixThreads		YES
+#  define ThreadedX			YES
+#  define NeedUIThrStubs		YES
+#  define ThreadsCompileFlag		-pthread
+#  define ThreadsLibraries		-pthread
+#  define SystemMTDefines	-D_REENTRANT
+#else */
+#  define ThreadedX			NO
+/* #endif */
+
+
+/* Set this to YES when getpwuid_r is added to libc_r */
+#define HasThreadSafeAPI		NO
+
+#ifndef ExtraLibraries
+# define ExtraLibraries		/**/
+#endif
+
+#ifndef DoLoadableServer
+#define DoLoadableServer	NO
+#endif
+
+#ifndef XVirtualFramebufferServer
+# undef BuildServer
+# define BuildServer			YES
+# define XVirtualFramebufferServer	YES
+#endif
+
+#ifndef XnestServer
+# undef BuildServer
+# define BuildServer			YES
+# define XnestServer			YES
+#endif
+
+#ifndef BuildScreenSaverLibrary
+# define BuildScreenSaverLibrary	YES
+#endif
+
+#ifndef CompressAllFonts
+# define CompressAllFonts		YES
+#endif
+
+#ifndef SharedLibXdmGreet
+# define SharedLibXdmGreet		NO
+#endif
+
+#define HasFreetype2		NO
+#define HasExpat		NO
+#define	BuildXterm		BuildClients
+
+/*
+ * XFree86 uses its own (more portable) database routines to speed up
+ * the RGB database lookups
+ * However, if you want to use ndbm anyway, you can set that to NO in
+ * host.def
+ */
+#ifndef UseRgbTxt
+# define UseRgbTxt			YES
+#endif
+
+#ifndef OSBinaryType
+# if UseElfFormat
+#  define OSBinaryType			[ELF]
+# else
+#  define OSBinaryType			/**/
+# endif
+#endif
+
+#ifndef HasDlopen
+# define HasDlopen		YES
+#endif
+
+#ifndef DlLibrary
+# if UseElfFormat
+#  if (OSMajorVersion < 3 || OSMajorVersion == 3 && OSMinorVersion == 0)
+#   define DlLibrary -ldl
+#  else
+#   define DlLibrary -Wl,--export-dynamic
+#  endif
+# else
+#  define DlLibrary /**/
+# endif
+#endif
+
+#if !defined(GccWarningOptions)
+# define GccWarningOptions 		-Wall -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch
+#endif
+
+#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
+#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+
+#define CplusplusLibC           -lstdc++
+
+#define ArchitectureDefines    -DOPENBSD_ARCHITECTURE
+
+#define BuildLibPathVar        LD_LIBRARY_PATH
+
+#ifndef RandomMotifMessageCatalogRule
+#define RandomMotifMessageCatalogRule(target)
+#endif
+
+/* This must come last */
+#include <bsdLib.rules>
diff --git a/cde/config/cf/bsdLib.tmpl b/cde/config/cf/bsdLib.tmpl
index 1c1d610..29ff0d6 100644
--- 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 5dfa301..a627226 100644
--- 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 2cdc401..9404bd9 100644
--- 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/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h
index 2ec32e2..ff279da 100644
--- a/cde/config/imake/imakemdep.h
+++ b/cde/config/imake/imakemdep.h
@@ -637,6 +637,10 @@ char *cpp_argv[ARGUMENTS] = {
 # define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
 # define DEFAULT_OS_TEENY_REV   "r %*d.%*d.%[0-9]" 
 # define DEFAULT_OS_NAME        "srm %[^\n]"
+#elif defined(CSRG_BASED)
+# define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
+# define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
+# define DEFAULT_OS_NAME        "srm %[^\n]"
 #endif
 
 #else /* else MAKEDEPEND */
diff --git a/cde/config/makedepend/def.h b/cde/config/makedepend/def.h
index 85ef815..1678222 100644
--- a/cde/config/makedepend/def.h
+++ b/cde/config/makedepend/def.h
@@ -150,7 +150,7 @@ char			*realloc();
 
 char			*copy();
 char			*base_name();
-char			*getline();
+char			*our_getline();
 struct symtab		**slookup();
 struct symtab		**isdefined();
 struct symtab		**fdefined();
diff --git a/cde/config/makedepend/main.c b/cde/config/makedepend/main.c
index 631eded..ae67ecb 100644
--- a/cde/config/makedepend/main.c
+++ b/cde/config/makedepend/main.c
@@ -499,7 +499,7 @@ match(str, list)
  * Get the next line.  We only return lines beginning with '#' since that
  * is all this program is ever interested in.
  */
-char *getline(filep)
+char *our_getline(filep)
 	register struct filepointer	*filep;
 {
 	register char	*p,	/* walking pointer */
diff --git a/cde/config/makedepend/parse.c b/cde/config/makedepend/parse.c
index bad3fcf..07153be 100644
--- a/cde/config/makedepend/parse.c
+++ b/cde/config/makedepend/parse.c
@@ -56,7 +56,7 @@ gobble(filep, file, file_red)
 	register char	*line;
 	register int	type;
 
-	while (line = getline(filep)) {
+	while (line = our_getline(filep)) {
 		switch(type = deftype(line, filep, file_red, file, FALSE)) {
 		case IF:
 		case IFFALSE:
@@ -544,7 +544,7 @@ find_includes(filep, file, file_red, recursion, failOK)
 	register int	type;
 	boolean recfailOK;
 
-	while (line = getline(filep)) {
+	while (line = our_getline(filep)) {
 		switch(type = deftype(line, filep, file_red, file, TRUE)) {
 		case IF:
 		doif:
diff --git a/cde/databases/CDE-FONTS.udb b/cde/databases/CDE-FONTS.udb
index c61f1da..4943f95 100644
--- a/cde/databases/CDE-FONTS.udb
+++ b/cde/databases/CDE-FONTS.udb
@@ -1067,3 +1067,27 @@ programs/fontaliases/postscript/ja/prolog.ps
 #{ dec
 #	install_target = /usr/dt/config/psfonts/zh_TW/prolog.ps
 #}
+
+
+#
+# for OpenBSD
+#
+programs/fontaliases/linux/C/fonts.alias
+{ openbsd
+	install_target = /usr/dt/config/xfonts/C/fonts.alias
+}
+#
+programs/fontaliases/linux/C/fonts.dir
+{ openbsd
+	install_target = /usr/dt/config/xfonts/C/fonts.dir
+}
+#
+programs/fontaliases/linux/ja_JP/fonts.alias
+{ openbsd
+	install_target = /usr/dt/config/xfonts/ja_JP/fonts.alias
+}
+#
+programs/fontaliases/linux/ja_JP/fonts.dir
+{ openbsd
+	install_target = /usr/dt/config/xfonts/ja_JP/fonts.dir
+}
diff --git a/cde/databases/CDE-SHLIBS.src b/cde/databases/CDE-SHLIBS.src
index e3e07ed..0708132 100644
--- a/cde/databases/CDE-SHLIBS.src
+++ b/cde/databases/CDE-SHLIBS.src
@@ -1223,3 +1223,75 @@ XCOMM
         install_target = /usr/shlib/libDtMmdb.so
 	type = sym_link
 }
+
+
+XCOMM 
+XCOMM 
+XCOMM >>-----------------------------
+XCOMM  openbsd libraries
+XCOMM <<-----------------------------
+XCOMM 
+
+XCOMM 
+lib/DtHelp/libDtHelp.so.%%SHVERSION%%
+{ openbsd
+        install_target = %%PREFIX%%/lib/libDtHelp.so.%%SHVERSION%%
+	mode = 0755
+}
+XCOMM 
+lib/DtPrint/libDtPrint.so.%%SHVERSION%%
+{ openbsd
+        install_target = %%PREFIX%%/lib/libDtPrint.so.%%SHVERSION%%
+	mode = 0755
+}        
+XCOMM 
+lib/DtMrm/libDtMrm.so.%%SHVERSION%%
+{ openbsd
+        install_target = %%PREFIX%%/lib/libDtMrm.so.%%SHVERSION%%
+	mode = 0755
+}        
+XCOMM 
+lib/DtSvc/libDtSvc.so.%%SHVERSION%%
+{ openbsd
+        install_target = %%PREFIX%%/lib/libDtSvc.so.%%SHVERSION%%
+	mode = 0755
+}
+XCOMM 
+lib/DtWidget/libDtWidget.so.%%SHVERSION%%
+{ openbsd
+        install_target = %%PREFIX%%/lib/libDtWidget.so.%%SHVERSION%%
+	mode = 0755
+}        
+XCOMM 
+lib/DtTerm/libDtTerm.so.%%SHVERSION%%
+{ openbsd
+        install_target = %%PREFIX%%/lib/libDtTerm.so.%%SHVERSION%%
+	mode = 0755
+}
+XCOMM 
+lib/tt/lib/libtt.so.%%SHVERSION%%
+{ openbsd
+        install_target = %%PREFIX%%/lib/libtt.so.%%SHVERSION%%
+	mode = 0755
+}
+XCOMM
+lib/csa/libcsa.so.%%SHVERSION%%
+{ openbsd
+	install_target = %%PREFIX%%/lib/libcsa.so.%%SHVERSION%%
+	mode = 0755
+}
+XCOMM 
+lib/DtSearch/libDtSearch.so.%%SHVERSION%%
+{ openbsd
+        install_target = %%PREFIX%%/lib/libDtSearch.so.%%SHVERSION%%
+	mode = 0755
+}
+#if 0 /* JET - not for openbsd (yet) */ 
+XCOMM
+lib/DtMmdb/libDtMmdb.so.%%SHVERSION%%
+{ openbsd
+        install_target = %%PREFIX%%/lib/libDtMmdb.so.%%SHVERSION%%
+	mode = 0755
+}
+XCOMM 
+#endif
diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile
index 79f539f..2db62e4 100644
--- a/cde/databases/Imakefile
+++ b/cde/databases/Imakefile
@@ -27,6 +27,9 @@ UDB_RELEASE_OPT = -ReleaseStream uxp
 #ifdef LinuxArchitecture
 UDB_RELEASE_OPT = -ReleaseStream linux
 #endif
+#ifdef OpenBSDArchitecture
+UDB_RELEASE_OPT = -ReleaseStream openbsd
+#endif
 
 /*
  * Insure that symbols used in the .udb files are undefined for
diff --git a/cde/doc/C/Imakefile b/cde/doc/C/Imakefile
index ff8e50c..70e475c 100644
--- a/cde/doc/C/Imakefile
+++ b/cde/doc/C/Imakefile
@@ -3,7 +3,7 @@ XCOMM $XConsortium: Imakefile /main/10 1996/07/23 22:00:00 rws $
 #define PassCDebugFlags
 
 /* due to split-VOB setup, force help to come last in make Makefiles */
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
 XCOMM we cannot build guides on linux yet
 SUBDIRS = man help
 BSUBDIRS = help man 
diff --git a/cde/doc/ja_JP.dt-eucJP/Imakefile b/cde/doc/ja_JP.dt-eucJP/Imakefile
index 742811e..c775b2c 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)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
 XCOMM we cannot build guides on linux yet
 SUBDIRS = help
 BSUBDIRS = help 
diff --git a/cde/include/EUSCompat.h b/cde/include/EUSCompat.h
index 31c43b0..3d85398 100644
--- a/cde/include/EUSCompat.h
+++ b/cde/include/EUSCompat.h
@@ -110,7 +110,7 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
 
 #endif	/* HPUX */
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 typedef enum {B_FALSE, B_TRUE} boolean_t;
 #define MAXNAMELEN      	256
 
diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index 89fe15c..eb219b5 100644
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -28,6 +28,9 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
 #endif
 
 INCLUDES = -I. -I./il -I./jpeg
+#if defined(OpenBSDArchitecture)
+INCLUDES += -I$(INCROOT)
+#endif
 DEFINES = -DDTLIB -DXK_MISCELLANY $(LOCAL_DEFINES) \
 	  -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
 	  -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
diff --git a/cde/lib/DtPrint/PrintSetupB.c b/cde/lib/DtPrint/PrintSetupB.c
index 0c1eb86..c7fa49f 100644
--- a/cde/lib/DtPrint/PrintSetupB.c
+++ b/cde/lib/DtPrint/PrintSetupB.c
@@ -46,7 +46,6 @@
 #endif
 
 #include <stdlib.h>
-#include <values.h>
 #include <stdio.h>
 
 #include <Xm/XmAll.h>
@@ -60,6 +59,8 @@
 #include <Dt/PsubUtilI.h>
 #include <Dt/PrintI.h>
 
+#define MAXINT INT_MAX
+
 /*
  * ------------------------------------------------------------------------
  * Constant Definitions
diff --git a/cde/lib/DtSearch/dtsrapi.c b/cde/lib/DtSearch/dtsrapi.c
index 27eded9..1d36a7e 100644
--- a/cde/lib/DtSearch/dtsrapi.c
+++ b/cde/lib/DtSearch/dtsrapi.c
@@ -313,7 +313,7 @@ int             DtSearchInit (
 	aa_argv0 = argv0;
     if (err_file)
 	aa_stderr = err_file;
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
     else
 	aa_stderr = stderr;
 #endif
@@ -337,7 +337,9 @@ int             DtSearchInit (
 	signal (SIGQUIT, signal_abort);	/* quit, ctrl-d */
 	signal (SIGKILL, signal_abort);	/* (kill -9, cannot be trapped) */
 	signal (SIGTERM, signal_abort);	/* kill [-15], sfwr terminate */
+#if !defined(CSRG_BASED)
 	signal (SIGPWR, signal_abort);	/* power failure imminent */
+#endif
 #ifdef _AIX
 	signal (SIGXCPU, signal_abort);	/* cpu time limit exceeded */
 	signal (SIGDANGER, signal_abort);  /* imminent paging space crash */
diff --git a/cde/lib/DtSearch/userint.c b/cde/lib/DtSearch/userint.c
index 2036ef7..2c2c416 100644
--- a/cde/lib/DtSearch/userint.c
+++ b/cde/lib/DtSearch/userint.c
@@ -105,7 +105,9 @@ void            init_user_interrupt (void)
     signal (SIGKILL, flag_shutdown);	/* kill -9, cannot be trapped */
     signal (SIGALRM, flag_shutdown);	/* called alarm() polling timer */
     signal (SIGTERM, flag_shutdown);	/* kill [-15], sfwr terminate */
+#if !defined(CSRG_BASED)
     signal (SIGPWR, flag_shutdown);	/* power failure imminent */
+#endif
     signal (SIGUSR1, flag_shutdown);	/* kill -30, "pings" OE */
 #ifdef _AIX
     signal (SIGXCPU, flag_shutdown);	/* cpu time limit exceeded */
diff --git a/cde/lib/DtSvc/DtCodelibs/buf.C b/cde/lib/DtSvc/DtCodelibs/buf.C
index 13abb89..e13e202 100644
--- a/cde/lib/DtSvc/DtCodelibs/buf.C
+++ b/cde/lib/DtSvc/DtCodelibs/buf.C
@@ -118,7 +118,8 @@ _SHXbuf::reset(boolean g, boolean comp)
 char **
 _SHXbuf::vector()
 {
-    for (int i = 0; i < vec.size(); i++)
+    int i;
+    for (i = 0; i < vec.size(); i++)
 	vec[i] = &buf[long(vec[i])];
 
     vec[i] = NULL;
diff --git a/cde/lib/DtSvc/DtCodelibs/filegen.C b/cde/lib/DtSvc/DtCodelibs/filegen.C
index e29f1c3..ad8c8de 100644
--- a/cde/lib/DtSvc/DtCodelibs/filegen.C
+++ b/cde/lib/DtSvc/DtCodelibs/filegen.C
@@ -272,10 +272,11 @@ _SHXbuf::filegen()
     // Find the longest match if we are doing completion:
     if (completion)
     {
+	long i;
 	// compare all entries to a copy of the first entry
 	strcpy(filebuf, &bufptr[long(vec[0])]);
 
-	for (long i = 1; i < vec.size(); i++)
+	for (i = 1; i < vec.size(); i++)
 	{
 	    register char *ref = filebuf;
 	    register char *ptr = &bufptr[long(vec[i])];
diff --git a/cde/lib/DtSvc/DtEncap/spc-termio.c b/cde/lib/DtSvc/DtEncap/spc-termio.c
index 033453a..89b7b4e 100644
--- a/cde/lib/DtSvc/DtEncap/spc-termio.c
+++ b/cde/lib/DtSvc/DtEncap/spc-termio.c
@@ -36,7 +36,7 @@
 #include <bms/stringbuf.h>
 
 #include <termios.h>
-#if !defined(linux)
+#if !defined(linux) && !defined(CSRG_BASED)
 #include <sys/termio.h>
 #endif
 #include <codelibs/stringx.h>
@@ -145,6 +145,7 @@ static struct modes_s Output_modes[] = {
     "OCRNL",	OCRNL,
     "ONOCR",	ONOCR,
     "ONLRET",	ONLRET,
+#if !defined(CSRG_BASED)
     "OFILL",	OFILL,
     "OFDEL",	OFDEL,
     "NLDLY",	NLDLY,
@@ -169,6 +170,7 @@ static struct modes_s Output_modes[] = {
     "FFDLY",	FFDLY,
     "FF0",	FF0,
     "FF1",	FF1,
+#endif
     END_OF_LIST, 0
 };
 
diff --git a/cde/lib/DtSvc/DtUtil1/CmdMain.c b/cde/lib/DtSvc/DtUtil1/CmdMain.c
index 00e64ec..d57a2f4 100644
--- a/cde/lib/DtSvc/DtUtil1/CmdMain.c
+++ b/cde/lib/DtSvc/DtUtil1/CmdMain.c
@@ -43,7 +43,7 @@
 #ifdef __apollo
 #include "/sys5/usr/include/sys/termio.h"
 #else
-#include <termio.h>
+#include <termios.h>
 #endif
 #include <errno.h>
 #include <unistd.h>
@@ -989,7 +989,7 @@ _DtCmdCommandInvokerExecute (
       if (commandPid == 0) 
       {
 
-#if defined(__hp_osf) || defined(__osf__)
+#if defined(__hp_osf) || defined(__osf__) || defined(CSRG_BASED)
          setsid() ;
 #else
          (void) setpgrp ();
diff --git a/cde/lib/DtSvc/DtUtil1/Dts.c b/cde/lib/DtSvc/DtUtil1/Dts.c
index 4c61d8a..4b5956c 100644
--- a/cde/lib/DtSvc/DtUtil1/Dts.c
+++ b/cde/lib/DtSvc/DtUtil1/Dts.c
@@ -49,7 +49,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <values.h>
 #include <sys/mman.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -59,6 +58,10 @@
  * On HP MAXINT is defined in both <values.h> and <sys/param.h>
  */
 #undef MAXINT
+#elif defined(CSRG_BASED)
+#define MAXINT INT_MAX
+#else
+#include <values.h>
 #endif
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/cde/lib/DtSvc/DtUtil2/XlationSvc.c b/cde/lib/DtSvc/DtUtil2/XlationSvc.c
index 4d7dc3d..cbb6982 100644
--- a/cde/lib/DtSvc/DtUtil2/XlationSvc.c
+++ b/cde/lib/DtSvc/DtUtil2/XlationSvc.c
@@ -2197,7 +2197,7 @@ int _DtXlateGetXlateEnv(
    /* then look up version number of execution host */
    if (ret_AppExecEnvVersion) 
    {
-#if defined(sun) || defined(_AIX) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(sun) || defined(_AIX) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
       char version[SYS_NMLN+SYS_NMLN+2];
 #else
       char version[UTSLEN+UTSLEN+2];
@@ -2250,7 +2250,7 @@ int _DtXlateGetXlateEnv(
 #error OSMAJORVERSION and/or OSMINORVERSION not defined
 #endif
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
       sprintf(buf,"%s%s%s", STR(OSMAJORVERSION), 
                      nl_langinfo('.'), STR(OSMINORVERSION));
 #else
diff --git a/cde/lib/DtSvc/include/bms/sbstdinc.h b/cde/lib/DtSvc/include/bms/sbstdinc.h
index 05711f1..6d5ca8c 100644
--- a/cde/lib/DtSvc/include/bms/sbstdinc.h
+++ b/cde/lib/DtSvc/include/bms/sbstdinc.h
@@ -59,7 +59,7 @@
 /************************************************************************/
 
 /* Domain/OS BSD has bzero(), bcmp(), and bcopy() defined. */
-#if !defined(apollo) || !defined(__bsd)
+#if !(defined(apollo) && defined(__bsd)) && !defined(BSD)
 
 #if defined(__STDC__)
 #if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_)
diff --git a/cde/lib/DtSvc/include/codelibs/dynarray.h b/cde/lib/DtSvc/include/codelibs/dynarray.h
index 8c2e88c..51f03cd 100644
--- a/cde/lib/DtSvc/include/codelibs/dynarray.h
+++ b/cde/lib/DtSvc/include/codelibs/dynarray.h
@@ -36,10 +36,10 @@
 #ifndef __DYNARRAY_H_
 #define __DYNARRAY_H_
 
-#if !defined(linux)
+#if !defined(linux) && !defined(CSRG_BASED)
 #include <generic.h>
 #endif
-#if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux)
+#if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 #define _DELETE_ARRAY(sz) delete[]
 #else
 #define _DELETE_ARRAY(sz) delete[(sz)]
diff --git a/cde/lib/DtSvc/include/codelibs/privbuf.h b/cde/lib/DtSvc/include/codelibs/privbuf.h
index e3a538b..23f7840 100644
--- a/cde/lib/DtSvc/include/codelibs/privbuf.h
+++ b/cde/lib/DtSvc/include/codelibs/privbuf.h
@@ -48,7 +48,7 @@ typedef void (*privbuf_func)(void *v);
 #include <stddef.h>
 #include <stdlib.h>
 
-#if defined(__osf__) || defined(sun) || defined(linux)
+#if defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 // The DEC C++ compiler rejects valid inline declarations, claiming
 // they have both internal and external linkage.
 #else
diff --git a/cde/lib/DtSvc/include/codelibs/stringx.h b/cde/lib/DtSvc/include/codelibs/stringx.h
index 6ccc6ce..0d878b6 100644
--- a/cde/lib/DtSvc/include/codelibs/stringx.h
+++ b/cde/lib/DtSvc/include/codelibs/stringx.h
@@ -75,7 +75,7 @@ extern "C"
 
 #ifdef __cplusplus
     char *strtokx(char *&ptr, const char *sep);
-# if !defined(__osf__) && !defined(linux)
+# if !defined(__osf__) && !defined(linux) && !defined(CSRG_BASED)
     char **strsep(const char *str, const char *sep,
 	boolean whsp = TRUE, int *num = NULL);
 #  if !defined(__osf__)
@@ -85,7 +85,7 @@ extern "C"
 
 #else /* __STDC__ */
     char *strtokx(char **ptr, const char *sep);
-# if !defined(linux)
+# if !defined(linux) && !defined(CSRG_BASED)
     char **strsep(const char *str, const char *sep,
 	boolean whsp, int *num);
 #endif
@@ -137,7 +137,7 @@ inline void  strfree(const char *s)
 	{ if (s != NULL) free((char *)s); }
 #else
 inline void  strfree(const char *s)
-#if defined(__hpux) || defined(__osf__)
+#if defined(__hpux) || defined(__osf__) || defined(CSRG_BASED)
 	{ if (s != NULL) free((void *)s); }
 #else
 	{ if (s != NULL) free((const void *)s); }
diff --git a/cde/lib/DtTerm/Term/TermParse.c b/cde/lib/DtTerm/Term/TermParse.c
index 2d41043..88993f6 100644
--- a/cde/lib/DtTerm/Term/TermParse.c
+++ b/cde/lib/DtTerm/Term/TermParse.c
@@ -57,7 +57,7 @@ static char rcs_id[] = "$TOG: TermParse.c /main/3 1999/10/15 12:25:13 mgreess $"
  */
 #undef MAXINT
 #endif
-#include  <values.h>        
+#define MAXSHORT SHRT_MAX
 
 #if defined(USL) || defined(__uxp__)
 #include <ctype.h>
diff --git a/cde/lib/DtTerm/TermPrim/Imakefile b/cde/lib/DtTerm/TermPrim/Imakefile
index 4fceb3c..286bcd8 100644
--- a/cde/lib/DtTerm/TermPrim/Imakefile
+++ b/cde/lib/DtTerm/TermPrim/Imakefile
@@ -109,6 +109,10 @@ LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
 LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
 #endif
 
+#ifdef OpenBSDArchitecture
+LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c)
+#endif
+
 SubdirLibraryRule($(OBJS))
 
 DependTarget()
diff --git a/cde/lib/DtTerm/TermPrim/TermHeader.h b/cde/lib/DtTerm/TermPrim/TermHeader.h
index fcee6e3..d955c4d 100644
--- a/cde/lib/DtTerm/TermPrim/TermHeader.h
+++ b/cde/lib/DtTerm/TermPrim/TermHeader.h
@@ -44,7 +44,7 @@
 #include <Xm/Xm.h>
 #include <X11/Xos.h>
 
-#if defined(linux) || defined(UXPArchitecture) || (defined(USL) && (OSMAJORVERSION > 1))
+#if defined(linux) || defined(UXPArchitecture) || (defined(USL) && (OSMAJORVERSION > 1)) || defined(CSRG_BASED)
 #define _NFILE   FOPEN_MAX
 #endif
 
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c
index ee7fe60..9422cc7 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c
@@ -254,7 +254,7 @@ GetPty(char **ptySlave, char **ptyMaster)
 			     * name for the tty that everyone else will
 			     * use...
 			     */
-			    if (c1 = _XTtyname(ttyFd, tty_buf)) {
+			    if (c1 = _XTtyname(ttyFd)) {
 				ttyDev = realloc(ttyDev, strlen(c1) + 1);
 				(void) strcpy(ttyDev, c1);
 			    }
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h b/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h
index 47061d7..e5a7b77 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h
+++ b/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h
@@ -96,6 +96,12 @@
 # define USE_TCSENDBREAK	/* use tiocbreak()		*/
 #endif /* LINUX_ARCHITECTURE */
 
+#ifdef  OPENBSD_ARCHITECTURE
+# define HAS_SETEUID             /* seteuid available            */
+# define HAS_SETREUID            /* setreuid available           */
+# define USE_TCSENDBREAK	/* use tiocbreak()		*/
+#endif /* OPENBSD_ARCHITECTURE */
+
 #ifdef	SUN_ARCHITECTURE
 # define XOR_CAPS_LOCK		/* xor caps lock and shift	*/
 # define USE_SRIOCSREDIR	/* use SRIOCSREDIR ioctl for -C	*/
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimParser.c b/cde/lib/DtTerm/TermPrim/TermPrimParser.c
index 98c606b..031364e 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimParser.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimParser.c
@@ -47,7 +47,7 @@ static char rcs_id[] = "$TOG: TermPrimParser.c /main/2 1999/10/15 12:23:41 mgree
  */
 #undef MAXINT
 #endif
-#include <values.h>          
+#define MAXINT INT_MAX
 
 #ifdef	BBA
 #pragma	BBA_IGNORE
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c
index 18e84a6..49fc8c9 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c
@@ -109,6 +109,17 @@ static char rcs_id[] = "$TOG: TermPrimSetPty.c /main/2 1998/04/03 17:11:24 mgree
 #define XTTYMODE_weras  14
 #define XTTYMODE_lnext  15
 #define NXTTYMODES      16
+
+#if defined(CSRG_BASED)
+#define TAB3	0x00000000
+#define NLDLY	0x00000000
+#define CRDLY	0x00000000
+#define TABDLY	0x00000000
+#define BSDLY	0x00000000
+#define VTDLY	0x00000000
+#define FFDLY	0x00000000
+#define CBAUD	0x00000000
+#endif
 typedef struct _ttyMode
 {
     char    *name;
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c
index 5619780..4328bd2 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c
@@ -332,6 +332,7 @@ _DtTermPrimUtmpGetUtLine(int pty, char *ptyName)
 static char *
 UtmpEntryCreate(Widget w, pid_t pid, char *utmpLine)
 {
+#if !defined(CSRG_BASED) /* XXX */
     DtTermPrimitiveWidget tw = (DtTermPrimitiveWidget) w;
     struct termData *tpd = tw->term.tpd;
     struct utmp ut;
@@ -489,6 +490,9 @@ UtmpEntryCreate(Widget w, pid_t pid, char *utmpLine)
     /* failure... */
     (void) endutent();
     return((char *) 0);
+#else /* __OpenBSD__ */
+    return(utmpLine);
+#endif
 }
 
 /* this is a public wrapper around the previous function that runs the
@@ -511,6 +515,7 @@ _DtTermPrimUtmpEntryCreate(Widget w, pid_t pid, char *utmpLine)
 static void
 UtmpEntryDestroy(Widget w, char *utmpLine)
 {
+#if !defined(CSRG_BASED)
     struct utmp ut;
     struct utmp *utPtr;
     time_t now;
@@ -537,6 +542,7 @@ UtmpEntryDestroy(Widget w, char *utmpLine)
     (void) endutent();
 
     (void) DeleteUtmpInfo(utmpLine);
+#endif /* !__OpenBSD__ */
 }
 
 /* this is a public wrapper around the previous function that runs the
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c b/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c
index b1d706c..f0d3148 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c
@@ -38,7 +38,7 @@ static char rcs_id[] = "$TOG: TermPrimSubproc.c /main/11 1998/04/20 12:45:57 mgr
 
 #include "TermHeader.h"
 #include <fcntl.h>
-#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_ARCHITECTURE) || defined(LINUX_ARCHITECTURE)
+#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_ARCHITECTURE) || defined(LINUX_ARCHITECTURE) || defined(OPENBSD_ARCHITECTURE)
 /* For TIOCSTTY definitions */
 #include <sys/ioctl.h>
 #endif /* ALPHA_ARCHITECTURE */
@@ -461,7 +461,7 @@ _DtTermPrimSubprocExec(Widget		  w,
 	/* child...
 	 */
         _DtTermProcessUnlock();
-#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_ARCHITECTURE) || defined(LINUX_ARCHITECTURE)
+#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_ARCHITECTURE) || defined(LINUX_ARCHITECTURE) || defined(OPENBSD_ARCHITECTURE)
         /* establish a new session for child */
         setsid();
 #else
@@ -482,7 +482,7 @@ _DtTermPrimSubprocExec(Widget		  w,
 	    (void) _exit(1);
 	}
 
-#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_ARCHITECTURE) || defined(LINUX_ARCHITECTURE)
+#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_ARCHITECTURE) || defined(LINUX_ARCHITECTURE) || defined(OPENBSD_ARCHITECTURE)
         /* BSD needs to do this to acquire pty as controlling terminal */
         if (ioctl(pty, TIOCSCTTY, (char *)NULL) < 0) {
 	    (void) close(pty);
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimUtil.c b/cde/lib/DtTerm/TermPrim/TermPrimUtil.c
index 608171d..1d9a638 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimUtil.c
+++ b/cde/lib/DtTerm/TermPrim/TermPrimUtil.c
@@ -462,7 +462,7 @@ _DtTermPrimStartLog(Widget w)
             ** reset signals
             */
             (void) signal(SIGHUP, SIG_DFL);
-            (void) signal(SIGCLD, SIG_DFL);
+            (void) signal(SIGCHLD, SIG_DFL);
 #ifdef	BBA
 	    _bA_dump();
 #endif	/* BBA */
diff --git a/cde/lib/DtWidget/Editor.c b/cde/lib/DtWidget/Editor.c
index c851ce2..431dbb5 100644
--- a/cde/lib/DtWidget/Editor.c
+++ b/cde/lib/DtWidget/Editor.c
@@ -67,6 +67,8 @@
 #elif defined(linux)
 # include <wctype.h>
 # define NO_putwc
+#elif defined(CSRG_BASED)
+# include <wctype.h>
 #endif /* linux */
 
 #include <sys/wait.h>
diff --git a/cde/lib/DtWidget/Imakefile b/cde/lib/DtWidget/Imakefile
index 67e2a41..9c1a80f 100644
--- a/cde/lib/DtWidget/Imakefile
+++ b/cde/lib/DtWidget/Imakefile
@@ -15,6 +15,8 @@ XCOMM $XConsortium: Imakefile /main/8 1996/04/21 19:11:16 drk $
 DEFINES = DtWidgetDefines
 #if defined(LinuxArchitecture)
 INCLUDES = -I. -I/usr/include/freetype2
+#elif defined(OpenBSDArchitecture)
+INCLUDES = -I. -I$(XPROJECTROOT)/include/freetype2
 #else
 INCLUDES = -I.
 #endif
diff --git a/cde/lib/csa/Imakefile b/cde/lib/csa/Imakefile
index fe1b785..fccccdc 100644
--- a/cde/lib/csa/Imakefile
+++ b/cde/lib/csa/Imakefile
@@ -15,7 +15,7 @@ INCLUDES = -I.
 OSMAJORVERSION = OSMajorVersion
 OSMINORVERSION = OSMinorVersion
 
-DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N -DSVR4 \
+DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \
 	-DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
 	-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)"
 
diff --git a/cde/lib/csa/agent.c b/cde/lib/csa/agent.c
index c41ab79..ee1154c 100644
--- a/cde/lib/csa/agent.c
+++ b/cde/lib/csa/agent.c
@@ -296,7 +296,7 @@ _DtCm_process_updates()
  */
  
 Update_Status *
-_DtCm_update_callback_1(Table_Res_4 *t, void *dummy)
+_DtCm_update_callback_1(Table_Res_4 *t, _DtCm_Connection *dummy)
 {
 	static Update_Status status = update_succeeded;
 	_CallbackInfo *cbi;
diff --git a/cde/lib/csa/agent.x b/cde/lib/csa/agent.x
index fdf014b..761f157 100644
--- a/cde/lib/csa/agent.x
+++ b/cde/lib/csa/agent.x
@@ -32,6 +32,6 @@ enum Update_Status {
 */
 program AGENTPROG {
         version AGENTVERS {
-                Update_Status update_callback(Table_Res) = 1;
+                Update_Status update_callback(Table_Res_4) = 1;
         }=1;
 }=00;
diff --git a/cde/lib/csa/lutil.c b/cde/lib/csa/lutil.c
index 78a9edc..f9185d1 100644
--- a/cde/lib/csa/lutil.c
+++ b/cde/lib/csa/lutil.c
@@ -29,6 +29,7 @@
  *  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
  */
 
+#include <sys/param.h>
 #include <EUSCompat.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/cde/lib/tt/bin/shell/mover.C b/cde/lib/tt/bin/shell/mover.C
index 264f50a..6a412c0 1006...
 
[truncated message content]