ViewVC Help

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

root/pack/freebsd/diff/security/py-keyring/py-keyring.2010-09-13T090751Z.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.2010-09-13T090751Z.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
2	>	--- /usr/ports/security/py-keyring/Makefile     2010-08-10 21:11:45.000000000 -0700
3	>	+++ py-keyring/Makefile 2010-09-13 02:06:25.901985332 -0700
4		@@ -6,7 +6,7 @@
5		#
6
7		PORTNAME=      keyring
8	<	-PORTVERSION=   0.1
9	<	+PORTVERSION=   0.2
8	>	-PORTVERSION=   0.3
9	>	+PORTVERSION=   0.4
10		CATEGORIES=    security python
11	<	MASTER_SITES=  CHEESESHOP \
12	<	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)|#&|' \
11	>	MASTER_SITES=  CHEESESHOP
12	>	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
13		diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
14	<	--- /usr/ports/security/py-keyring/distinfo     2009-09-04 14:04:44.000000000 -0700
15	<	+++ py-keyring/distinfo 2009-09-13 12:49:26.000000000 -0700
14	>	--- /usr/ports/security/py-keyring/distinfo     2010-08-10 21:11:45.000000000 -0700
15	>	+++ py-keyring/distinfo 2010-09-12 16:57:32.022286855 -0700
16		@@ -1,3 +1,3 @@
17	<	-MD5 (keyring-0.1.tar.gz) = e593725919ed00a631c4348d08c77f56
18	<	-SHA256 (keyring-0.1.tar.gz) = c5e19bfd138034a8d3193a5c5314493e51a90a0c4bb78db87c0a0451aa7327a8
19	<	-SIZE (keyring-0.1.tar.gz) = 14468
20	<	+MD5 (keyring-0.2.tar.gz) = 4a640c4d41c6aa702cf6122d1a22ece3
21	<	+SHA256 (keyring-0.2.tar.gz) = 05585abc75f50e625f46d90c07f7707da19050ddc2a89dfe92081a3ed0328f13
22	<	+SIZE (keyring-0.2.tar.gz) = 14836
23	<	diff -Nrux .svn -x work /usr/ports/security/py-keyring/files/patch-extensions.py py-keyring/files/patch-extensions.py
24	<	--- /usr/ports/security/py-keyring/files/patch-extensions.py    2009-09-04 14:04:44.000000000 -0700
25	<	+++ py-keyring/files/patch-extensions.py        1969-12-31 16:00:00.000000000 -0800
26	<	@@ -1,14 +0,0 @@
27	<	---- extensions.py.orig 2009-08-21 09:34:01.000000000 -0700
28	<	-+++ extensions.py      2009-09-03 15:43:41.224189815 -0700
29	<	-@@ -42,9 +42,9 @@
30	<	-
31	<	-     keywords.setdefault('libraries', []).append('kdeui')
32	<	-     libs = commands.getoutput("kde4-config --path lib").split(':')
33	<	--    if len(libs) == 0:
34	<	--        libs = commands.getoutput("kde-config --path lib").split(':')
35	<	-     keywords.setdefault('library_dirs', []).extend(libs)
36	<	-+    includes = commands.getoutput("kde4-config --install include").split(':')
37	<	-+    keywords.setdefault('include_dirs', []).extend(includes)
38	<	-     return keywords
39	<	-
40	<	- def get_extensions():
17	>	-MD5 (keyring-0.3.tar.gz) = de2dc78e97a110f7e21369c5ddb65712
18	>	-SHA256 (keyring-0.3.tar.gz) = bb9fcb99dbf5d89a9ca242def888810b6bbd7b3d08486c8f85750a38e7d71d84
19	>	-SIZE (keyring-0.3.tar.gz) = 18937
20	>	+MD5 (keyring-0.4.tar.gz) = f4c8fe1a3aa7236e437679d03f5f52c2
21	>	+SHA256 (keyring-0.4.tar.gz) = 01caeb7a388e13b9a93f9f8b912274e14a70c2882b0730ef6ead6303ec8f60be
22	>	+SIZE (keyring-0.4.tar.gz) = 19060
23	>	diff -Nrux .svn -x work /usr/ports/security/py-keyring/pkg-plist py-keyring/pkg-plist
24	>	--- /usr/ports/security/py-keyring/pkg-plist    2010-08-10 21:11:45.000000000 -0700
25	>	+++ py-keyring/pkg-plist        2010-09-12 17:47:01.589216921 -0700
26	>	@@ -12,4 +12,21 @@
27	>	%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.py
28	>	%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyc
29	>	%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyo
30	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.py
31	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyc
32	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyo
33	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_core.py
34	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_core.pyc
35	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_core.pyo
36	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_util.py
37	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_util.pyc
38	>	+%%PYTHON_SITELIBDIR%%/keyring/tests/test_util.pyo
39	>	+%%PYTHON_SITELIBDIR%%/keyring/util/__init__.py
40	>	+%%PYTHON_SITELIBDIR%%/keyring/util/__init__.pyc
41	>	+%%PYTHON_SITELIBDIR%%/keyring/util/__init__.pyo
42	>	+%%PYTHON_SITELIBDIR%%/keyring/util/escape.py
43	>	+%%PYTHON_SITELIBDIR%%/keyring/util/escape.pyc
44	>	+%%PYTHON_SITELIBDIR%%/keyring/util/escape.pyo
45	>	+@dirrm %%PYTHON_SITELIBDIR%%/keyring/tests
46	>	+@dirrm %%PYTHON_SITELIBDIR%%/keyring/util
47	>	@dirrm %%PYTHON_SITELIBDIR%%/keyring

Diff Legend

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