Changeset 82557

Timestamp:

08/15/11 12:47:19 (4 years ago)

Author:

ryandesign@…

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

Location:

trunk/dports/devel/tortoisehg

Files:

• Portfile (modified) (3 diffs)
• files/patch-setup.py.diff (modified) (1 diff)

trunk/dports/devel/tortoisehg/Portfile

@@ -4 +4 @@
 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
@@ -22 +22 @@
 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 \
@@ -52 +52 @@
 }
 
-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}
-    }
-    post-destroot {
-        xinstall -d ${destroot}${applications_dir}/${appname}.app/Contents/MacOS
-        xinstall ${workpath}/${appname} ${destroot}${applications_dir}/${appname}.app/Contents/MacOS
+        reinplace "s|@PREFIX@|${prefix}|g" ${workpath}/${app.name}
     }
 }

trunk/dports/devel/tortoisehg/files/patch-setup.py.diff

@@ -1 @@
---- 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: