svn commit: r301972 - head/devel/pyside
Nicola Vitale
nivit at FreeBSD.org
Fri Aug 3 21:13:51 UTC 2012
Author: nivit
Date: Fri Aug 3 21:13:50 2012
New Revision: 301972
URL: http://svn.freebsd.org/changeset/ports/301972
Log:
- Update to 1.1.1
- Add devel/generatorrunner to LIB_DEPENDS [1]
- Set MANUAL_PACKAGE_BUILD, because PySide
requires x11-toolkits/qt4-gui with QGTKSTYLE
- Disable color output of cmake
- Set USE_PYTHON to -2.7
- Add a post-fetch target, checking that QT4_OPTIONS
has the value QGTKSTYLE
Pointed out by: pointhat (via beat) [1]
Modified:
head/devel/pyside/Makefile (contents, props changed)
head/devel/pyside/distinfo (contents, props changed)
Modified: head/devel/pyside/Makefile
==============================================================================
--- head/devel/pyside/Makefile Fri Aug 3 21:09:26 2012 (r301971)
+++ head/devel/pyside/Makefile Fri Aug 3 21:13:50 2012 (r301972)
@@ -6,25 +6,28 @@
#
PORTNAME= pyside
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.1.1
+PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= http://www.pyside.org/files/
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
-DISTNAME= ${PORTNAME}-qt4.7+${PORTVERSION}
+DISTNAME= ${PORTNAME}-qt${QT4_VERSION:R}+${PORTVERSION}
MAINTAINER= nivit at FreeBSD.org
COMMENT= Python bindings for the Qt applications and UI framework
LICENSE= LGPL21
-LIB_DEPENDS= apiextractor.0:${PORTSDIR}/devel/apiextractor \
- shiboken-${PYTHON_VERSION}.1:${PORTSDIR}/devel/shiboken
+LIB_DEPENDS= apiextractor:${PORTSDIR}/devel/apiextractor \
+ genrunner:${PORTSDIR}/devel/generatorrunner \
+ shiboken-${PYTHON_VERSION}:${PORTSDIR}/devel/shiboken
-CMAKE_ARGS= -DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \
+MANUAL_PACKAGE_BUILD= requires x11-toolkits/qt4-gui with QGTKSTYLE enabled
+
+CMAKE_ARGS= -DCMAKE_COLOR_MAKEFILE:BOOL="OFF" \
+ -DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \
-DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include"
-# QT4_OPTIONS=QGTKSTYLE in /etc/make.conf removes some warnings
USE_QT4= declarative designer gui help qmake_build \
moc_build multimedia network opengl \
phonon rcc_build script scripttools \
@@ -36,8 +39,34 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} \
USE_BZIP2= yes
USE_CMAKE= yes
USE_LDCONFIG= yes
-USE_PYTHON= 2.5-2.7
+USE_PYTHON= -2.7
+
+.include <bsd.port.pre.mk>
+
+.include "${PORTSDIR}/devel/qt4/files/Makefile.options"
+
+nl= ${.newline}
-# API documentation requires graphics/graphviz and Qt4 src to build
+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
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/devel/pyside/distinfo
==============================================================================
--- head/devel/pyside/distinfo Fri Aug 3 21:09:26 2012 (r301971)
+++ head/devel/pyside/distinfo Fri Aug 3 21:13:50 2012 (r301972)
@@ -1,2 +1,2 @@
-SHA256 (pyside-qt4.7+1.1.0.tar.bz2) = e57ad83e7dfc78bcd72934240c14f59d31da7f429e1c9ee0a060a216ef162ddf
-SIZE (pyside-qt4.7+1.1.0.tar.bz2) = 3747682
+SHA256 (pyside-qt4.8+1.1.1.tar.bz2) = acda876bb8e531682ce0a14e133021142c07988d505117299db3c00668749284
+SIZE (pyside-qt4.8+1.1.1.tar.bz2) = 3756704
More information about the svn-ports-head
mailing list