net/pyrad: update to 2.0

- Update to 2.0 [1]
- NOPORTEXAMPLES -> PORT_OPTIONS:MEXAMPLES
- Proper install examples and add to options
- Trim Makefile header

PR:		ports/180213 [1]
Submitted by:	Chris Mikkelson <cmikk uerige.oss.uswest.net> [1]
Approved by:	maintainer

4 files changed, 97 insertions, 49 deletions

diff --git a/net/pyrad/Makefile b/net/pyrad/Makefile
index 5a5c99f8771d..3401fe177e84 100644
--- a/net/pyrad/Makefile
+++ b/net/pyrad/Makefile
@@ -1,28 +1,33 @@
-# New ports collection makefile for:	py-pyrad
-# Date created:				13 August 2007
-# Whom:					Blaz Zupan <blaz@si.FreeBSD.org>
-#
+# Created by: Blaz Zupan <blaz@si.FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pyrad
-PORTVERSION=	0.9
+PORTVERSION=	2.0
 CATEGORIES=	net python
-MASTER_SITES=	http://www.wiggy.net/files/ \
-		http://www.sourcefiles.org/Networking/Tools/Authentication/
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	steve@energistic.com
 COMMENT=	Python implementation of RADIUS client
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	pyrad
 
-.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES=	*
+
+OPTIONS_DEFINE=	EXAMPLES
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|zip_safe=True|zip_safe=False|' \
+		${WRKSRC}/setup.py
+
+.if ${PORT_OPTIONS:MEXAMPLES}
 post-install:
-	${MKDIR} ${EXAMPLESDIR}
-	${TAR} -C ${WRKSRC}/example -cf- . | ${TAR} -C ${EXAMPLESDIR} -xpf-
+	@${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/pyrad/distinfo b/net/pyrad/distinfo
index fb4dca888a64..554a8ddfa47b 100644
--- a/net/pyrad/distinfo
+++ b/net/pyrad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyrad-0.9.tar.gz) = ec48a2533e6a3273fe155641bd5481b581515f33e9178c083c9e10fbb9dfc4c8
-SIZE (pyrad-0.9.tar.gz) = 17749
+SHA256 (pyrad-2.0.tar.gz) = 6bdac1af328aceb4383c39986356b6bb8a880157c3fd95eefc28643526718999
+SIZE (pyrad-2.0.tar.gz) = 38388
diff --git a/net/pyrad/pkg-descr b/net/pyrad/pkg-descr
index 511df36679d0..d10a9e9e39fb 100644
--- a/net/pyrad/pkg-descr
+++ b/net/pyrad/pkg-descr
@@ -2,4 +2,4 @@ pyrad is a Python implementation of a RADIUS client as described in RFC2865.
 It takes care of all the details like building RADIUS packets, sending them
 and decoding responses.
 
-WWW: http://www.wiggy.net/code/pyrad/
+WWW: https://pypi.python.org/pypi/pyrad
diff --git a/net/pyrad/pkg-plist b/net/pyrad/pkg-plist
index e465b22f4506..c81f00060c60 100644
--- a/net/pyrad/pkg-plist
+++ b/net/pyrad/pkg-plist
@@ -1,34 +1,77 @@
-%%PYTHON_SITELIBDIR%%/pyrad/__init__.py
-%%PYTHON_SITELIBDIR%%/pyrad/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyrad/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyrad/bidict.py
-%%PYTHON_SITELIBDIR%%/pyrad/bidict.pyc
-%%PYTHON_SITELIBDIR%%/pyrad/bidict.pyo
-%%PYTHON_SITELIBDIR%%/pyrad/client.py
-%%PYTHON_SITELIBDIR%%/pyrad/client.pyc
-%%PYTHON_SITELIBDIR%%/pyrad/client.pyo
-%%PYTHON_SITELIBDIR%%/pyrad/curved.py
-%%PYTHON_SITELIBDIR%%/pyrad/curved.pyc
-%%PYTHON_SITELIBDIR%%/pyrad/curved.pyo
-%%PYTHON_SITELIBDIR%%/pyrad/dictionary.py
-%%PYTHON_SITELIBDIR%%/pyrad/dictionary.pyc
-%%PYTHON_SITELIBDIR%%/pyrad/dictionary.pyo
-%%PYTHON_SITELIBDIR%%/pyrad/host.py
-%%PYTHON_SITELIBDIR%%/pyrad/host.pyc
-%%PYTHON_SITELIBDIR%%/pyrad/host.pyo
-%%PYTHON_SITELIBDIR%%/pyrad/packet.py
-%%PYTHON_SITELIBDIR%%/pyrad/packet.pyc
-%%PYTHON_SITELIBDIR%%/pyrad/packet.pyo
-%%PYTHON_SITELIBDIR%%/pyrad/server.py
-%%PYTHON_SITELIBDIR%%/pyrad/server.pyc
-%%PYTHON_SITELIBDIR%%/pyrad/server.pyo
-%%PYTHON_SITELIBDIR%%/pyrad/tools.py
-%%PYTHON_SITELIBDIR%%/pyrad/tools.pyc
-%%PYTHON_SITELIBDIR%%/pyrad/tools.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/pyrad
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acct.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dictionary
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dictionary.attingo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.py
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%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/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/bidict.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/bidict.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/bidict.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/client.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/client.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/client.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/curved.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/curved.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/curved.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictfile.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictfile.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictfile.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictionary.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictionary.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictionary.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/host.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/host.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/host.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/packet.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/packet.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/packet.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/proxy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/proxy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/proxy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/server.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/server.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/server.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/data/dictfiletest
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/data/full
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/data/simple
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/mock.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/mock.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/mock.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testBidict.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testBidict.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testBidict.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testClient.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testClient.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testClient.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testDictionary.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testDictionary.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testDictionary.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testHost.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testHost.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testHost.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testPacket.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testPacket.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testPacket.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testProxy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testProxy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testProxy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testServer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testServer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testServer.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testTools.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testTools.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testTools.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tools.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tools.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tools.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/data
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%