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 380 by douglas, 2011-01-14T18:29:32-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-11-11 03:57:40.000000000 -0800
3	>	+++ py-keyring/Makefile 2011-01-14 18:25:56.000000000 -0800
4		@@ -6,7 +6,7 @@
5		#
6
7		PORTNAME=      keyring
8	<	-PORTVERSION=   0.1
9	<	+PORTVERSION=   0.2
8	>	-PORTVERSION=   0.5
9	>	+PORTVERSION=   0.5.1
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	>	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
13	>	@@ -14,19 +14,17 @@
14	>	MAINTAINER=    douglas@douglasthrift.net
15	>	COMMENT=       Store and access your passwords safely
16	>
17	>	-#LICENSE=      PSF
18	>	+LICENSE=       PSFL
19	>
20		LATEST_LINK=   py-${PORTNAME}
21
22	<	USE_KDE4=      #
23	<	-USE_PYTHON=    2.6+
18	<	+USE_PYTHON=    2.4+
22	>	-USE_KDE4=      #
23	>	USE_PYTHON=    2.4+
24		USE_PYDISTUTILS=       yes
25	+	-WANT_GNOME=    yes
26
27		OPTIONS=       GNOME_KEYRING "GNOME Keyring backend" Off \
28	<	@@ -46,7 +46,7 @@
29	<	${WRKSRC}/extensions.py
28	>	KDE_KWALLET "KDE KWallet backend" Off
29	>
30	>	-.include <bsd.port.pre.mk>
31	>	+.include <bsd.port.options.mk>
32	>
33	>	.if defined(WITH_GNOME_KEYRING)
34	>	USE_GNOME+=    pygnomedesktop
35	>	@@ -36,4 +34,4 @@
36	>	USE_KDE4+=     pykde4
37		.endif
38	<	.if defined(WITH_KDE_KWALLET)
39	<	-       @${REINPLACE_CMD} -e 's|kde4-config|${KDE4_PREFIX}/bin/kde4-config|' \
40	<	+       @${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)|#&|' \
38	>
39	>	-.include <bsd.port.post.mk>
40	>	+.include <bsd.port.mk>
41		diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
42	<	--- /usr/ports/security/py-keyring/distinfo     2009-09-04 14:04:44.000000000 -0700
43	<	+++ py-keyring/distinfo 2009-09-13 12:49:26.000000000 -0700
44	<	@@ -1,3 +1,3 @@
45	<	-MD5 (keyring-0.1.tar.gz) = e593725919ed00a631c4348d08c77f56
46	<	-SHA256 (keyring-0.1.tar.gz) = c5e19bfd138034a8d3193a5c5314493e51a90a0c4bb78db87c0a0451aa7327a8
47	<	-SIZE (keyring-0.1.tar.gz) = 14468
48	<	+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():
42	>	--- /usr/ports/security/py-keyring/distinfo     2010-11-11 03:57:40.000000000 -0800
43	>	+++ py-keyring/distinfo 2011-01-14 18:16:44.000000000 -0800
44	>	@@ -1,2 +1,2 @@
45	>	-SHA256 (keyring-0.5.tar.gz) = dd943b344f3f4748a12936337e1b974ce713cda177c7cdaeed2a1c912fe660c8
46	>	-SIZE (keyring-0.5.tar.gz) = 17491
47	>	+SHA256 (keyring-0.5.1.tar.gz) = b604aa35a488a726140033c0278ee419c1acd13d40905bb4c471c30378c04219
48	>	+SIZE (keyring-0.5.1.tar.gz) = 17928

Diff Legend

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