[130980] trunk/dports/editors/frescobaldi

[mf2k at macports.org]

Revision: 130980
          https://trac.macports.org/changeset/130980
Author:   mf2k at macports.org
Date:     2015-01-04 12:05:32 -0800 (Sun, 04 Jan 2015)
Log Message:
-----------
frescobaldi: Fix problem with trace mode. (#46388)

Modified Paths:
--------------
    trunk/dports/editors/frescobaldi/Portfile

Added Paths:
-----------
    trunk/dports/editors/frescobaldi/files/
    trunk/dports/editors/frescobaldi/files/patch-macosx-mac-app.py.diff

Modified: trunk/dports/editors/frescobaldi/Portfile
===================================================================
--- trunk/dports/editors/frescobaldi/Portfile	2015-01-04 18:47:12 UTC (rev 130979)
+++ trunk/dports/editors/frescobaldi/Portfile	2015-01-04 20:05:32 UTC (rev 130980)
@@ -6,6 +6,7 @@
 PortGroup           github 1.0
 
 github.setup        wbsoft frescobaldi 2.17.1 v
+revision            1
 conflicts           frescobaldi-devel
 categories          editors python
 maintainers         gmail.com:davide.liessi openmaintainer
@@ -43,6 +44,8 @@
     supported_archs     noarch
 }
 
+patchfiles          patch-macosx-mac-app.py.diff
+
 build {
     if {[variant_isset app]} {
         if {[info exists devel_version]} {

Added: trunk/dports/editors/frescobaldi/files/patch-macosx-mac-app.py.diff
===================================================================
--- trunk/dports/editors/frescobaldi/files/patch-macosx-mac-app.py.diff	                        (rev 0)
+++ trunk/dports/editors/frescobaldi/files/patch-macosx-mac-app.py.diff	2015-01-04 20:05:32 UTC (rev 130980)
@@ -0,0 +1,37 @@
+--- macosx/mac-app.py.orig	2015-01-02 16:48:00.000000000 +0100
++++ macosx/mac-app.py	2015-01-02 16:45:35.000000000 +0100
+@@ -17,10 +17,14 @@
+ macosx = os.path.realpath(os.path.dirname(__file__))
+ root = os.path.dirname(macosx)
+ 
+-sys.path.append(root)
++sys.path.insert(0, root)
+ 
+ from frescobaldi_app import info
+-from frescobaldi_app.portmidi import pm_ctypes
++try:
++    from frescobaldi_app.portmidi import pm_ctypes
++    dylib_name = pm_ctypes.dll_name
++except ImportError:
++    dylib_name = None
+ 
+ icon = '{0}/icons/{1}.icns'.format(macosx, info.name)
+ ipstrings = '{0}/app_resources/InfoPlist.strings'.format(macosx)
+@@ -40,7 +44,7 @@
+   (WARNING: some manual steps are required after the execution of this script)')
+ parser.add_argument('-p', '--portmidi', \
+   help = 'full path of PortMIDI library (used only with \'-a\')', \
+-  default = pm_ctypes.dll_name)
++  default = dylib_name)
+ parser.add_argument('-r', '--arch', \
+   help = 'architecture set to include, e.g. i386, x86_64, intel; \
+   if the value is None, the architecture of the current Python binary is used \
+@@ -52,7 +56,7 @@
+ If you really want to point the application bundle to \'{0}\',\n\
+ use the \'-f\' or \'--force\' flag.'.format(args.script))
+ 
+-if args.standalone and not os.path.isfile(args.portmidi):
++if args.standalone and not (isinstance(args.portmidi, basestring) and os.path.isfile(args.portmidi)):
+     sys.exit('Error: \'{0}\' does not exist or is not a file.'.format(args.portmidi))
+ 
+ plist = dict(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150104/8d2fb25a/attachment.html>