CVS commit: pkgsrc/cad/occt

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 24 07:40:42 UTC 2025

Modified Files:
        pkgsrc/cad/occt: options.mk

Log Message:
cad/occt: Find tcl under BUILDLINK_DIR.tcl, not BUILDLINK_PREFIX.tcl.

Likewise tk.  Needed for when we hide PREFIX from cmake.  Will
resolve issues like:

CMake Error at CMakeLists.txt:875 (message):
  Could not find libraries of used third-party products:
  3RDPARTY_TCL_LIBRARY_DIR 3RDPARTY_TK_LIBRARY_DIR


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cad/occt/options.mk

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/options.mk
diff -u pkgsrc/cad/occt/options.mk:1.2 pkgsrc/cad/occt/options.mk:1.3
--- pkgsrc/cad/occt/options.mk:1.2      Sun Aug 25 06:18:27 2024
+++ pkgsrc/cad/occt/options.mk  Fri Jan 24 07:40:42 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:27 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2025/01/24 07:40:42 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.occt
 PKG_SUPPORTED_OPTIONS= x11 occt-draw
@@ -26,16 +26,16 @@ CMAKE_CONFIGURE_ARGS+=      -DUSE_FREEIMAGE=O
 .include "../../x11/tk/buildlink3.mk"
 CMAKE_CONFIGURE_ARGS+= -DUSE_TCL=ON
 CMAKE_CONFIGURE_ARGS+= -DUSE_TK=ON
-CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_INCLUDE_DIR=${BUILDLINK_PREFIX.tcl}/include
-CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY_DIR=${BUILDLINK_PREFIX.tcl}/lib
-CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_INCLUDE_DIR=${BUILDLINK_PREFIX.tk}/include
-CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY_DIR=${BUILDLINK_PREFIX.tk}/lib
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_INCLUDE_DIR=${BUILDLINK_DIR.tcl}/include
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY_DIR=${BUILDLINK_DIR.tcl}/lib
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_INCLUDE_DIR=${BUILDLINK_DIR.tk}/include
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY_DIR=${BUILDLINK_DIR.tk}/lib
 .  if ${OPSYS} == "Darwin"
-CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.dylib
-CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.dylib
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_DIR.tcl}/lib/libtcl86.dylib
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_DIR.tk}/lib/libtk86.dylib
 .  elif ${OPSYS} == "SunOS"
-CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.so
-CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.so
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_DIR.tcl}/lib/libtcl86.so
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_DIR.tk}/lib/libtk86.so
 .  endif
 .else
 CMAKE_CONFIGURE_ARGS+= -DUSE_TCL=OFF