CVS commit: pkgsrc/mk/tools

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sun Jan 12 20:35:13 UTC 2025

Modified Files:
        pkgsrc/mk/tools: gdbus-codegen.mk itstool.mk

Log Message:
mk/tools: Tools live under ${TOOLBASE}, not ${PREFIX}.

No change to native packages where the two coincide.  Fixes cross
builds where the two are distinct.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/tools/gdbus-codegen.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/tools/itstool.mk

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

Modified files:

Index: pkgsrc/mk/tools/gdbus-codegen.mk
diff -u pkgsrc/mk/tools/gdbus-codegen.mk:1.2 pkgsrc/mk/tools/gdbus-codegen.mk:1.3
--- pkgsrc/mk/tools/gdbus-codegen.mk:1.2        Sun May  2 14:11:40 2021
+++ pkgsrc/mk/tools/gdbus-codegen.mk    Sun Jan 12 20:35:13 2025
@@ -1,9 +1,9 @@
-# $NetBSD: gdbus-codegen.mk,v 1.2 2021/05/02 14:11:40 ryoon Exp $
+# $NetBSD: gdbus-codegen.mk,v 1.3 2025/01/12 20:35:13 riastradh Exp $
 
 .if !empty(USE_TOOLS:Mgdbus-codegen)
 TOOLS_CREATE+=                 gdbus-codegen
 TOOLS_DEPENDS.gdbus-codegen?=  gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-TOOLS_PATH.gdbus-codegen=      ${PREFIX}/bin/gdbus-codegen
+TOOLS_PATH.gdbus-codegen=      ${TOOLBASE}/bin/gdbus-codegen
 .else
 #
 # If a package doesn't explicitly say it uses gdbus-codegen, then create a "broken"

Index: pkgsrc/mk/tools/itstool.mk
diff -u pkgsrc/mk/tools/itstool.mk:1.1 pkgsrc/mk/tools/itstool.mk:1.2
--- pkgsrc/mk/tools/itstool.mk:1.1      Sun May  2 10:24:50 2021
+++ pkgsrc/mk/tools/itstool.mk  Sun Jan 12 20:35:13 2025
@@ -1,9 +1,9 @@
-# $NetBSD: itstool.mk,v 1.1 2021/05/02 10:24:50 nia Exp $
+# $NetBSD: itstool.mk,v 1.2 2025/01/12 20:35:13 riastradh Exp $
 
 .if !empty(USE_TOOLS:Mitstool)
 TOOLS_CREATE+=         itstool
 TOOLS_DEPENDS.itstool?=        itstool-[0-9]*:../../textproc/itstool
-TOOLS_PATH.itstool=    ${PREFIX}/bin/itstool
+TOOLS_PATH.itstool=    ${TOOLBASE}/bin/itstool
 .else
 #
 # If a package doesn't explicitly say it uses itstool, then create a "broken"