Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Feb 2012 13:22:36 GMT
From:      Olivier Duchateau <duchateau.olivier@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/164708: [UPDATE] devel/mercurial to 2.1
Message-ID:  <201202021322.q12DMaCo098433@red.freebsd.org>
Resent-Message-ID: <201202021330.q12DUCdf029719@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         164708
>Category:       ports
>Synopsis:       [UPDATE] devel/mercurial to 2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 02 13:30:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Duchateau
>Release:        FreeBSD 8.2-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
New in this version: http://mercurial.selenic.com/wiki/UpgradeNotes#A2.1:_phases.2C_various_minor_changes

Add patch to avoid install 'httpclient.tests' module.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -uNr /usr/ports/devel/mercurial/Makefile mercurial/Makefile
--- /usr/ports/devel/mercurial/Makefile	2012-01-17 21:21:11.000000000 +0100
+++ mercurial/Makefile	2012-02-02 13:47:33.000000000 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercurial
-PORTVERSION=	2.0.2
+PORTVERSION=	2.1
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff -uNr /usr/ports/devel/mercurial/distinfo mercurial/distinfo
--- /usr/ports/devel/mercurial/distinfo	2012-01-17 21:21:11.000000000 +0100
+++ mercurial/distinfo	2012-02-02 13:47:33.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.0.2.tar.gz) = ca8b8fb93f2e3e8c3cdf2f81d87e92592f5f20c5bfcaaeb6a75550d4a69572c9
-SIZE (mercurial-2.0.2.tar.gz) = 3134016
+SHA256 (mercurial-2.1.tar.gz) = cb37f90807e99dd4508cac70c098aa433b26adb7a3ab064c0b1626dc9a094383
+SIZE (mercurial-2.1.tar.gz) = 3308300
diff -uNr /usr/ports/devel/mercurial/files/patch-setup.py mercurial/files/patch-setup.py
--- /usr/ports/devel/mercurial/files/patch-setup.py	1970-01-01 01:00:00.000000000 +0100
+++ mercurial/files/patch-setup.py	2012-02-02 13:47:33.000000000 +0100
@@ -0,0 +1,11 @@
+--- setup.py.orig	2012-02-01 21:23:54.000000000 +0100
++++ setup.py	2012-02-02 12:44:12.000000000 +0100
+@@ -379,7 +379,7 @@
+             'install_scripts': hginstallscripts}
+ 
+ packages = ['mercurial', 'mercurial.hgweb',
+-            'mercurial.httpclient', 'mercurial.httpclient.tests',
++            'mercurial.httpclient',
+             'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf',
+             'hgext.largefiles']
+ 
diff -uNr /usr/ports/devel/mercurial/pkg-plist mercurial/pkg-plist
--- /usr/ports/devel/mercurial/pkg-plist	2011-11-08 09:47:13.000000000 +0100
+++ mercurial/pkg-plist	2012-02-02 13:47:33.000000000 +0100
@@ -285,6 +285,7 @@
 %%PYTHON_SITELIBDIR%%/mercurial/help/merge-tools.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/multirevs.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/patterns.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/phases.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/revisions.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/revsets.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/subrepos.txt
@@ -332,27 +333,6 @@
 %%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.py
 %%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/simple_http_test.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/simple_http_test.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/simple_http_test.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_bogus_responses.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_bogus_responses.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_bogus_responses.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_chunked_transfer.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_chunked_transfer.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_chunked_transfer.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_proxy_support.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_proxy_support.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_proxy_support.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_ssl.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_ssl.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_ssl.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/util.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/util.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/util.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.py
 %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.pyo
@@ -368,6 +348,9 @@
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.py
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/phases.py
+%%PYTHON_SITELIBDIR%%/mercurial/phases.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/phases.pyo
 %%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES/hg.mo
 %%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES/hg.mo
 %%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES/hg.mo
@@ -735,7 +718,6 @@
 %%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES
 %%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW
 %%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/httpclient
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/help
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/hgweb


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202021322.q12DMaCo098433>