4 files changed, 34 insertions, 14 deletions
diff --git a/ftp/gftp/files/patch-ab b/ftp/gftp/files/patch-ab
index 772b70b506b3..895a326f45b5 100644
--- a/ftp/gftp/files/patch-ab
+++ b/ftp/gftp/files/patch-ab
@@ -1,7 +1,13 @@
---- docs/Makefile.in.orig	Fri Dec 21 01:40:24 2001
-+++ docs/Makefile.in	Wed Jan  2 13:50:13 2002
-@@ -104,11 +104,13 @@
+--- docs/Makefile.in.orig	Wed Nov 27 19:57:25 2002
++++ docs/Makefile.in	Wed Nov 27 20:01:29 2002
+@@ -109,15 +109,19 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ 
+ man_MANS = gftp.1
++.ifndef WITHOUT_X11
  SUBDIRS = sample.gftp
++.endif
  EXTRA_DIST = USERS-GUIDE gftp.1 gftp.desktop gftp.lsm gftp.png parse-netrc.pl
  
 +.ifdef HAVE_GNOME
diff --git a/ftp/gftp/files/patch-ac b/ftp/gftp/files/patch-ac
deleted file mode 100644
index 239750fa62c7..000000000000
--- a/ftp/gftp/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/text/Makefile.in.orig	Sun May 26 21:27:10 2002
-+++ src/text/Makefile.in	Sun May 26 21:28:58 2002
-@@ -105,7 +105,7 @@
- EXTRA_PROGRAMS = gftp-text
- gftp_text_SOURCES = gftp-text.c 
- INCLUDES = @GLIB_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(localedir)\" -I../../intl
--LDADD = ../../lib/libgftp.a @INTLLIBS@ @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@
-+LDADD = -lintl ../../lib/libgftp.a @INTLLIBS@ @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@
- noinst_HEADERS = gftp-text.h
- localedir = $(prefix)/share/locale
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/ftp/gftp/files/patch-configure b/ftp/gftp/files/patch-configure
new file mode 100644
index 000000000000..d86466fefad7
--- /dev/null
+++ b/ftp/gftp/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	Wed Nov 27 17:25:51 2002
++++ configure	Wed Nov 27 17:30:47 2002
+@@ -4725,9 +4725,9 @@
+   
+   rm -f conf.gtktest
+ 
+-    GTHREAD_LIBS="-lgthread"
++    GTHREAD_LIBS="$_GTHREAD_LIBS"
+   else
+-    GTHREAD_LIBS="-lgthread-2.0"
++    GTHREAD_LIBS="$_GTHREAD_LIBS"
+   fi
+ 
+   if test "x$GFTP_GTK" = xgftp-gtk; then
diff --git a/ftp/gftp/files/patch-lib::gftp.h b/ftp/gftp/files/patch-lib::gftp.h
new file mode 100644
index 000000000000..254d8a453485
--- /dev/null
+++ b/ftp/gftp/files/patch-lib::gftp.h
@@ -0,0 +1,11 @@
+--- lib/gftp.h.orig	Wed Nov 27 17:19:22 2002
++++ lib/gftp.h	Wed Nov 27 17:19:43 2002
+@@ -35,7 +35,7 @@
+ #endif
+ #include <sys/wait.h>
+ #include <sys/utsname.h>
+-#include <sys/sysmacros.h>
++/* #include <sys/sysmacros.h> */
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <glib.h>