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
(Generate patch)

Comparing freebsd/security/py-keyring.patch (file contents):
Revision 140 by douglas, 2009-11-21T02:08:51-08:00 vs.
Revision 370 by douglas, 2010-11-09T16:08:00-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-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
2 > --- /usr/ports/security/py-keyring/Makefile     2010-09-14 00:58:31.000000000 -0700
3 > +++ py-keyring/Makefile 2010-11-09 16:03:10.259699908 -0800
4 > @@ -6,7 +6,7 @@
5 > #
6 >
7 > PORTNAME=      keyring
8 > -PORTVERSION=   0.4
9 > +PORTVERSION=   0.5
10   CATEGORIES=    security python
11 < MASTER_SITES=  CHEESESHOP \
8 < +               http://apt.douglasthrift.net/files/${PORTNAME}/ \
9 <                http://code.douglasthrift.net/files/${PORTNAME}/
11 > MASTER_SITES=  CHEESESHOP
12   PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
13 + @@ -21,6 +21,7 @@
14 + USE_KDE4=      #
15 + USE_PYTHON=    2.4+
16 + USE_PYDISTUTILS=       yes
17 + +WANT_GNOME=    yes
18 +
19 + OPTIONS=       GNOME_KEYRING "GNOME Keyring backend" Off \
20 +                KDE_KWALLET "KDE KWallet backend" Off
21 + @@ -28,30 +29,11 @@
22 + .include <bsd.port.pre.mk>
23 +
24 + .if defined(WITH_GNOME_KEYRING)
25 + -LIB_DEPENDS+=  gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
26 + -PLIST_SUB+=    GNOME_KEYRING=""
27 + -.else
28 + -PLIST_SUB+=    GNOME_KEYRING="@comment "
29 + +USE_GNOME+=    pygnomedesktop
30 + .endif
31 +
32 + .if defined(WITH_KDE_KWALLET)
33 + -PLIST_SUB+=    KDE_KWALLET=""
34 + -USE_KDE4+=     kdelibs
35 + -.else
36 + -PLIST_SUB+=    KDE_KWALLET="@comment "
37 + -.endif
38 + -
39 + -post-patch:
40 + -.if !defined(WITH_GNOME_KEYRING)
41 + -       @${REINPLACE_CMD} -e 's|exts\.append(gnome_keychain_module)|#&|' \
42 + -               ${WRKSRC}/extensions.py
43 + -.endif
44 + -.if defined(WITH_KDE_KWALLET)
45 + -       @${REINPLACE_CMD} -e 's|kde-config|${KDE4_PREFIX}/bin/kde4-config|' \
46 + -               ${WRKSRC}/extensions.py
47 + -.else
48 + -       @${REINPLACE_CMD} -e 's|exts\.append(kde_kwallet_module)|#&|' \
49 + -               ${WRKSRC}/extensions.py
50 + +USE_KDE4+=     pykde4
51 + .endif
52  
53 + .include <bsd.port.post.mk>
54 + diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
55 + --- /usr/ports/security/py-keyring/distinfo     2010-09-14 00:58:31.000000000 -0700
56 + +++ py-keyring/distinfo 2010-11-06 17:52:26.770158782 -0700
57 + @@ -1,3 +1,2 @@
58 + -MD5 (keyring-0.4.tar.gz) = f4c8fe1a3aa7236e437679d03f5f52c2
59 + -SHA256 (keyring-0.4.tar.gz) = 01caeb7a388e13b9a93f9f8b912274e14a70c2882b0730ef6ead6303ec8f60be
60 + -SIZE (keyring-0.4.tar.gz) = 19060
61 + +SHA256 (keyring-0.5.tar.gz) = dd943b344f3f4748a12936337e1b974ce713cda177c7cdaeed2a1c912fe660c8
62 + +SIZE (keyring-0.5.tar.gz) = 17491
63 + diff -Nrux .svn -x work /usr/ports/security/py-keyring/pkg-plist py-keyring/pkg-plist
64 + --- /usr/ports/security/py-keyring/pkg-plist    2010-09-14 00:58:31.000000000 -0700
65 + +++ py-keyring/pkg-plist        2010-11-09 02:40:40.763097115 -0800
66 + @@ -1,17 +1,21 @@
67 + -%%GNOME_KEYRING%%%%PYTHON_SITELIBDIR%%/gnome_keyring.so
68 + -%%KDE_KWALLET%%%%PYTHON_SITELIBDIR%%/kde_kwallet.so
69 + %%PYTHON_SITELIBDIR%%/keyring/__init__.py
70 + %%PYTHON_SITELIBDIR%%/keyring/__init__.pyc
71 + %%PYTHON_SITELIBDIR%%/keyring/__init__.pyo
72 + %%PYTHON_SITELIBDIR%%/keyring/backend.py
73 + %%PYTHON_SITELIBDIR%%/keyring/backend.pyc
74 + %%PYTHON_SITELIBDIR%%/keyring/backend.pyo
75 + +%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.py
76 + +%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyc
77 + +%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyo
78 + %%PYTHON_SITELIBDIR%%/keyring/core.py
79 + %%PYTHON_SITELIBDIR%%/keyring/core.pyc
80 + %%PYTHON_SITELIBDIR%%/keyring/core.pyo
81 + %%PYTHON_SITELIBDIR%%/keyring/getpassbackend.py
82 + %%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyc
83 + %%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyo
84 + +%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.py
85 + +%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyc
86 + +%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyo
87 + %%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.py
88 + %%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyc
89 + %%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyo
90 + @@ -27,6 +31,7 @@
91 + %%PYTHON_SITELIBDIR%%/keyring/util/escape.py
92 + %%PYTHON_SITELIBDIR%%/keyring/util/escape.pyc
93 + %%PYTHON_SITELIBDIR%%/keyring/util/escape.pyo
94 + +@dirrm %%PYTHON_SITELIBDIR%%/keyring/backends
95 + @dirrm %%PYTHON_SITELIBDIR%%/keyring/tests
96 + @dirrm %%PYTHON_SITELIBDIR%%/keyring/util
97 + @dirrm %%PYTHON_SITELIBDIR%%/keyring

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines