same patch as before, but now (hopefully)
not eaten by anybody :-)

Holger
;-se

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/meld/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile    22 Dec 2009 12:51:52 -0000      1.3
+++ Makefile    6 Jan 2010 12:03:31 -0000
@@ -2,8 +2,7 @@

 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/
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/meld/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo    3 Jun 2009 18:23:27 -0000       1.1.1.1
+++ distinfo    6 Jan 2010 12:03:31 -0000
@@ -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) = e153f8d8675659dd0e6563008d4d7b4a
+RMD160 (meld-1.3.1.tar.gz) = c1d950d5cdfa8199e56b917ca6ae9b2c92a8e78d
+SHA1 (meld-1.3.1.tar.gz) = fb3f611de93b63602e963c2fad7ac428d8da95f4
+SHA256 (meld-1.3.1.tar.gz) = 
d35a285f4e26c4c3ac24ebfbd47024540462c183e6177d68e3b5ffa0a0905b78
+SIZE (meld-1.3.1.tar.gz) = 910745
Index: patches/patch-meld
===================================================================
RCS file: /cvs/ports/textproc/meld/patches/patch-meld,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-meld
--- patches/patch-meld  3 Jun 2009 18:23:27 -0000       1.1.1.1
+++ patches/patch-meld  6 Jan 2010 12:03:31 -0000
@@ -1,6 +1,6 @@
 $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
+--- meld.orig  Fri Aug 14 07:01:33 2009
++++ meld       Mon Jan  4 15:47:39 2010
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#!${MODPY_BIN}
@@ -24,6 +24,6 @@
  # i18n support
  #
 +import sys
- sys.path += [ #LIBDIR#
+ sys.path[0:0] = [ #LIBDIR#
  ]
  import paths
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/meld/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST   22 Dec 2009 12:51:52 -0000      1.2
+++ pkg/PLIST   6 Jan 2010 12:03:31 -0000
@@ -28,6 +28,12 @@
 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/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,7 +98,6 @@
 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/
@@ -122,6 +130,7 @@
 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 +166,18 @@
 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,6 +185,7 @@
 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

Reply via email to