From owner-svn-ports-head@freebsd.org Sun Apr 5 19:08:06 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 63D3C2BF7E5; Sun, 5 Apr 2020 19:08:06 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48wNVF0vqDz4BCH; Sun, 5 Apr 2020 19:08:05 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A16481A654; Sun, 5 Apr 2020 19:07:57 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 035J7vDI073643; Sun, 5 Apr 2020 19:07:57 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 035J7vx3073642; Sun, 5 Apr 2020 19:07:57 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <202004051907.035J7vx3073642@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Sun, 5 Apr 2020 19:07:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530806 - head/cad/freecad X-SVN-Group: ports-head X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: head/cad/freecad X-SVN-Commit-Revision: 530806 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2020 19:08:06 -0000 Author: cmt Date: Sun Apr 5 19:07:57 2020 New Revision: 530806 URL: https://svnweb.freebsd.org/changeset/ports/530806 Log: cleanup freecad after r520739 fr-med doesn't pull in that vintage hdf5-18 anymore, thus remove the leftover workarounds and dependency for that. Modified: head/cad/freecad/Makefile Modified: head/cad/freecad/Makefile ============================================================================== --- head/cad/freecad/Makefile Sun Apr 5 19:05:07 2020 (r530805) +++ head/cad/freecad/Makefile Sun Apr 5 19:07:57 2020 (r530806) @@ -2,7 +2,7 @@ PORTNAME= FreeCAD DISTVERSION= 0.18.4 -PORTREVISION= 2 +PORTREVISION= 3 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e @@ -45,20 +45,13 @@ USE_LDCONFIG= yes DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL -# To be removed when french/med will be built against science/hdf5 -LIB_DEPENDS+= libhdf5-18.so:science/hdf5-18 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" -DBUILD_QT5="ON" \ + -DBUILD_QT5="ON" \ -DPYTHON_LIBRARY="${PYTHONBASE}/lib/libpython${PYTHON_VER}${PYTHON_ABIVER}.so" \ -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \ -DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \ -DPYTHON_EXECUTABLE="${PYTHON_CMD}" \ -DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" -CFLAGS+= -I${LOCALBASE}/include/hdf5-18 CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} @@ -77,13 +70,6 @@ post-patch: ${WRKSRC}/src/Gui/CMakeLists.txt @${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \ ${WRKSRC}/src/Tools/SubWCRev.py - -pre-configure: - # To be removed when french/med will be built against science/hdf5 - @${REINPLACE_CMD} -e 's|find_package(HDF5 REQUIRED)|#find_package(HDF5 REQUIRED)|' \ - ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's|||' \ - ${WRKSRC}/src/3rdParty/salomesmesh/inc/MED_Common.hxx post-install: ${LN} -s ../${PORTNAME}/bin/FreeCAD ${STAGEDIR}${LOCALBASE}/bin/FreeCAD