NetBSD port

cde/programs/dtsearchpath/dtappg/Options.C

@@ -31,7 +31,7 @@
 
 #include "Options.h"
 #include <stdlib.h>
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <iostream>
 #else
 #include <iostream.h>

cde/programs/dtsearchpath/dtappg/dtappgather.C

@@ -75,7 +75,7 @@
 #include "dtappgather.h"
 #include "DirIterator.h"
 #include <stdlib.h>
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <iostream>
 #else
 #include <iostream.h>

cde/programs/dtsearchpath/dtsp/ManSearchPath.C

@@ -136,7 +136,7 @@ void ManSearchPath::Print()
     }
 }
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 std::ostream & operator<< 
 	(
 	std::ostream & os, 
@@ -150,7 +150,7 @@ ostream & operator<<
 	)
 #endif
 {
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
     os << sp.GetEnvVar() << std::endl;
 #else
     os << sp.GetEnvVar() << endl;

cde/programs/dtsearchpath/dtsp/Options.C

@@ -33,7 +33,7 @@
 
 #include "Options.h"
 #include <stdlib.h>
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <iostream>
 #else
 #include <iostream.h>

cde/programs/dtsearchpath/dtsp/SearchPath.C

@@ -387,7 +387,7 @@ void SearchPath::Print()
  *
  ****************************************************************/
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 void SearchPath::PrettyPrint
 	(
 	std::ostream & os
@@ -402,14 +402,14 @@ void SearchPath::PrettyPrint
     CTokenizedString path (GetSearchPath(), Separator().data());
     CString subpath = path.next();
     while (!subpath.isNull()) {
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 	os << "        " << subpath << std::endl;
 #else
 	os << "        " << subpath << endl;
 #endif
 	subpath = path.next();
     }
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
     os << std::endl;
 #else
     os << endl;
@@ -424,7 +424,7 @@ void SearchPath::PrettyPrint
  *
  ****************************************************************/
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 std::ostream & operator<< 
 	(
 	std::ostream & os, 
@@ -438,7 +438,7 @@ ostream & operator<<
 	)
 #endif
 {
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
     os << sp.GetEnvVar() << "SEARCHPATH:" << std::endl;
 #else
     os << sp.GetEnvVar() << "SEARCHPATH:" << endl;

cde/programs/dtsearchpath/dtsp/SearchPath.h

@@ -34,7 +34,7 @@
 
 #include "Environ.h"
 #include "cstring.h"
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <iostream>
 #else
 #include <iostream.h>
@@ -51,7 +51,7 @@ class SearchPath {
   virtual void Print();
   virtual void AddPredefinedPath();
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   virtual void PrettyPrint (std::ostream &) const;
 
   friend std::ostream & operator<< (std::ostream &, const SearchPath &);
@@ -186,7 +186,7 @@ class ManSearchPath : public SearchPath {
   virtual void    ExportPath ();
   virtual void    Print();
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   friend std::ostream & operator<< (std::ostream &, const ManSearchPath &);
 #else
   friend ostream & operator<< (ostream &, const ManSearchPath &);

cde/programs/dtsearchpath/libCliSrv/UnixEnv.C

@@ -84,6 +84,8 @@ UnixEnvironment::UnixEnvironment()
 	manpath = "/usr/share/man:/usr/X11R6/man:/usr/local/man:/usr/ports/infrastructure/man";
 #elif defined(__FreeBSD__)
 	manpath = "/usr/share/man:/usr/local/man";
+#elif defined(__NetBSD__)
+	manpath = "/usr/share/man:/usr/X11R6/man:/usr/X11R7/man";
 #endif
     else
 	manpath = temp;