3 files changed, 35 insertions, 33 deletions

diff --git a/security/php-Auth_OpenID2/Makefile b/security/php-Auth_OpenID2/Makefile
index 7c023ce3eaad..fb1cdf973096 100644
--- a/security/php-Auth_OpenID2/Makefile
+++ b/security/php-Auth_OpenID2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Auth_OpenID2
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.2
 CATEGORIES=	security www pear
 MASTER_SITES=	http://openidenabled.com/files/php-openid/packages/
 PKGNAMEPREFIX=	php-
@@ -55,7 +55,9 @@ do-install:
 	${CP} ${WRKSRC}/Auth/OpenID/* ${PREFIX}/share/pear/Auth/OpenID
 	${MKDIR} ${PREFIX}/share/pear/Auth/Yadis
 	${CP} -R ${WRKSRC}/Auth/Yadis/* ${PREFIX}/share/pear/Auth/Yadis
+.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/security/php-Auth_OpenID2/distinfo b/security/php-Auth_OpenID2/distinfo
index b6c3e83ca213..97f272b3799f 100644
--- a/security/php-Auth_OpenID2/distinfo
+++ b/security/php-Auth_OpenID2/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (php-openid-2.1.2.tar.bz2) = 26b96fa2cfa18e7ebc4532bafe6e75c2
+SHA256 (php-openid-2.1.2.tar.bz2) = bb6281b7926e66d201df55fd424d10660f6aa45406b0e1791093e065feb48204
+SIZE (php-openid-2.1.2.tar.bz2) = 311216
diff --git a/security/php-Auth_OpenID2/pkg-plist b/security/php-Auth_OpenID2/pkg-plist
index c062a7cfff51..3102029bffe1 100644
--- a/security/php-Auth_OpenID2/pkg-plist
+++ b/security/php-Auth_OpenID2/pkg-plist
@@ -1,28 +1,28 @@
 @comment $FreeBSD$
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/consumer/common.php
-%%EXAMPLESDIR%%/consumer/finish_auth.php
-%%EXAMPLESDIR%%/consumer/index.php
-%%EXAMPLESDIR%%/consumer/try_auth.php
-%%EXAMPLESDIR%%/detect.php
-%%EXAMPLESDIR%%/server/index.php
-%%EXAMPLESDIR%%/server/lib/actions.php
-%%EXAMPLESDIR%%/server/lib/common.php
-%%EXAMPLESDIR%%/server/lib/render.php
-%%EXAMPLESDIR%%/server/lib/render/about.php
-%%EXAMPLESDIR%%/server/lib/render/login.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
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/consumer/common.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/consumer/finish_auth.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/consumer/index.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/consumer/try_auth.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/detect.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/discover.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/index.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/lib/actions.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/lib/common.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/lib/render.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/lib/render/about.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/lib/render/idpXrds.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/lib/render/idpage.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/lib/render/login.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/lib/render/trust.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/lib/render/userXrds.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/lib/session.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/openid-server.css
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server/server.php
+%%PORTEXAMPLES%%%%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/Association.php
 share/pear/Auth/OpenID/BigMath.php
 share/pear/Auth/OpenID/Consumer.php
 share/pear/Auth/OpenID/CryptUtil.php
@@ -32,7 +32,7 @@ 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/HMAC.php
 share/pear/Auth/OpenID/Interface.php
 share/pear/Auth/OpenID/KVForm.php
 share/pear/Auth/OpenID/MemcachedStore.php
@@ -62,12 +62,12 @@ 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/OpenID
 @dirrmtry share/pear/Auth
 @dirrmtry share/pear
-@dirrmtry %%EXAMPLESDIR%%/server/lib/render
-@dirrmtry %%EXAMPLESDIR%%/server/lib
-@dirrmtry %%EXAMPLESDIR%%/server
-@dirrmtry %%EXAMPLESDIR%%/consumer
-@dirrmtry %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/server/lib/render
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/server/lib
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/server
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/consumer
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%