Date: Mon, 1 Feb 2021 20:43:00 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563761 - in head/cad/opencascade: . files Message-ID: <202102012043.111Kh0rw076487@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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|<malloc.h>|<stdlib.h>|' \ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102012043.111Kh0rw076487>