ports/186976: [PATCH] devel/tortoisehg2 upgrade to 2.11

Frédéric Praca frederic.praca at free.fr
Sun Feb 23 10:30:01 UTC 2014 

>Number:         186976
>Category:       ports
>Synopsis:       [PATCH] devel/tortoisehg2 upgrade to 2.11
>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:   Sun Feb 23 10:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Frédéric Praca
>Release:        FreeBSD 9.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD coruscant.dnsalias.net 9.2-STABLE FreeBSD 9.2-STABLE #25 r259727M: Sun Dec 22 23:11:19 CET 2013 root at coruscant.dnsalias.net:/usr/obj/usr/src/sys/CORUSCANT i386

>Description:
TortoiseHG v2.10.1 included in the ports does not work with the current Mercurial port. It needs to be upgraded to version 2.11
>How-To-Repeat:
Just install devel/tortoisehg2 and run
>Fix:

--- tortoisehg2.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(révision 345658)
+++ Makefile	(copie de travail)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tortoisehg
-PORTVERSION=	2.10.1
+PORTVERSION=	2.11
 CATEGORIES=	devel
 MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
 
Index: distinfo
===================================================================
--- distinfo	(révision 345658)
+++ distinfo	(copie de travail)
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-2.10.1.tar.gz) = 5c42af380ad1d00ce04e7b764eb1797a725451598627b3e8cc2dde9f359feb39
-SIZE (tortoisehg-2.10.1.tar.gz) = 8617287
+SHA256 (tortoisehg-2.11.tar.gz) = 4b66ac7c94a8b31a7a06cbb1d1919a271c8e7c5d2587247d1e08f22a835da687
+SIZE (tortoisehg-2.11.tar.gz) = 7383690
Index: pkg-plist
===================================================================
--- pkg-plist	(révision 345658)
+++ pkg-plist	(copie de travail)
@@ -1,5 +1,8 @@
 bin/thg
-%%NAUTILUS%%lib/nautilus/extensions-2.0/python/nautilus-thg.py
+%%PYTHON_SITELIBDIR%%/tortoisehg-2.11-py2.7.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/tortoisehg-2.11-py2.7.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/tortoisehg-2.11-py2.7.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/tortoisehg-2.11-py2.7.egg-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/tortoisehg/__init__.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/__init__.pyo
@@ -57,9 +60,6 @@
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/customtools.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/customtools.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/customtools.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/decorators.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/docklog.pyo
@@ -72,9 +72,9 @@
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/filedialogs.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/filedialogs.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/filedialogs.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/filelistmodel.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/filelistmodel.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/filelistmodel.pyo
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/fileencoding.py
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/fileencoding.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/fileencoding.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/filelistview.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/filelistview.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/filelistview.pyo
@@ -135,15 +135,12 @@
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/logcolumns.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/logcolumns.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/logcolumns.pyo
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestmodel.py
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestmodel.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestmodel.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/matching.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/matching.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/matching.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestdialog.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestdialog.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestdialog.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestmodel.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestmodel.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/manifestmodel.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/merge.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/merge.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/merge.pyo
@@ -165,9 +162,6 @@
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/partialcommit.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/partialcommit.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/partialcommit.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pathedit.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pathedit.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pathedit.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pbranch.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pbranch.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pbranch.pyo
@@ -379,43 +373,43 @@
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/wconfig.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/util/wconfig.pyo
 share/applications/tortoisehg.desktop
-%%NLS%%share/locale/ar/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/da/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/de/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/en_AU/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/es/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/et/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/fa/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/he/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/id/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/it/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/jv/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/oc/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo
+share/locale/ar/LC_MESSAGES/tortoisehg.mo
+share/locale/ca/LC_MESSAGES/tortoisehg.mo
+share/locale/cs/LC_MESSAGES/tortoisehg.mo
+share/locale/da/LC_MESSAGES/tortoisehg.mo
+share/locale/de/LC_MESSAGES/tortoisehg.mo
+share/locale/en_AU/LC_MESSAGES/tortoisehg.mo
+share/locale/en_GB/LC_MESSAGES/tortoisehg.mo
+share/locale/es/LC_MESSAGES/tortoisehg.mo
+share/locale/et/LC_MESSAGES/tortoisehg.mo
+share/locale/fa/LC_MESSAGES/tortoisehg.mo
+share/locale/fr/LC_MESSAGES/tortoisehg.mo
+share/locale/he/LC_MESSAGES/tortoisehg.mo
+share/locale/hr/LC_MESSAGES/tortoisehg.mo
+share/locale/hu/LC_MESSAGES/tortoisehg.mo
+share/locale/id/LC_MESSAGES/tortoisehg.mo
+share/locale/it/LC_MESSAGES/tortoisehg.mo
+share/locale/ja/LC_MESSAGES/tortoisehg.mo
+share/locale/jv/LC_MESSAGES/tortoisehg.mo
+share/locale/ko/LC_MESSAGES/tortoisehg.mo
+share/locale/lv/LC_MESSAGES/tortoisehg.mo
+share/locale/nb/LC_MESSAGES/tortoisehg.mo
+share/locale/nl/LC_MESSAGES/tortoisehg.mo
+share/locale/nn/LC_MESSAGES/tortoisehg.mo
+share/locale/oc/LC_MESSAGES/tortoisehg.mo
+share/locale/pl/LC_MESSAGES/tortoisehg.mo
+share/locale/pt/LC_MESSAGES/tortoisehg.mo
+share/locale/pt_BR/LC_MESSAGES/tortoisehg.mo
+share/locale/ru/LC_MESSAGES/tortoisehg.mo
+share/locale/sr/LC_MESSAGES/tortoisehg.mo
+share/locale/sv/LC_MESSAGES/tortoisehg.mo
+share/locale/tr/LC_MESSAGES/tortoisehg.mo
+share/locale/uk/LC_MESSAGES/tortoisehg.mo
+share/locale/zh_CN/LC_MESSAGES/tortoisehg.mo
+share/locale/zh_TW/LC_MESSAGES/tortoisehg.mo
 share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png
+share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
 share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
-share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
 share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-incoming.png
 share/pixmaps/tortoisehg/icons/24x24/actions/hg-outgoing.png
@@ -550,8 +544,8 @@
 share/pixmaps/tortoisehg/icons/scalable/actions/view-diff.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/view-file.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/view-filter.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/view-hidden.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/view-refresh.svg
-share/pixmaps/tortoisehg/icons/scalable/actions/view-hidden.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/visualdiff.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/help-browser.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/help-readme.svg
@@ -561,14 +555,14 @@
 share/pixmaps/tortoisehg/icons/scalable/apps/tools-hooks.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/tools-spanner-hammer.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/utilities-terminal.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-both.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p1.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p2.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-applied.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-guarded.svg
 share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-unguarded.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-added-subrepo.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-error.svg
-share/pixmaps/tortoisehg/icons/scalable/status/thg-file-merged.svg
-share/pixmaps/tortoisehg/icons/scalable/status/thg-file-p0.svg
-share/pixmaps/tortoisehg/icons/scalable/status/thg-file-p1.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-git-subrepo.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-remote-repo.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-removed-subrepo.svg
@@ -598,28 +592,24 @@
 share/pixmaps/tortoisehg/icons/svg/thg_logo.svg
 share/pixmaps/tortoisehg/icons/thg_logo.ico
 share/pixmaps/tortoisehg/icons/thg_logo_92x50.png
-%%DATADIR%%/mergetools.rc
- at dirrm share/pixmaps/tortoisehg/icons/16x16/apps
- at dirrm share/pixmaps/tortoisehg/icons/16x16
- at dirrm share/pixmaps/tortoisehg/icons/22x22/actions
- at dirrm share/pixmaps/tortoisehg/icons/22x22
- at dirrm share/pixmaps/tortoisehg/icons/24x24/actions
- at dirrm share/pixmaps/tortoisehg/icons/24x24
- at dirrm share/pixmaps/tortoisehg/icons/32x32/actions
- at dirrm share/pixmaps/tortoisehg/icons/32x32
- at dirrm share/pixmaps/tortoisehg/icons/scalable/apps
- at dirrm share/pixmaps/tortoisehg/icons/scalable/actions
- at dirrm share/pixmaps/tortoisehg/icons/scalable/status
- at dirrm share/pixmaps/tortoisehg/icons/scalable
- at dirrm share/pixmaps/tortoisehg/icons/svg
- at dirrm share/pixmaps/tortoisehg/icons
- at dirrm share/pixmaps/tortoisehg
- at dirrm %%DATADIR%%
-%%NLS%%@dirrmtry share/locale/jv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/jv
- at dirrm %%PYTHON_SITELIBDIR%%/tortoisehg/util
- at dirrm %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt
- at dirrm %%PYTHON_SITELIBDIR%%/tortoisehg
-%%NAUTILUS%%@dirrmtry lib/nautilus/extensions-2.0/python
-%%NAUTILUS%%@dirrmtry lib/nautilus/extensions-2.0
-%%NAUTILUS%%@dirrmtry lib/nautilus
+share/tortoisehg/mergetools.rc
+ at dirrmtry share/tortoisehg
+ at dirrmtry share/pixmaps/tortoisehg/icons/svg
+ at dirrmtry share/pixmaps/tortoisehg/icons/scalable/status
+ at dirrmtry share/pixmaps/tortoisehg/icons/scalable/apps
+ at dirrmtry share/pixmaps/tortoisehg/icons/scalable/actions
+ at dirrmtry share/pixmaps/tortoisehg/icons/scalable
+ at dirrmtry share/pixmaps/tortoisehg/icons/32x32/actions
+ at dirrmtry share/pixmaps/tortoisehg/icons/32x32
+ at dirrmtry share/pixmaps/tortoisehg/icons/24x24/actions
+ at dirrmtry share/pixmaps/tortoisehg/icons/24x24
+ at dirrmtry share/pixmaps/tortoisehg/icons/22x22/actions
+ at dirrmtry share/pixmaps/tortoisehg/icons/22x22
+ at dirrmtry share/pixmaps/tortoisehg/icons/16x16/apps
+ at dirrmtry share/pixmaps/tortoisehg/icons/16x16
+ at dirrmtry share/pixmaps/tortoisehg/icons
+ at dirrmtry share/pixmaps/tortoisehg
+ at dirrmtry %%PYTHON_SITELIBDIR%%/tortoisehg/util
+ at dirrmtry %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt
+ at dirrmtry %%PYTHON_SITELIBDIR%%/tortoisehg-2.11-py2.7.egg-info
+ at dirrmtry %%PYTHON_SITELIBDIR%%/tortoisehg
--- tortoisehg2.diff ends here ---


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

More information about the freebsd-ports-bugs mailing list