[pkgsrc/trunk]: pkgsrc/mk/buildlink3 In cwrappers case transform ${X11BASE} p...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86aaddfaea19
branches:  trunk
changeset: 348174:86aaddfaea19
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jun 09 02:38:34 2016 +0000

description:
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

diffstat:

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

diffs (22 lines):

diff -r 6cffecf0d296 -r 86aaddfaea19 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Thu Jun 09 02:24:47 2016 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Thu Jun 09 02:38:34 2016 +0000
@@ -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 @@
 # ${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