FreeBSD updates for dtspcd, dtfile and others

* Add libraries where necesary
* Point to Freetype2 includes for dtfile
* Define default manpath

diff --git a/cde/programs/dtaction/Imakefile b/cde/programs/dtaction/Imakefile
index a58065fe43aa320f0aafb740dd6b2ec1e278bdf2..a0b9ebd93e5dc56497f10a482a31f4e3c525f2e1 100644 (file)
--- 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 aff082600a98d54658a70d1d2a88f03675150bfb..b6fe1bc7bb375af647e29383045a334fce220131 100644 (file)
--- 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 10a2ce72f27423a9877c909f87d3dbf5a53d69f6..0d0febc2f2f3b4191a6258a1d139f97d3a2981a7 100644 (file)
--- 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 1e7fdf11126b1061175f591aa4104f5acb8fb4c9..e00bb2c5215b2ed02f1365be6975f8a8c44ab811 100644 (file)
--- 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 645abedfcc378ea499f19e43cc400dd4c10a2868..3e7a43384f174ba0d49cc4b63541580dab61f924 100644 (file)
--- 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