[122648] trunk/dports

[michaelld at macports.org]

Revision: 122648
          https://trac.macports.org/changeset/122648
Author:   michaelld at macports.org
Date:     2014-07-25 11:19:23 -0700 (Fri, 25 Jul 2014)
Log Message:
-----------
qscintilla and py*-qscintilla: update to 2.8.3.

Modified Paths:
--------------
    trunk/dports/devel/qscintilla/Portfile
    trunk/dports/python/py-qscintilla/Portfile
    trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff

Modified: trunk/dports/devel/qscintilla/Portfile
===================================================================
--- trunk/dports/devel/qscintilla/Portfile	2014-07-25 18:15:31 UTC (rev 122647)
+++ trunk/dports/devel/qscintilla/Portfile	2014-07-25 18:19:23 UTC (rev 122648)
@@ -9,9 +9,9 @@
 # NOTE: the version of this port must be kept in sync with the 'py*-qscintilla' port(s),
 #       since they contain the python bindings!
 
-version             2.8.2
-checksums           rmd160 030773b5013cc6e36a928b607ba24d5d5d841e55 \
-                    sha256 b054d70df9f460d54d42b2879a1ac921a490ebaea8313bac932282d234a53f74
+version             2.8.3
+checksums           rmd160 c60b841d8574eae3c318c69f16d43894084551e1 \
+                    sha256 fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505
 
 categories          devel
 license             {GPL-2 GPL-3 OpenSSLException}

Modified: trunk/dports/python/py-qscintilla/Portfile
===================================================================
--- trunk/dports/python/py-qscintilla/Portfile	2014-07-25 18:15:31 UTC (rev 122647)
+++ trunk/dports/python/py-qscintilla/Portfile	2014-07-25 18:19:23 UTC (rev 122648)
@@ -11,9 +11,9 @@
 #          number of the installed qscintilla port, or configure/building
 #          will fail with strange error messages.
 
-version             2.8.2
-checksums           rmd160 030773b5013cc6e36a928b607ba24d5d5d841e55 \
-                    sha256 b054d70df9f460d54d42b2879a1ac921a490ebaea8313bac932282d234a53f74
+version             2.8.3
+checksums           rmd160 c60b841d8574eae3c318c69f16d43894084551e1 \
+                    sha256 fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505
 
 categories          python devel
 license             {GPL-2 GPL-3}

Modified: trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff
===================================================================
--- trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff	2014-07-25 18:15:31 UTC (rev 122647)
+++ trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff	2014-07-25 18:19:23 UTC (rev 122648)
@@ -1,6 +1,6 @@
---- Python/configure.py.orig	2014-05-26 09:42:16.000000000 -0400
-+++ Python/configure.py	2014-06-02 14:51:02.000000000 -0400
-@@ -1108,6 +1108,13 @@
+--- Python/configure.py.orig	2014-07-03 06:15:50.000000000 -0400
++++ Python/configure.py	2014-07-25 13:43:38.000000000 -0400
+@@ -1162,6 +1162,13 @@
              action='store_true',
              help="suppress timestamps in the header comments of generated "
                      "code [default: include timestamps]")
@@ -14,7 +14,7 @@
  
      module_config.init_optparser(p, target_config)
  
-@@ -1235,6 +1242,11 @@
+@@ -1320,6 +1327,11 @@
      pro.write('CONFIG += %s\n' % ('debug' if opts.debug else 'release'))
      pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
  
@@ -26,15 +26,14 @@
      config = qmake_config.get('CONFIG')
      if config:
          pro.write('CONFIG += %s\n' % config)
-@@ -1334,10 +1346,7 @@
+@@ -1434,9 +1446,7 @@
  
  macx {
      QMAKE_LFLAGS += "-undefined dynamic_lookup"
 -    greaterThan(QT_MAJOR_VERSION, 4) {
 -        QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
 -    }
--
 +    QMAKE_LFLAGS += "-install_name $$target.path/$$PY_MODULE"
-     QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -change %s %s $$PY_MODULE)
- }
- ''' % (os.path.basename(dylib), dylib))
+ ''')
+ 
+         dylib = module_config.get_mac_wrapped_library_file(target_config)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140725/d7ee2628/attachment-0001.html>