Fix py-tortoisehg.

tortoisehg had a change that made it overwrite config.py on install.
due to this change behavior: patch setup-py instead of providing a config.py.
Bump PKGREVISION.

4 files changed, 22 insertions, 17 deletions

diff --git a/devel/py-tortoisehg/Makefile b/devel/py-tortoisehg/Makefile
index 97d732cf47f..daafeccad10 100644
--- a/devel/py-tortoisehg/Makefile
+++ b/devel/py-tortoisehg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2015/11/17 11:42:39 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/11/18 17:12:43 nros Exp $
 
 DISTNAME=		tortoisehg-3.6
+PKGREVISION=		1
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		devel python
 MASTER_SITES=		http://bitbucket.org/tortoisehg/targz/downloads/
@@ -19,11 +20,6 @@ DEPENDS+=	${PYPKGPREFIX}-mercurial>=2.8.1:../../devel/py-mercurial
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-iniparse, py-mercurial
 
-pre-configure:
-		${RUN} ${SED} -e 's:@PREFIX@:${PREFIX}:g' \
-			${FILESDIR}/config.py > \
-			${WRKSRC}/tortoisehg/util/config.py
-
 thg_icon=		/share/pixmaps/tortoisehg/icons/thg_logo.ico
 SUBST_CLASSES+=		df
 SUBST_STAGE.df=		post-configure
diff --git a/devel/py-tortoisehg/distinfo b/devel/py-tortoisehg/distinfo
index 5df17fbd268..9fc8714fd67 100644
--- a/devel/py-tortoisehg/distinfo
+++ b/devel/py-tortoisehg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2015/11/17 11:42:39 wiz Exp $
+$NetBSD: distinfo,v 1.22 2015/11/18 17:12:43 nros Exp $
 
 SHA1 (tortoisehg-3.6.tar.gz) = 26e8883f51c580bf9bcf249ba9fe82a9d5f5cb41
 RMD160 (tortoisehg-3.6.tar.gz) = da7ac0b3b1916d5692b6ecced3c0e5bbe5defe5f
 SHA512 (tortoisehg-3.6.tar.gz) = 2a0b90f3a7c0fdcb63f21c7885ebfa26de5da369b6a64b12282b72e144ef1c12a29a78f793c487f37dd5bf7b7ab93d3c6ea393c4607deabe5b0c4be7eb16342d
 Size (tortoisehg-3.6.tar.gz) = 7439819 bytes
-SHA1 (patch-setup.py) = 3f053f9935aacc25c271a3a7658918998058694a
+SHA1 (patch-setup.py) = a28c82a1709b932f54610fa770cae3c78de3a8d5
 SHA1 (patch-tortoisehg_hgqt_qtlib.py) = 7c66aaf4472ac39f158e4c393bf03afafbd707d9
 SHA1 (patch-tortoisehg_util_paths.py) = 0eea97a668b27d1ee8293bc2f2b6f6692a18b365
diff --git a/devel/py-tortoisehg/files/config.py b/devel/py-tortoisehg/files/config.py
deleted file mode 100644
index 3d693d18c34..00000000000
--- a/devel/py-tortoisehg/files/config.py
+++ /dev/null
@@ -1,6 +0,0 @@
-bin_path     = "@PREFIX@/bin"
-license_path = "@PREFIX@/share/doc/tortoisehg/COPYING.txt"
-locale_path  = "@PREFIX@/share/locale"
-icon_path    = "@PREFIX@/share/pixmaps/tortoisehg/icons"
-doc_path     = "@PREFIX@/share/doc/tortoisehg"
-nofork       = True
diff --git a/devel/py-tortoisehg/patches/patch-setup.py b/devel/py-tortoisehg/patches/patch-setup.py
index 7a95201f13f..b6434ba444f 100644
--- a/devel/py-tortoisehg/patches/patch-setup.py
+++ b/devel/py-tortoisehg/patches/patch-setup.py
@@ -1,10 +1,12 @@
-$NetBSD: patch-setup.py,v 1.2 2015/08/14 18:00:56 wiz Exp $
+$NetBSD: patch-setup.py,v 1.3 2015/11/18 17:12:44 nros Exp $
 
+* in config.py: adjust license filename and add doc_path
+  to point at the local docs
 * nautilus-python is not available in pkgsrc so don't install
   the nautilus extension.
 * Install html documention, desktop file and license file.
 
---- setup.py.orig	2015-08-06 01:30:23.000000000 +0000
+--- setup.py.orig	2015-11-09 16:49:02.000000000 +0000
 +++ setup.py
 @@ -11,6 +11,7 @@ import sys
  import os
@@ -14,7 +16,20 @@ $NetBSD: patch-setup.py,v 1.2 2015/08/14 18:00:56 wiz Exp $
  import tempfile
  import re
  import tarfile
-@@ -569,8 +570,14 @@ def setup_posix():
+@@ -205,10 +206,11 @@ class build_config(Command):
+         data = {
+             'bin_path': installcmd.install_scripts[rootlen:],
+             'license_path': os.path.join(sharedir, 'doc', 'tortoisehg',
+-                                         'Copying.txt.gz'),
++                                         'COPYING.txt'),
+             'locale_path': os.path.join(sharedir, 'locale'),
+             'icon_path': os.path.join(sharedir, 'pixmaps', 'tortoisehg',
+                                       'icons'),
++            'doc_path' : os.path.join(sharedir, 'doc', 'tortoisehg'),
+             'nofork': True,
+             }
+         # Distributions will need to supply their own
+@@ -569,8 +571,14 @@ def setup_posix():
                              [os.path.join(root, f) for f in files]))
      _data_files.extend((os.path.join('share', modir), [mofile])
                         for pofile, modir, mofile in _walklocales())