3 files changed, 31 insertions, 20 deletions

diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile
index 6ceeb84a3ff4..eeace4e8b45b 100644
--- a/www/py-flexget/Makefile
+++ b/www/py-flexget/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	flexget
-PORTVERSION=	1.1.28
+PORTVERSION=	1.1.45
 PORTEPOCH=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://download.flexget.com/archive/ \
-		http://download.flexget.com/ \
-		http://ompldr.org/vaGI2Mw/
+		http://download.flexget.com/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	FlexGet-${PORTVERSION}
 
@@ -16,26 +15,26 @@ COMMENT=	Program to automate downloading from different sources
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0.11:${PORTSDIR}/devel/py-nose
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.1.3:${PORTSDIR}/textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:${PORTSDIR}/databases/py-sqlalchemy \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=0.11:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}progressbar>=0:${PORTSDIR}/misc/py-progressbar \
-		${PYTHON_PKGNAMEPREFIX}pynzb>=0:${PORTSDIR}/news/py-pynzb \
-		${PYTHON_PKGNAMEPREFIX}feedparser>=5.1.3:${PORTSDIR}/textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}rss2gen>=0:${PORTSDIR}/textproc/py-rss2gen \
 		${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \
 		${PYTHON_SITELIBDIR}/bs4/__init__.py:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.0:${PORTSDIR}/www/py-cherrypy \
-		${PYTHON_PKGNAMEPREFIX}Flask>=0:${PORTSDIR}/www/py-flask \
 		${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:${PORTSDIR}/www/py-html5lib \
-		${PYTHON_PKGNAMEPREFIX}requests>=1:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}nose>=0.11:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:${PORTSDIR}/devel/py-jsonschema \
-		${PYTHON_PKGNAMEPREFIX}tvrage>=0:${PORTSDIR}/devel/py-tvrage
+		${PYTHON_PKGNAMEPREFIX}rss2gen>0:${PORTSDIR}/textproc/py-rss2gen \
+		${PYTHON_PKGNAMEPREFIX}pynzb>0:${PORTSDIR}/news/py-pynzb \
+		${PYTHON_PKGNAMEPREFIX}progressbar>0:${PORTSDIR}/misc/py-progressbar \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}Flask>0:${PORTSDIR}/www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}cherrypy>0:${PORTSDIR}/www/py-cherrypy \
+		${PYTHON_PKGNAMEPREFIX}requests>=1.0:${PORTSDIR}/www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:${PORTSDIR}/devel/py-jsonschema \
+		${PYTHON_PKGNAMEPREFIX}tvrage>0:${PORTSDIR}/devel/py-tvrage
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 
-USE_PYTHON=	-2.7
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	FlexGet
 PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}
@@ -43,4 +42,7 @@ PYDISTUTILS_NOEGGINFO=	yes
 
 PLIST_SUB=	PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO}
 
+regression-test: build
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+
 .include <bsd.port.mk>
diff --git a/www/py-flexget/distinfo b/www/py-flexget/distinfo
index 3238f2ebe5d4..ac7a60b2d767 100644
--- a/www/py-flexget/distinfo
+++ b/www/py-flexget/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FlexGet-1.1.28.tar.gz) = 527043a7222f47d1aae26ed56dfbfe3972eb386345590e0d78261647f9fe8afe
-SIZE (FlexGet-1.1.28.tar.gz) = 880264
+SHA256 (FlexGet-1.1.45.tar.gz) = fe844eb3c6ed5537117188fad750e44b1bb286e3f1ad5d6e2784bfd44cd9cce0
+SIZE (FlexGet-1.1.45.tar.gz) = 890908
diff --git a/www/py-flexget/pkg-plist b/www/py-flexget/pkg-plist
index 7093e9ceac78..299540ba0af4 100644
--- a/www/py-flexget/pkg-plist
+++ b/www/py-flexget/pkg-plist
@@ -80,6 +80,9 @@
 %%PYTHON_SITELIBDIR%%/flexget/plugins/download/__init__.py
 %%PYTHON_SITELIBDIR%%/flexget/plugins/download/__init__.pyc
 %%PYTHON_SITELIBDIR%%/flexget/plugins/download/__init__.pyo
+%%PYTHON_SITELIBDIR%%/flexget/plugins/download/ftp_download.py
+%%PYTHON_SITELIBDIR%%/flexget/plugins/download/ftp_download.pyc
+%%PYTHON_SITELIBDIR%%/flexget/plugins/download/ftp_download.pyo
 %%PYTHON_SITELIBDIR%%/flexget/plugins/est_released.py
 %%PYTHON_SITELIBDIR%%/flexget/plugins/est_released.pyc
 %%PYTHON_SITELIBDIR%%/flexget/plugins/est_released.pyo
@@ -236,6 +239,9 @@
 %%PYTHON_SITELIBDIR%%/flexget/plugins/input/find.py
 %%PYTHON_SITELIBDIR%%/flexget/plugins/input/find.pyc
 %%PYTHON_SITELIBDIR%%/flexget/plugins/input/find.pyo
+%%PYTHON_SITELIBDIR%%/flexget/plugins/input/ftp_list.py
+%%PYTHON_SITELIBDIR%%/flexget/plugins/input/ftp_list.pyc
+%%PYTHON_SITELIBDIR%%/flexget/plugins/input/ftp_list.pyo
 %%PYTHON_SITELIBDIR%%/flexget/plugins/input/gen_series.py
 %%PYTHON_SITELIBDIR%%/flexget/plugins/input/gen_series.pyc
 %%PYTHON_SITELIBDIR%%/flexget/plugins/input/gen_series.pyo
@@ -530,6 +536,9 @@
 %%PYTHON_SITELIBDIR%%/flexget/plugins/search_kat.py
 %%PYTHON_SITELIBDIR%%/flexget/plugins/search_kat.pyc
 %%PYTHON_SITELIBDIR%%/flexget/plugins/search_kat.pyo
+%%PYTHON_SITELIBDIR%%/flexget/plugins/search_newznab.py
+%%PYTHON_SITELIBDIR%%/flexget/plugins/search_newznab.pyc
+%%PYTHON_SITELIBDIR%%/flexget/plugins/search_newznab.pyo
 %%PYTHON_SITELIBDIR%%/flexget/plugins/search_rss.py
 %%PYTHON_SITELIBDIR%%/flexget/plugins/search_rss.pyc
 %%PYTHON_SITELIBDIR%%/flexget/plugins/search_rss.pyo