devel/pyside: update to 1.2.2

- Support stage
- Change maintainership to python@

5 files changed, 22 insertions, 40 deletions

diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile
index 696de3391d5b..e52fb550152d 100644
--- a/devel/pyside/Makefile
+++ b/devel/pyside/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	pyside
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	devel
-MASTER_SITES=	http://nivit.altervista.org/FreeBSD/ports/distfiles/
+MASTER_SITES=	https://download.qt-project.org/official_releases/pyside/
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
-DISTNAME=	${PORTNAME}-qt${QT4_VERSION:R}+${PORTVERSION}
+DISTNAME=	pyside-qt4.8+${PORTVERSION}
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python bindings for the Qt applications and UI framework
 
 LICENSE=	LGPL21
@@ -18,8 +17,6 @@ LIB_DEPENDS=	libapiextractor.so:${PORTSDIR}/devel/apiextractor \
 		libgenrunner.so:${PORTSDIR}/devel/generatorrunner \
 		libshiboken-${PYTHON_VERSION}.so:${PORTSDIR}/devel/shiboken
 
-MANUAL_PACKAGE_BUILD=	requires x11-toolkits/qt4-gui with QGTKSTYLE enabled
-
 CMAKE_ARGS+=	-DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \
 		-DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include"
 
@@ -31,38 +28,22 @@ USE_QT4=	declarative designer gui help qmake_build \
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		PYTHON_VERSION=${PYTHON_VERSION}
 
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_LDCONFIG=	yes
 USE_PYTHON=	2
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/devel/qt4/files/Makefile.options"
 
-nl=	${.newline}
-
-REBUILD_QT4GUI=		"${nl} Before building ${PORTNAME},\
-please add QT4_OPTIONS+=QGTKSTYLE to ${__MAKE_CONF}${nl}\
-and then reinstall devel/qt4-corelib and x11-toolkits/qt4-gui${nl}"
-
-#QGTKSTYLE_MSG=	"${nl}\# ${PORTNAME} requires\
-#x11-toolkits/qt4-gui built with QGTKSTYLE\
-#${nl}QT4_OPTIONS+=QGTKSTYLE${nl}"
-
-post-fetch:
-.if !${QT4_OPTIONS:MQGTKSTYLE}
-	@${ECHO_MSG} ${REBUILD_QT4GUI}
-	@exit 1
-# a non canonical way...
-#	@${ECHO_CMD} ${QGTKSTYLE_MSG} >> ${__MAKE_CONF}
-#.	if exists(${LOCALBASE}/include/qt4/Qt/QtGui)
-#.		for p in devel/qt4-corelib x11-toolkits/qt4-gui
-#		    @(cd ${PORTSDIR}/${p} && \
-#		    ${MAKE} clean install -DFORCE_PKG_REGISTER)
-#.		endfor
-#.	endif
-.endif
+#REBUILD_QT4GUI=		"${nl} Before building ${PORTNAME},\
+#please add QT4_OPTIONS+=QGTKSTYLE to ${__MAKE_CONF}${nl}\
+#and then reinstall devel/qt4-corelib and x11-toolkits/qt4-gui${nl}"
+#
+#post-fetch:
+#.if !${QT4_OPTIONS:MQGTKSTYLE}
+#	@${ECHO_MSG} ${REBUILD_QT4GUI}
+#	@exit 1
+#.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/pyside/distinfo b/devel/pyside/distinfo
index 266783871f45..4e485ba6598b 100644
--- a/devel/pyside/distinfo
+++ b/devel/pyside/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyside-qt4.8+1.1.1.tar.bz2) = acda876bb8e531682ce0a14e133021142c07988d505117299db3c00668749284
-SIZE (pyside-qt4.8+1.1.1.tar.bz2) = 3756704
+SHA256 (pyside-qt4.8+1.2.2.tar.bz2) = a1a9df746378efe52211f1a229f77571d1306fb72830bbf73f0d512ed9856ae1
+SIZE (pyside-qt4.8+1.2.2.tar.bz2) = 3765472
diff --git a/devel/pyside/files/patch-PySide__QtOpenGL__CMakeLists.txt b/devel/pyside/files/patch-PySide__QtOpenGL__CMakeLists.txt
index 44a7269c9d99..29c99e5ef1ba 100644
--- a/devel/pyside/files/patch-PySide__QtOpenGL__CMakeLists.txt
+++ b/devel/pyside/files/patch-PySide__QtOpenGL__CMakeLists.txt
@@ -1,10 +1,10 @@
---- ./PySide/QtOpenGL/CMakeLists.txt.orig	2011-11-29 15:13:14.000000000 +0100
-+++ ./PySide/QtOpenGL/CMakeLists.txt	2011-12-17 17:12:56.000000000 +0100
+--- PySide/QtOpenGL/CMakeLists.txt.orig	2014-07-04 11:36:41.495877837 -0300
++++ PySide/QtOpenGL/CMakeLists.txt	2014-07-04 11:37:00.483940905 -0300
 @@ -37,6 +37,7 @@
                              ${QT_QTCORE_INCLUDE_DIR}
                              ${QT_QTGUI_INCLUDE_DIR}
                              ${QT_QTOPENGL_INCLUDE_DIR}
-+                            ${GL_INCLUDE_DIR}
++			    ${GL_INCLUDE_DIR}
                              ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                              ${SHIBOKEN_INCLUDE_DIR}
                              ${libpyside_SOURCE_DIR}
diff --git a/devel/pyside/pkg-descr b/devel/pyside/pkg-descr
index 838a478006e2..d18abd932740 100644
--- a/devel/pyside/pkg-descr
+++ b/devel/pyside/pkg-descr
@@ -4,4 +4,4 @@ generation toolchain is available under LGPL license. This allows developers
 to create Qt and Qt Quick applications in Python programming language at no
 cost.
 
-WWW:	http://pyside.org/
+WWW: http://qt-project.org/wiki/PySide
diff --git a/devel/pyside/pkg-plist b/devel/pyside/pkg-plist
index d395f4030579..bd4e6a1b468b 100644
--- a/devel/pyside/pkg-plist
+++ b/devel/pyside/pkg-plist
@@ -34,7 +34,7 @@ lib/cmake/PySide-%%PORTVERSION%%/PySideConfig-%%PYTHON_VERSION%%.cmake
 lib/cmake/PySide-%%PORTVERSION%%/PySideConfig.cmake
 lib/cmake/PySide-%%PORTVERSION%%/PySideConfigVersion.cmake
 lib/libpyside-%%PYTHON_VERSION%%.so
-lib/libpyside-%%PYTHON_VERSION%%.so.1.1
+lib/libpyside-%%PYTHON_VERSION%%.so.1.2
 lib/libpyside-%%PYTHON_VERSION%%.so.%%PORTVERSION%%
 %%PYTHON_SITELIBDIR%%/PySide/QtCore.so
 %%PYTHON_SITELIBDIR%%/PySide/QtDeclarative.so
@@ -53,6 +53,7 @@ lib/libpyside-%%PYTHON_VERSION%%.so.%%PORTVERSION%%
 %%PYTHON_SITELIBDIR%%/PySide/QtXml.so
 %%PYTHON_SITELIBDIR%%/PySide/QtXmlPatterns.so
 %%PYTHON_SITELIBDIR%%/PySide/__init__.py
+%%PYTHON_SITELIBDIR%%/PySide/_utils.py
 %%PYTHON_SITELIBDIR%%/PySide/phonon.so
 libdata/pkgconfig/pyside.pc
 share/PySide/typesystems/typesystem_core.xml