[82557] trunk/dports/devel/tortoisehg

[ryandesign at macports.org]

Revision: 82557
          http://trac.macports.org/changeset/82557
Author:   ryandesign at macports.org
Date:     2011-08-15 12:47:19 -0700 (Mon, 15 Aug 2011)
Log Message:
-----------
tortoisehg: update to 2.1.2 (fixes inability to launch with mercurial 1.9; see #30131); use app portgroup (#29730); don't overwrite python26 portgroup dependency

Modified Paths:
--------------
    trunk/dports/devel/tortoisehg/Portfile
    trunk/dports/devel/tortoisehg/files/patch-setup.py.diff

Modified: trunk/dports/devel/tortoisehg/Portfile
===================================================================
--- trunk/dports/devel/tortoisehg/Portfile	2011-08-15 19:36:24 UTC (rev 82556)
+++ trunk/dports/devel/tortoisehg/Portfile	2011-08-15 19:47:19 UTC (rev 82557)
@@ -3,10 +3,10 @@
 
 PortSystem          1.0
 PortGroup           python26 1.0
+PortGroup           app 1.0
 
 name                tortoisehg
-version             2.0.4
-revision            1
+version             2.1.2
 categories          devel python
 platforms           darwin
 license             GPL-2
@@ -21,10 +21,10 @@
 homepage            http://tortoisehg.bitbucket.org/
 master_sites        http://bitbucket.org/tortoisehg/targz/downloads/
 
-checksums           sha1    8888f77a935714d9e156165fd620a1b1c94181b2 \
-                    rmd160  02598b9818003ea336e1407e7444afeb7b9aa0c5
+checksums           sha1    26d71af44a5cbd095e16d655d2874966e137e94e \
+                    rmd160  befd27d486e4f9a6840467befc65d9c52704c746
 
-depends_lib         port:mercurial \
+depends_lib-append  port:mercurial \
                     port:py26-pyqt4 \
                     port:py26-qscintilla \
                     port:py26-iniparse
@@ -51,16 +51,15 @@
     xinstall -m 644 -W ${worksrcpath} COPYING.txt ${destroot}${prefix}/share/doc/${name}
 }
 
-platform darwin {
-    set appname {TortoiseHg}
+app.name            TortoiseHg
+app.executable      ${workpath}/${app.name}
+app.icon            icons/thg_logo_92x50.png
+
+platform macosx {
     post-extract {
-        copy ${filespath}/${appname}.in ${workpath}/${appname}
+        copy ${filespath}/${app.name}.in ${workpath}/${app.name}
     }
     post-patch {
-        reinplace "s|@PREFIX@|${prefix}|g" ${workpath}/${appname}
+        reinplace "s|@PREFIX@|${prefix}|g" ${workpath}/${app.name}
     }
-    post-destroot {
-        xinstall -d ${destroot}${applications_dir}/${appname}.app/Contents/MacOS
-        xinstall ${workpath}/${appname} ${destroot}${applications_dir}/${appname}.app/Contents/MacOS
-    }
 }

Modified: trunk/dports/devel/tortoisehg/files/patch-setup.py.diff
===================================================================
--- trunk/dports/devel/tortoisehg/files/patch-setup.py.diff	2011-08-15 19:36:24 UTC (rev 82556)
+++ trunk/dports/devel/tortoisehg/files/patch-setup.py.diff	2011-08-15 19:47:19 UTC (rev 82557)
@@ -1,9 +1,9 @@
---- setup.py.orig	2011-03-29 21:14:56.000000000 +0200
-+++ setup.py	2011-03-29 21:15:23.000000000 +0200
-@@ -146,7 +146,7 @@
-         import PyQt4
-         path = os.getenv('PATH')
-         os.putenv('PATH', path + ';' + os.path.dirname(PyQt4.__file__) + '\\bin')
+--- setup.py.orig	2011-07-03 15:54:51.000000000 -0500
++++ setup.py	2011-08-15 14:33:16.000000000 -0500
+@@ -154,7 +154,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.6 "%s" -o "%s"' % (qrc_file, py_file)) > 0:
              self.warn("Unable to generate python module %s for resource file %s"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110815/6a44e693/attachment.html>