Index: head/security/py-keyring/Makefile
===================================================================
--- head/security/py-keyring/Makefile	(revision 315938)
+++ head/security/py-keyring/Makefile	(revision 315939)
@@ -1,43 +1,42 @@
 # Created by: Douglas Thrift <douglas@douglasthrift.net>
 # $FreeBSD$
 
 PORTNAME=	keyring
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Store and access your passwords safely
 
 LICENSE=	PSFL
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner
 
 LATEST_LINK=	py-${PORTNAME}
 
 USE_ZIP=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
 OPTIONS_DEFINE=		CRYPT_FILE GNOME_KEYRING KDE_KWALLET
 GNOME_KEYRING_DESC=	GNOME Keyring backend
 KDE_KWALLET_DESC=	KDE KWallet backend
 CRYPT_FILE_DESC=	Crypt(ed) File backend
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCRYPT_FILE}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto
 .endif
 
 .if ${PORT_OPTIONS:MGNOME_KEYRING}
 USE_GNOME+=	pygnomedesktop
 .endif
 
 .if ${PORT_OPTIONS:MKDE_KWALLET}
 USE_KDE4+=	pykde4
 .endif
 
 .include <bsd.port.mk>
Index: head/security/py-keyring/distinfo
===================================================================
--- head/security/py-keyring/distinfo	(revision 315938)
+++ head/security/py-keyring/distinfo	(revision 315939)
@@ -1,2 +1,2 @@
-SHA256 (keyring-1.2.zip) = 1a4b17ade8ce4e21f8ffcd860afa99fc6c6732c55a65407432c98b4e2e0358be
-SIZE (keyring-1.2.zip) = 77251
+SHA256 (keyring-1.2.2.zip) = 20e4e34f15deca61d5a58edc1d2e5e3720cbdc340726d4918590036db6decfab
+SIZE (keyring-1.2.2.zip) = 79028
Index: head/security/py-keyring/pkg-plist
===================================================================
--- head/security/py-keyring/pkg-plist	(revision 315938)
+++ head/security/py-keyring/pkg-plist	(revision 315939)
@@ -1,116 +1,153 @@
 bin/keyring
 %%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/requires.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backend.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backend.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backend.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Gnome.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Gnome.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Gnome.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Google.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Google.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Google.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/OS_X.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/OS_X.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/OS_X.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/SecretService.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/SecretService.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/SecretService.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Windows.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Windows.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/Windows.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/_win_crypto.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/_win_crypto.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/_win_crypto.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/file.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/file.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/file.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/keyczar.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/keyczar.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/keyczar.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/kwallet.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/kwallet.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/kwallet.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/multi.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/multi.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/multi.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/pyfs.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/pyfs.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends/pyfs.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/cli.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/cli.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/cli.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/core.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/core.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/core.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/credentials.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/credentials.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/credentials.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/errors.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/errors.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/errors.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/getpassbackend.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/getpassbackend.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/getpassbackend.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py27compat.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py27compat.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py27compat.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Gnome.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Gnome.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Gnome.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Google.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Google.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Google.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_OS_X.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_OS_X.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_OS_X.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_SecretService.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_SecretService.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_SecretService.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Windows.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Windows.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_Windows.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_crypto.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_crypto.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_crypto.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_file.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_file.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_file.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_keyczar.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_keyczar.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_keyczar.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_kwallet.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_kwallet.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_kwallet.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_multi.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_multi.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_multi.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_pyfs.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_pyfs.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends/test_pyfs.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/mocks.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/mocks.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/mocks.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/py30compat.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/py30compat.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/py30compat.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_backend.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_backend.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_backend.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_cli.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_cli.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_cli.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_core.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_core.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_core.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_util.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/test_util.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/util.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/util.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/escape.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/escape.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/escape.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/platform.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/platform.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/platform.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/properties.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/properties.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util/properties.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/util
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/backends
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/backends
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%