Patches from pkgsrc-WIP

diff --git a/cde/lib/DtHelp/HelpXlate.c b/cde/lib/DtHelp/HelpXlate.c
index bc83e4cdf4b62f1e4c088daf249541a21c3d7c20..acc83fe5a81cfc9de4cbb87ad3c3666891c2b1a9 100644 (file)
--- a/cde/lib/DtHelp/HelpXlate.c
+++ b/cde/lib/DtHelp/HelpXlate.c
@@ -39,6 +39,7 @@ $END$
 #include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>        /* MAXPATHLEN */
+#include <time.h>
 
 /* for Xrm */
 #include <X11/Intrinsic.h>

diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c
index b484974c94a75b907aed413dcc965e24673e1d85..6c415c2a6f3e6a7e3dc9a079bbea719ffe43484d 100644 (file)
--- a/cde/programs/dtlogin/dm.c
+++ b/cde/programs/dtlogin/dm.c
@@ -62,8 +62,7 @@
 # include      <time.h>
 # include      <utime.h>
 # include      <pwd.h>
-#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || \
-    defined(sun)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 # include      <stdarg.h>
 #else
 # include      <varargs.h>

diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h
index fa3bc23f9c7e799c666e13ca3074fcca84447c89..1d35f0082cb6d921c0a8f43491d2231df4d85126 100644 (file)
--- a/cde/programs/dtlogin/dm.h
+++ b/cde/programs/dtlogin/dm.h
@@ -202,7 +202,7 @@
  ***************************************************************************/
 
 /*#if defined(SYSV) && !defined(hpux)*/
-#if defined(SYSV) || defined(SVR4) || defined(linux) || defined(__FreeBSD__) || defined(OpenBSD)
+#if defined(SYSV) || defined(SVR4) || defined(linux) || defined(CSRG_BASED)
 #   include    <sys/wait.h>
 # define waitCode(w)   WEXITSTATUS(w)
 # define waitSig(w)    WTERMSIG(w)

diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C
index d42c553cff362641d31caf3cd9c9b362b8ea3ea7..830a99724426dec9bb0d79995e2e59478bb9f31f 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/Session.C
+++ b/cde/programs/dtmail/libDtMail/Common/Session.C
@@ -1618,7 +1618,7 @@ char *from_cs, char *to_cs)
    DtMailEnv error;
    iconv_t cd;
    size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0;
-#if defined(_AIX) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(_AIX) || defined(sun) || defined(CSRG_BASED)
    const char *ip = (const char *) *bp;
 #else
    char *ip = *bp;

diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
index 0f0630fb31e8dd7a44925d5bc95c71dd9c4997ff..172b844ef4e8697ca290d677c920e150908908be 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
@@ -1030,7 +1030,7 @@ char *from_cs, char *to_cs)
    DtMailEnv error;
    iconv_t cd;
    size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0;
-#if defined(_aix) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(_aix) || defined(sun) || defined(CSRG_BASED)
    const char *ip = (const char *) *bp;
 #else
    char *ip = *bp;

diff --git a/cde/programs/dtpdmd/manager.c b/cde/programs/dtpdmd/manager.c
index ae0fbd9ef41bbe827f4764961591bdd421d2a805..b0f058641c1e3d25b37b06e2429f10bd9f1202b9 100644 (file)
--- a/cde/programs/dtpdmd/manager.c
+++ b/cde/programs/dtpdmd/manager.c
@@ -648,7 +648,7 @@ void mgr_launch_reply( XpPdmServiceRec *rec )
     XEvent reply;
     Status status;
     FILE   *errlog;
-    long   now;
+    time_t now;
     char   *eec;
 
     Atom    tmpa;
@@ -897,7 +897,7 @@ Bool has_exec_token( XpPdmServiceRec *rec )
 void mgr_shutdown_scan()
 {
     int        i;
-    long       now;
+    time_t     now;
     FILE       *errlog;
     static int errlog_problem_notice = 0;
     Bool       shutdown_time;

diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c b/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c
index 87f6ac377aa709cebca6ee442361ae30511d36de..5f1507ae27ef0d78419adf12282ed1ce5c25339d 100644 (file)
--- a/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c
+++ b/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c
@@ -105,7 +105,7 @@ SysErrorMsg(
    int n
    )
 {
-#if !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(linux) && !defined(CSRG_BASED)
     extern char *sys_errlist[];
     extern int sys_nerr;
 #endif

diff --git a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C
index eca6258a7879f1b2b4762fc83f48049a0196fa78..aba63ef88521f5a4d4421b433bc695e019b3f3af 100644 (file)
--- a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C
+++ b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C
@@ -870,7 +870,7 @@ void LocalPrintJobs(char *printer, char **return_job_list, int *return_n_jobs)
 #if defined(__osf__)
    sprintf(buf, "LANG=C lpstat -o%s", printer);
 #endif
-#if defined(linux) || defined(__OpenBSD__)
+#if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
    snprintf(buf, 1000, "LANG=C lpq -P%s", printer);
 #elif defined(__FreeBSD__)
    snprintf(buf, 1000, "LANG=C /usr/local/bin/lpq -P%s", printer);

diff --git a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
index add17bfe6d688df01769c6bee056fdd8191bf94b..2ede9fe1385aade87d2491710da868ca06713dfe 100644 (file)
--- a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
+++ b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
@@ -85,7 +85,7 @@ UnixEnvironment::UnixEnvironment()
 #elif defined(__FreeBSD__)
        manpath = "/usr/share/man:/usr/local/man";
 #elif defined(__NetBSD__)
-       manpath = "/usr/share/man:/usr/X11R6/man:/usr/X11R7/man";
+       manpath = "/usr/share/man:/usr/X11R6/man:/usr/X11R7/man:/usr/local/man:/usr/pkg/man";
 #endif
     else
        manpath = temp;