4 files changed, 12 insertions, 34 deletions
diff --git a/source/xap/gftp/gftp.SlackBuild b/source/xap/gftp/gftp.SlackBuild
index fb7c560a..6d84ec43 100755
--- a/source/xap/gftp/gftp.SlackBuild
+++ b/source/xap/gftp/gftp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012, 2018, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gftp
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-10}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -63,7 +63,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf gftp-$VERSION
-tar xvf $CWD/gftp-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/gftp-$VERSION.tar.?z || exit 1
 cd gftp-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -72,7 +72,13 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/gftp.glibc-2.30.diff.gz | patch -p1 --verbose || exit 1
+if [ ! -r configure ]; then
+  if [ -x ./autogen.sh ]; then
+    NOCONFIGURE=1 ./autogen.sh
+  else
+    autoreconf -vif
+  fi
+fi
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/xap/gftp/gftp.desktop b/source/xap/gftp/gftp.desktop
deleted file mode 100644
index 0beaf5bc..00000000
--- a/source/xap/gftp/gftp.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=gFTP
-Comment=Download and upload files using multiple file transfer protocols
-Comment[fr]=Télécharge des fichiers en utilisant le protocole FTP
-GenericName=gFTP
-Exec=gftp %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=gftp
-Categories=Network;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gftp
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.0.19
diff --git a/source/xap/gftp/gftp.glibc-2.30.diff b/source/xap/gftp/gftp.glibc-2.30.diff
deleted file mode 100644
index efefcfe2..00000000
--- a/source/xap/gftp/gftp.glibc-2.30.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./lib/pty.c.orig	2007-03-12 20:56:43.000000000 -0500
-+++ ./lib/pty.c	2019-08-19 17:30:51.858199288 -0500
-@@ -61,10 +61,6 @@
- 
- #elif HAVE_GRANTPT
- 
--#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__))
--#include <stropts.h>
--#endif
--
- char *
- gftp_get_pty_impl (void)
- {
diff --git a/source/xap/gftp/gftp.url b/source/xap/gftp/gftp.url
new file mode 100644
index 00000000..5c8e4c2a
--- /dev/null
+++ b/source/xap/gftp/gftp.url
@@ -0,0 +1 @@
+https://github.com/masneyb/gftp