Update to 1.3.0:

2009-04-17 meld-1.3.0
=====================

        * Minimum requirements are pygobject 2.8 and python 2.4

        * Find dialog replaced with find bar with replace functionality

        * Remove gnome dependencies (Kai Willadsen, Vincent Legoll)
          Meld now runs on win32 (experimental).

        * Many ui tweaks and cleanups (Kai Willadsen, Vincent Legoll)

        * Support for multiple sourceview versions (Vincent Legoll)

        * Updated version control support
            * Multiple VCs in a single directory (Vincent Legoll)
            * Subversion 1.6.x (Vincent Legoll)
            * Add RCS support (Oliver Gerlich, Vincent Legoll)
            * Add Codeville support (Vincent Legoll)

4 files changed, 34 insertions, 34 deletions

diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 7675ceb5b48..e8f2fd9f043 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.17 2009/03/08 15:56:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2009/04/20 10:53:58 wiz Exp $
 #
 
-DISTNAME=		meld-1.2.1
-PKGREVISION=		1
+DISTNAME=		meld-1.3.0
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/1.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/1.3/}
 EXTRACT_SUFX=		.tar.bz2
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-DEPENDS+=		${PYPKGPREFIX}-gtk2>=2.8.0:../../x11/py-gtk2
-DEPENDS+=		${PYPKGPREFIX}-gnome2>=2.6.0:../../x11/py-gnome2
-
 MAINTAINER=		dieter.NetBSD@pandora.be
 HOMEPAGE=		http://meld.sourceforge.net/
 COMMENT=		Visual diff and merge tool
 
-USE_DIRS+=			xdg-1.3
-USE_DIRS+=			gnome2-1.6
+DEPENDS+=		${PYPKGPREFIX}-gtk2>=2.8.0:../../x11/py-gtk2
+
+LICENSE=		gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_DIRS+=			gnome2-1.6 xdg-1.3
 USE_PKGLOCALEDIR=		YES
 USE_TOOLS+=			gmake msgfmt intltool
 MAKE_FLAGS+=			prefix=${PREFIX}
@@ -25,10 +24,7 @@ MAKE_FLAGS+=			localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 MAKE_FLAGS+=			PYTHON=${PYTHONBIN}
 MAKE_FILE=			GNUmakefile
 PYTHON_PATCH_SCRIPTS=		meld
-
-post-extract:
-	# msgfmt complains about this in 1.2.1
-	${RM} ${WRKSRC}/po/sq.po
+PYTHON_VERSIONS_INCOMPATIBLE=	23
 
 # remove unnecessarily created empty dir
 post-install:
diff --git a/devel/meld/PLIST b/devel/meld/PLIST
index 27f6d052fa9..1ccd22f8c5e 100644
--- a/devel/meld/PLIST
+++ b/devel/meld/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/11/24 14:03:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/04/20 10:53:58 wiz Exp $
 bin/meld
 lib/meld/diffutil.py
 lib/meld/diffutil.pyc
@@ -9,9 +9,15 @@ 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
@@ -27,6 +33,9 @@ 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
@@ -48,6 +57,9 @@ 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
@@ -63,6 +75,9 @@ 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/svn.py
 lib/meld/vc/svn.pyc
 lib/meld/vc/svn.pyo
@@ -106,6 +121,7 @@ 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/sq/LC_MESSAGES/meld.mo
 share/locale/sr/LC_MESSAGES/meld.mo
 share/locale/sr@Latn/LC_MESSAGES/meld.mo
 share/locale/sv/LC_MESSAGES/meld.mo
@@ -116,6 +132,7 @@ 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
@@ -165,6 +182,7 @@ share/pixmaps/meld.png
 @dirrm share/gnome/help/meld/C
 @dirrm share/gnome/help/meld
 @comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome
 @comment in xdg-dirs: @dirrm share/applications
 @comment in xdg-dirs: @dirrm share/application-registry
 @dirrm lib/meld/vc
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index 0576630a6bf..a739ac8e30f 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2009/01/18 12:31:07 ahoka Exp $
+$NetBSD: distinfo,v 1.7 2009/04/20 10:53:58 wiz Exp $
 
-SHA1 (meld-1.2.1.tar.bz2) = 8c50e2b03ebc175d771539043c9db3a128373ab8
-RMD160 (meld-1.2.1.tar.bz2) = 4b38b786bbe1551a5434c54f00b77556e2f8f8b3
-Size (meld-1.2.1.tar.bz2) = 699861 bytes
+SHA1 (meld-1.3.0.tar.bz2) = a8b53d3f3e4ff1ededfef4ce500c2d664cb3af75
+RMD160 (meld-1.3.0.tar.bz2) = d001f2a74fe25f2bf6539bc29e9d9be8b5f4a94b
+Size (meld-1.3.0.tar.bz2) = 799554 bytes
 SHA1 (patch-aa) = 49ff28a613055ead56f63e8dd5df09b986bcbea1
-SHA1 (patch-ab) = e0e2503e6a7160f3cd63d4e8caf6e6d8d2f56f0a
diff --git a/devel/meld/patches/patch-ab b/devel/meld/patches/patch-ab
deleted file mode 100644
index 82160380d86..00000000000
--- a/devel/meld/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/01/18 12:31:07 ahoka Exp $
-
---- filediff.py.orig	2008-10-22 19:48:30.000000000 +0200
-+++ filediff.py
-@@ -568,7 +568,7 @@ class FileDiff(melddoc.MeldDoc, gnomegla
-                     bnew.label = bold.label
-                 self.bufferdata[i] = bnew
-         self.recompute_label()
--        self.textview[1 if len(files) >= 2 else 0].grab_focus()
-+        self.textview[len(files) >= 2].grab_focus()
-         self.scheduler.add_task( self._set_files_internal(files).next )
- 
-     def _set_files_internal(self, files):