From 62e6e5c58cde622b4e181adcb5dab04abe9a7f4d Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Wed, 30 Oct 2019 10:59:45 -0600
Subject: [PATCH] dtfile: make it build

---
 cde/programs/dtfile/FileManip.c        |  4 ++--
 cde/programs/dtfile/Makefile.am        | 11 ++++++-----
 cde/programs/dtfile/MkDir.c            |  3 ++-
 cde/programs/dtfile/SharedProcs.h      |  1 +
 cde/programs/dtfile/dtcopy/Makefile.am |  4 +++-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/cde/programs/dtfile/FileManip.c b/cde/programs/dtfile/FileManip.c
index c1fc99cf4..4500b0a99 100644
--- a/cde/programs/dtfile/FileManip.c
+++ b/cde/programs/dtfile/FileManip.c
@@ -712,13 +712,13 @@ CopyDir(
         rc = execlp(DTCOPY, "dtfile_copy",
                      "-dontDelete", "-forceCopies", "-copyTop",
                      "-confirmReplace", "-confirmErrors", "-popDown",
-                     from, target, 0);
+                    from, target, (char *)NULL);
       else
          /* replace target dir */
          rc = execlp(DTCOPY, "dtfile_copy",
                      "-forceCopies", "-copyTop",
                      "-confirmErrors", "-popDown",
-                     from, target, 0);
+                     from, target, (char *)NULL);
 
       /* call errorhandler */
       perror ("Could not exec child process \"dtfile_copy\"");
diff --git a/cde/programs/dtfile/Makefile.am b/cde/programs/dtfile/Makefile.am
index fd17af0fa..bfbec41fb 100644
--- a/cde/programs/dtfile/Makefile.am
+++ b/cde/programs/dtfile/Makefile.am
@@ -5,18 +5,19 @@ SUBDIRS = dtcopy
 bin_PROGRAMS = dtfile
 
 BUILT_SOURCES = dtfile.config dtfile_error
+CLEANFILES = dtfile.config dtfile_error
 
 dist_config_DATA = dtfile.config
 
 dist_bin_SCRIPTS = dtfile_error
 
-dtfile_CPPFLAGS = -I./dtcopy -I(TIRPCINC) -DSHAPE -D_ILS_MACROS -DSUN_PERF \
-		-DUSE_XINERAMA -DCDE_INSTALLATION_TOP=\"${prefix}\" \
+dtfile_CPPFLAGS = -I./dtcopy $(TIRPCINC) -DSHAPE -D_ILS_MACROS -DSUN_PERF \
+		-DCDE_INSTALLATION_TOP=\"${prefix}\" \
 		-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-		-DKORNSHELL=\"$(KSH)\" -I${x_includes}/freetype2
+		-DKORNSHELL=\"$(KSH)\" -I/usr/include/freetype2
 
-dtfile_LDADD = $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) -lXm \
-	       $(XTOOLLIB) ${X_LIBS} -lXinerama dtcopy/sharedFuncs.o \
+dtfile_LDADD = @DTCLIENTLIBS@ $(TIRPCLIB) -lXm -lXext \
+	       $(XTOOLLIB) ${X_LIBS} dtcopy/sharedFuncs.o \
 	       dtcopy/fsrtns.o
 
 if OPENBSD
diff --git a/cde/programs/dtfile/MkDir.c b/cde/programs/dtfile/MkDir.c
index 124b20ff4..9299f25ae 100644
--- a/cde/programs/dtfile/MkDir.c
+++ b/cde/programs/dtfile/MkDir.c
@@ -154,7 +154,8 @@ RunFileCommand(
       command_name++;
 
    _DtEnvControl(DT_ENV_RESTORE_PRE_DT);
-   (void) execl (command_path, command_name, argument1, argument2, argument3,0);
+   (void) execl (command_path, command_name, argument1, argument2,
+                 argument3, (char *)NULL);
     
    DBGFORK(("%s:  child exiting\n", pname));
 
diff --git a/cde/programs/dtfile/SharedProcs.h b/cde/programs/dtfile/SharedProcs.h
index e5a744caa..819bc9a8b 100644
--- a/cde/programs/dtfile/SharedProcs.h
+++ b/cde/programs/dtfile/SharedProcs.h
@@ -41,6 +41,7 @@
 #ifndef _DtFile_SharedProcs_h
 #define _DtFile_SharedProcs_h
 
+#include <Xm/XmPrivate.h>
 #include <Dt/Icon.h>
 #include <Dt/Action.h>
 #include <Dt/Dnd.h>
diff --git a/cde/programs/dtfile/dtcopy/Makefile.am b/cde/programs/dtfile/dtcopy/Makefile.am
index 41b6ccf13..817ab7e6b 100644
--- a/cde/programs/dtfile/dtcopy/Makefile.am
+++ b/cde/programs/dtfile/dtcopy/Makefile.am
@@ -2,11 +2,13 @@ MAINTAINERCLEANFILES = Makefile.in
 
 bin_PROGRAMS = dtfile_copy
 
-dtfile_copy_CFLAGS = -DSHAPE
+dtfile_copy_CFLAGS = -DSHAPE $(TIRPCINC)
 
 if SOLARIS
 dtfile_copy_CFLAGS += -xF
 endif
 
+dtfile_copy_LDADD = @DTCLIENTLIBS@ -lXm $(TIRPCLIB) $(XTOOLLIB)
+
 dtfile_copy_SOURCES = main_dtcopy.c   copydialog.c    overwrtdialog.c dosync.c \
 		      fsrtns.c  utils.c  errordialog.c   sharedFuncs.c