ftp/gftp: Update to 2.7.0b

This is technically a "beta" but the release version is ancient and
this version is being shipped by Debian/Ubuntu/Arch/Slackware.

PR:		258522
Approved by:	maintainer timeout

4 files changed, 33 insertions, 60 deletions

diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 495c5a3fc86e..7e97037bf596 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -1,25 +1,31 @@
 # Created by: Damjan Marion <dmarion@open.hr>
 
 PORTNAME=	gftp
-PORTVERSION=	2.0.19
-PORTREVISION=	6
+PORTVERSION=	2.7.0b
 CATEGORIES=	ftp
-MASTER_SITES=	http://gftp.seul.org/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Free multithreaded GTK-based FTP and SFTP client
 
 LICENSE=	GPLv2
 
-USES=		gnome pathfix pkgconfig ssl tar:bzip2
-GNU_CONFIGURE=	yes
+USES=		autoreconf gnome gmake libtool pathfix pkgconfig ssl tar:bzip2
+USE_GITHUB=	yes
+GH_ACCOUNT=	masneyb
 USE_GNOME=	glib20 gtk20
+
+GNU_CONFIGURE=	yes
+
 CFLAGS+=	-D_WANT_SEMUN
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=	gettext
+NLS_USES=		gettext
+NLS_USE=		GNOME=intltool
 NLS_CONFIGURE_OFF=	--disable-nls
 
+post-patch:
+	@${TOUCH} ${WRKSRC}/config.rpath
+
 .include <bsd.port.mk>
diff --git a/ftp/gftp/distinfo b/ftp/gftp/distinfo
index db02b17c1634..48716137aad0 100644
--- a/ftp/gftp/distinfo
+++ b/ftp/gftp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gftp-2.0.19.tar.bz2) = 5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd
-SIZE (gftp-2.0.19.tar.bz2) = 1687167
+TIMESTAMP = 1631708866
+SHA256 (masneyb-gftp-2.7.0b_GH0.tar.gz) = 164651e19c840e5df148e905fbfcf4d24c65204a2df078dc98ad6c95a421e7f4
+SIZE (masneyb-gftp-2.7.0b_GH0.tar.gz) = 1618157
diff --git a/ftp/gftp/files/patch-lib_charset-conv.c b/ftp/gftp/files/patch-lib_charset-conv.c
deleted file mode 100644
index 4661f4a6b0ba..000000000000
--- a/ftp/gftp/files/patch-lib_charset-conv.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- lib/charset-conv.c.orig	2008-03-04 12:18:03 UTC
-+++ lib/charset-conv.c
-@@ -230,7 +230,7 @@ gftp_filename_from_utf8 (gftp_request * 
- #else
- 
- char *
--gftp_string_to_utf8 (gftp_request * request, const char *str, size_t dest_len)
-+gftp_string_to_utf8 (gftp_request * request, const char *str, size_t *dest_len)
- {
-   return (NULL);
- }
-@@ -238,22 +238,22 @@ gftp_string_to_utf8 (gftp_request * requ
- 
- char *
- gftp_string_from_utf8 (gftp_request * request, int force_local, const char *str,
--                       size_t dest_len)
-+                       size_t *dest_len)
- {
-   return (NULL);
- }
- 
- 
- char *
--gftp_filename_to_utf8 (gftp_request * request, const char *str, size_t dest_len)
-+gftp_filename_to_utf8 (gftp_request * request, const char *str, size_t *dest_len)
- {
-   return (NULL);
- }
- 
- 
- char *
--gftp_filename_from_utf8 (gftp_request * request, int force_local,
--                         const char *str, size_t dest_len)
-+gftp_filename_from_utf8 (gftp_request * request,
-+                         const char *str, size_t *dest_len)
- {
-   return (NULL);
- }
diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist
index aeff3a984ce1..2c94155062b4 100644
--- a/ftp/gftp/pkg-plist
+++ b/ftp/gftp/pkg-plist
@@ -4,45 +4,41 @@ bin/gftp-text
 man/man1/gftp.1.gz
 share/applications/gftp.desktop
 share/pixmaps/gftp.png
-%%DATADIR%%/COPYING
+share/icons/hicolor/16x16/apps/gftp.png
+share/icons/hicolor/22x22/apps/gftp.png
+share/icons/hicolor/32x32/apps/gftp.png
+share/icons/hicolor/48x48/apps/gftp.png
+share/icons/hicolor/scalable/apps/gftp.svg
 %%DATADIR%%/bookmarks
-%%DATADIR%%/connect.xpm
 %%DATADIR%%/deb.xpm
 %%DATADIR%%/diff.xpm
 %%DATADIR%%/dir.xpm
 %%DATADIR%%/doc.xpm
 %%DATADIR%%/dotdot.xpm
-%%DATADIR%%/down.xpm
 %%DATADIR%%/exe.xpm
-%%DATADIR%%/gftp-16x16.png
-%%DATADIR%%/gftp-22x22.png
-%%DATADIR%%/gftp-24x24.png
-%%DATADIR%%/gftp-32x32.png
-%%DATADIR%%/gftp-48x48.png
 %%DATADIR%%/gftp-logo.xpm
-%%DATADIR%%/gftp-scalable.svg
-%%DATADIR%%/gftp.xpm
+%%DATADIR%%/gftp.png
 %%DATADIR%%/gftprc
 %%DATADIR%%/img.xpm
-%%DATADIR%%/left.xpm
 %%DATADIR%%/linkdir.xpm
 %%DATADIR%%/linkfile.xpm
 %%DATADIR%%/man.xpm
 %%DATADIR%%/open_dir.xpm
-%%DATADIR%%/right.xpm
 %%DATADIR%%/rpm.xpm
 %%DATADIR%%/sound.xpm
-%%DATADIR%%/stop.xpm
 %%DATADIR%%/tar.xpm
 %%DATADIR%%/txt.xpm
-%%DATADIR%%/up.xpm
 %%DATADIR%%/world.xpm
 %%NLS%%share/locale/am/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/as/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/az/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/be/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/bn_IN/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/da/LC_MESSAGES/gftp.mo
@@ -51,27 +47,33 @@ share/pixmaps/gftp.png
 %%NLS%%share/locale/el/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/en_CA/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/es/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/gu/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/he/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/it/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/kn/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ml/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ne/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/oc/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/or/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/gftp.mo
@@ -80,11 +82,13 @@ share/pixmaps/gftp.png
 %%NLS%%share/locale/ru/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/rw/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/sr@Latn/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/te/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/th/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/gftp.mo