From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 20 23:40:19 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFDB316A420 for ; Wed, 20 Jul 2005 23:40:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1F1343D45 for ; Wed, 20 Jul 2005 23:40:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6KNeHj8092803 for ; Wed, 20 Jul 2005 23:40:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6KNeHM9092802; Wed, 20 Jul 2005 23:40:17 GMT (envelope-from gnats) Resent-Date: Wed, 20 Jul 2005 23:40:17 GMT Resent-Message-Id: <200507202340.j6KNeHM9092802@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, Piet Delport Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D465216A421 for ; Wed, 20 Jul 2005 23:30:26 +0000 (GMT) (envelope-from pjd@tickbox.ctn.hosting.co.za) Received: from tickbox.ctn.hosting.co.za (tickbox.ctn.hosting.co.za [196.36.153.47]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FA4C43D5F for ; Wed, 20 Jul 2005 23:30:24 +0000 (GMT) (envelope-from pjd@tickbox.ctn.hosting.co.za) Received: by tickbox.ctn.hosting.co.za (Postfix, from userid 1001) id 1BBEDAC98; Thu, 21 Jul 2005 01:30:23 +0200 (SAST) Message-Id: <20050720233023.1BBEDAC98@tickbox.ctn.hosting.co.za> Date: Thu, 21 Jul 2005 01:30:23 +0200 (SAST) From: Piet Delport To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/83817: Update mercurial 0.6 -> 0.6b X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jul 2005 23:40:19 -0000 >Number: 83817 >Category: ports >Synopsis: Update mercurial 0.6 -> 0.6b >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jul 20 23:40:17 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Piet Delport >Release: >Organization: >Environment: >Description: Despite the small version increment, this release contains several significant new features, fixes and improvements. A summary can be found in the announcement email[1]. Besides bumping the version, this patch sorts pkg-plist, and removes the patch (which is now included). [1] http://www.selenic.com/pipermail/mercurial/2005-July/002357.html >How-To-Repeat: >Fix: --- mercurial-0.6b.patch begins here --- diff -r 32d3470cf990 -r 7f404a81358d Makefile --- a/Makefile Wed Jul 20 22:09:30 2005 +++ b/Makefile Wed Jul 20 23:02:51 2005 @@ -6,7 +6,7 @@ # PORTNAME= mercurial -PORTVERSION= 0.6 +PORTVERSION= 0.6b CATEGORIES= devel python MASTER_SITES= http://www.selenic.com/mercurial/release/ diff -r 32d3470cf990 -r 7f404a81358d distinfo --- a/distinfo Wed Jul 20 22:09:30 2005 +++ b/distinfo Wed Jul 20 23:02:51 2005 @@ -1,2 +1,2 @@ -MD5 (mercurial-0.6.tar.gz) = 25f9ce77b3e5e257d33a982d4ca7c43f -SIZE (mercurial-0.6.tar.gz) = 81760 +MD5 (mercurial-0.6b.tar.gz) = 502b7de4244017cb0b16658acbbbddc2 +SIZE (mercurial-0.6b.tar.gz) = 105466 diff -r 32d3470cf990 -r 7f404a81358d pkg-plist --- a/pkg-plist Wed Jul 20 22:09:30 2005 +++ b/pkg-plist Wed Jul 20 23:02:51 2005 @@ -1,72 +1,80 @@ bin/hg bin/hgmerge +%%PYTHON_SITELIBDIR%%/mercurial/__init__.py +%%PYTHON_SITELIBDIR%%/mercurial/__init__.pyc +%%PYTHON_SITELIBDIR%%/mercurial/__init__.pyo %%PYTHON_SITELIBDIR%%/mercurial/__version__.py %%PYTHON_SITELIBDIR%%/mercurial/__version__.pyc +%%PYTHON_SITELIBDIR%%/mercurial/__version__.pyo +%%PYTHON_SITELIBDIR%%/mercurial/bdiff.so +%%PYTHON_SITELIBDIR%%/mercurial/byterange.py +%%PYTHON_SITELIBDIR%%/mercurial/byterange.pyc +%%PYTHON_SITELIBDIR%%/mercurial/byterange.pyo +%%PYTHON_SITELIBDIR%%/mercurial/commands.py +%%PYTHON_SITELIBDIR%%/mercurial/commands.pyc +%%PYTHON_SITELIBDIR%%/mercurial/commands.pyo +%%PYTHON_SITELIBDIR%%/mercurial/demandload.py +%%PYTHON_SITELIBDIR%%/mercurial/demandload.pyc +%%PYTHON_SITELIBDIR%%/mercurial/demandload.pyo +%%PYTHON_SITELIBDIR%%/mercurial/fancyopts.py +%%PYTHON_SITELIBDIR%%/mercurial/fancyopts.pyc +%%PYTHON_SITELIBDIR%%/mercurial/fancyopts.pyo +%%PYTHON_SITELIBDIR%%/mercurial/hg.py +%%PYTHON_SITELIBDIR%%/mercurial/hg.pyc +%%PYTHON_SITELIBDIR%%/mercurial/hg.pyo +%%PYTHON_SITELIBDIR%%/mercurial/hgweb.py +%%PYTHON_SITELIBDIR%%/mercurial/hgweb.pyc +%%PYTHON_SITELIBDIR%%/mercurial/hgweb.pyo +%%PYTHON_SITELIBDIR%%/mercurial/httprangereader.py +%%PYTHON_SITELIBDIR%%/mercurial/httprangereader.pyc +%%PYTHON_SITELIBDIR%%/mercurial/httprangereader.pyo +%%PYTHON_SITELIBDIR%%/mercurial/lock.py +%%PYTHON_SITELIBDIR%%/mercurial/lock.pyc +%%PYTHON_SITELIBDIR%%/mercurial/lock.pyo +%%PYTHON_SITELIBDIR%%/mercurial/mdiff.py +%%PYTHON_SITELIBDIR%%/mercurial/mdiff.pyc +%%PYTHON_SITELIBDIR%%/mercurial/mdiff.pyo %%PYTHON_SITELIBDIR%%/mercurial/mpatch.so -%%PYTHON_SITELIBDIR%%/mercurial/bdiff.so -%%PYTHON_SITELIBDIR%%/mercurial/hg.py -%%PYTHON_SITELIBDIR%%/mercurial/commands.py -%%PYTHON_SITELIBDIR%%/mercurial/fancyopts.py -%%PYTHON_SITELIBDIR%%/mercurial/__init__.py -%%PYTHON_SITELIBDIR%%/mercurial/version.py -%%PYTHON_SITELIBDIR%%/mercurial/hgweb.py -%%PYTHON_SITELIBDIR%%/mercurial/transaction.py -%%PYTHON_SITELIBDIR%%/mercurial/ui.py -%%PYTHON_SITELIBDIR%%/mercurial/httprangereader.py -%%PYTHON_SITELIBDIR%%/mercurial/mdiff.py -%%PYTHON_SITELIBDIR%%/mercurial/lock.py -%%PYTHON_SITELIBDIR%%/mercurial/demandload.py -%%PYTHON_SITELIBDIR%%/mercurial/util.py -%%PYTHON_SITELIBDIR%%/mercurial/byterange.py %%PYTHON_SITELIBDIR%%/mercurial/revlog.py -%%PYTHON_SITELIBDIR%%/mercurial/hg.pyc -%%PYTHON_SITELIBDIR%%/mercurial/commands.pyc -%%PYTHON_SITELIBDIR%%/mercurial/fancyopts.pyc -%%PYTHON_SITELIBDIR%%/mercurial/__init__.pyc -%%PYTHON_SITELIBDIR%%/mercurial/version.pyc -%%PYTHON_SITELIBDIR%%/mercurial/hgweb.pyc -%%PYTHON_SITELIBDIR%%/mercurial/transaction.pyc -%%PYTHON_SITELIBDIR%%/mercurial/ui.pyc -%%PYTHON_SITELIBDIR%%/mercurial/httprangereader.pyc -%%PYTHON_SITELIBDIR%%/mercurial/mdiff.pyc -%%PYTHON_SITELIBDIR%%/mercurial/lock.pyc -%%PYTHON_SITELIBDIR%%/mercurial/demandload.pyc -%%PYTHON_SITELIBDIR%%/mercurial/util.pyc -%%PYTHON_SITELIBDIR%%/mercurial/byterange.pyc %%PYTHON_SITELIBDIR%%/mercurial/revlog.pyc +%%PYTHON_SITELIBDIR%%/mercurial/revlog.pyo +%%PYTHON_SITELIBDIR%%/mercurial/templates/changelog-rss.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/changelog.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/changelogentry-rss.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/changelogentry.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/changeset-raw.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/changeset.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/fileannotate.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/filediff-raw.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/filediff.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/filelog-rss.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/filelog.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/filelogentry-rss.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/filelogentry.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/filerevision-raw.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/filerevision.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/footer.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/header-raw.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/header-rss.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/header.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/manifest.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/map %%PYTHON_SITELIBDIR%%/mercurial/templates/map-raw -%%PYTHON_SITELIBDIR%%/mercurial/templates/fileannotate.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/footer.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/changelog.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/header.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/filelog.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/filediff.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/filerevision-raw.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/manifest.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/filerevision.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/changelogentry.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/filelogentry.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/filediff-raw.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/header-raw.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/map-rss +%%PYTHON_SITELIBDIR%%/mercurial/templates/search.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/searchentry.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/tags.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/changeset.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/templates/changeset-raw.tmpl -%%PYTHON_SITELIBDIR%%/mercurial/hg.pyo -%%PYTHON_SITELIBDIR%%/mercurial/commands.pyo -%%PYTHON_SITELIBDIR%%/mercurial/fancyopts.pyo -%%PYTHON_SITELIBDIR%%/mercurial/__init__.pyo +%%PYTHON_SITELIBDIR%%/mercurial/transaction.py +%%PYTHON_SITELIBDIR%%/mercurial/transaction.pyc +%%PYTHON_SITELIBDIR%%/mercurial/transaction.pyo +%%PYTHON_SITELIBDIR%%/mercurial/ui.py +%%PYTHON_SITELIBDIR%%/mercurial/ui.pyc +%%PYTHON_SITELIBDIR%%/mercurial/ui.pyo +%%PYTHON_SITELIBDIR%%/mercurial/util.py +%%PYTHON_SITELIBDIR%%/mercurial/util.pyc +%%PYTHON_SITELIBDIR%%/mercurial/util.pyo +%%PYTHON_SITELIBDIR%%/mercurial/version.py +%%PYTHON_SITELIBDIR%%/mercurial/version.pyc %%PYTHON_SITELIBDIR%%/mercurial/version.pyo -%%PYTHON_SITELIBDIR%%/mercurial/hgweb.pyo -%%PYTHON_SITELIBDIR%%/mercurial/transaction.pyo -%%PYTHON_SITELIBDIR%%/mercurial/ui.pyo -%%PYTHON_SITELIBDIR%%/mercurial/httprangereader.pyo -%%PYTHON_SITELIBDIR%%/mercurial/mdiff.pyo -%%PYTHON_SITELIBDIR%%/mercurial/lock.pyo -%%PYTHON_SITELIBDIR%%/mercurial/__version__.pyo -%%PYTHON_SITELIBDIR%%/mercurial/demandload.pyo -%%PYTHON_SITELIBDIR%%/mercurial/util.pyo -%%PYTHON_SITELIBDIR%%/mercurial/byterange.pyo -%%PYTHON_SITELIBDIR%%/mercurial/revlog.pyo @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates @dirrm %%PYTHON_SITELIBDIR%%/mercurial diff -r 32d3470cf990 -r 7f404a81358d files/patch-hgmerge --- a/files/patch-hgmerge Wed Jul 20 22:09:30 2005 +++ /dev/null Wed Jul 20 23:02:51 2005 @@ -1,8 +0,0 @@ ---- hgmerge.orig Mon Jul 11 23:59:46 2005 -+++ hgmerge Mon Jul 11 23:59:59 2005 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # hgmerge - default merge helper for Mercurial - # --- mercurial-0.6b.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: