[pkgsrc/trunk]: pkgsrc/x11/py-qt4 don't assume the native python on Darwin

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2de86664e2c3
branches:  trunk
changeset: 645332:2de86664e2c3
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Tue Jan 27 06:10:15 2015 +0000

description:
don't assume the native python on Darwin
ignore the mac qt distfile, which only differs in documentation

diffstat:

 x11/py-qt4/Makefile                   |   6 +---
 x11/py-qt4/distinfo                   |   4 +-
 x11/py-qt4/patches/patch-aa           |  36 ----------------------
 x11/py-qt4/patches/patch-configure.py |  56 +++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 43 deletions(-)

diffs (138 lines):

diff -r 1a59f7304060 -r 2de86664e2c3 x11/py-qt4/Makefile
--- a/x11/py-qt4/Makefile       Tue Jan 27 06:03:17 2015 +0000
+++ b/x11/py-qt4/Makefile       Tue Jan 27 06:10:15 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2014/08/21 21:33:07 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2015/01/27 06:10:15 dbj Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-qt4-${PYQT_VERSION}
 PYQT_VERSION=  4.11.1
@@ -53,12 +53,8 @@
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_SRC=             ${PKGDIR}/PLIST.common
-.if ${OPSYS} == "Darwin"
-DISTNAME=              PyQt-mac-gpl-${PYQT_VERSION}
-.else
 DISTNAME=              PyQt-x11-gpl-${PYQT_VERSION}
 PLIST_SRC+=            ${PKGDIR}/PLIST.X11
-.endif
 .include "../../lang/python/extension.mk"
 
 CONFIGURE_ARGS+=       --verbose
diff -r 1a59f7304060 -r 2de86664e2c3 x11/py-qt4/distinfo
--- a/x11/py-qt4/distinfo       Tue Jan 27 06:03:17 2015 +0000
+++ b/x11/py-qt4/distinfo       Tue Jan 27 06:10:15 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2014/09/25 11:03:52 jperkin Exp $
+$NetBSD: distinfo,v 1.35 2015/01/27 06:10:15 dbj Exp $
 
 SHA1 (PyQt-mac-gpl-4.11.1.tar.gz) = 9d7478758957c60ac5007144a0dc7f157f4a5836
 RMD160 (PyQt-mac-gpl-4.11.1.tar.gz) = cba54dcbb6a41d5ccb45d9b38e7e2647696772f9
@@ -6,5 +6,5 @@
 SHA1 (PyQt-x11-gpl-4.11.1.tar.gz) = 83a0740545d51c179a1b316b664b0f9ff5e0f5af
 RMD160 (PyQt-x11-gpl-4.11.1.tar.gz) = 37f5dc06b4d06720a9f94dcd50f67a011c2dad78
 Size (PyQt-x11-gpl-4.11.1.tar.gz) = 11118850 bytes
-SHA1 (patch-aa) = 218eb50a2b027384030e5ba9900631138687fac3
+SHA1 (patch-configure.py) = 516da08fad535a7b743b400e9e613689982d057d
 SHA1 (patch-sip_QtCore_qlist.sip) = 4fb548d4ee755cbc955ec32a6b1702a71a9815f1
diff -r 1a59f7304060 -r 2de86664e2c3 x11/py-qt4/patches/patch-aa
--- a/x11/py-qt4/patches/patch-aa       Tue Jan 27 06:03:17 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2014/08/21 21:33:07 wiz Exp $
-
---- configure.py.orig  2014-07-03 14:00:02.000000000 +0000
-+++ configure.py
-@@ -346,7 +346,7 @@ class ConfigurePyQt4:
-         pyqt_modules.append("QtCore")
- 
-         check_module("QtGui", "qwidget.h", "new QWidget()")
--        check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
-+        check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", extra_libs=["QtCore"])
-         check_module("QtMultimedia", "QAudioDeviceInfo",
-                 "new QAudioDeviceInfo()")
-         check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
-@@ -372,8 +372,8 @@ class ConfigurePyQt4:
-         check_module("QtTest", "QtTest", "QTest::qSleep(0)")
-         check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
-         check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
--        check_module("phonon", "phonon/videowidget.h",
--                "new Phonon::VideoWidget()")
-+#        check_module("phonon", "phonon/videowidget.h",
-+#                "new Phonon::VideoWidget()")
-         check_module("QtAssistant", "qassistantclient.h",
-                 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
-                 extra_libs=ass_libs)
-@@ -2027,11 +2027,7 @@ int main(int argc, char **argv)
- 
-     out << QLibraryInfo::licensee() << '\\n';
- 
--#if defined(QT_SHARED) || defined(QT_DLL)
-     out << "shared\\n";
--#else
--    out << "static\\n";
--#endif
- 
-     // Determine which features should be disabled.
- 
diff -r 1a59f7304060 -r 2de86664e2c3 x11/py-qt4/patches/patch-configure.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-qt4/patches/patch-configure.py     Tue Jan 27 06:10:15 2015 +0000
@@ -0,0 +1,56 @@
+$NetBSD: patch-configure.py,v 1.1 2015/01/27 06:10:15 dbj Exp $
+
+--- configure.py.orig  2014-07-03 14:00:02.000000000 +0000
++++ configure.py
+@@ -346,7 +346,7 @@ class ConfigurePyQt4:
+         pyqt_modules.append("QtCore")
+ 
+         check_module("QtGui", "qwidget.h", "new QWidget()")
+-        check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
++        check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", extra_libs=["QtCore"])
+         check_module("QtMultimedia", "QAudioDeviceInfo",
+                 "new QAudioDeviceInfo()")
+         check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
+@@ -372,8 +372,8 @@ class ConfigurePyQt4:
+         check_module("QtTest", "QtTest", "QTest::qSleep(0)")
+         check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
+         check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
+-        check_module("phonon", "phonon/videowidget.h",
+-                "new Phonon::VideoWidget()")
++#        check_module("phonon", "phonon/videowidget.h",
++#                "new Phonon::VideoWidget()")
+         check_module("QtAssistant", "qassistantclient.h",
+                 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
+                 extra_libs=ass_libs)
+@@ -968,7 +968,7 @@ include(%s)
+ 
+                 config_args = ducfg.get("CONFIG_ARGS", "")
+ 
+-                if sys.platform == "darwin":
++                if False: # sys.platform == "darwin":
+                     dynamic_pylib = "--enable-framework" in config_args
+ 
+                     # It's probably a Python bug that the library name doesn't
+@@ -1963,8 +1963,8 @@ def get_qt_configuration():
+         else:
+             exe_file = os.path.join("release", app + ".exe")
+             make_target = " release"
+-    elif sys.platform == "darwin":
+-        exe_file = os.path.join(app + ".app", "Contents", "MacOS", app)
++#    elif sys.platform == "darwin":
++#        exe_file = os.path.join(app + ".app", "Contents", "MacOS", app)
+     else:
+         exe_file = os.path.join(".", app)
+ 
+@@ -2027,11 +2027,7 @@ int main(int argc, char **argv)
+ 
+     out << QLibraryInfo::licensee() << '\\n';
+ 
+-#if defined(QT_SHARED) || defined(QT_DLL)
+     out << "shared\\n";
+-#else
+-    out << "static\\n";
+-#endif
+ 
+     // Determine which features should be disabled.
+