[pkgsrc/trunk]: pkgsrc/devel/meld Update to 1.2:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/55785d9f8103
branches:  trunk
changeset: 544705:55785d9f8103
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jul 18 09:43:57 2008 +0000

description:
Update to 1.2:

2008-06-26 meld-1.2
=======================

        * Improve tab rendering (Kai Willadsen)

        * Speedup folder comparison massively for large directories.

        * Fix crasher i18n bug (Kai Willadsen)

        * UI tweaks and cleanups (Tom Baugis, Kai Willadsen)

        * Cleanup vc library redundancy (Vincent Legoll)

        * Various version control fixes.

diffstat:

 devel/meld/Makefile         |   7 +++----
 devel/meld/PLIST            |  10 +++++++++-
 devel/meld/distinfo         |   9 +++++----
 devel/meld/patches/patch-aa |  14 ++++++++++++++
 4 files changed, 31 insertions(+), 9 deletions(-)

diffs (103 lines):

diff -r 2016f2f90c93 -r 55785d9f8103 devel/meld/Makefile
--- a/devel/meld/Makefile       Fri Jul 18 09:43:35 2008 +0000
+++ b/devel/meld/Makefile       Fri Jul 18 09:43:57 2008 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/07/14 12:56:02 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/07/18 09:43:57 wiz Exp $
 #
 
-DISTNAME=              meld-1.1.5.1
-PKGREVISION=           1
+DISTNAME=              meld-1.2
 CATEGORIES=            devel
-MASTER_SITES=          http://ftp.gnome.org/pub/gnome/sources/meld/1.1/
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/meld/1.2/}
 EXTRACT_SUFX=          .tar.bz2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
diff -r 2016f2f90c93 -r 55785d9f8103 devel/meld/PLIST
--- a/devel/meld/PLIST  Fri Jul 18 09:43:35 2008 +0000
+++ b/devel/meld/PLIST  Fri Jul 18 09:43:57 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/11/03 13:22:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/07/18 09:43:57 wiz Exp $
 bin/meld
 lib/meld/diffutil.py
 lib/meld/diffutil.pyc
@@ -54,6 +54,9 @@
 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
@@ -77,6 +80,7 @@
 share/cs/LC_MESSAGES/meld.mo
 share/de/LC_MESSAGES/meld.mo
 share/dz/LC_MESSAGES/meld.mo
+share/el/LC_MESSAGES/meld.mo
 share/en_CA/LC_MESSAGES/meld.mo
 share/en_GB/LC_MESSAGES/meld.mo
 share/es/LC_MESSAGES/meld.mo
@@ -88,6 +92,7 @@
 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/meld.xml
 share/hu/LC_MESSAGES/meld.mo
 share/it/LC_MESSAGES/meld.mo
 share/ja/LC_MESSAGES/meld.mo
@@ -126,8 +131,10 @@
 share/meld/glade2/vcview.glade
 share/ne/LC_MESSAGES/meld.mo
 share/nl/LC_MESSAGES/meld.mo
+share/oc/LC_MESSAGES/meld.mo
 share/omf/meld/meld-C.omf
 share/omf/meld/meld-es.omf
+share/omf/meld/meld-fr.omf
 share/pa/LC_MESSAGES/meld.mo
 share/pixmaps/meld.png
 share/pt/LC_MESSAGES/meld.mo
@@ -180,6 +187,7 @@
 @dirrm share/it
 @dirrm share/hu/LC_MESSAGES
 @dirrm share/hu
+@dirrm share/gnome/help/meld/fr
 @dirrm share/gnome/help/meld/es/figures
 @dirrm share/gnome/help/meld/es
 @dirrm share/gnome/help/meld/C/figures
diff -r 2016f2f90c93 -r 55785d9f8103 devel/meld/distinfo
--- a/devel/meld/distinfo       Fri Jul 18 09:43:35 2008 +0000
+++ b/devel/meld/distinfo       Fri Jul 18 09:43:57 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/06/16 02:35:08 obache Exp $
+$NetBSD: distinfo,v 1.3 2008/07/18 09:43:57 wiz Exp $
 
-SHA1 (meld-1.1.5.1.tar.bz2) = 047bc68184ed18d490bc41658c7d2d3d8950696a
-RMD160 (meld-1.1.5.1.tar.bz2) = 8ac6e0b6518388f188ab6a0f13ace67aad02fef4
-Size (meld-1.1.5.1.tar.bz2) = 602859 bytes
+SHA1 (meld-1.2.tar.bz2) = aa246307226332b865216d139c10de4c73562fc1
+RMD160 (meld-1.2.tar.bz2) = a06fee2f8f882a1edba329bd0be7797f89852920
+Size (meld-1.2.tar.bz2) = 616975 bytes
+SHA1 (patch-aa) = 6028b73c128ae38c34b1009a1a13de53d0ff61d6
diff -r 2016f2f90c93 -r 55785d9f8103 devel/meld/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/meld/patches/patch-aa       Fri Jul 18 09:43:57 2008 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2008/07/18 09:43:57 wiz Exp $
+
+--- help/fr/GNUmakefile.orig   2008-03-31 20:44:53.000000000 +0000
++++ help/fr/GNUmakefile
+@@ -15,9 +15,7 @@ all $(OMF_NAME).install : $(OMF_NAME)
+ 
+ .PHONY : install
+ install : $(OMF_NAME).install
+-      -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
+       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_)
+