ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/pack/freebsd/diff/security/py-keyring/py-keyring.2011-08-07T025310Z.diff

Comparing:
freebsd/security/py-keyring.patch (file contents), Revision 370 by douglas, 2010-11-09T16:08:00-08:00 vs.
freebsd/diff/security/py-keyring/py-keyring.2011-08-07T02:53:10Z.diff (file contents), Revision 494 by douglas, 2012-02-19T14:53:40-08:00

#	Line 1 | Line 1
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 @@
2	>	--- /usr/ports/security/py-keyring/Makefile     2011-02-24 19:19:27.000000000 -0800
3	>	+++ py-keyring/Makefile 2011-08-06 19:51:45.527946436 -0700
4	>	@@ -6,8 +6,7 @@
5		#
6
7		PORTNAME=      keyring
8	<	-PORTVERSION=   0.4
9	<	+PORTVERSION=   0.5
8	>	-PORTVERSION=   0.5.1
9	>	-PORTREVISION=  1
10	>	+PORTVERSION=   0.6.2
11		CATEGORIES=    security python
12		MASTER_SITES=  CHEESESHOP
13		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>
14		diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
15	<	--- /usr/ports/security/py-keyring/distinfo     2010-09-14 00:58:31.000000000 -0700
16	<	+++ py-keyring/distinfo 2010-11-06 17:52:26.770158782 -0700
17	<	@@ -1,3 +1,2 @@
18	<	-MD5 (keyring-0.4.tar.gz) = f4c8fe1a3aa7236e437679d03f5f52c2
19	<	-SHA256 (keyring-0.4.tar.gz) = 01caeb7a388e13b9a93f9f8b912274e14a70c2882b0730ef6ead6303ec8f60be
20	<	-SIZE (keyring-0.4.tar.gz) = 19060
21	<	+SHA256 (keyring-0.5.tar.gz) = dd943b344f3f4748a12936337e1b974ce713cda177c7cdaeed2a1c912fe660c8
62	<	+SIZE (keyring-0.5.tar.gz) = 17491
15	>	--- /usr/ports/security/py-keyring/distinfo     2011-01-15 05:38:35.000000000 -0800
16	>	+++ py-keyring/distinfo 2011-08-06 18:16:46.397515038 -0700
17	>	@@ -1,2 +1,2 @@
18	>	-SHA256 (keyring-0.5.1.tar.gz) = b604aa35a488a726140033c0278ee419c1acd13d40905bb4c471c30378c04219
19	>	-SIZE (keyring-0.5.1.tar.gz) = 17928
20	>	+SHA256 (keyring-0.6.2.tar.gz) = 67958427296147bf66560627578857ad4202deca419576aacc2dd67939b17ef8
21	>	+SIZE (keyring-0.6.2.tar.gz) = 21765
22		diff -Nrux .svn -x work /usr/ports/security/py-keyring/pkg-plist py-keyring/pkg-plist
23	<	--- /usr/ports/security/py-keyring/pkg-plist    2010-09-14 00:58:31.000000000 -0700
24	<	+++ py-keyring/pkg-plist        2010-11-09 02:40:40.763097115 -0800
25	<	@@ -1,17 +1,21 @@
26	<	-%%GNOME_KEYRING%%%%PYTHON_SITELIBDIR%%/gnome_keyring.so
27	<	-%%KDE_KWALLET%%%%PYTHON_SITELIBDIR%%/kde_kwallet.so
28	<	%%PYTHON_SITELIBDIR%%/keyring/__init__.py
29	<	%%PYTHON_SITELIBDIR%%/keyring/__init__.pyc
30	<	%%PYTHON_SITELIBDIR%%/keyring/__init__.pyo
31	<	%%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
23	>	--- /usr/ports/security/py-keyring/pkg-plist    2010-11-11 03:57:40.000000000 -0800
24	>	+++ py-keyring/pkg-plist        2011-08-06 19:03:49.417293380 -0700
25	>	@@ -7,18 +7,27 @@
26	>	%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.py
27	>	%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyc
28	>	%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyo
29	>	+%%PYTHON_SITELIBDIR%%/keyring/cli.py
30	>	+%%PYTHON_SITELIBDIR%%/keyring/cli.pyc
31	>	+%%PYTHON_SITELIBDIR%%/keyring/cli.pyo
32		%%PYTHON_SITELIBDIR%%/keyring/core.py
33		%%PYTHON_SITELIBDIR%%/keyring/core.pyc
34		%%PYTHON_SITELIBDIR%%/keyring/core.pyo
35		%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.py
36		%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyc
37		%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyo
38	<	+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.py
39	<	+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyc
40	<	+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyo
38	>	+%%PYTHON_SITELIBDIR%%/keyring/http.py
39	>	+%%PYTHON_SITELIBDIR%%/keyring/http.pyc
40	>	+%%PYTHON_SITELIBDIR%%/keyring/http.pyo
41	>	%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.py
42	>	%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyc
43	>	%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyo
44		%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.py
45		%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyc
46		%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyo
47	<	@@ -27,6 +31,7 @@
48	<	%%PYTHON_SITELIBDIR%%/keyring/util/escape.py
49	<	%%PYTHON_SITELIBDIR%%/keyring/util/escape.pyc
50	<	%%PYTHON_SITELIBDIR%%/keyring/util/escape.pyo
51	<	+@dirrm %%PYTHON_SITELIBDIR%%/keyring/backends
52	<	@dirrm %%PYTHON_SITELIBDIR%%/keyring/tests
96	<	@dirrm %%PYTHON_SITELIBDIR%%/keyring/util
97	<	@dirrm %%PYTHON_SITELIBDIR%%/keyring
47	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_cli.py
48	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_cli.pyc
49	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_cli.pyo
50	>	%%PYTHON_SITELIBDIR%%/keyring/tests/test_core.py
51	>	%%PYTHON_SITELIBDIR%%/keyring/tests/test_core.pyc
52	>	%%PYTHON_SITELIBDIR%%/keyring/tests/test_core.pyo

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines