- Update to 2.0.11

- Remove FORBIDDEN

PR:		33764
Submitted by:	Oliver Lehmann <lehmann@ans-netz.de>

8 files changed, 36 insertions, 25 deletions

diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index d20db25068bb..af9d3fe925dd 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gftp
-PORTVERSION=	2.0.8
+PORTVERSION=	2.0.11
 CATEGORIES=	ftp
 MASTER_SITES=	http://gftp.seul.org/ \
 		ftp://gftp.seul.org/pub/gftp/
@@ -20,8 +20,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-FORBIDDEN=	"Insecure temporary files up the wazoo"
-
 MAN1=		gftp.1
 
 .include <bsd.port.pre.mk>
diff --git a/ftp/gftp/distinfo b/ftp/gftp/distinfo
index 12bceebdff59..26d778192923 100644
--- a/ftp/gftp/distinfo
+++ b/ftp/gftp/distinfo
@@ -1 +1 @@
-MD5 (gftp-2.0.8.tar.gz) = a53217845e217162c11254fc936c1714
+MD5 (gftp-2.0.11.tar.gz) = 3c63b5eed2faffe820bace112be2db8a
diff --git a/ftp/gftp/files/patch-ab b/ftp/gftp/files/patch-ab
index 7dee68a5cdcf..772b70b506b3 100644
--- a/ftp/gftp/files/patch-ab
+++ b/ftp/gftp/files/patch-ab
@@ -1,8 +1,8 @@
---- docs/Makefile.in.orig	Sun Aug  6 19:53:16 2000
-+++ docs/Makefile.in	Fri Sep  8 02:09:07 2000
-@@ -91,11 +91,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 @@
  SUBDIRS = sample.gftp
- EXTRA_DIST = USERS-GUIDE gftp.1 gftp.desktop gftp.lsm gftp.png
+ EXTRA_DIST = USERS-GUIDE gftp.1 gftp.desktop gftp.lsm gftp.png parse-netrc.pl
  
 +.ifdef HAVE_GNOME
  Utilitiesdir = $(datadir)/apps/Internet
diff --git a/ftp/gftp/files/patch-ac b/ftp/gftp/files/patch-ac
index 1ae968b5648b..009353cbafa4 100644
--- a/ftp/gftp/files/patch-ac
+++ b/ftp/gftp/files/patch-ac
@@ -1,11 +1,11 @@
---- src/text/Makefile.in.orig	Mon Apr 30 00:11:48 2001
-+++ src/text/Makefile.in	Mon Apr 30 00:13:22 2001
-@@ -99,7 +99,7 @@
- bin_PROGRAMS = gftp-text
+--- src/text/Makefile.in.orig	Thu Jan 10 16:15:43 2002
++++ src/text/Makefile.in	Thu Jan 10 16:17:37 2002
+@@ -104,7 +104,7 @@
+ EXTRA_PROGRAMS = gftp-text
  gftp_text_SOURCES = gftp-text.c 
- INCLUDES = @GLIB_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(localedir)\"
--LDADD = @INTLLIBS@ @GLIB_LIBS@ @EXTRA_LIBS@ ../../lib/libgftp.a
-+LDADD = -lintl @INTLLIBS@ @GLIB_LIBS@ @EXTRA_LIBS@ ../../lib/libgftp.a
+ INCLUDES = @GLIB_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(localedir)\" -I../../intl
+-LDADD = ../../lib/libgftp.a @INTLLIBS@ @GLIB_LIBS@ @EXTRA_LIBS@
++LDADD = -lintl ../../lib/libgftp.a @INTLLIBS@ @GLIB_LIBS@ @EXTRA_LIBS@
  noinst_HEADERS = gftp-text.h
  localedir = $(prefix)/share/locale
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/ftp/gftp/files/patch-ad b/ftp/gftp/files/patch-ad
index 516e9d9f7a46..2100093243d0 100644
--- a/ftp/gftp/files/patch-ad
+++ b/ftp/gftp/files/patch-ad
@@ -1,6 +1,6 @@
---- lib/cache.c.orig	Sat Mar  3 17:42:43 2001
-+++ lib/cache.c	Mon Apr 30 00:16:57 2001
-@@ -42,7 +42,7 @@
+--- lib/cache.c.orig	Fri Jul 20 21:26:19 2001
++++ lib/cache.c	Wed Jan  2 13:54:45 2002
+@@ -45,7 +45,7 @@
      }
    g_free (tempstr);
  
@@ -9,7 +9,7 @@
    tempstr = NULL;
    cachefile = NULL;
    do
-@@ -54,7 +54,7 @@
+@@ -57,7 +57,7 @@
          g_free (cachefile);
  
        cachefile = g_strdup_printf ("cache%ld",
diff --git a/ftp/gftp/files/patch-ae b/ftp/gftp/files/patch-ae
index 9d6c3c735fc2..798b6dc00b1e 100644
--- a/ftp/gftp/files/patch-ae
+++ b/ftp/gftp/files/patch-ae
@@ -1,6 +1,6 @@
---- src/gtk/gftp-gtk.h.orig	Tue Mar 20 17:46:01 2001
-+++ src/gtk/gftp-gtk.h	Mon Apr 30 00:18:12 2001
-@@ -197,7 +197,7 @@
+--- src/gtk/gftp-gtk.h.orig	Wed Dec 19 03:52:39 2001
++++ src/gtk/gftp-gtk.h	Wed Jan  2 13:57:06 2002
+@@ -200,7 +200,7 @@
  void ftp_log					( gftp_logging_level level,
  						  void *ptr,
  						  const char *string,
diff --git a/ftp/gftp/files/patch-af b/ftp/gftp/files/patch-af
index d9c376646a48..401fd18c332c 100644
--- a/ftp/gftp/files/patch-af
+++ b/ftp/gftp/files/patch-af
@@ -1,6 +1,6 @@
---- ./src/text/gftp-text.h.orig	Fri Feb 23 10:59:57 2001
-+++ ./src/text/gftp-text.h	Mon Apr 30 00:19:21 2001
-@@ -43,7 +43,7 @@
+--- src/text/gftp-text.h.orig	Thu Sep 20 03:10:29 2001
++++ src/text/gftp-text.h	Wed Jan  2 13:59:28 2002
+@@ -48,7 +48,7 @@
  /* gftp-text.h */
  void gftp_text_log				( gftp_logging_level level, 
  						  void *ptr, 
diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist
index c22a6c99cd1e..f7ce983076b3 100644
--- a/ftp/gftp/pkg-plist
+++ b/ftp/gftp/pkg-plist
@@ -1,24 +1,33 @@
 bin/gftp
+bin/gftp-gtk
+bin/gftp-text
 %%GNOME:%%share/gnome/apps/Internet/gftp.desktop
 %%DATADIR%%/gftp/COPYING
 %%DATADIR%%/gftp/bookmarks
+%%DATADIR%%/gftp/connect.xpm
 %%DATADIR%%/gftp/deb.xpm
+%%DATADIR%%/gftp/down.xpm
 %%DATADIR%%/gftp/diff.xpm
 %%DATADIR%%/gftp/dir.xpm
 %%DATADIR%%/gftp/doc.xpm
 %%DATADIR%%/gftp/dotdot.xpm
 %%DATADIR%%/gftp/exe.xpm
+%%DATADIR%%/gftp/gftp.xpm
 %%DATADIR%%/gftp/gftp-logo.xpm
 %%DATADIR%%/gftp/gftprc
 %%DATADIR%%/gftp/img.xpm
+%%DATADIR%%/gftp/left.xpm
 %%DATADIR%%/gftp/linkdir.xpm
 %%DATADIR%%/gftp/linkfile.xpm
 %%DATADIR%%/gftp/man.xpm
 %%DATADIR%%/gftp/open_dir.xpm
+%%DATADIR%%/gftp/right.xpm
 %%DATADIR%%/gftp/rpm.xpm
 %%DATADIR%%/gftp/sound.xpm
+%%DATADIR%%/gftp/stop.xpm
 %%DATADIR%%/gftp/tar.xpm
 %%DATADIR%%/gftp/txt.xpm
+%%DATADIR%%/gftp/up.xpm
 %%DATADIR%%/gftp/world.xpm
 %%GNOME:%%share/gnome/pixmaps/gftp.png
 share/locale/br/LC_MESSAGES/gftp.mo
@@ -28,12 +37,16 @@ share/locale/de/LC_MESSAGES/gftp.mo
 share/locale/es/LC_MESSAGES/gftp.mo
 share/locale/fi/LC_MESSAGES/gftp.mo
 share/locale/fr/LC_MESSAGES/gftp.mo
+share/locale/it/LC_MESSAGES/gftp.mo
 share/locale/ja/LC_MESSAGES/gftp.mo
 share/locale/ko/LC_MESSAGES/gftp.mo
 share/locale/nl/LC_MESSAGES/gftp.mo
+share/locale/no/LC_MESSAGES/gftp.mo
 share/locale/pl/LC_MESSAGES/gftp.mo
 share/locale/pt_BR/LC_MESSAGES/gftp.mo
 share/locale/ru/LC_MESSAGES/gftp.mo
 share/locale/sv/LC_MESSAGES/gftp.mo
+share/locale/tr/LC_MESSAGES/gftp.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/gftp.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gftp.mo
 @dirrm %%DATADIR%%/gftp