Mon Aug 9 11:33:53 2010 UTC ()
update to 1.3.2
changes:
-Add keyboard merging, bulk change merging, auto-merge with ancestor mode
-Updates to VC support, including lots of git fixes
-UI cleanups
-bug fixes
-Translation updates


(drochner)
diff -r1.23 -r1.24 pkgsrc/devel/meld/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/meld/PLIST
diff -r1.8 -r1.9 pkgsrc/devel/meld/distinfo
diff -r1.2 -r0 pkgsrc/devel/meld/patches/patch-aa
diff -r0 -r1.1 pkgsrc/devel/meld/patches/patch-ac
cvs diff -r1.23 -r1.24 pkgsrc/devel/meld/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/meld/Makefile 2010/02/10 19:17:36 1.23
+++ pkgsrc/devel/meld/Makefile 2010/08/09 11:33:53 1.24
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1# $NetBSD: Makefile,v 1.23 2010/02/10 19:17:36 joerg Exp $ 1# $NetBSD: Makefile,v 1.24 2010/08/09 11:33:53 drochner Exp $
2# 2#
3 3
4DISTNAME= meld-1.3.1 4DISTNAME= meld-1.3.2
5PKGREVISION= 1 
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.3/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.3/}
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= dieter.NetBSD@pandora.be 9MAINTAINER= dieter.NetBSD@pandora.be
11HOMEPAGE= http://meld.sourceforge.net/ 10HOMEPAGE= http://meld.sourceforge.net/
12COMMENT= Visual diff and merge tool 11COMMENT= Visual diff and merge tool
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.8.0:../../x11/py-gtk2 14DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.8.0:../../x11/py-gtk2
16 15
17PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
18 17
19USE_PKGLOCALEDIR= YES 18USE_PKGLOCALEDIR= YES
20USE_TOOLS+= gmake msgfmt intltool 19USE_TOOLS+= gmake msgfmt intltool
21MAKE_FLAGS+= prefix=${PREFIX} 20MAKE_FLAGS+= prefix=${PREFIX}
22MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale 21MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale
23MAKE_FLAGS+= PYTHON=${PYTHONBIN} 22MAKE_FLAGS+= PYTHON=${PYTHONBIN}
24MAKE_FILE= GNUmakefile 23PYTHON_PATCH_SCRIPTS= bin/meld
25PYTHON_PATCH_SCRIPTS= meld 
26 24
27# remove unnecessarily created empty dir 25# remove unnecessarily created empty dir
28post-install: 26post-install:
29 ${RMDIR} ${DESTDIR}${PREFIX}/share/doc/meld 27 ${RMDIR} ${DESTDIR}${PREFIX}/share/doc/meld
30 28
 29.include "../../sysutils/desktop-file-utils/desktopdb.mk"
31.include "../../lang/python/application.mk" 30.include "../../lang/python/application.mk"
32.include "../../mk/omf-scrollkeeper.mk" 31.include "../../mk/omf-scrollkeeper.mk"
33.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/devel/meld/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/meld/PLIST 2009/08/21 08:30:30 1.8
+++ pkgsrc/devel/meld/PLIST 2010/08/09 11:33:53 1.9
@@ -1,178 +1,214 @@ @@ -1,178 +1,214 @@
1@comment $NetBSD: PLIST,v 1.8 2009/08/21 08:30:30 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.9 2010/08/09 11:33:53 drochner Exp $
2bin/meld 2bin/meld
3lib/meld/diffutil.py 3lib/meld/meld/__init__.py
4lib/meld/diffutil.pyc 4lib/meld/meld/__init__.pyc
5lib/meld/diffutil.pyo 5lib/meld/meld/__init__.pyo
6lib/meld/dirdiff.py 6lib/meld/meld/diffmap.py
7lib/meld/dirdiff.pyc 7lib/meld/meld/diffmap.pyc
8lib/meld/dirdiff.pyo 8lib/meld/meld/diffmap.pyo
9lib/meld/filediff.py 9lib/meld/meld/diffutil.py
10lib/meld/filediff.pyc 10lib/meld/meld/diffutil.pyc
11lib/meld/filediff.pyo 11lib/meld/meld/diffutil.pyo
12lib/meld/findbar.py 12lib/meld/meld/dirdiff.py
13lib/meld/findbar.pyc 13lib/meld/meld/dirdiff.pyc
14lib/meld/findbar.pyo 14lib/meld/meld/dirdiff.pyo
15lib/meld/gnomeglade.py 15lib/meld/meld/filediff.py
16lib/meld/gnomeglade.pyc 16lib/meld/meld/filediff.pyc
17lib/meld/gnomeglade.pyo 17lib/meld/meld/filediff.pyo
18lib/meld/historyentry.py 18lib/meld/meld/filemerge.py
19lib/meld/historyentry.pyc 19lib/meld/meld/filemerge.pyc
20lib/meld/historyentry.pyo 20lib/meld/meld/filemerge.pyo
21lib/meld/meldapp.py 21lib/meld/meld/matchers.py
22lib/meld/meldapp.pyc 22lib/meld/meld/matchers.pyc
23lib/meld/meldapp.pyo 23lib/meld/meld/matchers.pyo
24lib/meld/melddoc.py 24lib/meld/meld/meldapp.py
25lib/meld/melddoc.pyc 25lib/meld/meld/meldapp.pyc
26lib/meld/melddoc.pyo 26lib/meld/meld/meldapp.pyo
27lib/meld/misc.py 27lib/meld/meld/melddoc.py
28lib/meld/misc.pyc 28lib/meld/meld/melddoc.pyc
29lib/meld/misc.pyo 29lib/meld/meld/melddoc.pyo
30lib/meld/msgarea.py 30lib/meld/meld/merge.py
31lib/meld/msgarea.pyc 31lib/meld/meld/merge.pyc
32lib/meld/msgarea.pyo 32lib/meld/meld/merge.pyo
33lib/meld/notebooklabel.py 33lib/meld/meld/misc.py
34lib/meld/notebooklabel.pyc 34lib/meld/meld/misc.pyc
35lib/meld/notebooklabel.pyo 35lib/meld/meld/misc.pyo
36lib/meld/paths.py 36lib/meld/meld/paths.py
37lib/meld/paths.pyc 37lib/meld/meld/paths.pyc
38lib/meld/paths.pyo 38lib/meld/meld/paths.pyo
39lib/meld/prefs.py 39lib/meld/meld/preferences.py
40lib/meld/prefs.pyc 40lib/meld/meld/preferences.pyc
41lib/meld/prefs.pyo 41lib/meld/meld/preferences.pyo
42lib/meld/sourceviewer.py 42lib/meld/meld/task.py
43lib/meld/sourceviewer.pyc 43lib/meld/meld/task.pyc
44lib/meld/sourceviewer.pyo 44lib/meld/meld/task.pyo
45lib/meld/task.py 45lib/meld/meld/tree.py
46lib/meld/task.pyc 46lib/meld/meld/tree.pyc
47lib/meld/task.pyo 47lib/meld/meld/tree.pyo
48lib/meld/tree.py 48lib/meld/meld/ui/__init__.py
49lib/meld/tree.pyc 49lib/meld/meld/ui/__init__.pyc
50lib/meld/tree.pyo 50lib/meld/meld/ui/__init__.pyo
51lib/meld/undo.py 51lib/meld/meld/ui/findbar.py
52lib/meld/undo.pyc 52lib/meld/meld/ui/findbar.pyc
53lib/meld/undo.pyo 53lib/meld/meld/ui/findbar.pyo
54lib/meld/vc/__init__.py 54lib/meld/meld/ui/gnomeglade.py
55lib/meld/vc/__init__.pyc 55lib/meld/meld/ui/gnomeglade.pyc
56lib/meld/vc/__init__.pyo 56lib/meld/meld/ui/gnomeglade.pyo
57lib/meld/vc/_null.py 57lib/meld/meld/ui/historyentry.py
58lib/meld/vc/_null.pyc 58lib/meld/meld/ui/historyentry.pyc
59lib/meld/vc/_null.pyo 59lib/meld/meld/ui/historyentry.pyo
60lib/meld/vc/_vc.py 60lib/meld/meld/ui/msgarea.py
61lib/meld/vc/_vc.pyc 61lib/meld/meld/ui/msgarea.pyc
62lib/meld/vc/_vc.pyo 62lib/meld/meld/ui/msgarea.pyo
63lib/meld/vc/bzr.py 63lib/meld/meld/ui/notebooklabel.py
64lib/meld/vc/bzr.pyc 64lib/meld/meld/ui/notebooklabel.pyc
65lib/meld/vc/bzr.pyo 65lib/meld/meld/ui/notebooklabel.pyo
66lib/meld/vc/cdv.py 66lib/meld/meld/ui/wraplabel.py
67lib/meld/vc/cdv.pyc 67lib/meld/meld/ui/wraplabel.pyc
68lib/meld/vc/cdv.pyo 68lib/meld/meld/ui/wraplabel.pyo
69lib/meld/vc/cvs.py 69lib/meld/meld/undo.py
70lib/meld/vc/cvs.pyc 70lib/meld/meld/undo.pyc
71lib/meld/vc/cvs.pyo 71lib/meld/meld/undo.pyo
72lib/meld/vc/darcs.py 72lib/meld/meld/util/__init__.py
73lib/meld/vc/darcs.pyc 73lib/meld/meld/util/__init__.pyc
74lib/meld/vc/darcs.pyo 74lib/meld/meld/util/__init__.pyo
75lib/meld/vc/git.py 75lib/meld/meld/util/prefs.py
76lib/meld/vc/git.pyc 76lib/meld/meld/util/prefs.pyc
77lib/meld/vc/git.pyo 77lib/meld/meld/util/prefs.pyo
78lib/meld/vc/mercurial.py 78lib/meld/meld/util/sourceviewer.py
79lib/meld/vc/mercurial.pyc 79lib/meld/meld/util/sourceviewer.pyc
80lib/meld/vc/mercurial.pyo 80lib/meld/meld/util/sourceviewer.pyo
81lib/meld/vc/monotone.py 81lib/meld/meld/vc/__init__.py
82lib/meld/vc/monotone.pyc 82lib/meld/meld/vc/__init__.pyc
83lib/meld/vc/monotone.pyo 83lib/meld/meld/vc/__init__.pyo
84lib/meld/vc/rcs.py 84lib/meld/meld/vc/_null.py
85lib/meld/vc/rcs.pyc 85lib/meld/meld/vc/_null.pyc
86lib/meld/vc/rcs.pyo 86lib/meld/meld/vc/_null.pyo
87lib/meld/vc/svk.py 87lib/meld/meld/vc/_vc.py
88lib/meld/vc/svk.pyc 88lib/meld/meld/vc/_vc.pyc
89lib/meld/vc/svk.pyo 89lib/meld/meld/vc/_vc.pyo
90lib/meld/vc/svn.py 90lib/meld/meld/vc/bzr.py
91lib/meld/vc/svn.pyc 91lib/meld/meld/vc/bzr.pyc
92lib/meld/vc/svn.pyo 92lib/meld/meld/vc/bzr.pyo
93lib/meld/vc/tla.py 93lib/meld/meld/vc/cdv.py
94lib/meld/vc/tla.pyc 94lib/meld/meld/vc/cdv.pyc
95lib/meld/vc/tla.pyo 95lib/meld/meld/vc/cdv.pyo
96lib/meld/vcview.py 96lib/meld/meld/vc/cvs.py
97lib/meld/vcview.pyc 97lib/meld/meld/vc/cvs.pyc
98lib/meld/vcview.pyo 98lib/meld/meld/vc/cvs.pyo
 99lib/meld/meld/vc/darcs.py
 100lib/meld/meld/vc/darcs.pyc
 101lib/meld/meld/vc/darcs.pyo
 102lib/meld/meld/vc/git.py
 103lib/meld/meld/vc/git.pyc
 104lib/meld/meld/vc/git.pyo
 105lib/meld/meld/vc/mercurial.py
 106lib/meld/meld/vc/mercurial.pyc
 107lib/meld/meld/vc/mercurial.pyo
 108lib/meld/meld/vc/monotone.py
 109lib/meld/meld/vc/monotone.pyc
 110lib/meld/meld/vc/monotone.pyo
 111lib/meld/meld/vc/rcs.py
 112lib/meld/meld/vc/rcs.pyc
 113lib/meld/meld/vc/rcs.pyo
 114lib/meld/meld/vc/svk.py
 115lib/meld/meld/vc/svk.pyc
 116lib/meld/meld/vc/svk.pyo
 117lib/meld/meld/vc/svn.py
 118lib/meld/meld/vc/svn.pyc
 119lib/meld/meld/vc/svn.pyo
 120lib/meld/meld/vc/tla.py
 121lib/meld/meld/vc/tla.pyc
 122lib/meld/meld/vc/tla.pyo
 123lib/meld/meld/vcview.py
 124lib/meld/meld/vcview.pyc
 125lib/meld/meld/vcview.pyo
99share/applications/meld.desktop 126share/applications/meld.desktop
100share/gnome/help/meld/C/figures/dirdiff.png 127share/gnome/help/meld/C/figures/dirdiff.png
101share/gnome/help/meld/C/figures/filediff.png 128share/gnome/help/meld/C/figures/filediff.png
102share/gnome/help/meld/C/meld.xml 129share/gnome/help/meld/C/meld.xml
103share/gnome/help/meld/es/figures/dirdiff.png 130share/gnome/help/meld/es/figures/dirdiff.png
104share/gnome/help/meld/es/figures/filediff.png 131share/gnome/help/meld/es/figures/filediff.png
105share/gnome/help/meld/es/meld.xml 132share/gnome/help/meld/es/meld.xml
 133share/gnome/help/meld/fr/figures/dirdiff.png
 134share/gnome/help/meld/fr/figures/filediff.png
106share/gnome/help/meld/fr/meld.xml 135share/gnome/help/meld/fr/meld.xml
 136share/icons/hicolor/16x16/apps/meld.png
 137share/icons/hicolor/22x22/apps/meld.png
 138share/icons/hicolor/32x32/apps/meld.png
 139share/icons/hicolor/48x48/apps/meld.png
 140share/icons/hicolor/scalable/apps/meld.svg
107share/locale/ar/LC_MESSAGES/meld.mo 141share/locale/ar/LC_MESSAGES/meld.mo
108share/locale/bg/LC_MESSAGES/meld.mo 142share/locale/bg/LC_MESSAGES/meld.mo
109share/locale/ca/LC_MESSAGES/meld.mo 143share/locale/ca/LC_MESSAGES/meld.mo
110share/locale/cs/LC_MESSAGES/meld.mo 144share/locale/cs/LC_MESSAGES/meld.mo
111share/locale/de/LC_MESSAGES/meld.mo 145share/locale/de/LC_MESSAGES/meld.mo
112share/locale/dz/LC_MESSAGES/meld.mo 146share/locale/dz/LC_MESSAGES/meld.mo
113share/locale/el/LC_MESSAGES/meld.mo 147share/locale/el/LC_MESSAGES/meld.mo
114share/locale/en_CA/LC_MESSAGES/meld.mo 148share/locale/en_CA/LC_MESSAGES/meld.mo
115share/locale/en_GB/LC_MESSAGES/meld.mo 149share/locale/en_GB/LC_MESSAGES/meld.mo
116share/locale/es/LC_MESSAGES/meld.mo 150share/locale/es/LC_MESSAGES/meld.mo
117share/locale/fi/LC_MESSAGES/meld.mo 151share/locale/fi/LC_MESSAGES/meld.mo
118share/locale/fr/LC_MESSAGES/meld.mo 152share/locale/fr/LC_MESSAGES/meld.mo
119share/locale/gl/LC_MESSAGES/meld.mo 153share/locale/gl/LC_MESSAGES/meld.mo
120share/locale/hu/LC_MESSAGES/meld.mo 154share/locale/hu/LC_MESSAGES/meld.mo
121share/locale/it/LC_MESSAGES/meld.mo 155share/locale/it/LC_MESSAGES/meld.mo
122share/locale/ja/LC_MESSAGES/meld.mo 156share/locale/ja/LC_MESSAGES/meld.mo
123share/locale/ko/LC_MESSAGES/meld.mo 157share/locale/ko/LC_MESSAGES/meld.mo
124share/locale/nb/LC_MESSAGES/meld.mo 158share/locale/nb/LC_MESSAGES/meld.mo
125share/locale/ne/LC_MESSAGES/meld.mo 159share/locale/ne/LC_MESSAGES/meld.mo
126share/locale/nl/LC_MESSAGES/meld.mo 160share/locale/nl/LC_MESSAGES/meld.mo
127share/locale/oc/LC_MESSAGES/meld.mo 161share/locale/oc/LC_MESSAGES/meld.mo
128share/locale/pa/LC_MESSAGES/meld.mo 162share/locale/pa/LC_MESSAGES/meld.mo
129share/locale/pt/LC_MESSAGES/meld.mo 163share/locale/pt/LC_MESSAGES/meld.mo
130share/locale/pt_BR/LC_MESSAGES/meld.mo 164share/locale/pt_BR/LC_MESSAGES/meld.mo
131share/locale/ru/LC_MESSAGES/meld.mo 165share/locale/ru/LC_MESSAGES/meld.mo
132share/locale/rw/LC_MESSAGES/meld.mo 166share/locale/rw/LC_MESSAGES/meld.mo
 167share/locale/sl/LC_MESSAGES/meld.mo
133share/locale/sq/LC_MESSAGES/meld.mo 168share/locale/sq/LC_MESSAGES/meld.mo
134share/locale/sr/LC_MESSAGES/meld.mo 169share/locale/sr/LC_MESSAGES/meld.mo
135share/locale/sr@Latn/LC_MESSAGES/meld.mo 170share/locale/sr@latin/LC_MESSAGES/meld.mo
136share/locale/sv/LC_MESSAGES/meld.mo 171share/locale/sv/LC_MESSAGES/meld.mo
137share/locale/vi/LC_MESSAGES/meld.mo 172share/locale/vi/LC_MESSAGES/meld.mo
138share/locale/zh_CN/LC_MESSAGES/meld.mo 173share/locale/zh_CN/LC_MESSAGES/meld.mo
139share/locale/zh_TW/LC_MESSAGES/meld.mo 174share/locale/zh_TW/LC_MESSAGES/meld.mo
140share/meld/glade2/dirdiff-ui.xml 175share/meld/icons/button_apply0.xpm
141share/meld/glade2/dirdiff.glade 176share/meld/icons/button_apply1.xpm
142share/meld/glade2/filediff-ui.xml 177share/meld/icons/button_copy0.xpm
143share/meld/glade2/filediff.glade 178share/meld/icons/button_copy1.xpm
144share/meld/glade2/findbar.glade 179share/meld/icons/button_delete.xpm
145share/meld/glade2/meldapp-ui.xml 180share/meld/icons/filter-ignored-24.png
146share/meld/glade2/meldapp.glade 181share/meld/icons/filter-modified-24.png
147share/meld/glade2/pixmaps/button_apply0.xpm 182share/meld/icons/filter-nonvc-24.png
148share/meld/glade2/pixmaps/button_apply1.xpm 183share/meld/icons/filter-normal-24.png
149share/meld/glade2/pixmaps/button_copy0.xpm 184share/meld/icons/icon.png
150share/meld/glade2/pixmaps/button_copy1.xpm 185share/meld/icons/tree-file-changed.png
151share/meld/glade2/pixmaps/button_delete.xpm 186share/meld/icons/tree-file-missing.png
152share/meld/glade2/pixmaps/filter-ignored-24.png 187share/meld/icons/tree-file-new.png
153share/meld/glade2/pixmaps/filter-modified-24.png 188share/meld/icons/tree-file-newer.png
154share/meld/glade2/pixmaps/filter-nonvc-24.png 189share/meld/icons/tree-file-normal.png
155share/meld/glade2/pixmaps/filter-normal-24.png 190share/meld/icons/tree-folder-changed.png
156share/meld/glade2/pixmaps/icon.png 191share/meld/icons/tree-folder-missing.png
157share/meld/glade2/pixmaps/tree-file-changed.png 192share/meld/icons/tree-folder-new.png
158share/meld/glade2/pixmaps/tree-file-missing.png 193share/meld/icons/tree-folder-normal.png
159share/meld/glade2/pixmaps/tree-file-new.png 194share/meld/icons/vc-add-24.png
160share/meld/glade2/pixmaps/tree-file-newer.png 195share/meld/icons/vc-checkout-24.png
161share/meld/glade2/pixmaps/tree-file-normal.png 196share/meld/icons/vc-commit-24.png
162share/meld/glade2/pixmaps/tree-folder-changed.png 197share/meld/icons/vc-icon.png
163share/meld/glade2/pixmaps/tree-folder-missing.png 198share/meld/icons/vc-remove-24.png
164share/meld/glade2/pixmaps/tree-folder-new.png 199share/meld/icons/vc-resolve-24.png
165share/meld/glade2/pixmaps/tree-folder-normal.png 200share/meld/icons/vc-update-24.png
166share/meld/glade2/pixmaps/vc-add-24.png 201share/meld/ui/dirdiff-ui.xml
167share/meld/glade2/pixmaps/vc-checkout-24.png 202share/meld/ui/dirdiff.glade
168share/meld/glade2/pixmaps/vc-commit-24.png 203share/meld/ui/filediff-ui.xml
169share/meld/glade2/pixmaps/vc-icon.png 204share/meld/ui/filediff.glade
170share/meld/glade2/pixmaps/vc-remove-24.png 205share/meld/ui/findbar.glade
171share/meld/glade2/pixmaps/vc-resolve-24.png 206share/meld/ui/meldapp-ui.xml
172share/meld/glade2/pixmaps/vc-update-24.png 207share/meld/ui/meldapp.glade
173share/meld/glade2/vcview-ui.xml 208share/meld/ui/preferences.glade
174share/meld/glade2/vcview.glade 209share/meld/ui/vcview-ui.xml
 210share/meld/ui/vcview.glade
175share/omf/meld/meld-C.omf 211share/omf/meld/meld-C.omf
176share/omf/meld/meld-es.omf 212share/omf/meld/meld-es.omf
177share/omf/meld/meld-fr.omf 213share/omf/meld/meld-fr.omf
178share/pixmaps/meld.png 214share/pixmaps/meld.png
cvs diff -r1.8 -r1.9 pkgsrc/devel/meld/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/meld/distinfo 2009/08/21 08:30:30 1.8
+++ pkgsrc/devel/meld/distinfo 2010/08/09 11:33:53 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2009/08/21 08:30:30 wiz Exp $ 1$NetBSD: distinfo,v 1.9 2010/08/09 11:33:53 drochner Exp $
2 2
3SHA1 (meld-1.3.1.tar.bz2) = d3ab96a364b73afdfd9f26cc9bec18321f04c9df 3SHA1 (meld-1.3.2.tar.bz2) = 1cb5174385365127d5b2e02343c73fc01c8a89ef
4RMD160 (meld-1.3.1.tar.bz2) = bf9bace33ddf1d3b6b99e358799316791390cec0 4RMD160 (meld-1.3.2.tar.bz2) = 7ff1bbbb46448366693f9095c7687fde7b952bd2
5Size (meld-1.3.1.tar.bz2) = 795145 bytes 5Size (meld-1.3.2.tar.bz2) = 741154 bytes
6SHA1 (patch-aa) = 49ff28a613055ead56f63e8dd5df09b986bcbea1 6SHA1 (patch-ac) = a265fd2e88e91b9c8f781f630ee77f8829e008f7
File Deleted: pkgsrc/devel/meld/patches/Attic/patch-aa
File Added: pkgsrc/devel/meld/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.1 2010/08/09 11:33:53 drochner Exp $

--- meld/vc/_vc.py.orig	2010-06-24 21:31:33.000000000 +0000
+++ meld/vc/_vc.py
@@ -106,7 +106,7 @@ class Vc(object):
     def resolved_command(self):
         raise NotImplementedError()
     def patch_command(self, workdir):
-        return ["patch","--strip=%i"%self.PATCH_STRIP_NUM,"--reverse","--directory=%s" % workdir]
+        return ["patch","-p%i"%self.PATCH_STRIP_NUM,"-R","-d%s" % workdir]
 
     def check_repo_root(self, location):
         if not os.path.isdir(os.path.join(location, self.VC_DIR)):