devel/py-fabric: Update to 1.8.1 and Modernize

- Update to 1.8.1
- Enable STAGE support
- Update LICENSE (BSD2CLAUSE)
- Enable AUTOPLIST, delete pkg-plist
- Deprecate PYDISTUTILS_PKGNAME and update DISTNAME accordingly
- Deprecate OPTIONSFILE override
- Use OPTIONS helpers

3 files changed, 8 insertions, 114 deletions

diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile
index 8899a70fc577..532f33ae8312 100644
--- a/devel/py-fabric/Makefile
+++ b/devel/py-fabric/Makefile
@@ -2,17 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	fabric
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.1
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PYDISTUTILS_PKGNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
+DISTNAME=	${PORTNAME:C/f/F/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Simple pythonic remote deployment tool
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.10.0:${PORTSDIR}/security/py-paramiko
 TEST_DEPENDS:=	${RUN_DEPENDS} \
@@ -22,18 +22,12 @@ TEST_DEPENDS:=	${RUN_DEPENDS} \
 
 OPTIONS_DEFINE=	TESTS
 TESTS_DESC=	Install nose for test suite
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTESTS}
-BUILD_DEPENDS:=	${TEST_DEPENDS}
-.endif
+TESTS_BUILD_DEPENDS=	${TEST_DEPENDS}
 
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	${PORTNAME:C/f/F/}
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 regression-test: build
 	@cd ${WRKSRC} && nosetests -v
diff --git a/devel/py-fabric/distinfo b/devel/py-fabric/distinfo
index 2236da6122c2..b7f71f29f6a1 100644
--- a/devel/py-fabric/distinfo
+++ b/devel/py-fabric/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Fabric-1.8.0.tar.gz) = 0076c76abeef3ffe9172e1290e6e487e23a7229b676883241bfd57a1933b327a
-SIZE (Fabric-1.8.0.tar.gz) = 219420
+SHA256 (Fabric-1.8.1.tar.gz) = bf2b4a857e14ab5e555a4c287d2a26dc30e2f3d19a0e545df058e5c139019880
+SIZE (Fabric-1.8.1.tar.gz) = 220137
diff --git a/devel/py-fabric/pkg-plist b/devel/py-fabric/pkg-plist
deleted file mode 100644
index 44edb679fd8d..000000000000
--- a/devel/py-fabric/pkg-plist
+++ /dev/null
@@ -1,100 +0,0 @@
-bin/fab
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/docs.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/docs.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/docs.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/tag.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/tag.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/tag.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/api.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/api.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/api.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/auth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/auth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/auth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/colors.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/colors.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/colors.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/context_managers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/context_managers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/context_managers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/console.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/console.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/console.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/django.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/django.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/django.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/files.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/files.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/files.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/project.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/project.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib/project.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/decorators.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/decorators.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/decorators.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/docs.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/docs.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/docs.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/io.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/io.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/io.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/job_queue.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/job_queue.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/job_queue.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/main.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/main.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/main.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/network.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/network.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/network.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/operations.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/operations.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/operations.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/sftp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/sftp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/sftp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/state.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/state.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/state.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/task_utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/task_utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/task_utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/tasks.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/tasks.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/tasks.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/thread_handling.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/thread_handling.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/thread_handling.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/version.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/version.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/version.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabric
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fabfile
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%