1 files changed, 35 insertions, 43 deletions
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ac b/ftp/wu-ftpd+ipv6/files/patch-ac
index 971dbb40f3e6..93749a1da79a 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-ac
+++ b/ftp/wu-ftpd+ipv6/files/patch-ac
@@ -1,50 +1,42 @@
-*** src/pathnames.h.orig	Wed Apr 13 13:46:48 1994
---- src/pathnames.h	Sun Aug  6 21:45:38 1995
+*** src/pathnames.h.bak	Mon Jan 20 06:21:45 1997
+--- src/pathnames.h	Thu Jan 30 15:42:24 1997
 ***************
-*** 29,46 ****
-   *
-   * @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */
-  
-! #define _PATH_FTPUSERS  "/etc/ftpusers"
-  #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess"
-  #define _PATH_EXECPATH  "/bin/ftp-exec"
-! #define _PATH_PIDNAMES  "/usr/local/daemon/ftpd/ftp.pids-%s"
-  #define _PATH_CVT       "/usr/local/etc/ftpconversions"
-! #define _PATH_XFERLOG   "/usr/adm/xferlog"
-! #define _PATH_PRIVATE   "/etc/ftpgroups"
-  
-  #ifndef _PATH_UTMP
-! #define _PATH_UTMP      "/etc/utmp"
-! #define _PATH_WTMP      "/usr/adm/wtmp"
-! #define _PATH_LASTLOG   "/usr/adm/lastlog"
+*** 45,54 ****
+  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
+  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
+  #else
+! #define _PATH_FTPUSERS  "/usr/local/lib/ftpd/ftpusers"
+! #define _PATH_FTPACCESS "/usr/local/lib/ftpd/ftpaccess"
+! #define _PATH_CVT       "/usr/local/lib/ftpd/ftpconversions"
+! #define _PATH_PRIVATE   "/usr/local/lib/ftpd/ftpgroups"
+  #endif
   #endif
   
-  #define _PATH_BSHELL    "/bin/sh"
---- 29,46 ----
-   *
-   * @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */
-  
-! #define _PATH_FTPUSERS  "/usr/local/etc/ftpusers"
-  #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess"
-  #define _PATH_EXECPATH  "/bin/ftp-exec"
-! #define _PATH_PIDNAMES  "/var/run/ftp.pids-%s"
-  #define _PATH_CVT       "/usr/local/etc/ftpconversions"
-! #define _PATH_XFERLOG   "/var/log/xferlog"
-! #define _PATH_PRIVATE   "/usr/local/etc/ftpgroups"
-  
-  #ifndef _PATH_UTMP
-! #define _PATH_UTMP      "/var/run/utmp"
-! #define _PATH_WTMP      "/var/log/wtmp"
-! #define _PATH_LASTLOG   "/var/log/lastlog"
+--- 45,54 ----
+  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
+  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
+  #else
+! #define _PATH_FTPUSERS  "!!PREFIX!!/etc/ftpusers"
+! #define _PATH_FTPACCESS "!!PREFIX!!/etc/ftpaccess"
+! #define _PATH_CVT       "!!PREFIX!!/etc/ftpconversions"
+! #define _PATH_PRIVATE   "!!PREFIX!!/etc/ftpgroups"
+  #endif
   #endif
   
-  #define _PATH_BSHELL    "/bin/sh"
 ***************
-*** 48,52 ****
---- 48,53 ----
-  
-  #ifdef  HOST_ACCESS
-  #define _PATH_FTPHOSTS  "/usr/local/etc/ftphosts"
-+ #else
+*** 109,115 ****
+  #ifdef USE_ETC_FTPD
+  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
+  #else
+! #define _PATH_FTPHOSTS  "/usr/local/lib/ftpd/ftphosts"
+  #endif
+  #endif
+  #endif
+--- 109,115 ----
+  #ifdef USE_ETC_FTPD
+  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
+  #else
+! #define _PATH_FTPHOSTS  "!!PREFIX!!/etc/ftphosts"
+  #endif
+  #endif
   #endif
-