From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 30 17:00:10 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 263601065678 for ; Tue, 30 Jun 2009 17:00:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F40238FC13 for ; Tue, 30 Jun 2009 17:00:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5UH09dV070417 for ; Tue, 30 Jun 2009 17:00:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5UH09eB070416; Tue, 30 Jun 2009 17:00:09 GMT (envelope-from gnats) Resent-Date: Tue, 30 Jun 2009 17:00:09 GMT Resent-Message-Id: <200906301700.n5UH09eB070416@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Geoffrey Mainland Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A43B71065672 for ; Tue, 30 Jun 2009 16:59:43 +0000 (UTC) (envelope-from mainland@minipax.eecs.harvard.edu) Received: from minipax.eecs.harvard.edu (minipax.eecs.harvard.edu [140.247.60.67]) by mx1.freebsd.org (Postfix) with ESMTP id 82A1B8FC1A for ; Tue, 30 Jun 2009 16:59:43 +0000 (UTC) (envelope-from mainland@minipax.eecs.harvard.edu) Received: by minipax.eecs.harvard.edu (Postfix, from userid 33141) id 6E4BB3935B7; Tue, 30 Jun 2009 12:40:21 -0400 (EDT) Message-Id: <20090630164021.6E4BB3935B7@minipax.eecs.harvard.edu> Date: Tue, 30 Jun 2009 12:40:21 -0400 (EDT) From: Geoffrey Mainland To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/136190: UPDATE: textproc/meld to 1.3.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Geoffrey Mainland List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jun 2009 17:00:10 -0000 >Number: 136190 >Category: ports >Synopsis: UPDATE: textproc/meld to 1.3.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jun 30 17:00:09 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Geoffrey Mainland >Release: FreeBSD 7.2-STABLE amd64 >Organization: >Environment: System: FreeBSD minipax.eecs.harvard.edu 7.2-STABLE FreeBSD 7.2-STABLE #3: Thu Jun 18 17:57:55 EDT 2009 toor@minipax.eecs.harvard.edu:/usr/obj/amd64/usr/src/sys/MINIPAX amd64 >Description: The version of meld currenly in ports (1.2.1) no longer works with subversion 1.6+ (1.6.3 is in ports). Upgrading to 1.3.0 solves this incompatibility. >How-To-Repeat: >Fix: diff -ruN textproc/meld.orig/Makefile textproc/meld/Makefile --- textproc/meld.orig/Makefile 2009-02-01 20:36:07.000000000 -0500 +++ textproc/meld/Makefile 2009-05-27 16:21:14.000000000 -0400 @@ -6,7 +6,7 @@ # PORTNAME= meld -PORTVERSION= 1.2.1 +PORTVERSION= 1.3.0 CATEGORIES= textproc devel python MASTER_SITES= GNOME diff -ruN textproc/meld.orig/distinfo textproc/meld/distinfo --- textproc/meld.orig/distinfo 2009-01-18 16:05:57.000000000 -0500 +++ textproc/meld/distinfo 2009-05-27 16:21:14.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (meld-1.2.1.tar.bz2) = 78f6084b14ee5334cf3578e62383b341 -SHA256 (meld-1.2.1.tar.bz2) = 8ed7834a40fa10aaea33981bcc8f9862afd073461a258fe008e16b6b0c156394 -SIZE (meld-1.2.1.tar.bz2) = 699861 +MD5 (meld-1.3.0.tar.bz2) = 8f8eaabfb398cb59e7cb51284003f552 +SHA256 (meld-1.3.0.tar.bz2) = 94a6f834ce236fc1efb026fb9a875c8cb51d2c4f82361b0c989bef38ae015bfc +SIZE (meld-1.3.0.tar.bz2) = 799554 diff -ruN textproc/meld.orig/pkg-plist textproc/meld/pkg-plist --- textproc/meld.orig/pkg-plist 2009-01-19 10:33:31.000000000 -0500 +++ textproc/meld/pkg-plist 2009-05-27 16:21:14.000000000 -0400 @@ -8,9 +8,15 @@ 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 @@ -26,6 +32,9 @@ 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 @@ -47,6 +56,9 @@ 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 @@ -62,6 +74,9 @@ 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 @@ -122,6 +137,7 @@ %%DATADIR%%/glade2/dirdiff-ui.xml %%DATADIR%%/glade2/filediff-ui.xml %%DATADIR%%/glade2/filediff.glade +%%DATADIR%%/glade2/findbar.glade %%DATADIR%%/glade2/meldapp.glade %%DATADIR%%/glade2/meldapp-ui.xml %%DATADIR%%/glade2/pixmaps/button_apply0.xpm >Release-Note: >Audit-Trail: >Unformatted: