From: Pascal Stumpf <Pascal.Stumpf@cubes.de>
Date: Thu, 9 Aug 2012 19:57:47 +0000 (+0200)
Subject: Provide support for installation under OpenBSD. Don't override PATH in the install... 
X-Git-Tag: 2.2.0b~83^2~44
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6fc45220c4186b153b12900e709947d8f19fec96;p=oweals%2Fcde.git

Provide support for installation under OpenBSD. Don't override PATH in the install script, it may hide needed tools, and the location of these binaries is highly OS-dependent anyway.

Also, allow overriding some variables in the install script.
---

diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
index 6e13dd0f..9c902787 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 04669e03..f8e3d8dc 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/databases/CDE-FONTS.udb b/cde/databases/CDE-FONTS.udb
index c61f1da8..1cd029b0 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/local/dt/config/xfonts/C/fonts.alias
+}
+#
+programs/fontaliases/linux/C/fonts.dir
+{ openbsd
+	install_target = /usr/local/dt/config/xfonts/C/fonts.dir
+}
+#
+programs/fontaliases/linux/ja_JP/fonts.alias
+{ openbsd
+	install_target = /usr/local/dt/config/xfonts/ja_JP/fonts.alias
+}
+#
+programs/fontaliases/linux/ja_JP/fonts.dir
+{ openbsd
+	install_target = /usr/local/dt/config/xfonts/ja_JP/fonts.dir
+}
diff --git a/cde/databases/CDE-SHLIBS.src b/cde/databases/CDE-SHLIBS.src
index e3e07ed5..a9db7f8f 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.0.0
+{ openbsd
+        install_target = /usr/local/dt/lib/libDtHelp.so.0.0
+	mode = 0755
+}
+XCOMM 
+lib/DtPrint/libDtPrint.so.0.0
+{ openbsd
+        install_target = /usr/local/dt/lib/libDtPrint.so.0.0
+	mode = 0755
+}        
+XCOMM 
+lib/DtMrm/libDtMrm.so.0.0
+{ openbsd
+        install_target = /usr/local/dt/lib/libDtMrm.so.0.0
+	mode = 0755
+}        
+XCOMM 
+lib/DtSvc/libDtSvc.so.0.0
+{ openbsd
+        install_target = /usr/local/dt/lib/libDtSvc.so.0.0
+	mode = 0755
+}
+XCOMM 
+lib/DtWidget/libDtWidget.so.0.0
+{ openbsd
+        install_target = /usr/local/dt/lib/libDtWidget.so.0.0
+	mode = 0755
+}        
+XCOMM 
+lib/DtTerm/libDtTerm.so.0.0
+{ openbsd
+        install_target = /usr/local/dt/lib/libDtTerm.so.0.0
+	mode = 0755
+}
+XCOMM 
+lib/tt/lib/libtt.so.0.0
+{ openbsd
+        install_target = /usr/local/dt/lib/libtt.so.0.0
+	mode = 0755
+}
+XCOMM
+lib/csa/libcsa.so.0.0
+{ openbsd
+	install_target = /usr/local/dt/lib/libcsa.so.0.0
+	mode = 0755
+}
+XCOMM 
+lib/DtSearch/libDtSearch.so.0.0
+{ openbsd
+        install_target = /usr/local/dt/lib/libDtSearch.so.0.0
+	mode = 0755
+}
+#if 0 /* JET - not for openbsd (yet) */ 
+XCOMM
+lib/DtMmdb/libDtMmdb.so.0.0
+{ openbsd
+        install_target = /usr/local/dt/lib/libDtMmdb.so.0.0
+	mode = 0755
+}
+XCOMM 
+#endif
diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile
index 79f539f7..2db62e42 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