CVS commit: pkgsrc/cad/occt

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Feb 12 16:03:28 UTC 2023

Modified Files:
        pkgsrc/cad/occt: PLIST distinfo
        pkgsrc/cad/occt/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/cad/occt/patches: patch-adm_cmake_occt__macros.cmake

Log Message:
occt: fix DESTDIR issues during make replace


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cad/occt/PLIST pkgsrc/cad/occt/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cad/occt/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cad/occt/patches/patch-adm_cmake_occt__macros.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/occt/PLIST
diff -u pkgsrc/cad/occt/PLIST:1.1 pkgsrc/cad/occt/PLIST:1.2
--- pkgsrc/cad/occt/PLIST:1.1   Sun Feb 12 14:42:25 2023
+++ pkgsrc/cad/occt/PLIST       Sun Feb 12 16:03:28 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2023/02/12 14:42:25 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/02/12 16:03:28 tnn Exp $
 bin/DRAWEXE
 bin/DRAWEXE-${PKGVERSION}
 bin/ExpToCasExe
@@ -8390,7 +8390,6 @@ include/opencascade/math_Vector.hxx
 include/opencascade/step.tab.hxx
 lib/cmake/opencascade/OpenCASCADEApplicationFrameworkTargets-release.cmake
 lib/cmake/opencascade/OpenCASCADEApplicationFrameworkTargets.cmake
-lib/cmake/opencascade/OpenCASCADECompileDefinitionsAndFlags-release.cmake
 lib/cmake/opencascade/OpenCASCADEConfig.cmake
 lib/cmake/opencascade/OpenCASCADEConfigVersion.cmake
 lib/cmake/opencascade/OpenCASCADEDataExchangeTargets-release.cmake
Index: pkgsrc/cad/occt/distinfo
diff -u pkgsrc/cad/occt/distinfo:1.1 pkgsrc/cad/occt/distinfo:1.2
--- pkgsrc/cad/occt/distinfo:1.1        Sun Feb 12 14:42:25 2023
+++ pkgsrc/cad/occt/distinfo    Sun Feb 12 16:03:28 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1 2023/02/12 14:42:25 tnn Exp $
+$NetBSD: distinfo,v 1.2 2023/02/12 16:03:28 tnn Exp $
 
 BLAKE2s (opencascade-7.7.0.tgz) = 3ac0f49a8d50e3c5eb86192f3d9d7bb1c52ae58e7f4816d32a9971665bbd0c0b
 SHA512 (opencascade-7.7.0.tgz) = 27ed889bbe95fa40fbb1840788ce0f2c58af67a6fec799f5705f6cad2567fcfeddbe461ba1854b65672392a604f8b41fed1f77b2cc0704f83746a58957d830c7
 Size (opencascade-7.7.0.tgz) = 48391263 bytes
-SHA1 (patch-CMakeLists.txt) = 4a1b5af6bb6c3322c9713353aaeb6b03a074a407
+SHA1 (patch-CMakeLists.txt) = d6f533f8a54881b060e05ed816cb6e9bbfe0c5a8
+SHA1 (patch-adm_cmake_occt__macros.cmake) = 9f17527238443cc770d2def9ad8211f410fae7f4
 SHA1 (patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx) = ba177be057941b7077a4525348d0563cb1378213
 SHA1 (patch-src_OSD_OSD__MemInfo.cxx) = 39c8361e401a7cef9e04f05ab72c96c83126c507
 SHA1 (patch-src_OSD_OSD__Path.cxx) = 14763ec177b7f571350be6ef7bc36e301d57cd1e

Index: pkgsrc/cad/occt/patches/patch-CMakeLists.txt
diff -u pkgsrc/cad/occt/patches/patch-CMakeLists.txt:1.1 pkgsrc/cad/occt/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/cad/occt/patches/patch-CMakeLists.txt:1.1    Sun Feb 12 14:42:25 2023
+++ pkgsrc/cad/occt/patches/patch-CMakeLists.txt        Sun Feb 12 16:03:28 2023
@@ -1,6 +1,7 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2023/02/12 14:42:25 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2023/02/12 16:03:28 tnn Exp $
 
 Don't install world writable files.
+Fix DESTDIR issues.
 
 --- CMakeLists.txt.orig        2022-11-11 22:19:44.000000000 +0000
 +++ CMakeLists.txt
@@ -17,3 +18,22 @@ Don't install world writable files.
    endif()
  
    # copy draw script to CMake binary folder
+@@ -1021,7 +1021,8 @@ else()
+ endif()
+ 
+  # change custom.bat/sh
+-if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
++#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}")
+@@ -1265,7 +1266,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONF
+ 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)")
+-install (CODE "file(INSTALL FILES \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" DESTINATION \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/\" TYPE 
FILE)")
++install (CODE "file(INSTALL FILES \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" DESTINATION 
\"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/\" TYPE FILE)")
+ 
+ foreach (OCCT_MODULE ${OCCT_MODULES})
+   if (BUILD_MODULE_${OCCT_MODULE})

Added files:

Index: pkgsrc/cad/occt/patches/patch-adm_cmake_occt__macros.cmake
diff -u /dev/null pkgsrc/cad/occt/patches/patch-adm_cmake_occt__macros.cmake:1.1
--- /dev/null   Sun Feb 12 16:03:28 2023
+++ pkgsrc/cad/occt/patches/patch-adm_cmake_occt__macros.cmake  Sun Feb 12 16:03:28 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-adm_cmake_occt__macros.cmake,v 1.1 2023/02/12 16:03:28 tnn Exp $
+
+Fix DESTDIR issues.
+
+--- adm/cmake/occt_macros.cmake.orig   2022-11-11 22:19:44.000000000 +0000
++++ adm/cmake/occt_macros.cmake
+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
+ 
+   install (CODE
+   "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+-  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
++  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+   foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
+     file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
+     file (REMOVE \"\${TARGET_FILENAME}\")