From nobody Tue Nov 23 23:53:33 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2BD5B18948D2; Tue, 23 Nov 2021 23:53:36 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HzLZ62cTJz4qJZ; Tue, 23 Nov 2021 23:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F3392200C1; Tue, 23 Nov 2021 23:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ANNrXWM091227; Tue, 23 Nov 2021 23:53:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANNrXdT091226; Tue, 23 Nov 2021 23:53:33 GMT (envelope-from git) Date: Tue, 23 Nov 2021 23:53:33 GMT Message-Id: <202111232353.1ANNrXdT091226@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 5fff47e3957b - main - math/vtk9: Use external packages instead of bundled dependencies List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fff47e3957bc066cb63f6810e5e285820a8d86d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637711614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8H+f/ZPDw2ErxmYFm3sH45EOCfE1S8Q4cXblWXJJnzc=; b=WMRvXh4qbQWYnzzcMh2E241lBl3sr7bwubRAMMTjKcSAYDujQqgKhOFbJ61TYAazXSIour qbWwbARSQvhKUqLjp5lHzECB1l/vPf7O6MIQxTztF5nUPgwWCY+ENqo5GAuBJgmw161FVa aTbicPGxcWWARhh7l2IPjb+jgz4+RwqBW+r5XSmVg7nW0/OTuduCONJxfTV5mEeHEAnGqZ 4jgZyk394xsbF+Y+zCRxGezPcivjWOY+aCHoJcD7KIjFGJc7xrmXGbNxznGCQyVpTs2gzh Q95PR3U9OrRSM52Ugr0/MF6NCjAoomLm+zX3AoWVdl2Q0x5S26ZETBH0hP1Lvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637711614; a=rsa-sha256; cv=none; b=HtO3qTyD6CCU0Ir8NR0K0lnSgfWl7psrNPeViu4S/61qzvU68pA1oFsOJ+RjelEqBa8m0P BsD54rwFkfKaW6ng6Pd1LG2cAjOU/AtCQQLKycjDjBnlLNswTlnmzjaFWDEQ8dB/AfzDtK kktaDTWfqgJBB/g6wdZj1fp/WbsJt02pghq0WU5noeoEXlnkb/GswpLh2oylC/iOt8ZE82 e4Exlx32U19LvKKw2C9UUbKaJDBpjgc1B48EGXh3RB+4LsCNnBZpmJYqkQ0AA0rGk73z0A HaOwO9IAbLlGzoj7qEQ4a7hlV+4Qamv8Y7bovnpoLr9Nnhx+6KKNhbmH3KyF8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5fff47e3957bc066cb63f6810e5e285820a8d86d commit 5fff47e3957bc066cb63f6810e5e285820a8d86d Author: Yuri Victorovich AuthorDate: 2021-11-23 23:49:20 +0000 Commit: Yuri Victorovich CommitDate: 2021-11-23 23:53:29 +0000 math/vtk9: Use external packages instead of bundled dependencies This is partially restoring what has eroded with vtk updates, and is partially adding new external dependencies. --- math/vtk9/Makefile | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index 7583f31a6c2c..debd1f583cd2 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,5 +1,6 @@ PORTNAME= vtk DISTVERSION= 9.1.0 +PORTREVISION= 1 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 @@ -10,25 +11,29 @@ COMMENT= Visualization toolkit LICENSE= BSD3CLAUSE -LIB_DEPENDS= libtiff.so:graphics/tiff \ - libpng.so:graphics/png \ +LIB_DEPENDS= \ + libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ - libexpat.so:textproc/expat2 + libhdf5.so:science/hdf5 \ + libnetcdf.so:science/netcdf \ + libpng.so:graphics/png \ + libtiff.so:graphics/tiff USES= alias cmake compiler:c++11-lang gl jpeg localbase xorg USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} USE_XORG= ice x11 xt xext sm xcursor xfixes xrender CMAKE_ON= BUILD_SHARED_LIBS \ - VTK_INSTALL_NO_DOCUMENTATION VTK_USE_SYSTEM_EXPAT VTK_USE_SYSTEM_TIFF \ - VTK_USE_SYSTEM_PNG VTK_USE_SYSTEM_JPEG VTK_USE_SYSTEM_FREETYPE VTK_USE_SYSTEM_ZLIB \ + VTK_INSTALL_NO_DOCUMENTATION \ Module_vtkTestingCore Module_vtkTestingRendering +.for m in expat freetype hdf5 jpeg netcdf png tiff zlib +CMAKE_ON+= VTK_MODULE_USE_EXTERNAL_VTK_${m} +.endfor CMAKE_ARGS= -DVTK_INSTALL_LIBRARY_DIR=lib/vtk-${VTK_SHORT_VER} \ -DVTK_INSTALL_ARCHIVE_DIR=lib/vtk-${VTK_SHORT_VER} \ -DVTK_INSTALL_QT_DIR=/${QT_LIBDIR_REL}/plugins/designer \ -DSTAGEDIR=${STAGEDIR} - -CFLAGS+= -Du_int=unsigned # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259975 + # all build options are documented here: https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/build.md VTK_SHORT_VER= ${PORTVERSION:R} @@ -102,13 +107,6 @@ DOCS_BUILD_DEPENDS= doxygen:devel/doxygen EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES -# Mangling so that it will build when science/netcdf is installed. -post-patch: - @${MV} ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/netcdf.h \ - ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/xxxnetcdf.h - @${FIND} ${WRKSRC}/ThirdParty/netcdf -type f | ${XARGS} ${REINPLACE_CMD} \ - -E 's/[[:<:]]netcdf\.h[[:>:]]/xxxnetcdf.h/' - .include .for g in ${VTK_GROUPS}