From 71ddf025faff7f8e9c841b0a7fc15c81aa8147d0 Mon Sep 17 00:00:00 2001
From: Marcin Cieslak <saper@saper.info>
Date: Wed, 15 Aug 2012 19:46:03 +0200
Subject: [PATCH] FreeBSD updates for dtspcd, dtfile and others

* Add libraries where necesary
* Point to Freetype2 includes for dtfile
* Define default manpath
---
 cde/programs/dtaction/Imakefile               | 4 ++++
 cde/programs/dtcm/dtcm/Imakefile              | 2 +-
 cde/programs/dtfile/Imakefile                 | 2 +-
 cde/programs/dtsearchpath/libCliSrv/UnixEnv.C | 2 ++
 cde/programs/dtspcd/Imakefile                 | 3 ++-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cde/programs/dtaction/Imakefile b/cde/programs/dtaction/Imakefile
index a58065fe..a0b9ebd9 100644
--- a/cde/programs/dtaction/Imakefile
+++ b/cde/programs/dtaction/Imakefile
@@ -16,6 +16,10 @@ EXTRA_DEFINES = +e
 SYS_LIBRARIES   = -lm -lcrypt
 #endif
 
+#ifdef FreeBSDArchitecture
+SYS_LIBRARIES   = -lm -lcrypt
+#endif
+
 #ifdef SCOArchitecture
 SYS_LIBRARIES   = -lm -lcrypt
 #endif
diff --git a/cde/programs/dtcm/dtcm/Imakefile b/cde/programs/dtcm/dtcm/Imakefile
index aff08260..b6fe1bc7 100644
--- a/cde/programs/dtcm/dtcm/Imakefile
+++ b/cde/programs/dtcm/dtcm/Imakefile
@@ -32,7 +32,7 @@ EXTRA_LIBRARIES	= -lrpcsvc -lPW -ldiag
 EXTRA_LIBRARIES	= -lrpcsvc -lV3
 #endif
 
-#if defined(OpenBSDArchitecture)
+#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
 EXTRA_LIBRARIES = -lcompat
 #endif
 
diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 10a2ce72..0d0febc2 100644
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -31,7 +31,7 @@ EXTRA_CCOPTIONS = -xF
 EXTRA_INCLUDES = -I/usr/include/freetype2
 #endif
 
-#if defined(OpenBSDArchitecture)
+#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
 EXTRA_INCLUDES = -I$(XPROJECTROOT)/include/freetype2
 #endif
 
diff --git a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
index 1e7fdf11..e00bb2c5 100644
--- a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
+++ b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
@@ -82,6 +82,8 @@ UnixEnvironment::UnixEnvironment()
         manpath = "/usr/share/man/%L:/usr/share/man:/usr/contrib/man/%L:/usr/contrib/man:/usr/local/man/%L:/usr/local/man";
 #elif defined(__OpenBSD__)
 	manpath = "/usr/share/man:/usr/X11R6/man:/usr/local/man:/usr/ports/infrastructure/man";
+#elif defined(__FreeBSD__)
+	manpath = "/usr/share/man:/usr/local/man";
 #endif
     else
 	manpath = temp;
diff --git a/cde/programs/dtspcd/Imakefile b/cde/programs/dtspcd/Imakefile
index 645abedf..3e7a4338 100644
--- a/cde/programs/dtspcd/Imakefile
+++ b/cde/programs/dtspcd/Imakefile
@@ -24,7 +24,8 @@ LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
 SYS_LIBRARIES = -lm -lgen 
 #endif
 
-#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) \
+    || defined(FreeBSDArchitecture)
 LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
 	$(XMLIB) $(XTOOLLIB) $(XLIB)
 SYS_LIBRARIES = -lm
-- 
2.25.1