From owner-svn-ports-head@freebsd.org Mon May 11 23:39:45 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 CD09B2DAF97; Mon, 11 May 2020 23:39:45 +0000 (UTC) (envelope-from db@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 49Lcq54txnz4PJW; Mon, 11 May 2020 23:39:45 +0000 (UTC) (envelope-from db@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 A31D6267A0; Mon, 11 May 2020 23:39:45 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04BNdjDC021418; Mon, 11 May 2020 23:39:45 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04BNdiXi021411; Mon, 11 May 2020 23:39:44 GMT (envelope-from db@FreeBSD.org) Message-Id: <202005112339.04BNdiXi021411@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Mon, 11 May 2020 23:39:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534965 - in head/devel/libsavitar: . files X-SVN-Group: ports-head X-SVN-Commit-Author: db X-SVN-Commit-Paths: in head/devel/libsavitar: . files X-SVN-Commit-Revision: 534965 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.33 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: Mon, 11 May 2020 23:39:45 -0000 Author: db Date: Mon May 11 23:39:43 2020 New Revision: 534965 URL: https://svnweb.freebsd.org/changeset/ports/534965 Log: - pugixml-1.10 conflicts with libSavitar-4.5.0 on /usr/local/lib/cmake/pugixml/pugixml-config-release.cmake [1] - I had a TODO in original Makefile to rewrite to use our system pugixml [2] [1] maciej@pasternacki.net [2] db PR: ports/246316 Added: head/devel/libsavitar/files/ head/devel/libsavitar/files/patch-CMakeLists.txt (contents, props changed) head/devel/libsavitar/files/patch-src_MeshData.cpp (contents, props changed) head/devel/libsavitar/files/patch-src_Namespace.cpp (contents, props changed) head/devel/libsavitar/files/patch-src_SceneNode.cpp (contents, props changed) Modified: head/devel/libsavitar/Makefile head/devel/libsavitar/pkg-plist (contents, props changed) Modified: head/devel/libsavitar/Makefile ============================================================================== --- head/devel/libsavitar/Makefile Mon May 11 23:21:52 2020 (r534964) +++ head/devel/libsavitar/Makefile Mon May 11 23:39:43 2020 (r534965) @@ -2,6 +2,7 @@ PORTNAME= libSavitar DISTVERSION= 4.5.0 +PORTREVISION= 1 CATEGORIES= devel cad DIST_SUBDIR= Ultimaker @@ -12,19 +13,15 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR} +LIB_DEPENDS= libpugixml.so:textproc/pugixml USES= cmake compiler:c++11-lang python:3.4+ USE_GITHUB= yes GH_ACCOUNT= Ultimaker +USE_GITHUB= yes GH_TAGNAME= 96eba0e USE_LDCONFIG= yes - -# need this hack so as not to conflict with pugixml -# XXX TODO rework port to use pugixml instead -post-install: - ${RM} ${STAGEDIR}${PREFIX}/include/pugiconfig.hpp - ${RM} ${STAGEDIR}${PREFIX}/include/pugixml.hpp - ${RM} ${STAGEDIR}${PREFIX}/lib/cmake/pugixml/pugixml-config.cmake - ${RM} ${STAGEDIR}${PREFIX}/lib/libpugixml.a +CFLAGS+= "-I${LOCALBASE}/include" +LDFLAGS+= "-L${LOCALBASE}/lib" .include Added: head/devel/libsavitar/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libsavitar/files/patch-CMakeLists.txt Mon May 11 23:39:43 2020 (r534965) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2020-05-11 21:56:56 UTC ++++ CMakeLists.txt +@@ -15,7 +15,7 @@ if(BUILD_TESTS) + find_package(Threads QUIET) + endif() + +-add_subdirectory(pugixml) ++#add_subdirectory(pugixml) + + if(BUILD_PYTHON) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) Added: head/devel/libsavitar/files/patch-src_MeshData.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libsavitar/files/patch-src_MeshData.cpp Mon May 11 23:39:43 2020 (r534965) @@ -0,0 +1,11 @@ +--- src/MeshData.cpp.orig 2020-05-11 21:53:20 UTC ++++ src/MeshData.cpp +@@ -17,7 +17,7 @@ + */ + + #include "MeshData.h" +-#include "../pugixml/src/pugixml.hpp" ++#include + #include + #include + #include //For std::runtime_error. Added: head/devel/libsavitar/files/patch-src_Namespace.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libsavitar/files/patch-src_Namespace.cpp Mon May 11 23:39:43 2020 (r534965) @@ -0,0 +1,11 @@ +--- src/Namespace.cpp.orig 2020-05-11 21:53:27 UTC ++++ src/Namespace.cpp +@@ -3,7 +3,7 @@ + + #include "Namespace.h" + +-#include "../pugixml/src/pugixml.hpp" ++#include + + namespace xml_namespace + { Added: head/devel/libsavitar/files/patch-src_SceneNode.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libsavitar/files/patch-src_SceneNode.cpp Mon May 11 23:39:43 2020 (r534965) @@ -0,0 +1,11 @@ +--- src/SceneNode.cpp.orig 2020-05-11 21:53:40 UTC ++++ src/SceneNode.cpp +@@ -18,7 +18,7 @@ + + #include "SceneNode.h" + #include "Namespace.h" +-#include "../pugixml/src/pugixml.hpp" ++#include + #include + using namespace Savitar; + Modified: head/devel/libsavitar/pkg-plist ============================================================================== --- head/devel/libsavitar/pkg-plist Mon May 11 23:21:52 2020 (r534964) +++ head/devel/libsavitar/pkg-plist Mon May 11 23:39:43 2020 (r534965) @@ -11,7 +11,6 @@ lib/cmake/Savitar/Savitar-targets-%%CMAKE_BUILD_TYPE%% lib/cmake/Savitar/Savitar-targets.cmake lib/cmake/Savitar/SavitarConfig.cmake lib/cmake/Savitar/SavitarConfigVersion.cmake -lib/cmake/pugixml/pugixml-config-%%CMAKE_BUILD_TYPE%%.cmake lib/libSavitar.so lib/libSavitar.so.0 lib/libSavitar.so.0.1.1