CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Taylor R Campbell" <riastradh%netbsd.org@localhost>
Date: Sat, 13 Jan 2024 20:07:35 +0000

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 13 20:07:34 UTC 2024

Modified Files:
        pkgsrc/archivers/bzip2: builtin.mk
        pkgsrc/archivers/libarchive: builtin.mk
        pkgsrc/archivers/xz: builtin.mk
        pkgsrc/converters/libiconv: builtin.mk
        pkgsrc/devel/gmp: builtin.mk
        pkgsrc/devel/libexecinfo: builtin.mk
        pkgsrc/devel/libuuid: builtin.mk
        pkgsrc/devel/ncurses: builtin.mk
        pkgsrc/devel/ncursesw: builtin.mk
        pkgsrc/devel/readline: builtin.mk
        pkgsrc/devel/zlib: builtin.mk
        pkgsrc/fonts/Xft2: builtin.mk
        pkgsrc/fonts/fontconfig: builtin.mk
        pkgsrc/graphics/MesaLib: builtin.mk version.mk
        pkgsrc/graphics/freetype2: builtin.mk
        pkgsrc/graphics/glu: builtin.mk
        pkgsrc/math/mpfr: builtin.mk
        pkgsrc/net/net-snmp: builtin.mk
        pkgsrc/security/openpam: builtin.mk
        pkgsrc/security/openssl: builtin.mk
        pkgsrc/textproc/expat: builtin.mk
        pkgsrc/x11/libXft: builtin.mk
        pkgsrc/x11/xcursor: builtin.mk

Log Message:
*/builtin.mk: Use ${_CROSS_DESTDIR:U} for build-time file checks.

These are questions about the target system, whose files at
build-time are all relative to ${_CROSS_DESTDIR} if it is defined,
i.e., if USE_CROSS_COMPILE is set to yes.

No change to native builds because ${_CROSS_DESTDIR:U} is empty in
them.  (Possible minor change by adding :Q to ${H_FOO} in command
lines, but if this makes a difference it likely fixes problems.)


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/archivers/bzip2/builtin.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/libarchive/builtin.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/archivers/xz/builtin.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/converters/libiconv/builtin.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/gmp/builtin.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libexecinfo/builtin.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/libuuid/builtin.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/ncurses/builtin.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/ncursesw/builtin.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/readline/builtin.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/zlib/builtin.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/fonts/Xft2/builtin.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/fonts/fontconfig/builtin.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/MesaLib/builtin.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/MesaLib/version.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/freetype2/builtin.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/glu/builtin.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/mpfr/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/net-snmp/builtin.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/openpam/builtin.mk
cvs rdiff -u -r1.51 -r1.52 pkgsrc/security/openssl/builtin.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/expat/builtin.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXft/builtin.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/xcursor/builtin.mk

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

Modified files:

Index: pkgsrc/archivers/bzip2/builtin.mk
diff -u pkgsrc/archivers/bzip2/builtin.mk:1.10 pkgsrc/archivers/bzip2/builtin.mk:1.11
--- pkgsrc/archivers/bzip2/builtin.mk:1.10      Sat Nov  2 22:54:26 2019
+++ pkgsrc/archivers/bzip2/builtin.mk   Sat Jan 13 20:07:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2019/11/02 22:54:26 rillig Exp $
+# $NetBSD: builtin.mk,v 1.11 2024/01/13 20:07:31 riastradh Exp $
 
 BUILTIN_PKG:=  bzip2
 
@@ -39,7 +39,7 @@ BUILTIN_VERSION.bzip2!=                                                       \
                        };                                              \
                        print vers;                                     \
                };                                                      \
-       ' ${H_BZIP2:Q}
+       ' ${_CROSS_DESTDIR:U:Q}${H_BZIP2:Q}
 
 BUILTIN_PKG.bzip2=     bzip2-${BUILTIN_VERSION.bzip2}
 .endif

Index: pkgsrc/archivers/libarchive/builtin.mk
diff -u pkgsrc/archivers/libarchive/builtin.mk:1.11 pkgsrc/archivers/libarchive/builtin.mk:1.12
--- pkgsrc/archivers/libarchive/builtin.mk:1.11 Sat Nov  2 22:54:26 2019
+++ pkgsrc/archivers/libarchive/builtin.mk      Sat Jan 13 20:07:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2019/11/02 22:54:26 rillig Exp $
+# $NetBSD: builtin.mk,v 1.12 2024/01/13 20:07:32 riastradh Exp $
 
 BUILTIN_PKG:=  libarchive
 
@@ -53,7 +53,7 @@ BUILTIN_VERSION.libarchive!=                                          \
                        else if (found == 2)                            \
                                print vers_str;                         \
                }                                                       \
-       ' ${H_ARCHIVE:Q}
+       ' ${_CROSS_DESTDIR:U:Q}${H_ARCHIVE:Q}
 .  if !empty(BUILTIN_VERSION.libarchive)
 BUILTIN_PKG.libarchive=        libarchive-${BUILTIN_VERSION.libarchive}
 .  else

Index: pkgsrc/archivers/xz/builtin.mk
diff -u pkgsrc/archivers/xz/builtin.mk:1.10 pkgsrc/archivers/xz/builtin.mk:1.11
--- pkgsrc/archivers/xz/builtin.mk:1.10 Fri Dec  2 09:17:59 2022
+++ pkgsrc/archivers/xz/builtin.mk      Sat Jan 13 20:07:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2022/12/02 09:17:59 adam Exp $
+# $NetBSD: builtin.mk,v 1.11 2024/01/13 20:07:32 riastradh Exp $
 
 BUILTIN_PKG:=  xz
 
@@ -37,7 +37,7 @@ BUILTIN_VERSION.xz!=                                                  \
                        }                                               \
                }                                                       \
                END { printf "%s%s%s%s\n", M, m, p, s}                  \
-       ' ${H_LZMA_VERSION:Q}
+       ' ${_CROSS_DESTDIR:U:Q}${H_LZMA_VERSION:Q}
 
 BUILTIN_PKG.xz=        xz-${BUILTIN_VERSION.xz}
 .endif

Index: pkgsrc/converters/libiconv/builtin.mk
diff -u pkgsrc/converters/libiconv/builtin.mk:1.27 pkgsrc/converters/libiconv/builtin.mk:1.28
--- pkgsrc/converters/libiconv/builtin.mk:1.27  Tue Nov 14 17:51:58 2023
+++ pkgsrc/converters/libiconv/builtin.mk       Sat Jan 13 20:07:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.27 2023/11/14 17:51:58 adam Exp $
+# $NetBSD: builtin.mk,v 1.28 2024/01/13 20:07:32 riastradh Exp $
 #
 # Package-settable variables:
 #
@@ -53,7 +53,7 @@ BUILTIN_VERSION.iconv!=                                                       \
                        printf "%d.%d\n", M, m;                         \
                        exit 0;                                         \
                }                                                       \
-       ' ${H_ICONV}
+       ' ${_CROSS_DESTDIR:U:Q}${H_ICONV:Q}
 #
 # If the native GNU iconv is ABI version 1.9, then treat it the same
 # as the latest version on the libiconv-1.9.x branch.

Index: pkgsrc/devel/gmp/builtin.mk
diff -u pkgsrc/devel/gmp/builtin.mk:1.12 pkgsrc/devel/gmp/builtin.mk:1.13
--- pkgsrc/devel/gmp/builtin.mk:1.12    Sat Aug  5 07:08:26 2023
+++ pkgsrc/devel/gmp/builtin.mk Sat Jan 13 20:07:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2023/08/05 07:08:26 adam Exp $
+# $NetBSD: builtin.mk,v 1.13 2024/01/13 20:07:32 riastradh Exp $
 
 BUILTIN_PKG:=  gmp
 
@@ -33,7 +33,8 @@ MAKEVARS+=    IS_BUILTIN.gmp
 .if !defined(BUILTIN_PKG.gmp) && \
     ${IS_BUILTIN.gmp:tl} == yes && \
     empty(H_GMP:M__nonexistent__)
-BUILTIN_VERSION.gmp!=  ${BUILTIN_VERSION_SCRIPT.gmp} ${H_GMP}
+BUILTIN_VERSION.gmp!=  \
+       ${BUILTIN_VERSION_SCRIPT.gmp} ${_CROSS_DESTDIR:U:Q}${H_GMP:Q}
 BUILTIN_PKG.gmp=       gmp-${BUILTIN_VERSION.gmp}
 .endif
 MAKEVARS+=             BUILTIN_PKG.gmp

Index: pkgsrc/devel/libexecinfo/builtin.mk
diff -u pkgsrc/devel/libexecinfo/builtin.mk:1.4 pkgsrc/devel/libexecinfo/builtin.mk:1.5
--- pkgsrc/devel/libexecinfo/builtin.mk:1.4     Sun Nov  3 10:39:16 2019
+++ pkgsrc/devel/libexecinfo/builtin.mk Sat Jan 13 20:07:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2019/11/03 10:39:16 rillig Exp $
+# $NetBSD: builtin.mk,v 1.5 2024/01/13 20:07:32 riastradh Exp $
 
 BUILTIN_PKG:=  libexecinfo
 
@@ -56,7 +56,8 @@ CHECK_BUILTIN.libexecinfo?=   no
 .  if !empty(USE_BUILTIN.libexecinfo:M[nN][oO])
 _BLTN_LIBEXECINFO=             -lexecinfo
 .  else
-.    if exists(/usr/include/execinfo.h) && (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD")
+.    if exists(${_CROSS_DESTDIR:U}/usr/include/execinfo.h) && \
+        (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD")
 _BLTN_LIBEXECINFO=             -lexecinfo
 .    else
 _BLTN_LIBEXECINFO=             # empty

Index: pkgsrc/devel/libuuid/builtin.mk
diff -u pkgsrc/devel/libuuid/builtin.mk:1.12 pkgsrc/devel/libuuid/builtin.mk:1.13
--- pkgsrc/devel/libuuid/builtin.mk:1.12        Wed Aug 26 13:47:14 2020
+++ pkgsrc/devel/libuuid/builtin.mk     Sat Jan 13 20:07:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2020/08/26 13:47:14 schmonz Exp $
+# $NetBSD: builtin.mk,v 1.13 2024/01/13 20:07:32 riastradh Exp $
 
 BUILTIN_PKG:=  libuuid
 
@@ -31,7 +31,8 @@ MAKEVARS+=            IS_BUILTIN.libuuid
 .if !defined(BUILTIN_PKG.libuuid) && \
     !empty(IS_BUILTIN.libuuid:M[yY][eE][sS])
 .  if empty(UUID_PC:M__nonexistent__)
-BUILTIN_VERSION.libuuid!=      ${SED} -n -e 's/Version: //p' ${UUID_PC}
+BUILTIN_VERSION.libuuid!=      \
+       ${SED} -n -e 's/Version: //p' ${_CROSS_DESTDIR:U:Q}${UUID_PC:Q}
 BUILTIN_PKG.libuuid=           libuuid-${BUILTIN_VERSION.libuuid}
 .  else
 BUILTIN_PKG.libuuid=           libuuid-2.18    # whatever, as long as it is big enough

Index: pkgsrc/devel/ncurses/builtin.mk
diff -u pkgsrc/devel/ncurses/builtin.mk:1.44 pkgsrc/devel/ncurses/builtin.mk:1.45
--- pkgsrc/devel/ncurses/builtin.mk:1.44        Thu Jan 19 12:09:20 2023
+++ pkgsrc/devel/ncurses/builtin.mk     Sat Jan 13 20:07:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.44 2023/01/19 12:09:20 wiz Exp $
+# $NetBSD: builtin.mk,v 1.45 2024/01/13 20:07:32 riastradh Exp $
 
 BUILTIN_PKG:=  ncurses
 
@@ -47,7 +47,7 @@ BUILTIN_VERSION.ncurses!=                                             \
                        gsub("\"", "", vers);                           \
                        print vers;                                     \
                }                                                       \
-       ' ${H_NCURSES:Q}
+       ' ${_CROSS_DESTDIR:U:Q}${H_NCURSES:Q}
 BUILTIN_PKG.ncurses=   ncurses-${BUILTIN_VERSION.ncurses}
 .endif
 MAKEVARS+=             BUILTIN_PKG.ncurses

Index: pkgsrc/devel/ncursesw/builtin.mk
diff -u pkgsrc/devel/ncursesw/builtin.mk:1.16 pkgsrc/devel/ncursesw/builtin.mk:1.17
--- pkgsrc/devel/ncursesw/builtin.mk:1.16       Sun Nov  3 10:39:20 2019
+++ pkgsrc/devel/ncursesw/builtin.mk    Sat Jan 13 20:07:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2019/11/03 10:39:20 rillig Exp $
+# $NetBSD: builtin.mk,v 1.17 2024/01/13 20:07:32 riastradh Exp $
 
 BUILTIN_PKG:=  ncursesw
 
@@ -44,7 +44,7 @@ BUILTIN_VERSION.ncursesw!=                                            \
                        gsub("\"", "", vers);                           \
                        print vers;                                     \
                }                                                       \
-       ' ${H_NCURSESW:Q}
+       ' ${_CROSS_DESTDIR:U:Q}${H_NCURSESW:Q}
 BUILTIN_PKG.ncursesw=  ncursesw-${BUILTIN_VERSION.ncursesw}
 .endif
 MAKEVARS+=             BUILTIN_PKG.ncursesw

Index: pkgsrc/devel/readline/builtin.mk
diff -u pkgsrc/devel/readline/builtin.mk:1.21 pkgsrc/devel/readline/builtin.mk:1.22
--- pkgsrc/devel/readline/builtin.mk:1.21       Sun Nov  3 10:39:29 2019
+++ pkgsrc/devel/readline/builtin.mk    Sat Jan 13 20:07:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.21 2019/11/03 10:39:29 rillig Exp $
+# $NetBSD: builtin.mk,v 1.22 2024/01/13 20:07:33 riastradh Exp $
 
 BUILTIN_PKG:=  readline
 
@@ -35,7 +35,7 @@ BUILTIN_VERSION.readline!=                                            \
        ${AWK} '/\#define[      ]*RL_VERSION_MAJOR/ { M = $$3 }         \
                /\#define[      ]*RL_VERSION_MINOR/ { m = "."$$3 }      \
                END { printf "%s%s\n", M, m }                           \
-       ' ${H_READLINE:Q}
+       ' ${_CROSS_DESTDIR:U:Q}${H_READLINE:Q}
 BUILTIN_PKG.readline=  readline-${BUILTIN_VERSION.readline}
 .endif
 MAKEVARS+=             BUILTIN_PKG.readline

Index: pkgsrc/devel/zlib/builtin.mk
diff -u pkgsrc/devel/zlib/builtin.mk:1.17 pkgsrc/devel/zlib/builtin.mk:1.18
--- pkgsrc/devel/zlib/builtin.mk:1.17   Fri Oct 14 07:43:57 2022
+++ pkgsrc/devel/zlib/builtin.mk        Sat Jan 13 20:07:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.17 2022/10/14 07:43:57 wiz Exp $
+# $NetBSD: builtin.mk,v 1.18 2024/01/13 20:07:33 riastradh Exp $
 
 BUILTIN_PKG:=  zlib
 
@@ -36,7 +36,7 @@ BUILTIN_VERSION.zlib!=                                                        \
                        gsub("\"", "", vers);                           \
                        print vers;                                     \
                }                                                       \
-       ' ${H_ZLIB:Q}
+       ' ${_CROSS_DESTDIR:U:Q}${H_ZLIB:Q}
 BUILTIN_PKG.zlib=      zlib-${BUILTIN_VERSION.zlib:C/-[A-Za-z]*//}
 
 .endif

Index: pkgsrc/fonts/Xft2/builtin.mk
diff -u pkgsrc/fonts/Xft2/builtin.mk:1.21 pkgsrc/fonts/Xft2/builtin.mk:1.22
--- pkgsrc/fonts/Xft2/builtin.mk:1.21   Sat Nov  2 22:24:38 2019
+++ pkgsrc/fonts/Xft2/builtin.mk        Sat Jan 13 20:07:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.21 2019/11/02 22:24:38 rillig Exp $
+# $NetBSD: builtin.mk,v 1.22 2024/01/13 20:07:33 riastradh Exp $
 
 BUILTIN_PKG:=  Xft2
 
@@ -37,7 +37,7 @@ BUILTIN_VERSION.Xft2!=                                                        \
                /\#define[      ]*XFT_MINOR/ { m = "."$$3 }             \
                /\#define[      ]*XFT_REVISION/ { r = "."$$3 }          \
                END { printf "%s%s%s\n", M, m, r }'                     \
-               ${H_XFT2}
+               ${_CROSS_DESTDIR:U:Q}${H_XFT2:Q}
 BUILTIN_PKG.Xft2=      Xft2-${BUILTIN_VERSION.Xft2}
 .endif
 MAKEVARS+=             BUILTIN_PKG.Xft2

Index: pkgsrc/fonts/fontconfig/builtin.mk
diff -u pkgsrc/fonts/fontconfig/builtin.mk:1.15 pkgsrc/fonts/fontconfig/builtin.mk:1.16
--- pkgsrc/fonts/fontconfig/builtin.mk:1.15     Sat Dec 30 10:21:52 2023
+++ pkgsrc/fonts/fontconfig/builtin.mk  Sat Jan 13 20:07:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2023/12/30 10:21:52 wiz Exp $
+# $NetBSD: builtin.mk,v 1.16 2024/01/13 20:07:33 riastradh Exp $
 
 BUILTIN_PKG:=  fontconfig
 
@@ -33,7 +33,7 @@ BUILTIN_VERSION.fontconfig!=                                          \
                /\#define[      ]*FC_MINOR/ { m = "."$$3 }              \
                /\#define[      ]*FC_REVISION/ { r = "."$$3 }           \
                END { printf "%s%s%s\n", M, m, r }'                     \
-               ${H_FONTCONFIG}
+               ${_CROSS_DESTDIR:U:Q}${H_FONTCONFIG:Q}
 BUILTIN_PKG.fontconfig=        fontconfig-${BUILTIN_VERSION.fontconfig}
 .endif
 MAKEVARS+=             BUILTIN_PKG.fontconfig

Index: pkgsrc/graphics/MesaLib/builtin.mk
diff -u pkgsrc/graphics/MesaLib/builtin.mk:1.23 pkgsrc/graphics/MesaLib/builtin.mk:1.24
--- pkgsrc/graphics/MesaLib/builtin.mk:1.23     Fri Aug 30 19:06:34 2019
+++ pkgsrc/graphics/MesaLib/builtin.mk  Sat Jan 13 20:07:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.23 2019/08/30 19:06:34 nia Exp $
+# $NetBSD: builtin.mk,v 1.24 2024/01/13 20:07:33 riastradh Exp $
 
 BUILTIN_PKG:=  MesaLib
 
@@ -32,7 +32,8 @@ MAKEVARS+=    IS_BUILTIN.MesaLib
 .if !defined(BUILTIN_PKG.MesaLib) && \
     !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS])
 .  if empty(PC_GL:M__nonexistent__)
-BUILTIN_VERSION.Mesa!= ${SED} -n -e 's/Version: //p' ${PC_GL}
+BUILTIN_VERSION.Mesa!= \
+       ${SED} -n -e 's/Version: //p' ${_CROSS_DESTDIR:U:Q}${PC_GL:Q}
 .  elif empty(H_MESALIB:M__nonexistent__)
 .    include "version.mk"
 .  else # ?

Index: pkgsrc/graphics/MesaLib/version.mk
diff -u pkgsrc/graphics/MesaLib/version.mk:1.1 pkgsrc/graphics/MesaLib/version.mk:1.2
--- pkgsrc/graphics/MesaLib/version.mk:1.1      Fri Aug 30 19:06:34 2019
+++ pkgsrc/graphics/MesaLib/version.mk  Sat Jan 13 20:07:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.1 2019/08/30 19:06:34 nia Exp $
+# $NetBSD: version.mk,v 1.2 2024/01/13 20:07:33 riastradh Exp $
 #
 # This file computes the version number of the Mesa distributed with
 # XFree86 and stores it in ${BUILTIN_VERSION.Mesa}.
@@ -25,6 +25,6 @@ BUILTIN_VERSION.Mesa!=                                                        \
                /\#define[      ]*GL_VERSION_1_4/ { v = "5.0" }         \
                /\#define[      ]*GL_VERSION_1_5/ { v = "6.0" }         \
                END { printf "%s\n", v }'                               \
-               ${H_MESA}
+               ${_CROSS_DESTDIR:U:Q}${H_MESA:Q}
 .endif
 MAKEVARS+=     BUILTIN_VERSION.Mesa

Index: pkgsrc/graphics/freetype2/builtin.mk
diff -u pkgsrc/graphics/freetype2/builtin.mk:1.21 pkgsrc/graphics/freetype2/builtin.mk:1.22
--- pkgsrc/graphics/freetype2/builtin.mk:1.21   Tue Jun 27 08:52:57 2023
+++ pkgsrc/graphics/freetype2/builtin.mk        Sat Jan 13 20:07:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.21 2023/06/27 08:52:57 adam Exp $
+# $NetBSD: builtin.mk,v 1.22 2024/01/13 20:07:33 riastradh Exp $
 
 BUILTIN_PKG:=  freetype2
 
@@ -37,7 +37,7 @@ BUILTIN_VERSION.freetype2!=                                           \
                /\#define[      ]*FREETYPE_MINOR/ { m = "."$$3 }        \
                /\#define[      ]*FREETYPE_PATCH/ { p = "."$$3 }        \
                END { printf "%s%s%s\n", M, m, p }'                     \
-               ${H_FREETYPE2}
+               ${_CROSS_DESTDIR:U:Q}${H_FREETYPE2:Q}
 BUILTIN_PKG.freetype2= freetype2-${BUILTIN_VERSION.freetype2}
 .endif
 MAKEVARS+=             BUILTIN_PKG.freetype2

Index: pkgsrc/graphics/glu/builtin.mk
diff -u pkgsrc/graphics/glu/builtin.mk:1.18 pkgsrc/graphics/glu/builtin.mk:1.19
--- pkgsrc/graphics/glu/builtin.mk:1.18 Thu Aug 24 11:35:49 2023
+++ pkgsrc/graphics/glu/builtin.mk      Sat Jan 13 20:07:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.18 2023/08/24 11:35:49 wiz Exp $
+# $NetBSD: builtin.mk,v 1.19 2024/01/13 20:07:33 riastradh Exp $
 
 BUILTIN_PKG:=  glu
 
@@ -30,7 +30,8 @@ MAKEVARS+=    IS_BUILTIN.glu
 .if !defined(BUILTIN_PKG.glu) && \
     ${IS_BUILTIN.glu:tl} == yes
 .  if empty(PC_GLU:M__nonexistent__)
-BUILTIN_VERSION.Mesa!= ${SED} -n -e 's/Version: //p' ${PC_GLU}
+BUILTIN_VERSION.Mesa!= \
+       ${SED} -n -e 's/Version: //p' ${_CROSS_DESTDIR:U:Q}${PC_GLU:Q}
 .  elif empty(H_GLU:M__nonexistent__)
 .    include "../../graphics/MesaLib/version.mk"
 .  else # ?

Index: pkgsrc/math/mpfr/builtin.mk
diff -u pkgsrc/math/mpfr/builtin.mk:1.8 pkgsrc/math/mpfr/builtin.mk:1.9
--- pkgsrc/math/mpfr/builtin.mk:1.8     Mon Jan  9 13:25:11 2023
+++ pkgsrc/math/mpfr/builtin.mk Sat Jan 13 20:07:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2023/01/09 13:25:11 wiz Exp $
+# $NetBSD: builtin.mk,v 1.9 2024/01/13 20:07:33 riastradh Exp $
 
 BUILTIN_PKG:=  mpfr
 
@@ -31,7 +31,8 @@ MAKEVARS+=            IS_BUILTIN.mpfr
 .if !defined(BUILTIN_PKG.mpfr) && \
     ${IS_BUILTIN.mpfr:tl} == yes && \
     empty(H_MPFR:M__nonexistent__)
-BUILTIN_VERSION.mpfr!= ${BUILTIN_VERSION_SCRIPT.mpfr} ${H_MPFR}
+BUILTIN_VERSION.mpfr!= \
+       ${BUILTIN_VERSION_SCRIPT.mpfr} ${_CROSS_DESTDIR:U:Q}${H_MPFR:Q}
 BUILTIN_PKG.mpfr=      mpfr-${BUILTIN_VERSION.mpfr}
 .endif
 MAKEVARS+=             BUILTIN_PKG.mpfr

Index: pkgsrc/net/net-snmp/builtin.mk
diff -u pkgsrc/net/net-snmp/builtin.mk:1.3 pkgsrc/net/net-snmp/builtin.mk:1.4
--- pkgsrc/net/net-snmp/builtin.mk:1.3  Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/builtin.mk      Sat Jan 13 20:07:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2022/10/18 12:01:52 adam Exp $
+# $NetBSD: builtin.mk,v 1.4 2024/01/13 20:07:34 riastradh Exp $
 
 BUILTIN_PKG:=  net-snmp
 
@@ -32,7 +32,7 @@ BUILTIN_VERSION.net-snmp!=                            \
                        gsub("\"", "", vers);           \
                        print vers;                     \
                }                                       \
-       ' ${H_NETSNMP:Q}
+       ' ${_CROSS_DESTDIR:U:Q}${H_NETSNMP:Q}
 BUILTIN_PKG.net-snmp=  net-snmp-${BUILTIN_VERSION.net-snmp}
 .endif
 MAKEVARS+=             BUILTIN_PKG.net-snmp

Index: pkgsrc/security/openpam/builtin.mk
diff -u pkgsrc/security/openpam/builtin.mk:1.13 pkgsrc/security/openpam/builtin.mk:1.14
--- pkgsrc/security/openpam/builtin.mk:1.13     Fri Oct 23 09:16:05 2020
+++ pkgsrc/security/openpam/builtin.mk  Sat Jan 13 20:07:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2020/10/23 09:16:05 tnn Exp $
+# $NetBSD: builtin.mk,v 1.14 2024/01/13 20:07:34 riastradh Exp $
 
 BUILTIN_PKG:=  openpam
 
@@ -28,7 +28,7 @@ MAKEVARS+=            IS_BUILTIN.openpam
     empty(H_OPENPAM:M__nonexistent__)
 BUILTIN_VERSION.openpam!=      \
        ${AWK} '/\#define[      ]*_?OPENPAM_VERSION[    ]/ {print $$3; }' \
-               ${H_OPENPAM}
+               ${_CROSS_DESTDIR:U:Q}${H_OPENPAM:Q}
 BUILTIN_PKG.openpam=   openpam-${BUILTIN_VERSION.openpam}
 .endif
 MAKEVARS+=             BUILTIN_PKG.openpam

Index: pkgsrc/security/openssl/builtin.mk
diff -u pkgsrc/security/openssl/builtin.mk:1.51 pkgsrc/security/openssl/builtin.mk:1.52
--- pkgsrc/security/openssl/builtin.mk:1.51     Tue Feb  7 16:34:42 2023
+++ pkgsrc/security/openssl/builtin.mk  Sat Jan 13 20:07:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.51 2023/02/07 16:34:42 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.52 2024/01/13 20:07:34 riastradh Exp $
 
 BUILTIN_PKG:=  openssl
 
@@ -58,7 +58,7 @@ BUILTIN_VERSION.openssl!=                                             \
                                major, minor, teeny, patchlevel;        \
                        exit 0;                                         \
                }                                                       \
-       ' ${H_OPENSSLV}
+       ' ${_CROSS_DESTDIR:U:Q}${H_OPENSSLV:Q}
 BUILTIN_PKG.openssl=   openssl-${BUILTIN_VERSION.openssl}
 .endif
 MAKEVARS+=             BUILTIN_PKG.openssl
@@ -72,7 +72,7 @@ BUILTIN_OPENSSL_HAS_THREADS!=                                         \
                /\#[    ]*define[       ]*OPENSSL_THREADS/ { ans= "yes" } \
                /\#[    ]*define[       ]*THREADS/ { ans = "yes" }      \
                END { print ans; exit 0 }                               \
-       ' ${H_OPENSSLCONF:Q}
+       ' ${_CROSS_DESTDIR:U:Q}${H_OPENSSLCONF:Q}
 .endif
 MAKEVARS+=     BUILTIN_OPENSSL_HAS_THREADS
 
@@ -143,7 +143,7 @@ SSLDIR=     ${PKG_SYSCONFDIR.openssl}
 .    if ${OPSYS} == "NetBSD"
 SSLDIR=        /etc/openssl
 .    elif ${OPSYS} == "Linux"
-.      if exists(/etc/pki/tls)
+.      if exists(${_CROSS_DESTDIR:U}/etc/pki/tls)
 # Some distributions have moved to /etc/pki/tls, with incomplete
 # symlinks from /etc/ssl.  Prefer the new location if it exists
 SSLDIR=        /etc/pki/tls
@@ -151,7 +151,7 @@ SSLDIR=     /etc/pki/tls
 SSLDIR=        /etc/ssl                # standard location
 .      endif
 .    elif ${OPSYS} == "Haiku"
-.      if exists(/boot/system/data/ssl)
+.      if exists(${_CROSS_DESTDIR:U}/boot/system/data/ssl)
 SSLDIR=        /boot/system/data/ssl
 .      else
 SSLDIR=        /boot/common/data/ssl
@@ -168,7 +168,7 @@ SSLCERTS=   ${SSLDIR}/certs
 # Continue to define SSLCERTS because it's unclear if that's the
 # directory that has one file per cert, or the directory that contains
 # trust anchor config in some fortm.
-.  if exists(${SSLDIR}/certs/ca-bundle.crt)
+.  if exists(${_CROSS_DESTDIR:U}${SSLDIR}/certs/ca-bundle.crt)
 SSLCERTBUNDLE= ${SSLDIR}/certs/ca-bundle.crt
 .  endif
 SSLKEYS=       ${SSLDIR}/private

Index: pkgsrc/textproc/expat/builtin.mk
diff -u pkgsrc/textproc/expat/builtin.mk:1.21 pkgsrc/textproc/expat/builtin.mk:1.22
--- pkgsrc/textproc/expat/builtin.mk:1.21       Wed Oct 26 10:38:21 2022
+++ pkgsrc/textproc/expat/builtin.mk    Sat Jan 13 20:07:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.21 2022/10/26 10:38:21 wiz Exp $
+# $NetBSD: builtin.mk,v 1.22 2024/01/13 20:07:34 riastradh Exp $
 
 BUILTIN_PKG:=  expat
 
@@ -32,7 +32,7 @@ BUILTIN_VERSION.expat!=                                                       \
                /\#define[      ]*XML_MINOR_VERSION/ { m = "."$$3 }     \
                /\#define[      ]*XML_MICRO_VERSION/ { u = "."$$3 }     \
                END { printf "%s%s%s\n", M, m, u }'                     \
-               ${H_EXPAT}
+               ${_CROSS_DESTDIR:U:Q}${H_EXPAT:Q}
 BUILTIN_PKG.expat=     expat-${BUILTIN_VERSION.expat}
 .endif
 MAKEVARS+=             BUILTIN_PKG.expat

Index: pkgsrc/x11/libXft/builtin.mk
diff -u pkgsrc/x11/libXft/builtin.mk:1.6 pkgsrc/x11/libXft/builtin.mk:1.7
--- pkgsrc/x11/libXft/builtin.mk:1.6    Mon Apr 17 21:08:22 2023
+++ pkgsrc/x11/libXft/builtin.mk        Sat Jan 13 20:07:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2023/04/17 21:08:22 wiz Exp $
+# $NetBSD: builtin.mk,v 1.7 2024/01/13 20:07:34 riastradh Exp $
 
 BUILTIN_PKG:=  libXft
 
@@ -37,7 +37,7 @@ BUILTIN_VERSION.libXft!=                                              \
                /\#define[      ]*XFT_MINOR/ { m = "."$$3 }             \
                /\#define[      ]*XFT_REVISION/ { r = "."$$3 }          \
                END { printf "%s%s%s\n", M, m, r }'                     \
-               ${H_XFT2}
+               ${_CROSS_DESTDIR:U:Q}${H_XFT2:Q}
 BUILTIN_PKG.libXft=    libXft-${BUILTIN_VERSION.libXft}
 .endif
 MAKEVARS+=             BUILTIN_PKG.libXft

Index: pkgsrc/x11/xcursor/builtin.mk
diff -u pkgsrc/x11/xcursor/builtin.mk:1.17 pkgsrc/x11/xcursor/builtin.mk:1.18
--- pkgsrc/x11/xcursor/builtin.mk:1.17  Thu Jan 14 17:40:30 2021
+++ pkgsrc/x11/xcursor/builtin.mk       Sat Jan 13 20:07:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.17 2021/01/14 17:40:30 wiz Exp $
+# $NetBSD: builtin.mk,v 1.18 2024/01/13 20:07:34 riastradh Exp $
 
 BUILTIN_PKG:=  xcursor
 
@@ -32,7 +32,7 @@ BUILTIN_VERSION.xcursor!=                                             \
                /\#define[      ]*XCURSOR_(LIB_)?MINOR/ { m = "."$$3 }  \
                /\#define[      ]*XCURSOR_(LIB_)?REVISION/ { r = "."$$3 } \
                END { printf "%s%s%s\n", M, m, r }'                     \
-               ${H_XCURSOR}
+               ${_CROSS_DESTDIR:U:Q}${H_XCURSOR:Q}
 BUILTIN_PKG.xcursor=   xcursor-${BUILTIN_VERSION.xcursor}
 .endif
 MAKEVARS+=             BUILTIN_PKG.xcursor

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index