Imakefile diffs for OpenBSD.

cde/programs/Imakefile

@@ -5,11 +5,14 @@ XCOMM $XConsortium: Imakefile /main/17 1996/10/06 17:13:20 rws $
 #if UseNSGMLS
 NSGMLSDIR = nsgmls
 #endif
-EXTRADIRS = util types localized tttypes $(NSGMLSDIR)
+EXTRADIRS = types localized tttypes $(NSGMLSDIR)
+#if !defined(OpenBSDArchitecture)
+EXTRADIRS += util
+#endif
 
 XCOMM some of these cannot be built on linux yet.
 XCOMM dtksh dtinfo
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
 DTKSHDIR = 
 DTINFODIR = 
 #else
@@ -18,7 +21,7 @@ DTINFODIR = dtinfo
 #endif
 
 
-SUBDIRS = dthelp dtmail dsdm dtpad dtfile dtwm dtlogin \
+SUBDIRS = dthelp dsdm dtpad dtfile dtwm dtlogin \
 	dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \
 	dtcalc dtaction dtspcd \
 	dtscreen $(DTKSHDIR) dtcm dtsearchpath \
@@ -27,7 +30,7 @@ SUBDIRS = dthelp dtmail dsdm dtpad dtfile dtwm dtlogin \
 	dtudcfonted dtudcexch dtimsstart dtdocbook dtpdm dtsr \
 	dtpdmd $(DTINFODIR) $(EXTRADIRS)
 
-LINTSUBDIRS = dthelp dtmail dsdm dtpad dtfile dtlogin dtwm \
+LINTSUBDIRS = dthelp dsdm dtpad dtfile dtlogin dtwm \
 	dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \
 	dtcalc dtaction dtcreate \
 	dtscreen $(DTKSHDIR) dtcm dtsearchpath \

cde/programs/dtcm/dtcm/Imakefile

@@ -12,11 +12,11 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) DtClientLibs
 
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
-        DEFINES = -DSVR4 -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
+        DEFINES = -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
 	-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
 	$(ICONV_INBUF_DEFINE)
 
-#if defined(RsArchitecture) || defined(USLArchitecture) || defined(UXPArchitecture) || defined(LinuxArchitecture)
+#if defined(RsArchitecture) || defined(USLArchitecture) || defined(UXPArchitecture) || defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
 TTY_LIBRARIES = $(LOCAL_LIBRARIES) 
 #elif defined(AlphaArchitecture)
 TTY_LIBRARIES = $(DTCMPLIB) $(CSALIB) $(DTSVCLIB) $(XTOOLLIB) $(XLIB)
@@ -32,6 +32,10 @@ EXTRA_LIBRARIES	= -lrpcsvc -lPW -ldiag
 EXTRA_LIBRARIES	= -lrpcsvc -lV3
 #endif
 
+#if defined(OpenBSDArchitecture)
+EXTRA_LIBRARIES = -lcompat
+#endif
+
 #ifdef SunArchitecture
 XCOMM Uncomment to build using Federated Naming Services.  To activate
 XCOMM you must set the UseFNS resource to True before runnin dtcm.

cde/programs/dtcm/libDtCmP/Imakefile

@@ -12,7 +12,7 @@ INCLUDES = -I. -I$(CSASRC)
 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)"
 

cde/programs/dtcm/server/Imakefile

@@ -30,7 +30,7 @@ LOCAL_LIBRARIES = $(CSALIB) $(DTWIDGETLIB) $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(X
 
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
-        DEFINES = -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" -DSVR4 \
+        DEFINES = -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
                   -DRELMAJOR="$(OSMAJORVERSION)" \
                   -DRELMINOR="$(OSMINORVERSION)"
 

cde/programs/dtdocbook/tcl/Imakefile

@@ -14,6 +14,9 @@ XCOMM Directory from which applications will reference the library of Tcl
 XCOMM scripts (note: you can set the TCL_LIBRARY environment variable at
 XCOMM run-time to override this value):
 TCL_LIBRARY =	$(prefix)/lib/tcl$(VERSION)
+#ifdef OpenBSDArchitecture
+TCL_LIBRARY =	TclLibrary
+#endif
 
 #ifdef SunArchitecture
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
@@ -31,10 +34,17 @@ EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 	-DTCL_GOT_TIMEZONE -DTIME_WITH_SYS_TIME
 
 #   else
+#     ifdef OpenBSDArchitecture
+EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
+	-DNO_UNION_WAIT -DHAVE_UNISTD_H \
+	-DTCL_GOT_TIMEZONE
+
+#     else
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 	-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
 	-DTCL_GOT_TIMEZONE
 
+#     endif
 #   endif
 # endif
 #endif

cde/programs/dtfile/Imakefile

@@ -31,6 +31,10 @@ EXTRA_CCOPTIONS = -xF
 EXTRA_INCLUDES = -I/usr/include/freetype2
 #endif
 
+#if defined(OpenBSDArchitecture)
+EXTRA_INCLUDES = -I$(XPROJECTROOT)/include/freetype2
+#endif
+
 SRCS =  ChangeDir.c     ChangeDirP.c    Command.c       Common.c \
         Desktop.c       Directory.c     Encaps.c        File.c \
         FileDialog.c    FileManip.c     FileMgr.c       FileOp.c \

cde/programs/dtlogin/Imakefile

@@ -129,6 +129,10 @@ DEPXDMCPLIB =
 INCLUDES = -I/usr/include/freetype2
 #endif
 
+#ifdef OpenBSDArchitecture
+INCLUDES = -I$(XPROJECTROOT)/include/freetype2
+#endif
+
 /**************************************************************************
  *
  *  Source and object modules

cde/programs/dtspcd/Imakefile

@@ -24,7 +24,7 @@ LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
 SYS_LIBRARIES = -lm -lgen 
 #endif
 
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
 LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
 	$(XMLIB) $(XTOOLLIB) $(XLIB)
 SYS_LIBRARIES = -lm

cde/programs/nsgmls/Imakefile

@@ -77,7 +77,7 @@ STLIBCENV =
 M4 = /bin/m4
 #endif
 
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
 
 /*
  * put cpp directives here rather than in CXXDEFINES because