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.
Revision 140 by douglas, 2009-11-21T02:08:51-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 @@
5	<	#
6	<
7	<	PORTNAME=      keyring
8	<	-PORTVERSION=   0.1
9	<	+PORTVERSION=   0.2
2	>	--- /usr/ports/security/py-keyring/Makefile     2009-10-02 20:13:10.000000000 -0700
3	>	+++ py-keyring/Makefile 2009-11-21 02:07:15.650751351 -0800
4	>	@@ -9,6 +9,7 @@
5	>	PORTVERSION=   0.2
6		CATEGORIES=    security python
7		MASTER_SITES=  CHEESESHOP \
8	+	+               http://apt.douglasthrift.net/files/${PORTNAME}/ \
9		http://code.douglasthrift.net/files/${PORTNAME}/
10	<	@@ -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
10	>	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
11
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)|#&|' \
31	–	diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
32	–	--- /usr/ports/security/py-keyring/distinfo     2009-09-04 14:04:44.000000000 -0700
33	–	+++ py-keyring/distinfo 2009-09-13 12:49:26.000000000 -0700
34	–	@@ -1,3 +1,3 @@
35	–	-MD5 (keyring-0.1.tar.gz) = e593725919ed00a631c4348d08c77f56
36	–	-SHA256 (keyring-0.1.tar.gz) = c5e19bfd138034a8d3193a5c5314493e51a90a0c4bb78db87c0a0451aa7327a8
37	–	-SIZE (keyring-0.1.tar.gz) = 14468
38	–	+MD5 (keyring-0.2.tar.gz) = 4a640c4d41c6aa702cf6122d1a22ece3
39	–	+SHA256 (keyring-0.2.tar.gz) = 05585abc75f50e625f46d90c07f7707da19050ddc2a89dfe92081a3ed0328f13
40	–	+SIZE (keyring-0.2.tar.gz) = 14836
41	–	diff -Nrux .svn -x work /usr/ports/security/py-keyring/files/patch-extensions.py py-keyring/files/patch-extensions.py
42	–	--- /usr/ports/security/py-keyring/files/patch-extensions.py    2009-09-04 14:04:44.000000000 -0700
43	–	+++ py-keyring/files/patch-extensions.py        1969-12-31 16:00:00.000000000 -0800
44	–	@@ -1,14 +0,0 @@
45	–	---- extensions.py.orig 2009-08-21 09:34:01.000000000 -0700
46	–	-+++ extensions.py      2009-09-03 15:43:41.224189815 -0700
47	–	-@@ -42,9 +42,9 @@
48	–	-
49	–	-     keywords.setdefault('libraries', []).append('kdeui')
50	–	-     libs = commands.getoutput("kde4-config --path lib").split(':')
51	–	--    if len(libs) == 0:
52	–	--        libs = commands.getoutput("kde-config --path lib").split(':')
53	–	-     keywords.setdefault('library_dirs', []).extend(libs)
54	–	-+    includes = commands.getoutput("kde4-config --install include").split(':')
55	–	-+    keywords.setdefault('include_dirs', []).extend(includes)
56	–	-     return keywords
57	–	-
58	–	- def get_extensions():

Diff Legend

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