Revision: 140127 https://trac.macports.org/changeset/140127 Author: sean@macports.org Date: 2015-09-09 14:27:53 -0700 (Wed, 09 Sep 2015) Log Message: ----------- tortoisehg: update to 3.5 Modified Paths: -------------- trunk/dports/devel/tortoisehg/Portfile Removed Paths: ------------- trunk/dports/devel/tortoisehg/files/patch-setup.py.diff Modified: trunk/dports/devel/tortoisehg/Portfile =================================================================== --- trunk/dports/devel/tortoisehg/Portfile 2015-09-09 21:27:52 UTC (rev 140126) +++ trunk/dports/devel/tortoisehg/Portfile 2015-09-09 21:27:53 UTC (rev 140127) @@ -6,7 +6,7 @@ PortGroup app 1.0 PortGroup bitbucket 1.0 -bitbucket.setup tortoisehg thg 3.4 +bitbucket.setup tortoisehg thg 3.5 name tortoisehg categories devel python platforms darwin @@ -19,8 +19,8 @@ long_description A set of graphical tools for the Mercurial distributed \ revision control system. -checksums rmd160 b249f9cfc571849ce030d39774398e908e0d5c07 \ - sha256 dad18c15c94e08600124137176e67f24b58f9c48f21ef4b5f54f23b6d541eac0 +checksums rmd160 60e9107d49e4fc2600d2d34e770005f828dfe193 \ + sha256 19b6780af28a4969be90a4dc07ffcc8f2c119ec3e919e21de9396f7de05b46d1 python.default_version 27 @@ -35,10 +35,9 @@ post-extract { copy ${filespath}/config.py ${worksrcpath}/tortoisehg/util/ + reinplace -W ${worksrcpath} "s,pyrcc4,pyrcc4-2.7," setup.py } -patchfiles patch-setup.py.diff - post-patch { reinplace "s|{prefix}|${prefix}|" ${worksrcpath}/tortoisehg/util/config.py reinplace "s|{python.prefix}|${python.prefix}|" ${worksrcpath}/tortoisehg/util/config.py Deleted: trunk/dports/devel/tortoisehg/files/patch-setup.py.diff =================================================================== --- trunk/dports/devel/tortoisehg/files/patch-setup.py.diff 2015-09-09 21:27:52 UTC (rev 140126) +++ trunk/dports/devel/tortoisehg/files/patch-setup.py.diff 2015-09-09 21:27:53 UTC (rev 140127) @@ -1,22 +0,0 @@ -"the nautilus script shouldn't be distributed at all these days, no-one is maintaining it" -<https://bitbucket.org/tortoisehg/thg/issue/2178/setuppy-assumes-that-usr-is-writeable> ---- setup.py.orig 2012-09-05 10:36:36.000000000 -0500 -+++ setup.py 2013-01-07 17:00:28.000000000 -0600 -@@ -152,7 +152,7 @@ - pyqtfolder = os.path.dirname(PyQt4.__file__) - path.append(os.path.join(pyqtfolder, 'bin')) - os.putenv('PATH', os.pathsep.join(path)) -- if os.system('pyrcc4 "%s" -o "%s"' % (qrc_file, py_file)) > 0: -+ if os.system('pyrcc4-2.7 "%s" -o "%s"' % (qrc_file, py_file)) > 0: - self.warn("Unable to generate python module %s for resource file %s" - % (py_file, qrc_file)) - if not exists(py_file) or not file(py_file).read(): -@@ -421,8 +421,6 @@ - _data_files += [(os.path.join('share', root), - [os.path.join(root, file_) for file_ in files]) - for root, dirs, files in os.walk('locale')] -- _data_files += [('/usr/share/nautilus-python/extensions/', -- ['contrib/nautilus-thg.py'])] - - # Create a config.py. Distributions will need to supply their own - cfgfile = os.path.join('tortoisehg', 'util', 'config.py')