summaryrefslogtreecommitdiff
path: root/devel/meld
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2010-10-16 15:15:15 +0000
committerwiz <wiz@pkgsrc.org>2010-10-16 15:15:15 +0000
commit81afffedcac8eab09b314712c96bc452070c6f03 (patch)
treec359cdf611dbea2fc061284b1571615e7d65bfaf /devel/meld
parent7b669cef78bf73f65d36162522671bd9f1490022 (diff)
downloadpkgsrc-81afffedcac8eab09b314712c96bc452070c6f03.tar.gz
Update to 1.4.0. Send patch-ac upstream and add comment.
2010-09-27 meld-1.4.0 ===================== * Fix committing with RCS (Iuri Diniz) * Fix compatibility with old PyGObject (Kai Willadsen) * Translation updates: hu (Gabor Kelemen)
Diffstat (limited to 'devel/meld')
-rw-r--r--devel/meld/Makefile6
-rw-r--r--devel/meld/distinfo10
-rw-r--r--devel/meld/patches/patch-ac5
3 files changed, 12 insertions, 9 deletions
diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 6b7439d07a2..b926c26aa39 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2010/09/13 12:33:17 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/10/16 15:15:15 wiz Exp $
#
-DISTNAME= meld-1.3.3
+DISTNAME= meld-1.4.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.3/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.4/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= dieter.NetBSD@pandora.be
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index a518b2f1163..fe4da088af0 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2010/09/13 12:33:17 wiz Exp $
+$NetBSD: distinfo,v 1.11 2010/10/16 15:15:15 wiz Exp $
-SHA1 (meld-1.3.3.tar.bz2) = 2f0555a69430e4ab4bd9c0b69beb0658daa2132f
-RMD160 (meld-1.3.3.tar.bz2) = 2041864c14be2fc2c10f82ac300da80c9a51272c
-Size (meld-1.3.3.tar.bz2) = 333460 bytes
-SHA1 (patch-ac) = a265fd2e88e91b9c8f781f630ee77f8829e008f7
+SHA1 (meld-1.4.0.tar.bz2) = 2db6d610f1d1e2ef2bd0e0027695e72f6f6a6ac9
+RMD160 (meld-1.4.0.tar.bz2) = 5e244b450cd1a11b8eeb8176a77043a0a6eff63a
+Size (meld-1.4.0.tar.bz2) = 333793 bytes
+SHA1 (patch-ac) = 2688060101a1aa756b235ac8542f652baf098ae7
diff --git a/devel/meld/patches/patch-ac b/devel/meld/patches/patch-ac
index 464e38585b5..b7491529f18 100644
--- a/devel/meld/patches/patch-ac
+++ b/devel/meld/patches/patch-ac
@@ -1,4 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2010/08/09 11:33:53 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2010/10/16 15:15:16 wiz Exp $
+
+NetBSD patch doesn't support long options.
+https://bugzilla.gnome.org/show_bug.cgi?id=632297
--- meld/vc/_vc.py.orig 2010-06-24 21:31:33.000000000 +0000
+++ meld/vc/_vc.py