3 files changed, 77 insertions, 13 deletions

diff --git a/security/py-openid/Makefile b/security/py-openid/Makefile
index 77c82da6dffb..223e58d912e2 100644
--- a/security/py-openid/Makefile
+++ b/security/py-openid/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	openid
-PORTVERSION=	1.2.0
+PORTVERSION=	2.1.1
 CATEGORIES=	security python
-MASTER_SITES=	http://www.openidenabled.com/resources/downloads/python-openid/
+MASTER_SITES=	http://openidenabled.com/files/python-openid/packages/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Python OpenID version
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/urljr:${PORTSDIR}/www/py-urljr \
-		${PYTHON_SITELIBDIR}/yadis:${PORTSDIR}/net/py-yadis
+USE_BZIP2=	yes
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
diff --git a/security/py-openid/distinfo b/security/py-openid/distinfo
index 2230ce9eb7f5..b3849cca3990 100644
--- a/security/py-openid/distinfo
+++ b/security/py-openid/distinfo
@@ -1,3 +1,3 @@
-MD5 (python-openid-1.2.0.tar.gz) = 4ad16ef790d80a965b902eb315fe57b2
-SHA256 (python-openid-1.2.0.tar.gz) = a2503296bc860ae47c118544d81967fff83028e9bbd7373ea4f67acffe456f82
-SIZE (python-openid-1.2.0.tar.gz) = 333299
+MD5 (python-openid-2.1.1.tar.bz2) = b15ead9183a0550ef974c15bb6a36f2e
+SHA256 (python-openid-2.1.1.tar.bz2) = 9f10ff07d72cba34cfa846d5fee0c0714cd7957f2c3a7d7d8272996b48365818
+SIZE (python-openid-2.1.1.tar.bz2) = 311375
diff --git a/security/py-openid/pkg-plist b/security/py-openid/pkg-plist
index 2bfeb9ab9e2a..b5fe26e7f4d8 100644
--- a/security/py-openid/pkg-plist
+++ b/security/py-openid/pkg-plist
@@ -13,18 +13,39 @@
 %%PYTHON_SITELIBDIR%%/openid/consumer/discover.py
 %%PYTHON_SITELIBDIR%%/openid/consumer/discover.pyc
 %%PYTHON_SITELIBDIR%%/openid/consumer/discover.pyo
-%%PYTHON_SITELIBDIR%%/openid/consumer/parse.py
-%%PYTHON_SITELIBDIR%%/openid/consumer/parse.pyc
-%%PYTHON_SITELIBDIR%%/openid/consumer/parse.pyo
+%%PYTHON_SITELIBDIR%%/openid/consumer/html_parse.py
+%%PYTHON_SITELIBDIR%%/openid/consumer/html_parse.pyc
+%%PYTHON_SITELIBDIR%%/openid/consumer/html_parse.pyo
 %%PYTHON_SITELIBDIR%%/openid/cryptutil.py
 %%PYTHON_SITELIBDIR%%/openid/cryptutil.pyc
 %%PYTHON_SITELIBDIR%%/openid/cryptutil.pyo
 %%PYTHON_SITELIBDIR%%/openid/dh.py
 %%PYTHON_SITELIBDIR%%/openid/dh.pyc
 %%PYTHON_SITELIBDIR%%/openid/dh.pyo
+%%PYTHON_SITELIBDIR%%/openid/extension.py
+%%PYTHON_SITELIBDIR%%/openid/extension.pyc
+%%PYTHON_SITELIBDIR%%/openid/extension.pyo
+%%PYTHON_SITELIBDIR%%/openid/extensions/__init__.py
+%%PYTHON_SITELIBDIR%%/openid/extensions/__init__.pyc
+%%PYTHON_SITELIBDIR%%/openid/extensions/__init__.pyo
+%%PYTHON_SITELIBDIR%%/openid/extensions/ax.py
+%%PYTHON_SITELIBDIR%%/openid/extensions/ax.pyc
+%%PYTHON_SITELIBDIR%%/openid/extensions/ax.pyo
+%%PYTHON_SITELIBDIR%%/openid/extensions/pape.py
+%%PYTHON_SITELIBDIR%%/openid/extensions/pape.pyc
+%%PYTHON_SITELIBDIR%%/openid/extensions/pape.pyo
+%%PYTHON_SITELIBDIR%%/openid/extensions/sreg.py
+%%PYTHON_SITELIBDIR%%/openid/extensions/sreg.pyc
+%%PYTHON_SITELIBDIR%%/openid/extensions/sreg.pyo
+%%PYTHON_SITELIBDIR%%/openid/fetchers.py
+%%PYTHON_SITELIBDIR%%/openid/fetchers.pyc
+%%PYTHON_SITELIBDIR%%/openid/fetchers.pyo
 %%PYTHON_SITELIBDIR%%/openid/kvform.py
 %%PYTHON_SITELIBDIR%%/openid/kvform.pyc
 %%PYTHON_SITELIBDIR%%/openid/kvform.pyo
+%%PYTHON_SITELIBDIR%%/openid/message.py
+%%PYTHON_SITELIBDIR%%/openid/message.pyc
+%%PYTHON_SITELIBDIR%%/openid/message.pyo
 %%PYTHON_SITELIBDIR%%/openid/oidutil.py
 %%PYTHON_SITELIBDIR%%/openid/oidutil.pyc
 %%PYTHON_SITELIBDIR%%/openid/oidutil.pyo
@@ -37,22 +58,66 @@
 %%PYTHON_SITELIBDIR%%/openid/server/trustroot.py
 %%PYTHON_SITELIBDIR%%/openid/server/trustroot.pyc
 %%PYTHON_SITELIBDIR%%/openid/server/trustroot.pyo
+%%PYTHON_SITELIBDIR%%/openid/sreg.py
+%%PYTHON_SITELIBDIR%%/openid/sreg.pyc
+%%PYTHON_SITELIBDIR%%/openid/sreg.pyo
 %%PYTHON_SITELIBDIR%%/openid/store/__init__.py
 %%PYTHON_SITELIBDIR%%/openid/store/__init__.pyc
 %%PYTHON_SITELIBDIR%%/openid/store/__init__.pyo
-%%PYTHON_SITELIBDIR%%/openid/store/dumbstore.py
-%%PYTHON_SITELIBDIR%%/openid/store/dumbstore.pyc
-%%PYTHON_SITELIBDIR%%/openid/store/dumbstore.pyo
 %%PYTHON_SITELIBDIR%%/openid/store/filestore.py
 %%PYTHON_SITELIBDIR%%/openid/store/filestore.pyc
 %%PYTHON_SITELIBDIR%%/openid/store/filestore.pyo
 %%PYTHON_SITELIBDIR%%/openid/store/interface.py
 %%PYTHON_SITELIBDIR%%/openid/store/interface.pyc
 %%PYTHON_SITELIBDIR%%/openid/store/interface.pyo
+%%PYTHON_SITELIBDIR%%/openid/store/memstore.py
+%%PYTHON_SITELIBDIR%%/openid/store/memstore.pyc
+%%PYTHON_SITELIBDIR%%/openid/store/memstore.pyo
+%%PYTHON_SITELIBDIR%%/openid/store/nonce.py
+%%PYTHON_SITELIBDIR%%/openid/store/nonce.pyc
+%%PYTHON_SITELIBDIR%%/openid/store/nonce.pyo
 %%PYTHON_SITELIBDIR%%/openid/store/sqlstore.py
 %%PYTHON_SITELIBDIR%%/openid/store/sqlstore.pyc
 %%PYTHON_SITELIBDIR%%/openid/store/sqlstore.pyo
+%%PYTHON_SITELIBDIR%%/openid/urinorm.py
+%%PYTHON_SITELIBDIR%%/openid/urinorm.pyc
+%%PYTHON_SITELIBDIR%%/openid/urinorm.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/__init__.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/__init__.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/__init__.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/accept.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/accept.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/accept.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/constants.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/constants.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/constants.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/discover.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/discover.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/discover.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/etxrd.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/etxrd.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/etxrd.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/filters.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/filters.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/filters.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/manager.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/manager.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/manager.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/parsehtml.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/parsehtml.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/parsehtml.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/services.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/services.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/services.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/xri.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/xri.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/xri.pyo
+%%PYTHON_SITELIBDIR%%/openid/yadis/xrires.py
+%%PYTHON_SITELIBDIR%%/openid/yadis/xrires.pyc
+%%PYTHON_SITELIBDIR%%/openid/yadis/xrires.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/openid/yadis
 @dirrm %%PYTHON_SITELIBDIR%%/openid/store
 @dirrm %%PYTHON_SITELIBDIR%%/openid/server
+@dirrm %%PYTHON_SITELIBDIR%%/openid/extensions
 @dirrm %%PYTHON_SITELIBDIR%%/openid/consumer
 @dirrm %%PYTHON_SITELIBDIR%%/openid