Fix FreeBSD 10.2 build

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index ce3e62c28433d787d197e77811b78f9758d2e490..c8945df46f49463b7bd8d4b8a26023690b055bb8 100644 (file)
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -45,6 +45,9 @@ USE_GCC = UseGcc
 #define StandardCppDefines     -traditional CppArgs
 #endif
 
+#ifndef PerlCmd
+#define PerlCmd                        /usr/local/bin/perl
+#endif
 #undef  InstallCmd
 #define InstallCmd             /usr/bin/install
 #undef KornShell

diff --git a/cde/programs/dtmail/dtmail/Imakefile b/cde/programs/dtmail/dtmail/Imakefile
index cd6e89cf803c5b7b7625f2a7cdfcab712c6934ae..a360597a592d338357edfb33aed61a27209b5260 100644 (file)
--- a/cde/programs/dtmail/dtmail/Imakefile
+++ b/cde/programs/dtmail/dtmail/Imakefile
@@ -5,8 +5,8 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 INCLUDES = -I. -I../include -I../include/MotifApp \
-       -I../include/utils -I../include/DtMail \
-       -I../libDtMail/RFC -I$(CDELIBSRC) -I$(DTHELPSRC)
+          -I../include/utils -I../include/DtMail \
+          -I../libDtMail/RFC -I$(CDELIBSRC) -I$(DTHELPSRC) $(STD_INCLUDES)
 
 #ifndef DtMailDefines
 # define DtMailDefines

diff --git a/cde/programs/dtmail/dtmailpr/Imakefile b/cde/programs/dtmail/dtmailpr/Imakefile
index 171913c6555fb778a86254896f4c4691a621e81d..929d49fe89d56059bb4f0402b5a973169bb61b7d 100644 (file)
--- a/cde/programs/dtmail/dtmailpr/Imakefile
+++ b/cde/programs/dtmail/dtmailpr/Imakefile
@@ -4,7 +4,8 @@ XCOMM $TOG: Imakefile /main/15 1998/08/05 13:24:40 mgreess $
 DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
-INCLUDES = -I. -I../include -I../../dtcompat -I../../../. -I$(CDELIBSRC)
+INCLUDES = -I. -I../include -I../../dtcompat -I../../../. \
+          -I$(CDELIBSRC) $(STD_INCLUDES)
 
 #ifndef DtMailDefines
 # define DtMailDefines

diff --git a/cde/programs/dtmail/include/DtMail/DtMail.hh b/cde/programs/dtmail/include/DtMail/DtMail.hh
index 566298b4030601c71001b560035d46bc20909500..f326b5060f015d8b8dbec952eeccbf9d3a888324 100644 (file)
--- a/cde/programs/dtmail/include/DtMail/DtMail.hh
+++ b/cde/programs/dtmail/include/DtMail/DtMail.hh
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#if defined(sun)
+#if defined(sun) || defined(__FreeBSD__)
 #include <iconv.h>
 #endif
 #include <sys/stat.h>
@@ -914,7 +914,7 @@ friend class Session;
                        DTMailError_t minor_code);
 };
 
-#if defined(sun)
+#if defined(sun) || defined(__FreeBSD__)
 template <typename T>
 size_t iconv (iconv_t i, const T inbuf, size_t* inleft,
               char** outbuf, size_t* outleft)