[88587] trunk/dports/www/QupZilla

[ryandesign at macports.org]

Revision: 88587
          http://trac.macports.org/changeset/88587
Author:   ryandesign at macports.org
Date:     2012-01-04 15:37:42 -0800 (Wed, 04 Jan 2012)
Log Message:
-----------
qupzilla: remove wrapper script; instead, patch argument parsing to accept and ignore OS X -psn_ arguments

Modified Paths:
--------------
    trunk/dports/www/QupZilla/Portfile

Added Paths:
-----------
    trunk/dports/www/QupZilla/files/patch-src-app-commandlineoptions.cpp.diff

Removed Paths:
-------------
    trunk/dports/www/QupZilla/files/qupzilla

Modified: trunk/dports/www/QupZilla/Portfile
===================================================================
--- trunk/dports/www/QupZilla/Portfile	2012-01-04 23:36:50 UTC (rev 88586)
+++ trunk/dports/www/QupZilla/Portfile	2012-01-04 23:37:42 UTC (rev 88587)
@@ -6,6 +6,7 @@
 
 name                QupZilla
 version             1.1.0
+revision            1
 categories          www
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -31,7 +32,8 @@
     move [glob ${workpath}/*] ${worksrcpath}
 }
 
-patchfiles          patch-src-src.pro.diff
+patchfiles          patch-src-app-commandlineoptions.cpp.diff \
+                    patch-src-src.pro.diff
 
 configure.cmd       ${prefix}/bin/qmake
 configure.pre_args
@@ -52,8 +54,6 @@
 
 post-destroot {
     move ${destroot}${prefix}/bin/qupzilla.app ${destroot}${applications_dir}/${name}.app
-    move ${destroot}${applications_dir}/${name}.app/Contents/MacOS/qupzilla ${destroot}${applications_dir}/${name}.app/Contents/MacOS/qupzilla-bin
-    xinstall ${filespath}/qupzilla ${destroot}${applications_dir}/${name}.app/Contents/MacOS
 }
 
 livecheck.type      regex

Added: trunk/dports/www/QupZilla/files/patch-src-app-commandlineoptions.cpp.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-app-commandlineoptions.cpp.diff	                        (rev 0)
+++ trunk/dports/www/QupZilla/files/patch-src-app-commandlineoptions.cpp.diff	2012-01-04 23:37:42 UTC (rev 88587)
@@ -0,0 +1,14 @@
+--- src/app/commandlineoptions.cpp.orig	2011-12-14 11:09:43.000000000 -0600
++++ src/app/commandlineoptions.cpp	2012-01-04 17:26:20.000000000 -0600
+@@ -131,6 +131,11 @@
+             pair.text = "";
+             m_actions.append(pair);
+         }
++
++        if (arg.startsWith("-psn_")) {
++            // The OS X process serial number, which we don't need, but which OS X will pass us anyway
++            found = true;
++        }
+     }
+ 
+     QString url(m_argv[m_argc - 1]);

Deleted: trunk/dports/www/QupZilla/files/qupzilla
===================================================================
--- trunk/dports/www/QupZilla/files/qupzilla	2012-01-04 23:36:50 UTC (rev 88586)
+++ trunk/dports/www/QupZilla/files/qupzilla	2012-01-04 23:37:42 UTC (rev 88587)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec "$(dirname "$0")/qupzilla-bin"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120104/83f1f30c/attachment.html>