occt: Rename wip/opencascade to wip/occt, and merge in diffs from cad/occt

Tested with wip/prusaslicer and cad/kicad.

occt/DESCR

@@ -0,0 +1,5 @@
+Development platform providing services for 3D surface and solid modeling, CAD
+data exchange, and visualization. Most of OCCT functionality is available in
+the form of C++ libraries. OCCT can be best applied in development of software
+dealing with 3D modeling (CAD), manufacturing / measuring (CAM) or numerical
+simulation (CAE).

occt/Makefile

@@ -1,12 +1,14 @@
 # $NetBSD$
 
 DISTNAME=	opencascade-7.7.0
+PKGNAME=	${DISTNAME:S/opencascade/occt/}
+PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	-http://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${PKGVERSION_NOREV:S/./_/g};sf=tgz
 
-MAINTAINER=	stix@stix.id.au
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.opencascade.org/
-COMMENT=	Software development platform for 3D CAD CAM CAE
+COMMENT=	Boundary Representation modeling toolkit and 3D geometry library
 LICENSE=	gnu-lgpl-v2.1
 
 USE_LANGUAGES=	c c++

occt/PLIST

@@ -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

occt/buildlink3.mk

@@ -0,0 +1,35 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	occt
+
+.if !defined(OCCT_BUILDLINK3_MK)
+OCCT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.occt+=	occt>=7.7.0
+BUILDLINK_ABI_DEPENDS.occt+=	occt>=7.7.0nb2
+BUILDLINK_PKGSRCDIR.occt?=	../../wip/occt
+
+BUILDLINK_INCDIRS.occt+=	include/opencascade
+CMAKE_ARGS+=			-DOCC_INCLUDE_DIR=${BUILDLINK_PREFIX.occt}/include/opencascade
+
+pkgbase := occt
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.occt:Mx11}
+.  include "../../graphics/freeimage/buildlink3.mk"
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.  include "../../x11/libX11/buildlink3.mk"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.occt:Mocct-draw}
+.  include "../../lang/tcl/buildlink3.mk"
+.  include "../../x11/tk/buildlink3.mk"
+.endif
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
+.include "../../textproc/rapidjson/buildlink3.mk"
+.endif	# OCCT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-occt

occt/distinfo

@@ -3,20 +3,20 @@ $NetBSD$
 BLAKE2s (opencascade-7.7.0.tar.gz) = 3ac0f49a8d50e3c5eb86192f3d9d7bb1c52ae58e7f4816d32a9971665bbd0c0b
 SHA512 (opencascade-7.7.0.tar.gz) = 27ed889bbe95fa40fbb1840788ce0f2c58af67a6fec799f5705f6cad2567fcfeddbe461ba1854b65672392a604f8b41fed1f77b2cc0704f83746a58957d830c7
 Size (opencascade-7.7.0.tar.gz) = 48391263 bytes
-SHA1 (patch-CMakeLists.txt) = e09a83be7708806a0f09798fad011947ebc0e88d
+SHA1 (patch-CMakeLists.txt) = 0efdd031b69e55721e0328908e8fe350405da639
 SHA1 (patch-adm_cmake_occt__macros.cmake) = 60de48fed68d10f3d885d6a9a7b370e733483124
 SHA1 (patch-src_DrawResources_InitEnvironment.tcl) = 436803f7b8f3e72b0c62a8df7a3b76babf9aecaf
 SHA1 (patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx) = ba177be057941b7077a4525348d0563cb1378213
 SHA1 (patch-src_OSD_OSD__Chronometer.cxx) = 8df82aefe0fe738534c4ee2c93aa0d542cd75443
 SHA1 (patch-src_OSD_OSD__Host.cxx) = 6f56c0a582c0880e01b8923ef9356acf0a3bf55c
 SHA1 (patch-src_OSD_OSD__MemInfo.cxx) = 6cd4e1095abcadeb3c2df27b2669853764aa5a32
-SHA1 (patch-src_OSD_OSD__Path.cxx) = c6972cbd91658923b75a6e343adacfb217da87fc
+SHA1 (patch-src_OSD_OSD__Path.cxx) = 68d68f9aa13bd99aa9c3238a22abef98c23033e3
 SHA1 (patch-src_OSD_OSD__signal.cxx) = 5a6a6d914340368d089a7bcaadf1aacfeef9bed8
 SHA1 (patch-src_OpenGl_OpenGl__ShaderObject.cxx) = 804cbd76d7377ca003442374b5fcfad951984f37
 SHA1 (patch-src_OpenGl_OpenGl__ShaderProgram.cxx) = a6b7d8e8f15f2c72134fd99f7015e7458d6086d8
 SHA1 (patch-src_Standard_Standard__CString.cxx) = 30de1afeea9952b40fc614df93b1d3a653cc5315
 SHA1 (patch-src_Standard_Standard__Failure.cxx) = a10c3dcb43837fbb82f16fce8232ebdf5ba9d8f1
-SHA1 (patch-src_Standard_Standard__MMgrOpt.cxx) = ed4f05ca2b24563ecffe22bae6000b652ec18ab6
+SHA1 (patch-src_Standard_Standard__MMgrOpt.cxx) = 4c5e0fdeec43848604ef84014ad5cf05d6dd0c0d
 SHA1 (patch-src_Standard_Standard__PrimitiveTypes.hxx) = 868c062a76fd1f77b272ac734f3b0c06eea0be51
 SHA1 (patch-src_Standard_Standard__StackTrace.cxx) = 166ab4d7b79a4fc7361c01196e6aca702f6e15f2
 SHA1 (patch-src_ViewerTest_ViewerTest__CmdParser.cxx) = d92c768377484a64731940cee387d9054114adab

occt/options.mk

@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.opencascade
+PKG_OPTIONS_VAR=	PKG_OPTIONS.occt
 PKG_SUPPORTED_OPTIONS=	x11 occt-draw
 PKG_SUGGESTED_OPTIONS=	occt-draw
 

occt/patches/patch-CMakeLists.txt

@@ -0,0 +1,38 @@
+$NetBSD$
+
+Don't install world writable files.
+Fix DESTDIR issues.
+
+--- CMakeLists.txt.orig	2022-11-11 22:19:44.000000000 +0000
++++ CMakeLists.txt
+@@ -1002,10 +1002,10 @@ if (${DRAWEXE_INDEX} GREATER -1)
+   # copy draw script to install script folder
+   if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}")
+     install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
+-            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
++            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+   else()
+     install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
+-            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
++            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+   endif()
+ 
+   # copy draw script to CMake binary folder
+@@ -1021,7 +1021,7 @@ else()
+ endif()
+ 
+  # change custom.bat/sh
+-if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
++if (False AND EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
+   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})

occt/patches/patch-src_OSD_OSD__Path.cxx

@@ -1,6 +1,6 @@
 $NetBSD$
 
-Add NetBSD support.
+NetBSD support
 
 --- src/OSD/OSD_Path.cxx.orig	2016-04-04 14:58:12.000000000 +0000
 +++ src/OSD/OSD_Path.cxx
@@ -9,7 +9,7 @@ Add NetBSD support.
  static OSD_SysType whereAmI()
  {
 -#if defined(__digital__) || defined(__FreeBSD__) || defined(SUNOS) || defined(__APPLE__) || defined(__QNX__) || defined(__FreeBSD_kernel__)
-+#if defined(__digital__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(SUNOS) || defined(__APPLE__) || defined(__QNX__) || defined(__FreeBSD_kernel__)
++#if defined(__digital__) || defined(__FreeBSD__) || defined(SUNOS) || defined(__APPLE__) || defined(__QNX__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) 
    return OSD_UnixBSD;
  #elif defined(sgi)  || defined(IRIX) || defined(__sun)  || defined(SOLARIS) ||  defined(__sco__) || defined(__hpux) || defined(HPUX)
    return OSD_UnixSystemV;

occt/patches/patch-src_Standard_Standard__MMgrOpt.cxx

@@ -9,7 +9,7 @@ Add NetBSD support.
  #endif
      
 -#if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__)
-+#if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__ANDROID__)
++#if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__NetBSD__) 
      if ((myMMap = open ("/dev/zero", O_RDWR)) < 0) {
        if ((myMMap = open ("/dev/null", O_RDWR)) < 0){
          myMMap = 0;

opencascade/DESCR

@@ -1,7 +0,0 @@
-Open CASCADE Technology is a software development platform freely available in
-open source. It includes components for 3D surface and solid modeling,
-visualization, data exchange and rapid application development.
-
-Open CASCADE Technology can be best applied in development of numerical
-simulation software including CAD/CAM/CAE, AEC and GIS, as well as PDM
-applications.

opencascade/buildlink3.mk

@@ -1,35 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	opencascade
-
-.if !defined(OPENCASCADE_BUILDLINK3_MK)
-OPENCASCADE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.opencascade+=	opencascade>=7.0.0
-BUILDLINK_PKGSRCDIR.opencascade?=	../../wip/opencascade
-
-BUILDLINK_INCDIRS.opencascade+=		include/opencascade
-CMAKE_ARGS+=				-DOCC_INCLUDE_DIR=${BUILDLINK_PREFIX.opencascade}/include/opencascade
-
-pkgbase:=	opencascade
-
-.include "../../mk/pkg-build-options.mk"
-
-.if ${PKG_BUILD_OPTIONS.opencascade:Mx11}
-.  include "../../graphics/freeimage/buildlink3.mk"
-.  include "../../graphics/MesaLib/buildlink3.mk"
-.  include "../../x11/libX11/buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.opencascade:Mocct-draw}
-.  include "../../lang/tcl/buildlink3.mk"
-.  include "../../x11/tk/buildlink3.mk"
-.endif
-
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../math/eigen3/buildlink3.mk"
-.include "../../textproc/rapidjson/buildlink3.mk"
-.endif	# OPENCASCADE_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-opencascade

opencascade/patches/patch-CMakeLists.txt

@@ -1,16 +0,0 @@
-$NetBSD$
-
-Install configure_file under prefix. Patch from upstream:
-https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff;h=b9184c271493f25ae444304a62f35d9c236c6f12
-
---- CMakeLists.txt.orig	2022-11-11 22:19:44.000000000 +0000
-+++ CMakeLists.txt
-@@ -1021,7 +1021,7 @@ else()
- endif()
- 
-  # change custom.bat/sh
--if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
-+if (FALSE AND EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
-   file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
- 
-   set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")

prusaslicer/Makefile

@@ -35,8 +35,8 @@ CMAKE_ARGS+=	-DSLIC3R_FHS:BOOL=TRUE
 
 # CMake goes looking for this binary. Make it happy.
 pre-configure:
-	${LN} -s ${PREFIX}/bin/heatshrink ${BUILDLINK_DIR}/bin/
-	${LN} -s ${PREFIX}/bin/bgcode ${BUILDLINK_DIR}/bin/
+	${LN} -sf ${PREFIX}/bin/heatshrink ${BUILDLINK_DIR}/bin/
+	${LN} -sf ${PREFIX}/bin/bgcode ${BUILDLINK_DIR}/bin/
 
 .include "../../archivers/brotli/buildlink3.mk"
 .include "../../comms/libhidapi/buildlink3.mk"
@@ -71,7 +71,7 @@ pre-configure:
 .include "../../wip/libbgcode/buildlink3.mk"
 .include "../../wip/nanosvg/buildlink3.mk"
 .include "../../wip/nlopt/buildlink3.mk"
-.include "../../wip/opencascade/buildlink3.mk"
+.include "../../wip/occt/buildlink3.mk"
 .include "../../wip/openvdb/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/xcursor/buildlink3.mk"