- Update to 1.5.1

6 files changed, 11 insertions, 63 deletions

diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile
index 18be73cdf06e..dd57144a5aeb 100644
--- a/ftp/py-pyftpdlib/Makefile
+++ b/ftp/py-pyftpdlib/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	pyftpdlib
-PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTVERSION=	1.5.1
 CATEGORIES=	ftp python
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lwhsu@FreeBSD.org
@@ -13,14 +12,10 @@ COMMENT=	Python FTP server library
 
 LICENSE=	MIT
 
-BROKEN=		Unfetchable (google code has gone away)
-DEPRECATED=	Unfetchable for more than six months (google code has gone away)
-EXPIRATION_DATE=	2017-04-30
+USES=		python
+USE_PYTHON=	autoplist distutils
 
-USES=		python:2
-USE_PYTHON=	distutils
-
-OPTIONS_DEFINE=		SENDFILE OPENSSL EXAMPLES
+OPTIONS_DEFINE=		SENDFILE OPENSSL
 OPTIONS_DEFAULT=	SENDFILE OPENSSL
 SENDFILE_DESC=		Enable sendfile(2) support
 OPENSSL_DESC=		Enable FTP over SSL/TLS (RFC4217)
@@ -29,13 +24,13 @@ SENDFILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysendfile>0:net/py-pysendfile
 OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
+PORTEXAMPLES=	*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/demo/ ${STAGEDIR}${EXAMPLESDIR}
 
 test: build
-	${TOUCH} ${WRKSRC}/test/__init__.py
-	cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+	cd ${WRKSRC}/pyftpdlib && ${PYTHON_CMD} ${PYSETUP} test
 
 .include <bsd.port.mk>
diff --git a/ftp/py-pyftpdlib/distinfo b/ftp/py-pyftpdlib/distinfo
index b26582ca0381..2f6a9d1ff755 100644
--- a/ftp/py-pyftpdlib/distinfo
+++ b/ftp/py-pyftpdlib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pyftpdlib-0.7.0.tar.gz) = a11a4b6b5cffa7eab8fb48b24cc90777c21fbedb8873fa15c2231526df0596c6
-SIZE (pyftpdlib-0.7.0.tar.gz) = 94898
+TIMESTAMP = 1490700676
+SHA256 (pyftpdlib-1.5.1.tar.gz) = 7bcd7fc825123414a157718c6dcdcb0978208d3c865d4650564acef4acce3354
+SIZE (pyftpdlib-1.5.1.tar.gz) = 127582
diff --git a/ftp/py-pyftpdlib/files/patch-setup.py b/ftp/py-pyftpdlib/files/patch-setup.py
deleted file mode 100644
index 7fc6b80d89a1..000000000000
--- a/ftp/py-pyftpdlib/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./setup.py.orig	2012-01-26 06:31:16.000000000 +1100
-+++ ./setup.py	2012-09-15 01:20:41.000000000 +1000
-@@ -83,6 +83,8 @@
-           'Programming Language :: Python :: 2.6',
-           'Programming Language :: Python :: 2.7',
-           ],
-+    test_suite='test',
-+    zip_safe=False,
-     )
- 
- if os.name == 'posix':
diff --git a/ftp/py-pyftpdlib/files/patch-test__test_contrib.py b/ftp/py-pyftpdlib/files/patch-test__test_contrib.py
deleted file mode 100644
index 769523747c0c..000000000000
--- a/ftp/py-pyftpdlib/files/patch-test__test_contrib.py
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./test/test_contrib.py.orig	2012-01-26 05:16:27.000000000 +1100
-+++ ./test/test_contrib.py	2012-09-15 01:25:10.000000000 +1000
-@@ -37,6 +37,7 @@
- import ftplib
- import unittest
- import os
-+import sys
- import random
- import string
- import warnings
-@@ -56,10 +57,15 @@
- except ImportError:
-     pass
- 
-+#Path hacks
-+sys.path.insert(0, os.path.abspath('..'))
- from pyftpdlib import ftpserver
- from pyftpdlib.contrib import authorizers
- from pyftpdlib.contrib import handlers
- from pyftpdlib.contrib import filesystems
-+
-+#More hacks
-+sys.path.append('.')
- from test_ftpd import *
- 
- 
diff --git a/ftp/py-pyftpdlib/files/patch-test__test_ftpd.py b/ftp/py-pyftpdlib/files/patch-test__test_ftpd.py
deleted file mode 100644
index 31cbedc2e379..000000000000
--- a/ftp/py-pyftpdlib/files/patch-test__test_ftpd.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./test/test_ftpd.py.orig	2012-01-26 05:16:27.000000000 +1100
-+++ ./test/test_ftpd.py	2012-09-15 01:25:53.000000000 +1000
-@@ -77,6 +77,8 @@
- except ImportError:
-     sendfile = None
- 
-+#Path hacks
-+sys.path.insert(0, os.path.abspath('..'))
- from pyftpdlib import ftpserver
- 
- 
diff --git a/ftp/py-pyftpdlib/pkg-descr b/ftp/py-pyftpdlib/pkg-descr
index 6172a7e26df6..2fc16f912d13 100644
--- a/ftp/py-pyftpdlib/pkg-descr
+++ b/ftp/py-pyftpdlib/pkg-descr
@@ -3,4 +3,4 @@ write asynchronous FTP servers with Python. Based on asyncore / asynchat
 frameworks pyftpdlib is actually the most complete RFC959 FTP server
 implementation available for Python language.
 
-WWW: http://code.google.com/p/pyftpdlib/
+WWW: https://github.com/giampaolo/pyftpdlib