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

5 files changed, 191 insertions, 158 deletions

diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index fe4bc4b4b45..76467cbeac5 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/02/10 19:17:36 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2010/08/09 11:33:53 drochner Exp $
 #
 
-DISTNAME=		meld-1.3.1
-PKGREVISION=		1
+DISTNAME=		meld-1.3.2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/1.3/}
 EXTRACT_SUFX=		.tar.bz2
@@ -21,13 +20,13 @@ USE_TOOLS+=			gmake msgfmt intltool
 MAKE_FLAGS+=			prefix=${PREFIX}
 MAKE_FLAGS+=			localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 MAKE_FLAGS+=			PYTHON=${PYTHONBIN}
-MAKE_FILE=			GNUmakefile
-PYTHON_PATCH_SCRIPTS=		meld
+PYTHON_PATCH_SCRIPTS=		bin/meld
 
 # remove unnecessarily created empty dir
 post-install:
 	${RMDIR} ${DESTDIR}${PREFIX}/share/doc/meld
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/meld/PLIST b/devel/meld/PLIST
index d2c16fee829..5df3b9464ff 100644
--- a/devel/meld/PLIST
+++ b/devel/meld/PLIST
@@ -1,101 +1,128 @@
-@comment $NetBSD: PLIST,v 1.8 2009/08/21 08:30:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/08/09 11:33:53 drochner Exp $
 bin/meld
-lib/meld/diffutil.py
-lib/meld/diffutil.pyc
-lib/meld/diffutil.pyo
-lib/meld/dirdiff.py
-lib/meld/dirdiff.pyc
-lib/meld/dirdiff.pyo
-lib/meld/filediff.py
-lib/meld/filediff.pyc
-lib/meld/filediff.pyo
-lib/meld/findbar.py
-lib/meld/findbar.pyc
-lib/meld/findbar.pyo
-lib/meld/gnomeglade.py
-lib/meld/gnomeglade.pyc
-lib/meld/gnomeglade.pyo
-lib/meld/historyentry.py
-lib/meld/historyentry.pyc
-lib/meld/historyentry.pyo
-lib/meld/meldapp.py
-lib/meld/meldapp.pyc
-lib/meld/meldapp.pyo
-lib/meld/melddoc.py
-lib/meld/melddoc.pyc
-lib/meld/melddoc.pyo
-lib/meld/misc.py
-lib/meld/misc.pyc
-lib/meld/misc.pyo
-lib/meld/msgarea.py
-lib/meld/msgarea.pyc
-lib/meld/msgarea.pyo
-lib/meld/notebooklabel.py
-lib/meld/notebooklabel.pyc
-lib/meld/notebooklabel.pyo
-lib/meld/paths.py
-lib/meld/paths.pyc
-lib/meld/paths.pyo
-lib/meld/prefs.py
-lib/meld/prefs.pyc
-lib/meld/prefs.pyo
-lib/meld/sourceviewer.py
-lib/meld/sourceviewer.pyc
-lib/meld/sourceviewer.pyo
-lib/meld/task.py
-lib/meld/task.pyc
-lib/meld/task.pyo
-lib/meld/tree.py
-lib/meld/tree.pyc
-lib/meld/tree.pyo
-lib/meld/undo.py
-lib/meld/undo.pyc
-lib/meld/undo.pyo
-lib/meld/vc/__init__.py
-lib/meld/vc/__init__.pyc
-lib/meld/vc/__init__.pyo
-lib/meld/vc/_null.py
-lib/meld/vc/_null.pyc
-lib/meld/vc/_null.pyo
-lib/meld/vc/_vc.py
-lib/meld/vc/_vc.pyc
-lib/meld/vc/_vc.pyo
-lib/meld/vc/bzr.py
-lib/meld/vc/bzr.pyc
-lib/meld/vc/bzr.pyo
-lib/meld/vc/cdv.py
-lib/meld/vc/cdv.pyc
-lib/meld/vc/cdv.pyo
-lib/meld/vc/cvs.py
-lib/meld/vc/cvs.pyc
-lib/meld/vc/cvs.pyo
-lib/meld/vc/darcs.py
-lib/meld/vc/darcs.pyc
-lib/meld/vc/darcs.pyo
-lib/meld/vc/git.py
-lib/meld/vc/git.pyc
-lib/meld/vc/git.pyo
-lib/meld/vc/mercurial.py
-lib/meld/vc/mercurial.pyc
-lib/meld/vc/mercurial.pyo
-lib/meld/vc/monotone.py
-lib/meld/vc/monotone.pyc
-lib/meld/vc/monotone.pyo
-lib/meld/vc/rcs.py
-lib/meld/vc/rcs.pyc
-lib/meld/vc/rcs.pyo
-lib/meld/vc/svk.py
-lib/meld/vc/svk.pyc
-lib/meld/vc/svk.pyo
-lib/meld/vc/svn.py
-lib/meld/vc/svn.pyc
-lib/meld/vc/svn.pyo
-lib/meld/vc/tla.py
-lib/meld/vc/tla.pyc
-lib/meld/vc/tla.pyo
-lib/meld/vcview.py
-lib/meld/vcview.pyc
-lib/meld/vcview.pyo
+lib/meld/meld/__init__.py
+lib/meld/meld/__init__.pyc
+lib/meld/meld/__init__.pyo
+lib/meld/meld/diffmap.py
+lib/meld/meld/diffmap.pyc
+lib/meld/meld/diffmap.pyo
+lib/meld/meld/diffutil.py
+lib/meld/meld/diffutil.pyc
+lib/meld/meld/diffutil.pyo
+lib/meld/meld/dirdiff.py
+lib/meld/meld/dirdiff.pyc
+lib/meld/meld/dirdiff.pyo
+lib/meld/meld/filediff.py
+lib/meld/meld/filediff.pyc
+lib/meld/meld/filediff.pyo
+lib/meld/meld/filemerge.py
+lib/meld/meld/filemerge.pyc
+lib/meld/meld/filemerge.pyo
+lib/meld/meld/matchers.py
+lib/meld/meld/matchers.pyc
+lib/meld/meld/matchers.pyo
+lib/meld/meld/meldapp.py
+lib/meld/meld/meldapp.pyc
+lib/meld/meld/meldapp.pyo
+lib/meld/meld/melddoc.py
+lib/meld/meld/melddoc.pyc
+lib/meld/meld/melddoc.pyo
+lib/meld/meld/merge.py
+lib/meld/meld/merge.pyc
+lib/meld/meld/merge.pyo
+lib/meld/meld/misc.py
+lib/meld/meld/misc.pyc
+lib/meld/meld/misc.pyo
+lib/meld/meld/paths.py
+lib/meld/meld/paths.pyc
+lib/meld/meld/paths.pyo
+lib/meld/meld/preferences.py
+lib/meld/meld/preferences.pyc
+lib/meld/meld/preferences.pyo
+lib/meld/meld/task.py
+lib/meld/meld/task.pyc
+lib/meld/meld/task.pyo
+lib/meld/meld/tree.py
+lib/meld/meld/tree.pyc
+lib/meld/meld/tree.pyo
+lib/meld/meld/ui/__init__.py
+lib/meld/meld/ui/__init__.pyc
+lib/meld/meld/ui/__init__.pyo
+lib/meld/meld/ui/findbar.py
+lib/meld/meld/ui/findbar.pyc
+lib/meld/meld/ui/findbar.pyo
+lib/meld/meld/ui/gnomeglade.py
+lib/meld/meld/ui/gnomeglade.pyc
+lib/meld/meld/ui/gnomeglade.pyo
+lib/meld/meld/ui/historyentry.py
+lib/meld/meld/ui/historyentry.pyc
+lib/meld/meld/ui/historyentry.pyo
+lib/meld/meld/ui/msgarea.py
+lib/meld/meld/ui/msgarea.pyc
+lib/meld/meld/ui/msgarea.pyo
+lib/meld/meld/ui/notebooklabel.py
+lib/meld/meld/ui/notebooklabel.pyc
+lib/meld/meld/ui/notebooklabel.pyo
+lib/meld/meld/ui/wraplabel.py
+lib/meld/meld/ui/wraplabel.pyc
+lib/meld/meld/ui/wraplabel.pyo
+lib/meld/meld/undo.py
+lib/meld/meld/undo.pyc
+lib/meld/meld/undo.pyo
+lib/meld/meld/util/__init__.py
+lib/meld/meld/util/__init__.pyc
+lib/meld/meld/util/__init__.pyo
+lib/meld/meld/util/prefs.py
+lib/meld/meld/util/prefs.pyc
+lib/meld/meld/util/prefs.pyo
+lib/meld/meld/util/sourceviewer.py
+lib/meld/meld/util/sourceviewer.pyc
+lib/meld/meld/util/sourceviewer.pyo
+lib/meld/meld/vc/__init__.py
+lib/meld/meld/vc/__init__.pyc
+lib/meld/meld/vc/__init__.pyo
+lib/meld/meld/vc/_null.py
+lib/meld/meld/vc/_null.pyc
+lib/meld/meld/vc/_null.pyo
+lib/meld/meld/vc/_vc.py
+lib/meld/meld/vc/_vc.pyc
+lib/meld/meld/vc/_vc.pyo
+lib/meld/meld/vc/bzr.py
+lib/meld/meld/vc/bzr.pyc
+lib/meld/meld/vc/bzr.pyo
+lib/meld/meld/vc/cdv.py
+lib/meld/meld/vc/cdv.pyc
+lib/meld/meld/vc/cdv.pyo
+lib/meld/meld/vc/cvs.py
+lib/meld/meld/vc/cvs.pyc
+lib/meld/meld/vc/cvs.pyo
+lib/meld/meld/vc/darcs.py
+lib/meld/meld/vc/darcs.pyc
+lib/meld/meld/vc/darcs.pyo
+lib/meld/meld/vc/git.py
+lib/meld/meld/vc/git.pyc
+lib/meld/meld/vc/git.pyo
+lib/meld/meld/vc/mercurial.py
+lib/meld/meld/vc/mercurial.pyc
+lib/meld/meld/vc/mercurial.pyo
+lib/meld/meld/vc/monotone.py
+lib/meld/meld/vc/monotone.pyc
+lib/meld/meld/vc/monotone.pyo
+lib/meld/meld/vc/rcs.py
+lib/meld/meld/vc/rcs.pyc
+lib/meld/meld/vc/rcs.pyo
+lib/meld/meld/vc/svk.py
+lib/meld/meld/vc/svk.pyc
+lib/meld/meld/vc/svk.pyo
+lib/meld/meld/vc/svn.py
+lib/meld/meld/vc/svn.pyc
+lib/meld/meld/vc/svn.pyo
+lib/meld/meld/vc/tla.py
+lib/meld/meld/vc/tla.pyc
+lib/meld/meld/vc/tla.pyo
+lib/meld/meld/vcview.py
+lib/meld/meld/vcview.pyc
+lib/meld/meld/vcview.pyo
 share/applications/meld.desktop
 share/gnome/help/meld/C/figures/dirdiff.png
 share/gnome/help/meld/C/figures/filediff.png
@@ -103,7 +130,14 @@ share/gnome/help/meld/C/meld.xml
 share/gnome/help/meld/es/figures/dirdiff.png
 share/gnome/help/meld/es/figures/filediff.png
 share/gnome/help/meld/es/meld.xml
+share/gnome/help/meld/fr/figures/dirdiff.png
+share/gnome/help/meld/fr/figures/filediff.png
 share/gnome/help/meld/fr/meld.xml
+share/icons/hicolor/16x16/apps/meld.png
+share/icons/hicolor/22x22/apps/meld.png
+share/icons/hicolor/32x32/apps/meld.png
+share/icons/hicolor/48x48/apps/meld.png
+share/icons/hicolor/scalable/apps/meld.svg
 share/locale/ar/LC_MESSAGES/meld.mo
 share/locale/bg/LC_MESSAGES/meld.mo
 share/locale/ca/LC_MESSAGES/meld.mo
@@ -130,48 +164,50 @@ share/locale/pt/LC_MESSAGES/meld.mo
 share/locale/pt_BR/LC_MESSAGES/meld.mo
 share/locale/ru/LC_MESSAGES/meld.mo
 share/locale/rw/LC_MESSAGES/meld.mo
+share/locale/sl/LC_MESSAGES/meld.mo
 share/locale/sq/LC_MESSAGES/meld.mo
 share/locale/sr/LC_MESSAGES/meld.mo
-share/locale/sr@Latn/LC_MESSAGES/meld.mo
+share/locale/sr@latin/LC_MESSAGES/meld.mo
 share/locale/sv/LC_MESSAGES/meld.mo
 share/locale/vi/LC_MESSAGES/meld.mo
 share/locale/zh_CN/LC_MESSAGES/meld.mo
 share/locale/zh_TW/LC_MESSAGES/meld.mo
-share/meld/glade2/dirdiff-ui.xml
-share/meld/glade2/dirdiff.glade
-share/meld/glade2/filediff-ui.xml
-share/meld/glade2/filediff.glade
-share/meld/glade2/findbar.glade
-share/meld/glade2/meldapp-ui.xml
-share/meld/glade2/meldapp.glade
-share/meld/glade2/pixmaps/button_apply0.xpm
-share/meld/glade2/pixmaps/button_apply1.xpm
-share/meld/glade2/pixmaps/button_copy0.xpm
-share/meld/glade2/pixmaps/button_copy1.xpm
-share/meld/glade2/pixmaps/button_delete.xpm
-share/meld/glade2/pixmaps/filter-ignored-24.png
-share/meld/glade2/pixmaps/filter-modified-24.png
-share/meld/glade2/pixmaps/filter-nonvc-24.png
-share/meld/glade2/pixmaps/filter-normal-24.png
-share/meld/glade2/pixmaps/icon.png
-share/meld/glade2/pixmaps/tree-file-changed.png
-share/meld/glade2/pixmaps/tree-file-missing.png
-share/meld/glade2/pixmaps/tree-file-new.png
-share/meld/glade2/pixmaps/tree-file-newer.png
-share/meld/glade2/pixmaps/tree-file-normal.png
-share/meld/glade2/pixmaps/tree-folder-changed.png
-share/meld/glade2/pixmaps/tree-folder-missing.png
-share/meld/glade2/pixmaps/tree-folder-new.png
-share/meld/glade2/pixmaps/tree-folder-normal.png
-share/meld/glade2/pixmaps/vc-add-24.png
-share/meld/glade2/pixmaps/vc-checkout-24.png
-share/meld/glade2/pixmaps/vc-commit-24.png
-share/meld/glade2/pixmaps/vc-icon.png
-share/meld/glade2/pixmaps/vc-remove-24.png
-share/meld/glade2/pixmaps/vc-resolve-24.png
-share/meld/glade2/pixmaps/vc-update-24.png
-share/meld/glade2/vcview-ui.xml
-share/meld/glade2/vcview.glade
+share/meld/icons/button_apply0.xpm
+share/meld/icons/button_apply1.xpm
+share/meld/icons/button_copy0.xpm
+share/meld/icons/button_copy1.xpm
+share/meld/icons/button_delete.xpm
+share/meld/icons/filter-ignored-24.png
+share/meld/icons/filter-modified-24.png
+share/meld/icons/filter-nonvc-24.png
+share/meld/icons/filter-normal-24.png
+share/meld/icons/icon.png
+share/meld/icons/tree-file-changed.png
+share/meld/icons/tree-file-missing.png
+share/meld/icons/tree-file-new.png
+share/meld/icons/tree-file-newer.png
+share/meld/icons/tree-file-normal.png
+share/meld/icons/tree-folder-changed.png
+share/meld/icons/tree-folder-missing.png
+share/meld/icons/tree-folder-new.png
+share/meld/icons/tree-folder-normal.png
+share/meld/icons/vc-add-24.png
+share/meld/icons/vc-checkout-24.png
+share/meld/icons/vc-commit-24.png
+share/meld/icons/vc-icon.png
+share/meld/icons/vc-remove-24.png
+share/meld/icons/vc-resolve-24.png
+share/meld/icons/vc-update-24.png
+share/meld/ui/dirdiff-ui.xml
+share/meld/ui/dirdiff.glade
+share/meld/ui/filediff-ui.xml
+share/meld/ui/filediff.glade
+share/meld/ui/findbar.glade
+share/meld/ui/meldapp-ui.xml
+share/meld/ui/meldapp.glade
+share/meld/ui/preferences.glade
+share/meld/ui/vcview-ui.xml
+share/meld/ui/vcview.glade
 share/omf/meld/meld-C.omf
 share/omf/meld/meld-es.omf
 share/omf/meld/meld-fr.omf
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index ab4fd9a111d..48194dfc22b 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/08/21 08:30:30 wiz Exp $
+$NetBSD: distinfo,v 1.9 2010/08/09 11:33:53 drochner Exp $
 
-SHA1 (meld-1.3.1.tar.bz2) = d3ab96a364b73afdfd9f26cc9bec18321f04c9df
-RMD160 (meld-1.3.1.tar.bz2) = bf9bace33ddf1d3b6b99e358799316791390cec0
-Size (meld-1.3.1.tar.bz2) = 795145 bytes
-SHA1 (patch-aa) = 49ff28a613055ead56f63e8dd5df09b986bcbea1
+SHA1 (meld-1.3.2.tar.bz2) = 1cb5174385365127d5b2e02343c73fc01c8a89ef
+RMD160 (meld-1.3.2.tar.bz2) = 7ff1bbbb46448366693f9095c7687fde7b952bd2
+Size (meld-1.3.2.tar.bz2) = 741154 bytes
+SHA1 (patch-ac) = a265fd2e88e91b9c8f781f630ee77f8829e008f7
diff --git a/devel/meld/patches/patch-aa b/devel/meld/patches/patch-aa
deleted file mode 100644
index 99170ab34aa..00000000000
--- a/devel/meld/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/07/21 07:53:13 abs Exp $
-
---- help/fr/GNUmakefile.orig	2008-03-31 21:44:53.000000000 +0100
-+++ help/fr/GNUmakefile
-@@ -15,9 +15,8 @@ all $(OMF_NAME).install : $(OMF_NAME)
- 
- .PHONY : install
- install : $(OMF_NAME).install
--	-mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
-+	-mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_)
- 	install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml
--	install -m 644 figures/*.png $(XML_DIR_)/figures
- 	-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
- 	-scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
- 
diff --git a/devel/meld/patches/patch-ac b/devel/meld/patches/patch-ac
new file mode 100644
index 00000000000..464e38585b5
--- /dev/null
+++ b/devel/meld/patches/patch-ac
@@ -0,0 +1,13 @@
+$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)):