- Update to 3.4

- Change MASTER_SITES to CHEESESHOP

PR:		239330
Submitted by:	pkubaj

5 files changed, 22 insertions, 69 deletions

diff --git a/ftp/py-ftputil/Makefile b/ftp/py-ftputil/Makefile
index 6c3a143b0c68..99c118f463ff 100644
--- a/ftp/py-ftputil/Makefile
+++ b/ftp/py-ftputil/Makefile
@@ -1,35 +1,27 @@
-# Created by: Li-Wen Hsu <lwhsu@lwhsu.org>
 # $FreeBSD$
 
 PORTNAME=	ftputil
-PORTVERSION=	2.6
-PORTREVISION=	1
+PORTVERSION=	3.4
 CATEGORIES=	ftp python
-MASTER_SITES=	# http://ftputil.sschwarzer.net/trac/attachment/wiki/Download/
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	High-level FTP client library
 
-USES=		python:2.7
-USE_PYTHON=	distutils
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-PORTDOC_FILES=	README.html README.txt ftputil.html ftputil.txt ftputil_ru_utf8.txt
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
+NO_ARCH=	yes
+PORTDOCS=	doc/*
 
-do-fetch:
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-	${FETCH_CMD} -o "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}" "http://ftputil.sschwarzer.net/trac/attachment/wiki/Download/${DISTNAME}${EXTRACT_SUFX}?format=raw"
-.endif
-
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${PORTDOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/ftp/py-ftputil/distinfo b/ftp/py-ftputil/distinfo
index f471074a85e1..8729cd8d7e2e 100644
--- a/ftp/py-ftputil/distinfo
+++ b/ftp/py-ftputil/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ftputil-2.6.tar.gz) = e0eff097074504877be82cf0ac11323f075511c25113569ae05caf888af99abe
-SIZE (ftputil-2.6.tar.gz) = 85788
+TIMESTAMP = 1563613549
+SHA256 (ftputil-3.4.tar.gz) = 374b01e174079e91babe2a462fbd6f6c00dbfbfa299dec04239ca4229fbf8762
+SIZE (ftputil-3.4.tar.gz) = 141472
diff --git a/ftp/py-ftputil/files/patch-setup.py b/ftp/py-ftputil/files/patch-setup.py
deleted file mode 100644
index a005b73aa6dc..000000000000
--- a/ftp/py-ftputil/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2010-08-14 13:22:25.000000000 +0400
-+++ setup.py	2011-03-05 14:52:45.000000000 +0300
-@@ -29,8 +29,6 @@
-   version=_version,
-   packages=[_package],
-   package_dir={_package: ""},
--  data_files=[("doc/ftputil", ["ftputil.txt", "ftputil.html",
--                               "README.txt", "README.html"])],
-   # Metadata
-   author="Stefan Schwarzer",
-   author_email="sschwarzer@sschwarzer.net",
diff --git a/ftp/py-ftputil/pkg-descr b/ftp/py-ftputil/pkg-descr
index 5d348b3aa697..ae1a160f04a1 100644
--- a/ftp/py-ftputil/pkg-descr
+++ b/ftp/py-ftputil/pkg-descr
@@ -6,4 +6,4 @@ functions similar to those in the os, os.path and shutil modules. ftputil has
 convenience functions for conditional uploads and downloads, and handles FTP
 clients and servers in different timezones.
 
-WWW: http://ftputil.sschwarzer.net/
+WWW: https://ftputil.sschwarzer.net/
diff --git a/ftp/py-ftputil/pkg-plist b/ftp/py-ftputil/pkg-plist
index cb645f5793e5..7330759ddbbb 100644
--- a/ftp/py-ftputil/pkg-plist
+++ b/ftp/py-ftputil/pkg-plist
@@ -1,38 +1,9 @@
-%%PYTHON_SITELIBDIR%%/ftputil/__init__.py
-%%PYTHON_SITELIBDIR%%/ftputil/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ftputil/file_transfer.py
-%%PYTHON_SITELIBDIR%%/ftputil/file_transfer.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/file_transfer.pyo
-%%PYTHON_SITELIBDIR%%/ftputil/find_deprecated_code.py
-%%PYTHON_SITELIBDIR%%/ftputil/find_deprecated_code.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/find_deprecated_code.pyo
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_error.py
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_error.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_error.pyo
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_file.py
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_file.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_file.pyo
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_path.py
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_path.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_path.pyo
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_stat.py
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_stat.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_stat.pyo
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_stat_cache.py
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_stat_cache.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/ftp_stat_cache.pyo
-%%PYTHON_SITELIBDIR%%/ftputil/ftputil.py
-%%PYTHON_SITELIBDIR%%/ftputil/ftputil.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/ftputil.pyo
-%%PYTHON_SITELIBDIR%%/ftputil/ftputil_version.py
-%%PYTHON_SITELIBDIR%%/ftputil/ftputil_version.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/ftputil_version.pyo
-%%PYTHON_SITELIBDIR%%/ftputil/lrucache.py
-%%PYTHON_SITELIBDIR%%/ftputil/lrucache.pyc
-%%PYTHON_SITELIBDIR%%/ftputil/lrucache.pyo
-%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/announcements.txt
+%%PORTDOCS%%%%DOCSDIR%%/contributors.txt
 %%PORTDOCS%%%%DOCSDIR%%/ftputil.html
 %%PORTDOCS%%%%DOCSDIR%%/ftputil.txt
-%%PORTDOCS%%%%DOCSDIR%%/ftputil_ru_utf8.txt
+%%PORTDOCS%%%%DOCSDIR%%/python3_support_outline.txt
+%%PORTDOCS%%%%DOCSDIR%%/python3_support.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/whats_new_in_ftputil_3.0.html
+%%PORTDOCS%%%%DOCSDIR%%/whats_new_in_ftputil_3.0.txt