- Update to 2.1.2.

PR:		ports/159649
Submitted by:	arrowdodger <6yearold@gmail.com> (maintainer)

6 files changed, 33 insertions, 8 deletions

diff --git a/devel/tortoisehg2/Makefile b/devel/tortoisehg2/Makefile
index 21cda4eed529..9f012fe94c7d 100644
--- a/devel/tortoisehg2/Makefile
+++ b/devel/tortoisehg2/Makefile
@@ -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-patch:
 
 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 --git a/devel/tortoisehg2/distinfo b/devel/tortoisehg2/distinfo
index 79afe5eaf689..0a3c9f585852 100644
--- a/devel/tortoisehg2/distinfo
+++ b/devel/tortoisehg2/distinfo
@@ -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 --git a/devel/tortoisehg2/files/patch-setup.py b/devel/tortoisehg2/files/patch-setup.py
index ac0c6df5f82b..1a73fa445feb 100644
--- a/devel/tortoisehg2/files/patch-setup.py
+++ b/devel/tortoisehg2/files/patch-setup.py
@@ -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 --git a/devel/tortoisehg2/files/patch-thg b/devel/tortoisehg2/files/patch-thg
index 7fa3b4644559..1078bd7950cf 100644
--- a/devel/tortoisehg2/files/patch-thg
+++ b/devel/tortoisehg2/files/patch-thg
@@ -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 --git a/devel/tortoisehg2/pkg-message b/devel/tortoisehg2/pkg-message
index 3466b64d7d34..a749b39a7bb7 100644
--- a/devel/tortoisehg2/pkg-message
+++ b/devel/tortoisehg2/pkg-message
@@ -1,4 +1,4 @@
 It is recommended to %include TortoiseHG's mergetools.rc into your ~/.hgrc file,
 especially if you use textproc/kdiff3 as your merge tool.
 
-%include /usr/local/share/tortoisehg/mergetools.rc
+%include %%PREFIX%%/share/tortoisehg/mergetools.rc
diff --git a/devel/tortoisehg2/pkg-plist b/devel/tortoisehg2/pkg-plist
index f408ae069db8..d792c7dcb36d 100644
--- a/devel/tortoisehg2/pkg-plist
+++ b/devel/tortoisehg2/pkg-plist
@@ -354,6 +354,7 @@ bin/thg
 %%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