Update to 2.0.7a and make the following cleanups:

- Replace pthread configure patch with perl regex (should make future upgrades
  easier);
- use installed libintl instead of port's own version;
- add WWW to pkg/DESCR and remove absolete lines from there;
- correctly place Gnome icon into share/gnome/pixmap instead of share/pixmap;
- add gnomecc into RUN_DEPENDS to exsure correct removal of Gnome bits.

Obtained from:	http://www.gnome.org/

4 files changed, 29 insertions, 7 deletions

diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 79e5aac337b7..42c625830275 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gftp
-PORTVERSION=	2.0.6a
+PORTVERSION=	2.0.7a
 CATEGORIES=	ftp
 MASTER_SITES=	http://gftp.seul.org/ \
 		ftp://gftp.seul.org/pub/gftp/
@@ -14,11 +14,25 @@ MASTER_SITES=	http://gftp.seul.org/ \
 MAINTAINER=	dmarion@open.hr
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+.if !defined(WITHOUT_GNOME)
+RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
+.endif
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gftp.1
 
+post-extract:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g'
+
 .include <bsd.port.mk>
diff --git a/ftp/gftp/distinfo b/ftp/gftp/distinfo
index cde89df2d523..82b9e7de0934 100644
--- a/ftp/gftp/distinfo
+++ b/ftp/gftp/distinfo
@@ -1 +1 @@
-MD5 (gftp-2.0.6a.tar.gz) = 8eba39ab947712b46756b4e014b72e8c
+MD5 (gftp-2.0.7a.tar.gz) = 017ee9a61d61e7c7ec0adae86495c80d
diff --git a/ftp/gftp/pkg-descr b/ftp/gftp/pkg-descr
index 6034cd22e08b..339713f3f97f 100644
--- a/ftp/gftp/pkg-descr
+++ b/ftp/gftp/pkg-descr
@@ -1,7 +1,7 @@
 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 Agreement 
-  Written in C and uses GTK+ 1.1.x+ for the GUI 
+  Written in C and uses GTK+ 1.2.x+ for the GUI 
   Multithreaded to allow for simultaneous downloads 
   File transfer queues to allow for downloading multiple files 
   Supports downloading entire directories and subdirectories 
@@ -18,7 +18,8 @@ X11R6 or later. It has the following features:
   Allows for passive and non-passive file transfers 
   Eliminates buffer overruns from malicious ftp sites 
 
-Latest version: 1.12
 gFTP is copyright (c) 1998 by Brian Masney <masneyb@newwave.net>.
 
+WWW: http://gftp.seul.org/
+
 - Damjan Marion <dmarion@open.hr>
diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist
index 3ce56bc3c100..1a7a575c0163 100644
--- a/ftp/gftp/pkg-plist
+++ b/ftp/gftp/pkg-plist
@@ -9,14 +9,20 @@ share/gftp/dotdot.xpm
 share/gftp/exe.xpm
 share/gftp/gftp-logo.xpm
 share/gftp/gftprc
+share/gftp/img.xpm
 share/gftp/linkdir.xpm
 share/gftp/linkfile.xpm
 share/gftp/man.xpm
 share/gftp/open_dir.xpm
+share/gftp/rpm.xpm
+share/gftp/sound.xpm
 share/gftp/tar.xpm
 share/gftp/txt.xpm
+share/gftp/world.xpm
 share/gnome/apps/Internet/gftp.desktop
+share/gnome/pixmaps/gftp.png
 share/locale/br/LC_MESSAGES/gftp.mo
+share/locale/cs/LC_MESSAGES/gftp.mo
 share/locale/da/LC_MESSAGES/gftp.mo
 share/locale/de/LC_MESSAGES/gftp.mo
 share/locale/es/LC_MESSAGES/gftp.mo
@@ -26,7 +32,8 @@ share/locale/ja/LC_MESSAGES/gftp.mo
 share/locale/ko/LC_MESSAGES/gftp.mo
 share/locale/nl/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/zh_TW.Big5/LC_MESSAGES/gftp.mo
-share/pixmaps/gftp.png
 @dirrm share/gftp