From 611f4b127f79f17fb5d562e1447c0753025ed263 Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Thu, 9 Jun 2016 02:38:34 +0000
Subject: In cwrappers case transform ${X11BASE} path after ${LOCALBASE} path
 in case its a prefix of ${LOCALBASE}. Fixes build of print/poppler-glib and
 others when using CWRAPPERS on Linux with native X and ${X11BASE}=/usr

---
 mk/buildlink3/bsd.buildlink3.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index d4e77781e55..2265a75c3f1 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.237 2016/03/14 20:11:56 markd Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.238 2016/06/09 02:38:34 markd Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -998,11 +998,11 @@ _CWRAPPERS_TRANSFORM+=	R:${_dir_}:${_dir_}
 # ${LOCALBASE} or ${X11BASE} into references into ${BUILDLINK_DIR}.
 #
 _BLNK_TRANSFORM+=	P:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
-_CWRAPPERS_TRANSFORM+=	P:${X11BASE}:${BUILDLINK_X11_DIR}
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=	P:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 _CWRAPPERS_TRANSFORM+=	P:${LOCALBASE}:${BUILDLINK_DIR}
 .endif
+_CWRAPPERS_TRANSFORM+=	P:${X11BASE}:${BUILDLINK_X11_DIR}
 #
 # Transform references to ${X11BASE} into ${BUILDLINK_X11_DIR}.
 # (do so before transforming references to ${LOCALBASE} unless the
-- 
cgit v1.2.3