From dc20ce7cd6b3e13557c23927d89da16e36d970aa Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 31 Aug 2003 06:59:06 +0000
Subject: Pull in "depot" command from buildlink3 and use it consistently. Also
 restore USE_X11_LINKS=NO to mean "don't add a build dependency on x11-links
 even though I define USE_X11".

---
 mk/buildlink2/bsd.buildlink2.mk | 13 ++++++++-----
 mk/buildlink2/gen-transform.sh  | 12 +++++++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index d67c226097a..8d6353eb557 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.90.4.12 2003/08/27 11:44:33 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.90.4.13 2003/08/31 06:59:06 jlam Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -87,8 +87,11 @@ MAKE_ENV+=		BUILDLINK_CACHE_ALL=yes
 .endfor
 
 .if defined(USE_X11)
+USE_X11_LINKS?=		YES
+.  if empty(USE_X11_LINKS:M[nN][oO])
 BUILD_DEPENDS+=		x11-links>=0.12:../../pkgtools/x11-links
 _BLNK_X11_DIR=		${LOCALBASE}/share/x11-links
+.  endif
 _BLNK_CPPFLAGS+=	-I${X11BASE}/include
 _BLNK_LDFLAGS+=		-L${X11BASE}/lib
 .if ${_USE_RPATH} == "yes"
@@ -166,7 +169,9 @@ buildlink-directories:
 .if defined(USE_X11)
 	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${BUILDLINK_X11_DIR}
 	${_PKG_SILENT}${_PKG_DEBUG}${LN} -sf ${BUILDLINK_DIR} ${BUILDLINK_X11_DIR}
+.  if empty(USE_X11_LINKS:M[nN][oO])
 	${_PKG_SILENT}${_PKG_DEBUG}${CP} -R ${_BLNK_X11_DIR}/* ${BUILDLINK_X11_DIR}
+.  endif
 .endif
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/include
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/lib
@@ -325,11 +330,11 @@ _BLNK_UNPROTECT+=	s:${_BLNK_MANGLE_DIR.${_dir_}}:${${_dir_}}
 
 _BLNK_TRANSFORM+=	${_BLNK_PROTECT}
 #
-# Change references to -[IL]${DEPOTBASE}/* into -[IL]${LOCALBASE} so that
+# Change references to ${DEPOTBASE}/<pkg> into ${LOCALBASE} so that
 # "overwrite" packages think headers and libraries for "pkgviews" packages
 # are just found in the default view.
 #
-_BLNK_TRANSFORM+=	s:${DEPOTBASE}/[^/]*/:${LOCALBASE}/
+_BLNK_TRANSFORM+=	depot:${DEPOTBASE}:${LOCALBASE}
 #
 # Convert direct paths to shared libraries into "-Ldir -llib" equivalents.
 #
@@ -404,8 +409,6 @@ _REPLACE_BUILDLINK= \
 # more like they would without the pkgviews integration.
 #
 LIBTOOL_ARCHIVE_UNTRANSFORM_SED?=	# empty
-_LIBTOOL_ARCHIVE_UNTRANSFORM_SED=	\
-	-e "s|${DEPOTBASE}/[^/]*/|${LOCALBASE}/|g"
 _LIBTOOL_ARCHIVE_UNTRANSFORM_SED+=	${LIBTOOL_ARCHIVE_UNTRANSFORM_SED}
 REPLACE_BUILDLINK_SED?=			# empty
 _REPLACE_BUILDLINK_SED=			${REPLACE_BUILDLINK_SED}
diff --git a/mk/buildlink2/gen-transform.sh b/mk/buildlink2/gen-transform.sh
index 1e6c01e0ed2..349e7ed847b 100644
--- a/mk/buildlink2/gen-transform.sh
+++ b/mk/buildlink2/gen-transform.sh
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: gen-transform.sh,v 1.12 2003/07/09 16:07:22 salo Exp $
+# $NetBSD: gen-transform.sh,v 1.12.4.1 2003/08/31 06:59:07 jlam Exp $
 
 transform="@_BLNK_TRANSFORM_SEDFILE@"
 untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -140,6 +140,16 @@ EOF
 			@CAT@ >> $sedfile << EOF
 s|-Wl,-R\([^ 	"':;]*\)|@_COMPILER_LD_FLAG@@_OPSYS_RPATH_NAME@\1|g
 s|-Wl,-rpath,\([^ 	"':;]*\)|@_COMPILER_LD_FLAG@@_OPSYS_RPATH_NAME@\1|g
+EOF
+			;;
+		esac
+		;;
+	depot)
+		case "$action" in
+		transform|untransform)
+			@CAT@ >> $sedfile << EOF
+s|$2/[^/ 	\`"':;]*\(/[^ 	\`"':;]\)|$3\1|g
+s|$2/[^/ 	\`"':;]*$|$3|g
 EOF
 			;;
 		esac
-- 
cgit v1.2.3