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 122 by douglas, 2009-09-13T13:29:16-07:00 vs.
freebsd/diff/security/py-keyring/py-keyring.2011-08-07T025310Z.diff (file contents), Revision 497 by douglas, 2012-02-19T17:36:49-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     2009-09-04 14:04:44.000000000 -0700
3	<	+++ py-keyring/Makefile 2009-09-13 13:28:25.000000000 -0700
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.1
9	<	+PORTVERSION=   0.2
8	>	-PORTVERSION=   0.5.1
9	>	-PORTREVISION=  1
10	>	+PORTVERSION=   0.6.2
11		CATEGORIES=    security python
12	<	MASTER_SITES=  CHEESESHOP \
13	<	http://code.douglasthrift.net/files/${PORTNAME}/
13	<	@@ -18,7 +18,7 @@
14	<	LATEST_LINK=   py-${PORTNAME}
15	<
16	<	USE_KDE4=      #
17	<	-USE_PYTHON=    2.6+
18	<	+USE_PYTHON=    2.4+
19	<	USE_PYDISTUTILS=       yes
20	<
21	<	OPTIONS=       GNOME_KEYRING "GNOME Keyring backend" Off \
22	<	@@ -46,7 +46,7 @@
23	<	${WRKSRC}/extensions.py
24	<	.endif
25	<	.if defined(WITH_KDE_KWALLET)
26	<	-       @${REINPLACE_CMD} -e 's|kde4-config|${KDE4_PREFIX}/bin/kde4-config|' \
27	<	+       @${REINPLACE_CMD} -e 's|kde-config|${KDE4_PREFIX}/bin/kde4-config|' \
28	<	${WRKSRC}/extensions.py
29	<	.else
30	<	@${REINPLACE_CMD} -e 's|exts\.append(kde_kwallet_module)|#&|' \
12	>	MASTER_SITES=  CHEESESHOP
13	>	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
14		diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
15	<	--- /usr/ports/security/py-keyring/distinfo     2009-09-04 14:04:44.000000000 -0700
16	<	+++ py-keyring/distinfo 2009-09-13 12:49:26.000000000 -0700
17	<	@@ -1,3 +1,3 @@
18	<	-MD5 (keyring-0.1.tar.gz) = e593725919ed00a631c4348d08c77f56
19	<	-SHA256 (keyring-0.1.tar.gz) = c5e19bfd138034a8d3193a5c5314493e51a90a0c4bb78db87c0a0451aa7327a8
20	<	-SIZE (keyring-0.1.tar.gz) = 14468
21	<	+MD5 (keyring-0.2.tar.gz) = 4a640c4d41c6aa702cf6122d1a22ece3
22	<	+SHA256 (keyring-0.2.tar.gz) = 05585abc75f50e625f46d90c07f7707da19050ddc2a89dfe92081a3ed0328f13
23	<	+SIZE (keyring-0.2.tar.gz) = 14836
24	<	diff -Nrux .svn -x work /usr/ports/security/py-keyring/files/patch-extensions.py py-keyring/files/patch-extensions.py
25	<	--- /usr/ports/security/py-keyring/files/patch-extensions.py    2009-09-04 14:04:44.000000000 -0700
26	<	+++ py-keyring/files/patch-extensions.py        1969-12-31 16:00:00.000000000 -0800
27	<	@@ -1,14 +0,0 @@
28	<	---- extensions.py.orig 2009-08-21 09:34:01.000000000 -0700
29	<	-+++ extensions.py      2009-09-03 15:43:41.224189815 -0700
30	<	-@@ -42,9 +42,9 @@
31	<	-
32	<	-     keywords.setdefault('libraries', []).append('kdeui')
33	<	-     libs = commands.getoutput("kde4-config --path lib").split(':')
34	<	--    if len(libs) == 0:
35	<	--        libs = commands.getoutput("kde-config --path lib").split(':')
36	<	-     keywords.setdefault('library_dirs', []).extend(libs)
37	<	-+    includes = commands.getoutput("kde4-config --install include").split(':')
38	<	-+    keywords.setdefault('include_dirs', []).extend(includes)
39	<	-     return keywords
40	<	-
41	<	- def get_extensions():
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-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/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	>	+%%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