Update to meld 1.3.1, based on a diff from Holger Mikolon, thanks!

textproc/meld/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2009/12/22 12:51:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2010/01/06 18:29:19 landry Exp $
 
 COMMENT=	graphical diff and merge tool
 
-DISTNAME=	meld-1.3.0
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	meld-1.3.1
 CATEGORIES=	textproc x11
 
 HOMEPAGE=	http://meld.sourceforge.net/

textproc/meld/distinfo

@@ -1,5 +1,5 @@
-MD5 (meld-1.3.0.tar.gz) = XPxCB3ugu58D1uVo29kG1w==
-RMD160 (meld-1.3.0.tar.gz) = e4fIognfai7vr7aSJZG4bTysm4I=
-SHA1 (meld-1.3.0.tar.gz) = NjbLvSE4rqzUyWLZI0rQvPB1OpI=
-SHA256 (meld-1.3.0.tar.gz) = vGTmQVdLOLvYxbtziy3VrHSbKj+4K8VuT6magds7pms=
-SIZE (meld-1.3.0.tar.gz) = 883758
+MD5 (meld-1.3.1.tar.gz) = 4VP42GdWWd0OZWMAjU17Sg==
+RMD160 (meld-1.3.1.tar.gz) = wdlQ1c36gZnla5F8pq6bLJKo540=
+SHA1 (meld-1.3.1.tar.gz) = +z9hHek7Y2AuljwvrXrEKNjalfQ=
+SHA256 (meld-1.3.1.tar.gz) = 01ooX04mxMOsJOv71HAkVARiwYPmF31o47X/oKCQW3g=
+SIZE (meld-1.3.1.tar.gz) = 910745

textproc/meld/patches/patch-meld

@@ -1,29 +1,9 @@
-$OpenBSD: patch-meld,v 1.1.1.1 2009/06/03 18:23:27 landry Exp $
---- meld.orig	Fri Apr 17 15:49:43 2009
-+++ meld	Wed Jun  3 10:54:34 2009
+$OpenBSD: patch-meld,v 1.2 2010/01/06 18:29:19 landry Exp $
+--- meld.orig	Fri Aug 14 07:01:33 2009
++++ meld	Wed Jan  6 19:23:50 2010
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!${MODPY_BIN}
  
  ### Copyright (C) 2002-2006 Stephen Kennedy <stevek@gnome.org>
  
-@@ -17,18 +17,9 @@
- ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #
--# pychecker
--#
--import sys
--if "--pychecker" in sys.argv:
--    sys.argv.remove("--pychecker")
--    import os
--    os.environ['PYCHECKER'] = "--no-argsused --no-classattr --stdlib"
--        #'--blacklist=gettext,locale,pygtk,gtk,gtk.keysyms,popen2,random,difflib,filecmp,tempfile'
--    import pychecker.checker
--#
- # i18n support
- #
-+import sys
- sys.path += [ #LIBDIR#
- ]
- import paths

textproc/meld/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/12/22 12:51:52 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/01/06 18:29:19 landry Exp $
 bin/meld
 lib/python${MODPY_VERSION}/site-packages/meld/
 lib/python${MODPY_VERSION}/site-packages/meld/diffutil.py
@@ -28,6 +28,12 @@ lib/python${MODPY_VERSION}/site-packages/meld/melddoc.pyo
 lib/python${MODPY_VERSION}/site-packages/meld/misc.py
 lib/python${MODPY_VERSION}/site-packages/meld/misc.pyc
 lib/python${MODPY_VERSION}/site-packages/meld/misc.pyo
+lib/python${MODPY_VERSION}/site-packages/meld/msgarea.py
+lib/python${MODPY_VERSION}/site-packages/meld/msgarea.pyc
+lib/python${MODPY_VERSION}/site-packages/meld/msgarea.pyo
+lib/python${MODPY_VERSION}/site-packages/meld/notebooklabel.py
+lib/python${MODPY_VERSION}/site-packages/meld/notebooklabel.pyc
+lib/python${MODPY_VERSION}/site-packages/meld/notebooklabel.pyo
 lib/python${MODPY_VERSION}/site-packages/meld/paths.py
 lib/python${MODPY_VERSION}/site-packages/meld/paths.pyc
 lib/python${MODPY_VERSION}/site-packages/meld/paths.pyo
@@ -80,6 +86,9 @@ lib/python${MODPY_VERSION}/site-packages/meld/vc/monotone.pyo
 lib/python${MODPY_VERSION}/site-packages/meld/vc/rcs.py
 lib/python${MODPY_VERSION}/site-packages/meld/vc/rcs.pyc
 lib/python${MODPY_VERSION}/site-packages/meld/vc/rcs.pyo
+lib/python${MODPY_VERSION}/site-packages/meld/vc/svk.py
+lib/python${MODPY_VERSION}/site-packages/meld/vc/svk.pyc
+lib/python${MODPY_VERSION}/site-packages/meld/vc/svk.pyo
 lib/python${MODPY_VERSION}/site-packages/meld/vc/svn.py
 lib/python${MODPY_VERSION}/site-packages/meld/vc/svn.pyc
 lib/python${MODPY_VERSION}/site-packages/meld/vc/svn.pyo
@@ -89,11 +98,8 @@ lib/python${MODPY_VERSION}/site-packages/meld/vc/tla.pyo
 lib/python${MODPY_VERSION}/site-packages/meld/vcview.py
 lib/python${MODPY_VERSION}/site-packages/meld/vcview.pyc
 lib/python${MODPY_VERSION}/site-packages/meld/vcview.pyo
-share/application-registry/meld.applications
 share/applications/meld.desktop
 share/doc/meld/
-share/gnome/
-share/gnome/help/
 share/gnome/help/meld/
 share/gnome/help/meld/C/
 share/gnome/help/meld/C/figures/
@@ -122,6 +128,7 @@ share/locale/en_GB/LC_MESSAGES/meld.mo
 share/locale/es/LC_MESSAGES/meld.mo
 share/locale/fi/LC_MESSAGES/meld.mo
 share/locale/fr/LC_MESSAGES/meld.mo
+share/locale/gl/LC_MESSAGES/meld.mo
 share/locale/hu/LC_MESSAGES/meld.mo
 share/locale/it/LC_MESSAGES/meld.mo
 share/locale/ja/LC_MESSAGES/meld.mo
@@ -157,21 +164,18 @@ 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/close.xpm
-share/meld/glade2/pixmaps/cvs-icon-small.png
-share/meld/glade2/pixmaps/cvs-icon.png
 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/svn-icon-small.png
-share/meld/glade2/pixmaps/svn-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
@@ -179,10 +183,10 @@ 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/omf/
 share/omf/meld/
 share/omf/meld/meld-C.omf
 share/omf/meld/meld-es.omf