From owner-svn-ports-all@FreeBSD.ORG Sat Jul 5 15:19:34 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7DB1C9BC; Sat, 5 Jul 2014 15:19:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F65722EF; Sat, 5 Jul 2014 15:19:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s65FJYhT001126; Sat, 5 Jul 2014 15:19:34 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s65FJXOg001121; Sat, 5 Jul 2014 15:19:33 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201407051519.s65FJXOg001121@svn.freebsd.org> From: William Grzybowski Date: Sat, 5 Jul 2014 15:19:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360763 - in head/devel/pyside: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jul 2014 15:19:34 -0000 Author: wg Date: Sat Jul 5 15:19:32 2014 New Revision: 360763 URL: http://svnweb.freebsd.org/changeset/ports/360763 QAT: https://qat.redports.org/buildarchive/r360763/ Log: devel/pyside: update to 1.2.2 - Support stage - Change maintainership to python@ Modified: head/devel/pyside/Makefile head/devel/pyside/distinfo head/devel/pyside/files/patch-PySide__QtOpenGL__CMakeLists.txt head/devel/pyside/pkg-descr head/devel/pyside/pkg-plist Modified: head/devel/pyside/Makefile ============================================================================== --- head/devel/pyside/Makefile Sat Jul 5 15:17:44 2014 (r360762) +++ head/devel/pyside/Makefile Sat Jul 5 15:19:32 2014 (r360763) @@ -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:${PORTSD 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 q 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 .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 Modified: head/devel/pyside/distinfo ============================================================================== --- head/devel/pyside/distinfo Sat Jul 5 15:17:44 2014 (r360762) +++ head/devel/pyside/distinfo Sat Jul 5 15:19:32 2014 (r360763) @@ -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 Modified: head/devel/pyside/files/patch-PySide__QtOpenGL__CMakeLists.txt ============================================================================== --- head/devel/pyside/files/patch-PySide__QtOpenGL__CMakeLists.txt Sat Jul 5 15:17:44 2014 (r360762) +++ head/devel/pyside/files/patch-PySide__QtOpenGL__CMakeLists.txt Sat Jul 5 15:19:32 2014 (r360763) @@ -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} Modified: head/devel/pyside/pkg-descr ============================================================================== --- head/devel/pyside/pkg-descr Sat Jul 5 15:17:44 2014 (r360762) +++ head/devel/pyside/pkg-descr Sat Jul 5 15:19:32 2014 (r360763) @@ -4,4 +4,4 @@ generation toolchain is available under 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 Modified: head/devel/pyside/pkg-plist ============================================================================== --- head/devel/pyside/pkg-plist Sat Jul 5 15:17:44 2014 (r360762) +++ head/devel/pyside/pkg-plist Sat Jul 5 15:19:32 2014 (r360763) @@ -34,7 +34,7 @@ lib/cmake/PySide-%%PORTVERSION%%/PySideC 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.%%PO %%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