Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Feb 2019 21:04:07 +0000 (UTC)
From:      Christoph Moench-Tegeder <cmt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r492522 - head/cad/freecad
Message-ID:  <201902092104.x19L47CJ085873@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cmt
Date: Sat Feb  9 21:04:06 2019
New Revision: 492522
URL: https://svnweb.freebsd.org/changeset/ports/492522

Log:
  switch cad/freecad to Qt5 - this is the Makefile.

Modified:
  head/cad/freecad/Makefile

Modified: head/cad/freecad/Makefile
==============================================================================
--- head/cad/freecad/Makefile	Sat Feb  9 21:00:11 2019	(r492521)
+++ head/cad/freecad/Makefile	Sat Feb  9 21:04:06 2019	(r492522)
@@ -3,56 +3,52 @@
 PORTNAME=	FreeCAD
 DISTVERSION=	0.17-13541 # git rev-list --count
 DISTVERSIONSUFFIX=	-g9948ee4f1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	General purpose 3D CAD modeller
 
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-
-BUILD_DEPENDS=	pyside-rcc:devel/pyside-tools \
+BUILD_DEPENDS=	pyside2-rcc:devel/pyside2-tools \
 		swig3.0:devel/swig30
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		${PY_BOOST} \
-		libpyside-python2.7.so:devel/pyside@${PY_FLAVOR} \
+		libpyside2-${PYTHON_VERSION}.so:devel/pyside2@${PY_FLAVOR} \
 		libCoin.so:graphics/Coin \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libvtkFiltersTexture-6.2.so:math/vtk6 \
 		libTKernel.so:cad/opencascade \
-		libSoQt.so:x11-toolkits/soqt \
 		libxerces-c.so:textproc/xerces-c3 \
 		libboost_thread.so:devel/boost-libs \
 		libarea.so:devel/libarea \
 		libmed.so:french/med \
-		libshiboken-${PYTHON_VERSION}.so:devel/shiboken \
+		libshiboken2-${PYTHON_VERSION}.so:devel/shiboken2@${PY_FLAVOR} \
 		libhdf5.so:science/hdf5
-RUN_DEPENDS=	pivy>0:graphics/py-pivy@${PY_FLAVOR}
+RUN_DEPENDS=	pivy-devel>0:graphics/py-pivy-devel@${PY_FLAVOR}
 
-USES=		dos2unix compiler:c++11-lib cmake eigen:3 fortran jpeg \
-		python:2.7 localbase qt:4
+USES=		dos2unix compiler:c++11-lib cmake gl eigen:3 fortran jpeg \
+		python:2.7 localbase qt:5
 USE_GITHUB=	yes
 USE_XORG=	ice sm x11 xext xt
 USE_GL=		gl glu
-USE_QT=		qmake_build corelib gui moc_build network opengl rcc_build \
-		uic_build svg xml webkit
+USE_QT=		buildtools qmake_build core gui network opengl svg xml webkit widgets printsupport concurrent
 USE_LDCONFIG=	yes
+
 DOS2UNIX_GLOB=	*.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL
-CMAKE_ARGS=	-DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE"
 
 # To be removed when french/med will be built against science/hdf5
 LIB_DEPENDS+=	libhdf5-18.so:science/hdf5-18
-CMAKE_ARGS+=	-DHDF5_FOUND="TRUE" -DHDF5_VERSION="1.8.17"		\
+CMAKE_ARGS+=	-DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \
+		-DHDF5_FOUND="TRUE" -DHDF5_VERSION="1.8.17"		\
 		-DHDF5_INCLUDE_DIRS="${LOCALBASE}/include/hdf5-18"	\
 		-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include/hdf5-18"	\
 		-DCMAKE_C_FLAGS="-I${LOCALBASE}/include/hdf5-18"	\
-		-DHDF5_LIBRARIES="-lhdf5-18"
+		-DHDF5_LIBRARIES="-lhdf5-18" -DBUILD_QT5="ON"
 CFLAGS+=	-I${LOCALBASE}/include/hdf5-18
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
@@ -63,7 +59,7 @@ COLLADA_DESC=		Install pycollada for Collada files imp
 COLLADA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR}
 
 DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \
-		${PORTNAME} "Engineering;" false
+		${PORTNAME} "Graphics;Engineering;" false
 
 post-patch:
 	@${REINPLACE_CMD} -e '/sed/s,-i,& \\"\\",' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902092104.x19L47CJ085873>