security/py-keyring/py-keyring.2010-11-10T000800Z.diff

diff -Nrux .svn -x work /usr/ports/security/py-keyring/Makefile py-keyring/Makefile
--- /usr/ports/security/py-keyring/Makefile     2010-09-14 00:58:31.000000000 -0700
+++ py-keyring/Makefile 2010-11-09 16:03:10.259699908 -0800
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=      keyring
-PORTVERSION=   0.4
+PORTVERSION=   0.5
 CATEGORIES=    security python
 MASTER_SITES=  CHEESESHOP
 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -21,6 +21,7 @@
 USE_KDE4=      #
 USE_PYTHON=    2.4+
 USE_PYDISTUTILS=       yes
+WANT_GNOME=    yes
 
 OPTIONS=       GNOME_KEYRING "GNOME Keyring backend" Off \
                KDE_KWALLET "KDE KWallet backend" Off
@@ -28,30 +29,11 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GNOME_KEYRING)
-LIB_DEPENDS+=  gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
-PLIST_SUB+=    GNOME_KEYRING=""
-.else
-PLIST_SUB+=    GNOME_KEYRING="@comment "
+USE_GNOME+=    pygnomedesktop
 .endif
 
 .if defined(WITH_KDE_KWALLET)
-PLIST_SUB+=    KDE_KWALLET=""
-USE_KDE4+=     kdelibs
-.else
-PLIST_SUB+=    KDE_KWALLET="@comment "
-.endif
-
-post-patch:
-.if !defined(WITH_GNOME_KEYRING)
-       @${REINPLACE_CMD} -e 's|exts\.append(gnome_keychain_module)|#&|' \
-               ${WRKSRC}/extensions.py
-.endif
-.if defined(WITH_KDE_KWALLET)
-       @${REINPLACE_CMD} -e 's|kde-config|${KDE4_PREFIX}/bin/kde4-config|' \
-               ${WRKSRC}/extensions.py
-.else
-       @${REINPLACE_CMD} -e 's|exts\.append(kde_kwallet_module)|#&|' \
-               ${WRKSRC}/extensions.py
+USE_KDE4+=     pykde4
 .endif
 
 .include <bsd.port.post.mk>
diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
--- /usr/ports/security/py-keyring/distinfo     2010-09-14 00:58:31.000000000 -0700
+++ py-keyring/distinfo 2010-11-06 17:52:26.770158782 -0700
@@ -1,3 +1,2 @@
-MD5 (keyring-0.4.tar.gz) = f4c8fe1a3aa7236e437679d03f5f52c2
-SHA256 (keyring-0.4.tar.gz) = 01caeb7a388e13b9a93f9f8b912274e14a70c2882b0730ef6ead6303ec8f60be
-SIZE (keyring-0.4.tar.gz) = 19060
+SHA256 (keyring-0.5.tar.gz) = dd943b344f3f4748a12936337e1b974ce713cda177c7cdaeed2a1c912fe660c8
+SIZE (keyring-0.5.tar.gz) = 17491
diff -Nrux .svn -x work /usr/ports/security/py-keyring/pkg-plist py-keyring/pkg-plist
--- /usr/ports/security/py-keyring/pkg-plist    2010-09-14 00:58:31.000000000 -0700
+++ py-keyring/pkg-plist        2010-11-09 02:40:40.763097115 -0800
@@ -1,17 +1,21 @@
-%%GNOME_KEYRING%%%%PYTHON_SITELIBDIR%%/gnome_keyring.so
-%%KDE_KWALLET%%%%PYTHON_SITELIBDIR%%/kde_kwallet.so
 %%PYTHON_SITELIBDIR%%/keyring/__init__.py
 %%PYTHON_SITELIBDIR%%/keyring/__init__.pyc
 %%PYTHON_SITELIBDIR%%/keyring/__init__.pyo
 %%PYTHON_SITELIBDIR%%/keyring/backend.py
 %%PYTHON_SITELIBDIR%%/keyring/backend.pyc
 %%PYTHON_SITELIBDIR%%/keyring/backend.pyo
+%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.py
+%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyc
+%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyo
 %%PYTHON_SITELIBDIR%%/keyring/core.py
 %%PYTHON_SITELIBDIR%%/keyring/core.pyc
 %%PYTHON_SITELIBDIR%%/keyring/core.pyo
 %%PYTHON_SITELIBDIR%%/keyring/getpassbackend.py
 %%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyc
 %%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyo
+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyo
 %%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.py
 %%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyc
 %%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyo
@@ -27,6 +31,7 @@
 %%PYTHON_SITELIBDIR%%/keyring/util/escape.py
 %%PYTHON_SITELIBDIR%%/keyring/util/escape.pyc
 %%PYTHON_SITELIBDIR%%/keyring/util/escape.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/keyring/backends
 @dirrm %%PYTHON_SITELIBDIR%%/keyring/tests
 @dirrm %%PYTHON_SITELIBDIR%%/keyring/util
 @dirrm %%PYTHON_SITELIBDIR%%/keyring
Revision:	497
Committed:	2012-02-19T17:36:49-08:00 (13 years, 4 months ago) by douglas
File size:	3659 byte(s)
Log Message:	Use ISO 8601 basic format instead of extended format since Windows is unhappy when I try to select a file with ':'s to attach in Thunderbird.
#	Content
1	diff -Nrux .svn -x work /usr/ports/security/py-keyring/Makefile py-keyring/Makefile
2	--- /usr/ports/security/py-keyring/Makefile 2010-09-14 00:58:31.000000000 -0700
3	+++ py-keyring/Makefile 2010-11-09 16:03:10.259699908 -0800
4	@@ -6,7 +6,7 @@
5	#
6
7	PORTNAME= keyring
8	-PORTVERSION= 0.4
9	+PORTVERSION= 0.5
10	CATEGORIES= security python
11	MASTER_SITES= CHEESESHOP
12	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
13	@@ -21,6 +21,7 @@
14	USE_KDE4= #
15	USE_PYTHON= 2.4+
16	USE_PYDISTUTILS= yes
17	+WANT_GNOME= yes
18
19	OPTIONS= GNOME_KEYRING "GNOME Keyring backend" Off \
20	KDE_KWALLET "KDE KWallet backend" Off
21	@@ -28,30 +29,11 @@
22	.include <bsd.port.pre.mk>
23
24	.if defined(WITH_GNOME_KEYRING)
25	-LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
26	-PLIST_SUB+= GNOME_KEYRING=""
27	-.else
28	-PLIST_SUB+= GNOME_KEYRING="@comment "
29	+USE_GNOME+= pygnomedesktop
30	.endif
31
32	.if defined(WITH_KDE_KWALLET)
33	-PLIST_SUB+= KDE_KWALLET=""
34	-USE_KDE4+= kdelibs
35	-.else
36	-PLIST_SUB+= KDE_KWALLET="@comment "
37	-.endif
38	-
39	-post-patch:
40	-.if !defined(WITH_GNOME_KEYRING)
41	- @${REINPLACE_CMD} -e 's\|exts\.append(gnome_keychain_module)\|#&\|' \
42	- ${WRKSRC}/extensions.py
43	-.endif
44	-.if defined(WITH_KDE_KWALLET)
45	- @${REINPLACE_CMD} -e 's\|kde-config\|${KDE4_PREFIX}/bin/kde4-config\|' \
46	- ${WRKSRC}/extensions.py
47	-.else
48	- @${REINPLACE_CMD} -e 's\|exts\.append(kde_kwallet_module)\|#&\|' \
49	- ${WRKSRC}/extensions.py
50	+USE_KDE4+= pykde4
51	.endif
52
53	.include <bsd.port.post.mk>
54	diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
55	--- /usr/ports/security/py-keyring/distinfo 2010-09-14 00:58:31.000000000 -0700
56	+++ py-keyring/distinfo 2010-11-06 17:52:26.770158782 -0700
57	@@ -1,3 +1,2 @@
58	-MD5 (keyring-0.4.tar.gz) = f4c8fe1a3aa7236e437679d03f5f52c2
59	-SHA256 (keyring-0.4.tar.gz) = 01caeb7a388e13b9a93f9f8b912274e14a70c2882b0730ef6ead6303ec8f60be
60	-SIZE (keyring-0.4.tar.gz) = 19060
61	+SHA256 (keyring-0.5.tar.gz) = dd943b344f3f4748a12936337e1b974ce713cda177c7cdaeed2a1c912fe660c8
62	+SIZE (keyring-0.5.tar.gz) = 17491
63	diff -Nrux .svn -x work /usr/ports/security/py-keyring/pkg-plist py-keyring/pkg-plist
64	--- /usr/ports/security/py-keyring/pkg-plist 2010-09-14 00:58:31.000000000 -0700
65	+++ py-keyring/pkg-plist 2010-11-09 02:40:40.763097115 -0800
66	@@ -1,17 +1,21 @@
67	-%%GNOME_KEYRING%%%%PYTHON_SITELIBDIR%%/gnome_keyring.so
68	-%%KDE_KWALLET%%%%PYTHON_SITELIBDIR%%/kde_kwallet.so
69	%%PYTHON_SITELIBDIR%%/keyring/__init__.py
70	%%PYTHON_SITELIBDIR%%/keyring/__init__.pyc
71	%%PYTHON_SITELIBDIR%%/keyring/__init__.pyo
72	%%PYTHON_SITELIBDIR%%/keyring/backend.py
73	%%PYTHON_SITELIBDIR%%/keyring/backend.pyc
74	%%PYTHON_SITELIBDIR%%/keyring/backend.pyo
75	+%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.py
76	+%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyc
77	+%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyo
78	%%PYTHON_SITELIBDIR%%/keyring/core.py
79	%%PYTHON_SITELIBDIR%%/keyring/core.pyc
80	%%PYTHON_SITELIBDIR%%/keyring/core.pyo
81	%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.py
82	%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyc
83	%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyo
84	+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.py
85	+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyc
86	+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyo
87	%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.py
88	%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyc
89	%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyo
90	@@ -27,6 +31,7 @@
91	%%PYTHON_SITELIBDIR%%/keyring/util/escape.py
92	%%PYTHON_SITELIBDIR%%/keyring/util/escape.pyc
93	%%PYTHON_SITELIBDIR%%/keyring/util/escape.pyo
94	+@dirrm %%PYTHON_SITELIBDIR%%/keyring/backends
95	@dirrm %%PYTHON_SITELIBDIR%%/keyring/tests
96	@dirrm %%PYTHON_SITELIBDIR%%/keyring/util
97	@dirrm %%PYTHON_SITELIBDIR%%/keyring