Update "gftp" and "gftp-gtk1" package to version 2.0.18. Changes since

version 2.0.17:
- Added support for the FSP protocol (http://fsp.sourceforge.net/)
- SSH2: Fixed segfault that could occur when renaming a file (bug introduced
  in 2.0.18rc1)
- SSH2: Fixes for parsing the directory listing from the commercial SSH server
- FTP: added pasv_behind_router option. If this is enabled, then the IP
  address that is in the PASV response will be ignored. Instead the IP
  address of the remote host will be used
- FTP: removed the quote filename functionality in the SITE CHMOD and
  SITE UTIME commands
- Chmod: Fixes for setting the group execute bit (bug introduced in 2.0.18rc1)
- Fixes so that the text port will prompt you for your password when a URL is
  entered on the command line
- In the text port, convert the string from UTF8 to the users' current locale
  before it is displayed
- Fixes for when the host system does not have getaddrinfo() (bug introduced in
  2.0.18rc1)
- Rewrote and improved the URL parser so that the :, @ characters are allowed
  in directories and passwords
- Security Fix: Ignore the file paths that are returned by the remote server
- FreeBSD and HP/UX fixes
- GNOME HIG fixes
- Many other small changes and improvements. See the ChangeLog file in the
  distribution for a detailed list of changes.
- Updated language translations (cs de en_CA en_GB es hu nl zh_CN)

5 files changed, 21 insertions, 16 deletions

diff --git a/net/gftp-gtk1/DESCR b/net/gftp-gtk1/DESCR
index 75fea4158b2..c99e839bbb1 100644
--- a/net/gftp-gtk1/DESCR
+++ b/net/gftp-gtk1/DESCR
@@ -1,10 +1,10 @@
-gFTP is a free multithreaded ftp client for *NIX based machines 
+gFTP is a free multithreaded ftp client for *NIX based machines
 running X11R6 or later. It has the following features:
 
- * Distributed under the terms of the GNU Public License 
+ * Distributed under the terms of the GNU Public License
  * Written in C and has a text interface and a GTK+ 1.2/2.0 interface
  * Supports the FTP, HTTP and SSH protocols
- * Supports FXP file transfers (transfering files between 2 remote 
+ * Supports FXP file transfers (transfering files between 2 remote
    servers via FTP)
  * Multithreaded to allow for simultaneous downloads
  * File transfer queues to allow for downloading multiple files
diff --git a/net/gftp/DESCR b/net/gftp/DESCR
index b7c9bdbe6d4..cebb36ddde6 100644
--- a/net/gftp/DESCR
+++ b/net/gftp/DESCR
@@ -1,10 +1,10 @@
-gFTP is a free multithreaded ftp client for *NIX based machines 
+gFTP is a free multithreaded ftp client for *NIX based machines
 running X11R6 or later. It has the following features:
 
- * Distributed under the terms of the GNU Public License 
+ * Distributed under the terms of the GNU Public License
  * Written in C and has a text interface and a GTK+ 1.2/2.0 interface
  * Supports the FTP, HTTP and SSH protocols
- * Supports FXP file transfers (transfering files between 2 remote 
+ * Supports FXP file transfers (transfering files between 2 remote
    servers via FTP)
  * Multithreaded to allow for simultaneous downloads
  * File transfer queues to allow for downloading multiple files
diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common
index 83d70ad96ed..8b66c225ab9 100644
--- a/net/gftp/Makefile.common
+++ b/net/gftp/Makefile.common
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile.common,v 1.7 2004/10/03 00:17:51 tv Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/03/02 14:36:53 tron Exp $
 
 DISTNAME=	gftp-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://gftp.seul.org/	\
 		ftp://gftp.seul.org/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	jmcneill@invisible.yi.org
+MAINTAINER=	jmcneill@NetBSD.org
 HOMEPAGE=	http://gftp.seul.org/
 
 BUILD_USES_MSGFMT=	yes
@@ -21,7 +20,7 @@ PTHREAD_OPTS=		require
 
 CONFIGURE_ARGS+=	--with-readline
 
-VERSION=		2.0.17
+VERSION=		2.0.18
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/gftp/PLIST b/net/gftp/PLIST
index 616a9f86370..dbd31319318 100644
--- a/net/gftp/PLIST
+++ b/net/gftp/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/05 02:45:45 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/03/02 14:36:53 tron Exp $
 bin/gftp
 bin/gftp-gtk
 bin/gftp-text
 man/man1/gftp.1
+share/applications/gftp.desktop
 share/gftp/COPYING
 share/gftp/bookmarks
 share/gftp/connect.xpm
@@ -31,7 +32,6 @@ share/gftp/tar.xpm
 share/gftp/txt.xpm
 share/gftp/up.xpm
 share/gftp/world.xpm
-share/gnome/apps/Internet/gftp.desktop
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gftp.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gftp.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gftp.mo
@@ -72,5 +72,9 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gftp.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gftp.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gftp.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gftp.mo
 share/pixmaps/gftp.png
 @dirrm share/gftp
diff --git a/net/gftp/distinfo b/net/gftp/distinfo
index 18b749f2cb1..129ee14010f 100644
--- a/net/gftp/distinfo
+++ b/net/gftp/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 12:13:46 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/03/02 14:36:53 tron Exp $
 
-SHA1 (gftp-2.0.17.tar.bz2) = beeb1edfac3aa5b9b7a4a02d0a0a3ed374fc2ce0
-RMD160 (gftp-2.0.17.tar.bz2) = 5327e7c563dcafa8da8f89e5faf1d559e44f3abc
-Size (gftp-2.0.17.tar.bz2) = 1228736 bytes
+SHA1 (gftp-2.0.18.tar.bz2) = c2468f1ff1fe978a5fab3a198e513558f3b48f5a
+RMD160 (gftp-2.0.18.tar.bz2) = 0e0daea8543ae822b25635647360193362a2648d
+Size (gftp-2.0.18.tar.bz2) = 1374850 bytes
+SHA1 (patch-aa) = fe0aff2e0f8408d6a5b663e2095b61b9e92e0d84
+SHA1 (patch-ab) = 739be62c545d7644da4bcd53140fb734ec8e19ef