4 files changed, 32 insertions, 20 deletions

diff --git a/security/Makefile b/security/Makefile
index c144c4487ab8..ec14462a5416 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -547,6 +547,7 @@
     SUBDIR += pear-Auth
     SUBDIR += pear-Auth_HTTP
     SUBDIR += pear-Auth_OpenID
+    SUBDIR += pear-Auth_OpenID2
     SUBDIR += pear-Auth_PrefManager
     SUBDIR += pear-Auth_SASL
     SUBDIR += pear-Crypt_Blowfish
diff --git a/security/php-Auth_OpenID2/Makefile b/security/php-Auth_OpenID2/Makefile
index fb5ab08b64b5..7c023ce3eaad 100644
--- a/security/php-Auth_OpenID2/Makefile
+++ b/security/php-Auth_OpenID2/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	Auth_OpenID
-PORTVERSION=	1.2.3
+PORTNAME=	Auth_OpenID2
+PORTVERSION=	2.1.0
 CATEGORIES=	security www pear
 MASTER_SITES=	http://openidenabled.com/files/php-openid/packages/
 PKGNAMEPREFIX=	php-
@@ -27,7 +27,7 @@ OPTIONS=	BCMATH "Use bcmath instead of libgmp" off \
 		PGSQL "Use pgsql" off \
 		SQLITE "Use sqlite" off
 
-USE_PHP=	curl
+USE_PHP=	curl dom
 
 .include <bsd.port.pre.mk>
 
@@ -53,8 +53,8 @@ do-install:
 	${MKDIR} ${PREFIX}/share/pear/Auth/OpenID
 	${CP} ${WRKSRC}/Auth/OpenID.php ${PREFIX}/share/pear/Auth
 	${CP} ${WRKSRC}/Auth/OpenID/* ${PREFIX}/share/pear/Auth/OpenID
-	${MKDIR} ${PREFIX}/share/pear/Services/Yadis
-	${CP} ${WRKSRC}/Services/Yadis/* ${PREFIX}/share/pear/Services/Yadis
+	${MKDIR} ${PREFIX}/share/pear/Auth/Yadis
+	${CP} -R ${WRKSRC}/Auth/Yadis/* ${PREFIX}/share/pear/Auth/Yadis
 	${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
 
diff --git a/security/php-Auth_OpenID2/distinfo b/security/php-Auth_OpenID2/distinfo
index 6ac526f948e7..b6c3e83ca213 100644
--- a/security/php-Auth_OpenID2/distinfo
+++ b/security/php-Auth_OpenID2/distinfo
@@ -1,3 +1,3 @@
-MD5 (php-openid-1.2.3.tar.bz2) = 4591d6a2f5866f218682639f0f9c0f20
-SHA256 (php-openid-1.2.3.tar.bz2) = 84cda7ad1b2d0df78e20968602a53f9414b1767363b7fcc4f7160ca22e79ed8e
-SIZE (php-openid-1.2.3.tar.bz2) = 214325
+MD5 (php-openid-2.1.0.tar.bz2) = 16853f8cbbe6ceab93a66a0048f4d8e7
+SHA256 (php-openid-2.1.0.tar.bz2) = 0273a7f3fe2d9431fdbaa08dcfa8e1a5c73602192c678cba4d153d5100848023
+SIZE (php-openid-2.1.0.tar.bz2) = 308080
diff --git a/security/php-Auth_OpenID2/pkg-plist b/security/php-Auth_OpenID2/pkg-plist
index 805c02e9e1d3..c062a7cfff51 100644
--- a/security/php-Auth_OpenID2/pkg-plist
+++ b/security/php-Auth_OpenID2/pkg-plist
@@ -11,14 +11,18 @@
 %%EXAMPLESDIR%%/server/lib/render.php
 %%EXAMPLESDIR%%/server/lib/render/about.php
 %%EXAMPLESDIR%%/server/lib/render/login.php
-%%EXAMPLESDIR%%/server/lib/render/sites.php
 %%EXAMPLESDIR%%/server/lib/render/trust.php
+%%EXAMPLESDIR%%/server/lib/render/idpXrds.php
+%%EXAMPLESDIR%%/server/lib/render/idpage.php
+%%EXAMPLESDIR%%/server/lib/render/userXrds.php
 %%EXAMPLESDIR%%/server/lib/session.php
+%%EXAMPLESDIR%%/discover.php
 %%EXAMPLESDIR%%/server/openid-server.css
 %%EXAMPLESDIR%%/server/server.php
 %%EXAMPLESDIR%%/server/setup.php
 share/pear/Auth/OpenID.php
 share/pear/Auth/OpenID/Association.php
+share/pear/Auth/OpenID/AX.php
 share/pear/Auth/OpenID/BigMath.php
 share/pear/Auth/OpenID/Consumer.php
 share/pear/Auth/OpenID/CryptUtil.php
@@ -26,33 +30,40 @@ share/pear/Auth/OpenID/DatabaseConnection.php
 share/pear/Auth/OpenID/DiffieHellman.php
 share/pear/Auth/OpenID/Discover.php
 share/pear/Auth/OpenID/DumbStore.php
+share/pear/Auth/OpenID/Extension.php
 share/pear/Auth/OpenID/FileStore.php
 share/pear/Auth/OpenID/HMACSHA1.php
 share/pear/Auth/OpenID/Interface.php
 share/pear/Auth/OpenID/KVForm.php
+share/pear/Auth/OpenID/MemcachedStore.php
+share/pear/Auth/OpenID/Message.php
 share/pear/Auth/OpenID/MySQLStore.php
+share/pear/Auth/OpenID/Nonce.php
+share/pear/Auth/OpenID/PAPE.php
 share/pear/Auth/OpenID/Parse.php
 share/pear/Auth/OpenID/PostgreSQLStore.php
 share/pear/Auth/OpenID/SQLStore.php
 share/pear/Auth/OpenID/SQLiteStore.php
+share/pear/Auth/OpenID/SReg.php
 share/pear/Auth/OpenID/Server.php
 share/pear/Auth/OpenID/ServerRequest.php
 share/pear/Auth/OpenID/TrustRoot.php
 share/pear/Auth/OpenID/URINorm.php
-share/pear/Services/Yadis/HTTPFetcher.php
-share/pear/Services/Yadis/Manager.php
-share/pear/Services/Yadis/Misc.php
-share/pear/Services/Yadis/ParanoidHTTPFetcher.php
-share/pear/Services/Yadis/ParseHTML.php
-share/pear/Services/Yadis/PlainHTTPFetcher.php
-share/pear/Services/Yadis/XML.php
-share/pear/Services/Yadis/XRDS.php
-share/pear/Services/Yadis/XRI.php
-share/pear/Services/Yadis/XRIRes.php
-share/pear/Services/Yadis/Yadis.php
+share/pear/Auth/Yadis/HTTPFetcher.php
+share/pear/Auth/Yadis/Manager.php
+share/pear/Auth/Yadis/Misc.php
+share/pear/Auth/Yadis/ParanoidHTTPFetcher.php
+share/pear/Auth/Yadis/ParseHTML.php
+share/pear/Auth/Yadis/PlainHTTPFetcher.php
+share/pear/Auth/Yadis/XML.php
+share/pear/Auth/Yadis/XRDS.php
+share/pear/Auth/Yadis/XRI.php
+share/pear/Auth/Yadis/XRIRes.php
+share/pear/Auth/Yadis/Yadis.php
 @dirrmtry share/pear/Services/Yadis
 @dirrmtry share/pear/Services
 @dirrmtry share/pear/Auth/OpenID
+@dirrmtry share/pear/Auth/Yadis
 @dirrmtry share/pear/Auth
 @dirrmtry share/pear
 @dirrmtry %%EXAMPLESDIR%%/server/lib/render