From owner-svn-ports-head@freebsd.org Mon Feb 1 20:43:01 2021 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 868015363E4; Mon, 1 Feb 2021 20:43:01 +0000 (UTC) (envelope-from thierry@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 4DV0JP3Mgwz3Bxl; Mon, 1 Feb 2021 20:43:01 +0000 (UTC) (envelope-from thierry@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 6691F219E9; Mon, 1 Feb 2021 20:43:01 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 111Kh1GO076490; Mon, 1 Feb 2021 20:43:01 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 111Kh0rw076487; Mon, 1 Feb 2021 20:43:00 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202102012043.111Kh0rw076487@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Mon, 1 Feb 2021 20:43:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563761 - in head/cad/opencascade: . files X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: in head/cad/opencascade: . files X-SVN-Commit-Revision: 563761 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.34 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, 01 Feb 2021 20:43:01 -0000 Author: thierry Date: Mon Feb 1 20:43:00 2021 New Revision: 563761 URL: https://svnweb.freebsd.org/changeset/ports/563761 Log: Fix building when installed. Since I´m there, add 3 more doc files to plist, but do not bump PORTREVISION to avoid a rebuild. PR: 253085 Submitted by: greg (at) unrelenting.technology Modified: head/cad/opencascade/Makefile head/cad/opencascade/files/patch-CMakeLists.txt head/cad/opencascade/pkg-plist Modified: head/cad/opencascade/Makefile ============================================================================== --- head/cad/opencascade/Makefile Mon Feb 1 20:28:35 2021 (r563760) +++ head/cad/opencascade/Makefile Mon Feb 1 20:43:00 2021 (r563761) @@ -109,8 +109,6 @@ pre-everything:: @${ECHO_MSG} "Warning: to build OpenCascade, you should have at least" @${ECHO_MSG} "2.6 Gb of free disk space in build area!" @${ECHO_MSG} - @${ECHO_MSG} "Warning: OpenCascade must be deinstalled before rebuilding it!" - @${ECHO_MSG} pre-patch: ${REINPLACE_CMD} 's|||' \ Modified: head/cad/opencascade/files/patch-CMakeLists.txt ============================================================================== --- head/cad/opencascade/files/patch-CMakeLists.txt Mon Feb 1 20:28:35 2021 (r563760) +++ head/cad/opencascade/files/patch-CMakeLists.txt Mon Feb 1 20:43:00 2021 (r563761) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2017-08-30 13:27:56 UTC +--- CMakeLists.txt.orig 2020-11-03 14:49:47 UTC +++ CMakeLists.txt -@@ -847,7 +847,7 @@ if (${DRAWEXE_INDEX} GREATER -1) +@@ -893,7 +893,7 @@ if (${DRAWEXE_INDEX} GREATER -1) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) else() install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" @@ -9,7 +9,16 @@ endif() # copy draw script to CMake binary folder -@@ -1056,7 +1056,13 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONF +@@ -909,7 +909,7 @@ else() + endif() + + # change custom.bat/sh +-if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}") ++if (FALSE) + file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT) + + set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}") +@@ -1156,7 +1156,13 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPE endforeach() # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") Modified: head/cad/opencascade/pkg-plist ============================================================================== --- head/cad/opencascade/pkg-plist Mon Feb 1 20:28:35 2021 (r563760) +++ head/cad/opencascade/pkg-plist Mon Feb 1 20:43:00 2021 (r563761) @@ -28237,6 +28237,7 @@ lib/libTKernel.so.%%VER%% %%DOXYGEN%%%%DOCSDIR%%/html/documentation_test_image.svg %%DOXYGEN%%%%DOCSDIR%%/html/doxygen.css %%DOXYGEN%%%%DOCSDIR%%/html/doxygen.png +%%DOXYGEN%%%%DOCSDIR%%/html/doxygen.svg %%DOXYGEN%%%%DOCSDIR%%/html/draw_image001.png %%DOXYGEN%%%%DOCSDIR%%/html/draw_image002.png %%DOXYGEN%%%%DOCSDIR%%/html/draw_image003.png @@ -28395,6 +28396,7 @@ lib/libTKernel.so.%%VER%% %%DOXYGEN%%%%DOCSDIR%%/html/navtree.js %%DOXYGEN%%%%DOCSDIR%%/html/navtreedata.js %%DOXYGEN%%%%DOCSDIR%%/html/navtreeindex0.js +%%DOXYGEN%%%%DOCSDIR%%/html/navtreeindex10.js %%DOXYGEN%%%%DOCSDIR%%/html/navtreeindex1.js %%DOXYGEN%%%%DOCSDIR%%/html/navtreeindex2.js %%DOXYGEN%%%%DOCSDIR%%/html/navtreeindex3.js @@ -28403,6 +28405,7 @@ lib/libTKernel.so.%%VER%% %%DOXYGEN%%%%DOCSDIR%%/html/navtreeindex6.js %%DOXYGEN%%%%DOCSDIR%%/html/navtreeindex7.js %%DOXYGEN%%%%DOCSDIR%%/html/navtreeindex8.js +%%DOXYGEN%%%%DOCSDIR%%/html/navtreeindex9.js %%DOXYGEN%%%%DOCSDIR%%/html/ocaf_functionmechanism_wp_image003.png %%DOXYGEN%%%%DOCSDIR%%/html/ocaf_functionmechanism_wp_image005.png %%DOXYGEN%%%%DOCSDIR%%/html/ocaf_image003.svg