Re: native X, linux and $(prefix)

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

On Mon, 09 Dec 2013, OBATA Akio wrote:
> How about reorder sed script as followings?

That doesn't appear to be the relevant substitution but may cause 
similar issues elsewhere.

Anyway if got me looking at bsd.buildlink3.mk and I seem to have found 
the actual one further down in that file.  With this patch both 
poppler-utils and cairo-gobject build.

cheers
mark

Index: bsd.buildlink3.mk
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v
retrieving revision 1.223
diff -u -r1.223 bsd.buildlink3.mk
--- bsd.buildlink3.mk   8 Jun 2013 20:23:02 -0000       1.223
+++ bsd.buildlink3.mk   9 Dec 2013 02:52:18 -0000
@@ -800,13 +800,14 @@
        -e "/^libdir=/s,/usr\(/lib/[^${_BLNK_SEP}]*\),
${BUILDLINK_DIR}\\1,g" \
        -e "/^libdir=/s,
${DEPOTBASE}/[^/${_BLNK_SEP}]*\(/[^${_BLNK_SEP}]*\),
${BUILDLINK_DIR}\\1,g"
 
+_BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=                          \
+       -e "/^libdir=/s,${LOCALBASE}\(/[^${_BLNK_SEP}]*\),
${BUILDLINK_DIR}\\1,g"
+
 .    if ${X11_TYPE} != "modular"
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=                          \
        -e "/^libdir=/s,${X11BASE}\(/[^${_BLNK_SEP}]*\),
${BUILDLINK_X11_DIR}\\1,g"
 .    endif
 
-_BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=                          \
-       -e "/^libdir=/s,${LOCALBASE}\(/[^${_BLNK_SEP}]*\),
${BUILDLINK_DIR}\\1,g"
 .  endif
 .endfor
 
@@ -1050,10 +1051,10 @@
 # ${LOCALBASE} or ${X11BASE} into references into ${BUILDLINK_DIR}.
 #
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
+_BLNK_TRANSFORM+=      P:${LOCALBASE}:${_BLNK_MANGLE_DIR.
${BUILDLINK_DIR}}
 .  if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=      P:${X11BASE}:${_BLNK_MANGLE_DIR.
${BUILDLINK_X11_DIR}}
 .  endif
-_BLNK_TRANSFORM+=      P:${LOCALBASE}:${_BLNK_MANGLE_DIR.
${BUILDLINK_DIR}}
 .endif
 #
 # Transform references to ${X11BASE} into ${BUILDLINK_X11_DIR}.