Remove the abuse of buildlink that was pkg-config/buildlink3.mk. That

file's sole purpose was to provide a dependency on pkg-config and set
some environment variables.  Instead, turn pkg-config into a "tool"
in the tools framework, where the pkg-config wrapper automatically
adds PKG_CONFIG_LIBDIR to the environment before invoking the real
pkg-config.

For all package Makefiles that included pkg-config/buildlink3.mk, remove
that inclusion and replace it with USE_TOOLS+=pkg-config.

1 files changed, 0 insertions, 26 deletions

diff --git a/devel/pkg-config/buildlink3.mk b/devel/pkg-config/buildlink3.mk
deleted file mode 100644
index 27454a79c42..00000000000
--- a/devel/pkg-config/buildlink3.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/07/22 01:57:02 grant Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PKG_CONFIG_BUILDLINK3_MK:=	${PKG_CONFIG_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pkg-config
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npkg-config}
-BUILDLINK_PACKAGES+=	pkg-config
-
-.if !empty(PKG_CONFIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pkg-config+=		pkg{,-}config>=0.15.0
-BUILDLINK_PKGSRCDIR.pkg-config?=	../../devel/pkg-config
-BUILDLINK_DEPMETHOD.pkg-config?=	build
-
-PKG_CONFIG_LIBDIR?=	${BUILDLINK_DIR}/lib/pkgconfig
-CONFIGURE_ENV+=		PKG_CONFIG=${BUILDLINK_PREFIX.pkg-config}/bin/pkg-config
-CONFIGURE_ENV+=		PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
-MAKE_ENV+=		PKG_CONFIG=${BUILDLINK_PREFIX.pkg-config}/bin/pkg-config
-MAKE_ENV+=		PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
-
-.endif	# PKG_CONFIG_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}