aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsunpoet <sunpoet@FreeBSD.org>2012-06-19 17:00:36 +0800
committersunpoet <sunpoet@FreeBSD.org>2012-06-19 17:00:36 +0800
commit77cd2855475fa06848a7ce2164296ae172db63f7 (patch)
tree2dd4b46d5db4fad83ad846b180a6beaafa22be62
parentcedafdd846e6a6c87e09a9a80a5a7f0f14b7ea1c (diff)
downloadfreebsd-ports-gnome-77cd2855475fa06848a7ce2164296ae172db63f7.tar.gz
freebsd-ports-gnome-77cd2855475fa06848a7ce2164296ae172db63f7.tar.zst
freebsd-ports-gnome-77cd2855475fa06848a7ce2164296ae172db63f7.zip
- Update to 0.9.2
Changes: http://pypi.python.org/pypi/keyring#changes PR: ports/169232 Submitted by: Douglas Thrift <douglas@douglasthrift.net> (maintainer)
-rw-r--r--security/py-keyring/Makefile16
-rw-r--r--security/py-keyring/distinfo4
-rw-r--r--security/py-keyring/pkg-plist3
3 files changed, 16 insertions, 7 deletions
diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index 07827da95bab..a6d78243a5d4 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= keyring
-PORTVERSION= 0.9.1
+PORTVERSION= 0.9.2
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -22,13 +22,17 @@ USE_ZIP= yes
USE_PYTHON= 2.5+
USE_PYDISTUTILS= easy_install
-OPTIONS_DEFINE= CRYPT_FILE GNOME_KEYRING KDE_KWALLET
+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
@@ -37,8 +41,10 @@ USE_GNOME+= pygnomedesktop
USE_KDE4+= pykde4
.endif
-.if ${PORT_OPTIONS:MCRYPT_FILE}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MCRYPT_FILE} && ${PYTHON_VERSION} == "python2.5"
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.5:${PORTSDIR}/devel/py-simplejson
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/py-keyring/distinfo b/security/py-keyring/distinfo
index d45101b359f4..43ac50bffdda 100644
--- a/security/py-keyring/distinfo
+++ b/security/py-keyring/distinfo
@@ -1,2 +1,2 @@
-SHA256 (keyring-0.9.1.zip) = ef9fad76daeadd4ea2f8992e768d8dd873c812dd4c226cae1e64ccca4627377b
-SIZE (keyring-0.9.1.zip) = 46907
+SHA256 (keyring-0.9.2.zip) = 3495c72ec6fdefd6da3a7271acac89903e6ffdfb984a71a3e087c49538351c30
+SIZE (keyring-0.9.2.zip) = 49117
diff --git a/security/py-keyring/pkg-plist b/security/py-keyring/pkg-plist
index ea95635655cb..3b968ff20e99 100644
--- a/security/py-keyring/pkg-plist
+++ b/security/py-keyring/pkg-plist
@@ -31,6 +31,9 @@
%%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/tests/__init__.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.pyo