The KDE FreeBSD team is proud to announce the release of SIP-4.10 and

PyQt-4.7 for FreeBSD. The official update notes can be found at
http://www.riverbankcomputing.com

We'd like to say thanks to all helpers, testers and submitters.

2 files changed, 34 insertions, 18 deletions

diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile
index e39569055775..23631bdd5c4f 100644
--- a/science/avogadro/Makefile
+++ b/science/avogadro/Makefile
@@ -7,31 +7,47 @@
 
 PORTNAME=	avogadro
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	SF
 
 MAINTAINER=	tkjacobsen@gmail.com
 COMMENT=	An advanced molecular editor and viewer
 
-BUILD_DEPENDS=	eigen>=2.0.3:${PORTSDIR}/math/eigen2 \
-		${PYNUMPY} \
-		sip:${PORTSDIR}/devel/py-sip
-RUN_DEPENDS=	${PYNUMPY} \
-		sip:${PORTSDIR}/devel/py-sip
-LIB_DEPENDS=	openbabel.3:${PORTSDIR}/science/openbabel \
-		boost_python:${PORTSDIR}/devel/boost-python-libs
+BUILD_DEPENDS=	eigen>=2.0.3:${PORTSDIR}/math/eigen2
+LIB_DEPENDS=	openbabel.3:${PORTSDIR}/science/openbabel
 
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui opengl linguist qmake_build moc_build rcc_build uic_build
+QT_COMPONENTS=	gui opengl network linguist_build \
+		qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
-CMAKE_ARGS=	-DCMAKE_INSTALL_PREFIX="${PREFIX}" -DLIB_INSTALL_DIR="${LOCALBASE}/lib" \
-		-DENABLE_GLSL=OFF -DENABLE_PYTHON=ON
+CMAKE_ARGS=	-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+		-DLIB_INSTALL_DIR="${LOCALBASE}/lib" \
+		-DENABLE_GLSL=OFF
 USE_GCC=	4.3+
-USE_PYTHON=	2.5+
 MAKE_JOBS_SAFE=	yes
 
+OPTIONS=	PYTHON "Enable python support (broken with sip-4.10)" off
+
+.include <bsd.port.options.mk>
+
+.if defined (WITH_PYTHON)
+IGNORE=		doesn't compile with devel/py-sip>=4.10
+CMAKE_ARGS+=	-DENABLE_PYTHON=ON
+USE_PYTHON=	2.5+
+BUILD_DEPENDS+=	${PYNUMPY} \
+		sip:${PORTSDIR}/devel/py-sip
+RUN_DEPENDS+=	${PYNUMPY} \
+		sip:${PORTSDIR}/devel/py-sip
+LIB_DEPENDS+=	boost_python:${PORTSDIR}/devel/boost-python-libs
+PLIST_SUB+=	PYTHON=""
+.else
+CMAKE_ARGS+=	-DENABLE_PYTHON=OFF
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700013
diff --git a/science/avogadro/pkg-plist b/science/avogadro/pkg-plist
index e36127740b7f..dcd1c33cb32d 100644
--- a/science/avogadro/pkg-plist
+++ b/science/avogadro/pkg-plist
@@ -33,9 +33,9 @@ include/avogadro/pluginmanager.h
 include/avogadro/primitive.h
 include/avogadro/primitivelist.h
 include/avogadro/protein.h
-include/avogadro/pythonerror.h
-include/avogadro/pythoninterpreter.h
-include/avogadro/pythonscript.h
+%%PYTHON%%include/avogadro/pythonerror.h
+%%PYTHON%%include/avogadro/pythoninterpreter.h
+%%PYTHON%%include/avogadro/pythonscript.h
 include/avogadro/residue.h
 include/avogadro/tool.h
 include/avogadro/toolgroup.h
@@ -81,7 +81,7 @@ lib/avogadro/1_0/extensions/molecularpropextension.so
 lib/avogadro/1_0/extensions/networkfetchextension.so
 lib/avogadro/1_0/extensions/povrayextension.so
 lib/avogadro/1_0/extensions/propextension.so
-lib/avogadro/1_0/extensions/pythonterminal.so
+%%PYTHON%%lib/avogadro/1_0/extensions/pythonterminal.so
 lib/avogadro/1_0/extensions/selectextension.so
 lib/avogadro/1_0/extensions/spectraextension.so
 lib/avogadro/1_0/extensions/supercellextension.so
@@ -100,7 +100,7 @@ lib/avogadro/1_0/tools/selectrotatetool.so
 lib/libavogadro.so
 lib/libavogadro.so.1
 lib/libavogadro.so.1.0.0
-%%PYTHON_SITELIBDIR%%/Avogadro.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/Avogadro.so
 %%DATADIR%%/builder/amino/d-ala.zmat
 %%DATADIR%%/builder/amino/d-arg.zmat
 %%DATADIR%%/builder/amino/d-asn.zmat
@@ -420,8 +420,8 @@ lib/libavogadro.so.1.0.0
 %%DATADIR%%/i18n/libavogadro_uk.qm
 %%DATADIR%%/i18n/libavogadro_zh_CN.qm
 %%DATADIR%%/i18n/libavogadro_zh_TW.qm
-share/libavogadro/engineScripts/wireframe.py
-share/libavogadro/extensionScripts/example.py
+%%PYTHON%%share/libavogadro/engineScripts/wireframe.py
+%%PYTHON%%share/libavogadro/extensionScripts/example.py
 @dirrm share/libavogadro/extensionScripts
 @dirrm share/libavogadro/engineScripts
 @dirrm share/libavogadro