Update gftp to 2.0.15, provide a Makefile.common for the upcoming

package of gftp which uses GTK+ version 1. Actually this package
uses GTK+ version 2. Ok'ed by wiz@

Changes (resumed):

Changes from 2.0.15rc2 to 2.0.15

    * FTP: Fixes for selecting ASCII/Binary transfers
    * Fixed crash when deleting files in the GTK+ port
    * Fixed parsing directory listings that have timestamps that are
      not in the current locale.
    * More largefile support fixes.
    * Updated translations (cs, pl, sr, sr@Latn, sv)

Changes from 2.0.15rc1 to 2.0.15rc2

    * Largefile (>2.1GB) fixes.
    * When resuming files, look up the right option name. gFTP would bail
      out whenever it couldn't look up the right option.
    * Fixes to the permissions of files when they are first transfered. New
      files are created with the mode 0644 & ~umask.
    * Change to the proper local directory when one was enabled with a
      bookmark.
    * Fixed crash that would occur in the options dialog when you hit Apply,
      then OK.
    * Fixed possible division by 0 when transfering a file.
    * Fixed double free of a gftp_file structure member (utf8_file). This was
      not present in 2.0.14.
    * FreeBSD PTY and password prompt fixes.
    * Detect write errors properly.
    * Added --info argument to the command line. This will give some
      information about how gFTP was compiled.

Changes from 2.0.14 to 2.0.15rc1

    * I18N improvements in GTK+ 2.0 port. If the remote server is not
      returning output in UTF8, it will first attempt to convert it from
      the local character set and if that fails it will try the character
      sets listed in the remote_charsets option.
    * Added an improved internal configuration interface. You can now override
      just about any option in the bookmarks dialog for a particular site.
    * Each protocol that gFTP supports is now completely self contained in
      it's own file. So, if gFTP doesn't support your favorite protocol, it
      should be pretty easy to add support

... Please review the long list of changes here:

http://gftp.seul.org/changelog.html

5 files changed, 102 insertions, 43 deletions

diff --git a/net/gftp/DESCR b/net/gftp/DESCR
index 30abb4002ad..b7c9bdbe6d4 100644
--- a/net/gftp/DESCR
+++ b/net/gftp/DESCR
@@ -1,2 +1,21 @@
-gFTP is a free multithreaded ftp client for *NIX based machines running X11R6
-or later.
+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 
+ * 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 
+   servers via FTP)
+ * Multithreaded to allow for simultaneous downloads
+ * File transfer queues to allow for downloading multiple files
+ * Supports downloading entire directories and subdirectories
+ * Bookmarks menu to allow you to quickly connect to remote sites
+ * Supports resuming interrupted file transfers
+ * Supports caching of remote directory listings
+ * Drag-N-Drop support
+ * FTP and HTTP proxy server support
+ * Allows for passive and non-passive file transfers
+ * Supports UNIX, EPLF, Novell, MacOS, and NT (DOS) style directory listings
+ * Full graphical configuration
+
+This package contains the GTK+ 2.0 version.
diff --git a/net/gftp/Makefile b/net/gftp/Makefile
index 480e48952ea..4331e91dcf6 100644
--- a/net/gftp/Makefile
+++ b/net/gftp/Makefile
@@ -1,23 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 17:10:38 martti Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/01 21:38:43 xtraeme Exp $
+#
 
-DISTNAME=	gftp-2.0.8
-PKGREVISION=	4
-CATEGORIES=	net
-MASTER_SITES=	http://gftp.seul.org/					\
-		ftp://gftp.seul.org/pub/gftp/				\
-		ftp://gftp.seul.org/pub/gftp/old-releases/
+.include "${.CURDIR}/Makefile.common"
 
-MAINTAINER=	jmcneill@invisible.yi.org
-HOMEPAGE=	http://gftp.seul.org/
-COMMENT=	Multithreaded ftp client for *NIX based machines running X11R6
+COMMENT=	Multithreaded GTK2+ ftp client
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=	gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
-USE_BUILDLINK2=		YES
-USE_PKGLOCALEDIR=	YES
-GNU_CONFIGURE=		YES
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include -D_POSIX_THREAD_SYSCALL_SOFT=1 ${CFLAGS}"
+CONFLICTS=	gftp-gtk1-[0-9]*
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common
new file mode 100644
index 00000000000..e8d8b38c2ef
--- /dev/null
+++ b/net/gftp/Makefile.common
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile.common,v 1.1 2003/09/01 21:38:43 xtraeme Exp $
+
+DISTNAME=	gftp-${VERSION}
+CATEGORIES=	net
+MASTER_SITES=	http://gftp.seul.org/					\
+		ftp://gftp.seul.org/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	jmcneill@invisible.yi.org
+HOMEPAGE=	http://gftp.seul.org/
+
+BUILD_USES_MSGFMT=	yes
+
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
+
+PTHREAD_OPTS=		require
+
+CONFIGURE_ARGS+=	--with-readline
+
+VERSION=		2.0.15
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !exists(/usr/bin/ssh-agent)
+DEPENDS+=       openssh-[0-9]*:../../security/openssh
+.endif
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../textproc/intltool/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
diff --git a/net/gftp/PLIST b/net/gftp/PLIST
index 566eb1f16c9..9d9228f993f 100644
--- a/net/gftp/PLIST
+++ b/net/gftp/PLIST
@@ -1,25 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2003/06/30 16:27:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/09/01 21:38:43 xtraeme Exp $
 bin/gftp
 bin/gftp-gtk
 bin/gftp-text
-${PKGLOCALEDIR}/locale/br/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/zh_CN.gb2312/LC_MESSAGES/gftp.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gftp.mo
 man/man1/gftp.1
 share/gftp/COPYING
 share/gftp/bookmarks
@@ -32,6 +14,8 @@ share/gftp/dotdot.xpm
 share/gftp/down.xpm
 share/gftp/exe.xpm
 share/gftp/gftp-logo.xpm
+share/gftp/gftp-mini-logo.xpm
+share/gftp/gftp.xpm
 share/gftp/gftprc
 share/gftp/img.xpm
 share/gftp/left.xpm
@@ -48,5 +32,38 @@ 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/be/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gftp.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gftp.mo
+${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
 share/pixmaps/gftp.png
+@dirrm share/gnome/apps/Internet
 @dirrm share/gftp
diff --git a/net/gftp/distinfo b/net/gftp/distinfo
index 5f0dbf2061a..0903eea4750 100644
--- a/net/gftp/distinfo
+++ b/net/gftp/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/10/27 07:53:58 rh Exp $
+$NetBSD: distinfo,v 1.4 2003/09/01 21:38:44 xtraeme Exp $
 
-SHA1 (gftp-2.0.8.tar.gz) = 67a93e1b2e6f67a19bb8b6429be99e1870e57430
-Size (gftp-2.0.8.tar.gz) = 786985 bytes
-SHA1 (patch-aa) = dc1720a8d18c2fcbdc45832431d6d68a4501c0ae
-SHA1 (patch-ab) = 71780f1a5e110e2e61889778e65f5ff92e086af4
+SHA1 (gftp-2.0.15.tar.bz2) = 2884278d152768769086082110517ffa314e6b44
+Size (gftp-2.0.15.tar.bz2) = 1045038 bytes