| 1 |
diff -Nrux .svn -x work /usr/ports/security/py-keyring/Makefile py-keyring/Makefile |
| 2 |
--- /usr/ports/security/py-keyring/Makefile 2012-06-17 18:20:15.000000000 -0700 |
| 3 |
+++ py-keyring/Makefile 2012-06-18 13:39:26.000000000 -0700 |
| 4 |
@@ -6,7 +6,7 @@ |
| 5 |
# |
| 6 |
|
| 7 |
PORTNAME= keyring |
| 8 |
-PORTVERSION= 0.9.1 |
| 9 |
+PORTVERSION= 0.9.2 |
| 10 |
CATEGORIES= security python |
| 11 |
MASTER_SITES= CHEESESHOP |
| 12 |
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} |
| 13 |
@@ -22,12 +22,12 @@ |
| 14 |
USE_PYTHON= 2.5+ |
| 15 |
USE_PYDISTUTILS= easy_install |
| 16 |
|
| 17 |
-OPTIONS_DEFINE= CRYPT_FILE GNOME_KEYRING KDE_KWALLET |
| 18 |
+OPTIONS_DEFINE= CRYPT_FILE GNOME_KEYRING KDE_KWALLET |
| 19 |
GNOME_KEYRING_DESC= GNOME Keyring backend |
| 20 |
KDE_KWALLET_DESC= KDE KWallet backend |
| 21 |
CRYPT_FILE_DESC= Crypt(ed) File backend |
| 22 |
|
| 23 |
-.include <bsd.port.options.mk> |
| 24 |
+.include <bsd.port.pre.mk> |
| 25 |
|
| 26 |
.if ${PORT_OPTIONS:MGNOME_KEYRING} |
| 27 |
USE_GNOME+= pygnomedesktop |
| 28 |
@@ -39,6 +39,9 @@ |
| 29 |
|
| 30 |
.if ${PORT_OPTIONS:MCRYPT_FILE} |
| 31 |
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto |
| 32 |
+.if ${PYTHON_VERSION} == "python2.5" |
| 33 |
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.5:${PORTSDIR}/devel/py-simplejson |
| 34 |
+.endif |
| 35 |
.endif |
| 36 |
|
| 37 |
-.include <bsd.port.mk> |
| 38 |
+.include <bsd.port.post.mk> |
| 39 |
diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo |
| 40 |
--- /usr/ports/security/py-keyring/distinfo 2012-06-17 18:20:15.000000000 -0700 |
| 41 |
+++ py-keyring/distinfo 2012-06-18 13:20:14.000000000 -0700 |
| 42 |
@@ -1,2 +1,2 @@ |
| 43 |
-SHA256 (keyring-0.9.1.zip) = ef9fad76daeadd4ea2f8992e768d8dd873c812dd4c226cae1e64ccca4627377b |
| 44 |
-SIZE (keyring-0.9.1.zip) = 46907 |
| 45 |
+SHA256 (keyring-0.9.2.zip) = 3495c72ec6fdefd6da3a7271acac89903e6ffdfb984a71a3e087c49538351c30 |
| 46 |
+SIZE (keyring-0.9.2.zip) = 49117 |
| 47 |
diff -Nrux .svn -x work /usr/ports/security/py-keyring/pkg-plist py-keyring/pkg-plist |
| 48 |
--- /usr/ports/security/py-keyring/pkg-plist 2012-03-02 10:47:43.000000000 -0800 |
| 49 |
+++ py-keyring/pkg-plist 2012-06-18 13:22:51.000000000 -0700 |
| 50 |
@@ -31,6 +31,9 @@ |
| 51 |
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.py |
| 52 |
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.pyc |
| 53 |
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.pyo |
| 54 |
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.py |
| 55 |
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.pyc |
| 56 |
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.pyo |
| 57 |
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.py |
| 58 |
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.pyc |
| 59 |
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.pyo |
