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.
Revision 338 by douglas, 2010-08-10T12:41:39-07: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     2009-11-21 07:48:35.000000000 -0800
3	>	+++ py-keyring/Makefile 2010-08-10 12:33:43.339166735 -0700
4	>	@@ -6,16 +6,16 @@
5		#
6
7		PORTNAME=      keyring
8	<	-PORTVERSION=   0.1
9	<	+PORTVERSION=   0.2
8	>	-PORTVERSION=   0.2
9	>	+PORTVERSION=   0.3
10		CATEGORIES=    security python
11	<	MASTER_SITES=  CHEESESHOP \
12	<	http://code.douglasthrift.net/files/${PORTNAME}/
13	<	@@ -18,7 +18,7 @@
11	>	-MASTER_SITES=  CHEESESHOP \
12	>	-               http://apt.douglasthrift.net/files/${PORTNAME}/ \
13	>	-               http://code.douglasthrift.net/files/${PORTNAME}/
14	>	+MASTER_SITES=  CHEESESHOP
15	>	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
16	>
17	>	MAINTAINER=    douglas@douglasthrift.net
18	>	COMMENT=       Store and access your passwords safely
19	>
20	>	+#LICENSE=      PSF
21	>	+
22		LATEST_LINK=   py-${PORTNAME}
23
24		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)|#&|' \
25		diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
26	<	--- /usr/ports/security/py-keyring/distinfo     2009-09-04 14:04:44.000000000 -0700
27	<	+++ py-keyring/distinfo 2009-09-13 12:49:26.000000000 -0700
26	>	--- /usr/ports/security/py-keyring/distinfo     2009-10-02 20:13:10.000000000 -0700
27	>	+++ py-keyring/distinfo 2010-08-10 12:17:57.959919287 -0700
28		@@ -1,3 +1,3 @@
29	<	-MD5 (keyring-0.1.tar.gz) = e593725919ed00a631c4348d08c77f56
30	<	-SHA256 (keyring-0.1.tar.gz) = c5e19bfd138034a8d3193a5c5314493e51a90a0c4bb78db87c0a0451aa7327a8
31	<	-SIZE (keyring-0.1.tar.gz) = 14468
32	<	+MD5 (keyring-0.2.tar.gz) = 4a640c4d41c6aa702cf6122d1a22ece3
33	<	+SHA256 (keyring-0.2.tar.gz) = 05585abc75f50e625f46d90c07f7707da19050ddc2a89dfe92081a3ed0328f13
34	<	+SIZE (keyring-0.2.tar.gz) = 14836
35	<	diff -Nrux .svn -x work /usr/ports/security/py-keyring/files/patch-extensions.py py-keyring/files/patch-extensions.py
36	<	--- /usr/ports/security/py-keyring/files/patch-extensions.py    2009-09-04 14:04:44.000000000 -0700
37	<	+++ py-keyring/files/patch-extensions.py        1969-12-31 16:00:00.000000000 -0800
38	<	@@ -1,14 +0,0 @@
39	<	---- extensions.py.orig 2009-08-21 09:34:01.000000000 -0700
40	<	-+++ extensions.py      2009-09-03 15:43:41.224189815 -0700
41	<	-@@ -42,9 +42,9 @@
42	<	-
43	<	-     keywords.setdefault('libraries', []).append('kdeui')
44	<	-     libs = commands.getoutput("kde4-config --path lib").split(':')
45	<	--    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():
29	>	-MD5 (keyring-0.2.tar.gz) = 4a640c4d41c6aa702cf6122d1a22ece3
30	>	-SHA256 (keyring-0.2.tar.gz) = 05585abc75f50e625f46d90c07f7707da19050ddc2a89dfe92081a3ed0328f13
31	>	-SIZE (keyring-0.2.tar.gz) = 14836
32	>	+MD5 (keyring-0.3.tar.gz) = de2dc78e97a110f7e21369c5ddb65712
33	>	+SHA256 (keyring-0.3.tar.gz) = bb9fcb99dbf5d89a9ca242def888810b6bbd7b3d08486c8f85750a38e7d71d84
34	>	+SIZE (keyring-0.3.tar.gz) = 18937
35	>	diff -Nrux .svn -x work /usr/ports/security/py-keyring/pkg-plist py-keyring/pkg-plist
36	>	--- /usr/ports/security/py-keyring/pkg-plist    2009-09-04 14:04:44.000000000 -0700
37	>	+++ py-keyring/pkg-plist        2010-08-10 12:22:47.177547027 -0700
38	>	@@ -9,4 +9,7 @@
39	>	%%PYTHON_SITELIBDIR%%/keyring/core.py
40	>	%%PYTHON_SITELIBDIR%%/keyring/core.pyc
41	>	%%PYTHON_SITELIBDIR%%/keyring/core.pyo
42	>	+%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.py
43	>	+%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyc
44	>	+%%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyo
45	>	@dirrm %%PYTHON_SITELIBDIR%%/keyring

Diff Legend

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