ports/159649: [PATCH][MAINTAINER UPDATE] Update devel/tortoisehg2
arrowdodger
6yearold at gmail.com
Wed Aug 10 16:20:09 UTC 2011
>Number: 159649
>Category: ports
>Synopsis: [PATCH][MAINTAINER UPDATE] Update devel/tortoisehg2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 10 16:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: arrowdodger
>Release: 8-stable
>Organization:
none
>Environment:
>Description:
Update devel/tortoisehg2 port to version 2.1.2
The patch file is also locate here: http://intara.org.ru/tortoisehg2.patch
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/devel/tortoisehg2/Makefile ./Makefile
--- /usr/ports/devel/tortoisehg2/Makefile 2011-07-14 13:25:23.631391683 +0400
+++ ./Makefile 2011-08-10 19:58:03.465133141 +0400
@@ -6,7 +6,7 @@
#
PORTNAME= tortoisehg
-PORTVERSION= 2.1.1
+PORTVERSION= 2.1.2
CATEGORIES= devel
MASTER_SITES= http://cdn.bitbucket.org/tortoisehg/targz/downloads/
@@ -68,7 +68,9 @@
post-install:
${MKDIR} ${PREFIX}/share/tortoisehg
+ ${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/contrib/mergetools.rc ${PREFIX}/share/tortoisehg/
+ ${INSTALL_DATA} ${WRKSRC}/contrib/tortoisehg.desktop ${PREFIX}/share/applications/
@${ECHO_MSG}
@${CAT} pkg-message
diff -ruN /usr/ports/devel/tortoisehg2/distinfo ./distinfo
--- /usr/ports/devel/tortoisehg2/distinfo 2011-07-14 13:25:23.643896904 +0400
+++ ./distinfo 2011-08-10 18:01:52.171897828 +0400
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-2.1.1.tar.gz) = 65b1d4723dadd9cf2e1db33d29d8b452d1a0683ce18166a63f0de9fa00bbf77f
-SIZE (tortoisehg-2.1.1.tar.gz) = 9773900
+SHA256 (tortoisehg-2.1.2.tar.gz) = 33ab105e734cea16f5e58fffa9b867fee66176d1f2426774c63b85a4c733ee0a
+SIZE (tortoisehg-2.1.2.tar.gz) = 9033204
diff -ruN /usr/ports/devel/tortoisehg2/files/patch-setup.py ./files/patch-setup.py
--- /usr/ports/devel/tortoisehg2/files/patch-setup.py 2011-06-13 22:39:00.000000000 +0400
+++ ./files/patch-setup.py 2011-08-10 19:56:18.973632964 +0400
@@ -1,5 +1,27 @@
--- setup.py_ 2011-05-02 07:06:56.000000000 +0400
+++ setup.py 2011-05-25 15:54:34.833312978 +0400
+@@ -283,7 +283,7 @@
+ class build(_build_orig):
+ sub_commands = [
+ ('build_qt', None),
+- ('build_mo', None),
++%%NLS%% ('build_mo', None),
+ ] + _build_orig.sub_commands
+
+ class clean(_clean_orig):
+@@ -299,10 +299,10 @@
+ cmdclass = {
+ 'build': build,
+ 'build_qt': build_qt ,
+- 'build_mo': build_mo ,
++%%NLS%% 'build_mo': build_mo ,
+ 'clean': clean,
+ 'clean_local': clean_local,
+- 'update_pot': update_pot ,
++%%NLS%% 'update_pot': update_pot ,
+ }
+
+ def setup_windows(version):
@@ -407,11 +407,11 @@
_data_files = [(os.path.join('share/pixmaps/tortoisehg', root),
[os.path.join(root, file_) for file_ in files])
diff -ruN /usr/ports/devel/tortoisehg2/files/patch-thg ./files/patch-thg
--- /usr/ports/devel/tortoisehg2/files/patch-thg 2011-06-13 22:39:00.000000000 +0400
+++ ./files/patch-thg 2011-08-10 18:13:30.821704996 +0400
@@ -1,11 +1,11 @@
--- thg_ 2011-05-02 01:39:58.000000000 +0400
+++ thg 2011-05-25 15:51:43.418176138 +0400
-@@ -10,7 +10,7 @@
+@@ -13,7 +13,7 @@
import os
import sys
-
+os.environ["PATH"] += ":%%LOCALBASE%%/kde4/bin"
- if hasattr(sys, "frozen"):
- if sys.frozen == 'windows_exe' and 'THGDEBUG' in os.environ:
- import win32traceutil
+ argv = sys.argv[1:]
+ if 'THG_OSX_APP' in os.environ:
+ # Remove the -psn argument supplied by launchd
diff -ruN /usr/ports/devel/tortoisehg2/pkg-plist ./pkg-plist
--- /usr/ports/devel/tortoisehg2/pkg-plist 2011-07-14 13:25:23.657908182 +0400
+++ ./pkg-plist 2011-08-10 18:25:47.565165966 +0400
@@ -354,6 +354,7 @@
%%PYTHON_SITELIBDIR%%/tortoisehg/util/wconfig.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/wconfig.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/util/wconfig.pyo
+share/applications/tortoisehg.desktop
%%NLS%%share/locale/ca/LC_MESSAGES/tortoisehg.mo
%%NLS%%share/locale/cs/LC_MESSAGES/tortoisehg.mo
%%NLS%%share/locale/da/LC_MESSAGES/tortoisehg.mo
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list