CVS commit: pkgsrc/x11/libxcb

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jun 27 10:28:45 UTC 2023

Modified Files:
        pkgsrc/x11/libxcb: Makefile

Log Message:
x11/libxcb: Handle TOOLBASE/LOCALBASE split.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/libxcb/Makefile

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

Modified files:

Index: pkgsrc/x11/libxcb/Makefile
diff -u pkgsrc/x11/libxcb/Makefile:1.39 pkgsrc/x11/libxcb/Makefile:1.40
--- pkgsrc/x11/libxcb/Makefile:1.39     Fri Jun 17 16:43:34 2022
+++ pkgsrc/x11/libxcb/Makefile  Tue Jun 27 10:28:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2022/06/17 16:43:34 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2023/06/27 10:28:45 riastradh Exp $
 
 DISTNAME=      libxcb-1.15
 PKGREVISION=   1
@@ -24,13 +24,21 @@ CONFIGURE_ARGS+=    --without-doxygen
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == "yes"
 # No native C compiler needed -- the tool that gobbles up the xcb
 # prototypes is in Python.
 #
 # XXX This needs to match the version of xcb-proto we get for the
 # target by buildlink3.
 TOOL_DEPENDS+=         xcb-proto-[0-9]*:../../x11/xcb-proto
+SUBST_CLASSES+=                xcbproto
+SUBST_FILES.xcbproto=  src/Makefile
+SUBST_MESSAGE.xcbproto=        Fixing xcb-proto paths dir for cross-compile.
+SUBST_STAGE.xcbproto=  post-configure
+SUBST_SED.xcbproto+=   \
+       -e 's,^\(XCBPROTO_XCBINCLUDEDIR = \).*$$,\1${TOOLBASE}/share/xcb,'
+SUBST_SED.xcbproto+=   \
+       -e 's,^\(XCBPROTO_XCBPYTHONDIR = \).*$$,\1${TOOLBASE}/${PYSITELIB},'
 .endif
 
 # Adds -Wl,-R to pkgconfig files automatically