Changes 4.11.4:

- Added support for Qt v4.8.7.
- Added QWIDGETSIZE_MAX to QtGui.
- Added some missing QEvent.Type enum values.
- Added the --license-dir command line option to configure-ng.py.
- Added the --no-python-dbus command line option to configure-ng.py.
- Bug fixes.

4 files changed, 20 insertions, 16 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index c0bbb3cbeee..e40fdcbba13 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2015/04/25 14:25:15 tnn Exp $
+# $NetBSD: Makefile,v 1.77 2015/11/23 15:18:19 adam Exp $
 
 PKGNAME=	${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PKGREVISION=	1
-PYQT_VERSION=	4.11.1
+PYQT_VERSION=	4.11.4
 CATEGORIES=	x11 python
 #MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
@@ -10,6 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Python binding for Qt4
 HOMEPAGE=	http://www.riverbankcomputing.com/software/pyqt/intro
+LICENSE=	gnu-gpl-v3
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
@@ -53,9 +53,12 @@ SUBST_MESSAGE.PIC=	Adding -fPIC to CXXFLAGS.
 
 .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 --git a/x11/py-qt4/PLIST.X11 b/x11/py-qt4/PLIST.X11
deleted file mode 100644
index 8ec4328e846..00000000000
--- a/x11/py-qt4/PLIST.X11
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.X11,v 1.1.1.1 2008/12/13 05:19:12 epg Exp $
-share/sip${PYVERSSUFFIX}/QtGui/qx11embed_x11.sip
-share/sip${PYVERSSUFFIX}/QtGui/qx11info_x11.sip
diff --git a/x11/py-qt4/PLIST.common b/x11/py-qt4/PLIST.common
index 5b3ee993cc6..70ed20cba6e 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.24 2014/08/21 21:33:07 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.25 2015/11/23 15:18:19 adam Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
@@ -407,6 +407,8 @@ share/sip${PYVERSSUFFIX}/QtGui/qwidgetaction.sip
 share/sip${PYVERSSUFFIX}/QtGui/qwindowdefs.sip
 share/sip${PYVERSSUFFIX}/QtGui/qwizard.sip
 share/sip${PYVERSSUFFIX}/QtGui/qworkspace.sip
+share/sip${PYVERSSUFFIX}/QtGui/qx11embed_x11.sip
+share/sip${PYVERSSUFFIX}/QtGui/qx11info_x11.sip
 share/sip${PYVERSSUFFIX}/QtHelp/QtHelpmod.sip
 share/sip${PYVERSSUFFIX}/QtHelp/qhelpcontentwidget.sip
 share/sip${PYVERSSUFFIX}/QtHelp/qhelpengine.sip
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index 717a6836cf1..1eac9e2ea85 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.35 2015/01/27 06:10:15 dbj Exp $
+$NetBSD: distinfo,v 1.36 2015/11/23 15:18:19 adam Exp $
 
-SHA1 (PyQt-mac-gpl-4.11.1.tar.gz) = 9d7478758957c60ac5007144a0dc7f157f4a5836
-RMD160 (PyQt-mac-gpl-4.11.1.tar.gz) = cba54dcbb6a41d5ccb45d9b38e7e2647696772f9
-Size (PyQt-mac-gpl-4.11.1.tar.gz) = 11117079 bytes
-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 (PyQt-mac-gpl-4.11.4.tar.gz) = c319f273e40afe68a2e65ff2b9c01e0d43e980f7
+RMD160 (PyQt-mac-gpl-4.11.4.tar.gz) = 55ab22e65a2681b7af3680db9462967578a907f0
+SHA512 (PyQt-mac-gpl-4.11.4.tar.gz) = 9aa8b860dc72eea5ccee33cc62d6935ac2dac21cfff8b1ed18c584d075f58a717fa2880284b0b27615f63bfafd1a50a0f7f40c1a1f43dd513aeb0da7e8cae900
+Size (PyQt-mac-gpl-4.11.4.tar.gz) = 11312655 bytes
+SHA1 (PyQt-x11-gpl-4.11.4.tar.gz) = 5c489e655279f85d47c8a275d97a12dfa0c8fd87
+RMD160 (PyQt-x11-gpl-4.11.4.tar.gz) = d3ade67c4433852474c86220ea8611eb7f7cd0b1
+SHA512 (PyQt-x11-gpl-4.11.4.tar.gz) = 58d0c5e30b0480c1b6ce1a3cc3ef0a1841bb15631830fb937d1f17f5d3d8cbe66a5e2adcfb2c3990fae38db66dd430668bd25413e254e72064a38c48f689f170
+Size (PyQt-x11-gpl-4.11.4.tar.gz) = 11317088 bytes
 SHA1 (patch-configure.py) = 516da08fad535a7b743b400e9e613689982d057d
 SHA1 (patch-sip_QtCore_qlist.sip) = 4fb548d4ee755cbc955ec32a6b1702a71a9815f1