Use bsd.buildlink.mk instead of duplicating code all over the place.

19 files changed, 257 insertions, 862 deletions

diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk
index fd634fad410..6f41bb4ac58 100644
--- a/converters/libiconv/buildlink.mk
+++ b/converters/libiconv/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:29 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/11 01:59:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libiconv.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define ICONV_REQD to the version of libiconv desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(ICONV_BUILDLINK_MK)
@@ -18,50 +17,18 @@ ICONV_BUILDLINK_MK=	# defined
 ICONV_REQD?=		1.5
 DEPENDS+=		libiconv>=${ICONV_REQD}:../../converters/libiconv
 
-ICONV_HEADERS=		${LOCALBASE}/include/iconv.h
-ICONV_HEADERS+=		${LOCALBASE}/include/libcharset.h
-ICONV_LIBS=		${LOCALBASE}/lib/libcharset.*
-ICONV_LIBS+=		${LOCALBASE}/lib/libiconv.*
+BUILDLINK_PREFIX.iconv=		${LOCALBASE}
+BUILDLINK_FILES.iconv=		include/iconv.h
+BUILDLINK_FILES.iconv+=		include/libcharset.h
+BUILDLINK_FILES.iconv+=		lib/libcharset.*
+BUILDLINK_FILES.iconv+=		lib/libiconv.*
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_TARGETS.iconv=	iconv-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.iconv}
 
-ICONV_BUILDLINK_COOKIE=		${WRKDIR}/.iconv_buildlink_done
-ICONV_BUILDLINK_TARGETS=	link-iconv-headers
-ICONV_BUILDLINK_TARGETS+=	link-iconv-libs
-BUILDLINK_TARGETS+=		${ICONV_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.iconv}
+iconv-buildlink: _BUILDLINK_USE
 
-pre-configure: ${ICONV_BUILDLINK_COOKIE}
-
-${ICONV_BUILDLINK_COOKIE}: ${ICONV_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${ICONV_BUILDLINK_COOKIE}
-
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-iconv-headers:
-	@${ECHO} "Linking iconv headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${ICONV_HEADERS}; do				\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-        done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-iconv-libs:
-	@${ECHO} "Linking iconv libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${ICONV_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# ICONV_BUILDLINK_MK
diff --git a/databases/gdbm/buildlink.mk b/databases/gdbm/buildlink.mk
index d42f1a4d81e..d154e9eec03 100644
--- a/databases/gdbm/buildlink.mk
+++ b/databases/gdbm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:29 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/11 01:59:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdbm.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define GDBM_REQD to the version of gdbm desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(GDBM_BUILDLINK_MK)
@@ -18,48 +17,14 @@ GDBM_BUILDLINK_MK=	# defined
 GDBM_REQD?=		1.7.3
 DEPENDS+=		gdbm>=${GDBM_REQD}:../../databases/gdbm
 
-GDBM_HEADERS=		${LOCALBASE}/include/gdbm.h
-GDBM_LIBS=		${LOCALBASE}/lib/libgdbm.*
+BUILDLINK_PREFIX.gdbm=		${LOCALBASE}
+BUILDLINK_FILES.gdbm=		include/gdbm.h
+BUILDLINK_FILES.gdbm+=		lib/libgdbm.*
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_TARGETS.gdbm=		gdbm-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gdbm}
 
-GDBM_BUILDLINK_COOKIE=		${WRKDIR}/.gdbm_buildlink_done
-GDBM_BUILDLINK_TARGETS=		link-gdbm-headers
-GDBM_BUILDLINK_TARGETS+=	link-gdbm-libs
-BUILDLINK_TARGETS+=		${GDBM_BUILDLINK_COOKIE}
-
-pre-configure: ${GDBM_BUILDLINK_COOKIE}
-
-${GDBM_BUILDLINK_COOKIE}: ${GDBM_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${GDBM_BUILDLINK_COOKIE}
-
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-gdbm-headers:
-	@${ECHO} "Linking gdbm headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${GDBM_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-        done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-gdbm-libs:
-	@${ECHO} "Linking gdbm libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${GDBM_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+pre-configure: ${BUILDLINK_TARGETS.gdbm}
+gdbm-buildlink: _BUILDLINK_USE
 
 .endif	# GDBM_BUILDLINK_MK
diff --git a/devel/gettext-lib/buildlink.mk b/devel/gettext-lib/buildlink.mk
index 8afeb4b9476..074b4aeffee 100644
--- a/devel/gettext-lib/buildlink.mk
+++ b/devel/gettext-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/10 00:09:29 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/06/11 01:59:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gettext.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define GETTEXT_REQD to the version of gettext desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(GETTEXT_BUILDLINK_MK)
@@ -27,15 +26,16 @@ _NEED_GNU_GETTEXT=	YES
 
 .if ${_NEED_GNU_GETTEXT} == "YES"
 DEPENDS+=		gettext-lib>=${GETTEXT_REQD}:../../devel/gettext-lib
-GETTEXT_HEADERS=	${LOCALBASE}/include/libintl.h
-GETTEXT_LIBS=		${LOCALBASE}/lib/libintl.*
+BUILDLINK_PREFIX.gettext=	${LOCALBASE}
 .else
-GETTEXT_HEADERS=	/usr/include/libintl.h
-GETTEXT_LIBS=		/usr/lib/libintl.*
+BUILDLINK_PREFIX.gettext=	/usr
 .endif
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_FILES.gettext=	include/libintl.h
+BUILDLINK_FILES.gettext+=	lib/libintl.*
+
+BUILDLINK_TARGETS.gettext=	gettext-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gettext}
 
 .if defined(GNU_CONFIGURE)
 #
@@ -46,48 +46,15 @@ BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 #
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=		LIBS="${LIBS}"
-CFLAGS+=		-I${BUILDLINK_INCDIR}
-CPPFLAGS+=		-I${BUILDLINK_INCDIR}
-LDFLAGS+=		-L${BUILDLINK_LIBDIR}
+CFLAGS+=		-I${BUILDLINK_DIR}/include
+CPPFLAGS+=		-I${BUILDLINK_DIR}/include
+LDFLAGS+=		-L${BUILDLINK_DIR}/lib
 LIBS+=			-lintl
 .endif
 
-GETTEXT_BUILDLINK_COOKIE=	${WRKDIR}/.gettext_buildlink_done
-GETTEXT_BUILDLINK_TARGETS=	link-gettext-headers
-GETTEXT_BUILDLINK_TARGETS+=	link-gettext-libs
-BUILDLINK_TARGETS+=		${GETTEXT_BUILDLINK_COOKIE}
-
-pre-configure: ${GETTEXT_BUILDLINK_COOKIE}
-
-${GETTEXT_BUILDLINK_COOKIE}: ${GETTEXT_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${GETTEXT_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.gettext}
+gettext-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-gettext-headers:
-	@${ECHO} "Linking gettext headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${GETTEXT_HEADERS}; do				\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-gettext-libs:
-	@${ECHO} "Linking gettext libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${GETTEXT_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# GETTEXT_BUILDLINK_MK
diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk
index 1c7ef4c5b95..71e03068801 100644
--- a/devel/gmp/buildlink.mk
+++ b/devel/gmp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/11 01:59:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gmp.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define GMP_REQD to the version of gmp desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(GMP_BUILDLINK_MK)
@@ -18,48 +17,16 @@ GMP_BUILDLINK_MK=	# defined
 GMP_REQD?=		3.0
 DEPENDS+=		gmp>=${GMP_REQD}:../../devel/gmp
 
-GMP_HEADERS=		${LOCALBASE}/include/gmp.h
-GMP_LIBS=		${LOCALBASE}/lib/libgmp.*
+BUILDLINK_PREFIX.gmp=	${LOCALBASE}
+BUILDLINK_FILES.gmp=	include/gmp.h
+BUILDLINK_FILES.gmp+=	lib/libgmp.*
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_TARGETS.gmp=	gmp-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gmp}
 
-GMP_BUILDLINK_COOKIE=		${WRKDIR}/.gmp_buildlink_done
-GMP_BUILDLINK_TARGETS=		link-gmp-headers
-GMP_BUILDLINK_TARGETS+=		link-gmp-libs
-BUILDLINK_TARGETS+=		${GMP_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.gmp}
+gmp-buildlink: _BUILDLINK_USE
 
-pre-configure: ${GMP_BUILDLINK_COOKIE}
-
-${GMP_BUILDLINK_COOKIE}: ${GMP_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${GMP_BUILDLINK_COOKIE}
-
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-gmp-headers:
-	@${ECHO} "Linking gmp headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${GMP_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-        done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-gmp-libs:
-	@${ECHO} "Linking gmp libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${GMP_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# GMP_BUILDLINK_MK
diff --git a/devel/libgetopt/buildlink.mk b/devel/libgetopt/buildlink.mk
index 1ba2423ec7a..12fb51c5746 100644
--- a/devel/libgetopt/buildlink.mk
+++ b/devel/libgetopt/buildlink.mk
@@ -1,73 +1,41 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/10 00:09:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/06/11 01:59:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use getopt_long().
 #
-# If getopt_long() is not present in the base system, then a dependency
-# on devel/libgetopt is added, and the appropriate headers are linked
-# into ${BUILDLINK_INCDIR} (${WRKDIR}/include).
-#
 # To use this Makefile fragment, simply:
 #
 # (1) Include this Makefile fragment in the package Makefile,
 # (2) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (3) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path.
-# (4) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(GETOPT_BUILDLINK_MK)
 GETOPT_BUILDLINK_MK=	# defined
 
 .if exists(/usr/include/getopt.h)
-GETOPT_H=		/usr/include/getopt.h
+BUILDLINK_PREFIX.getopt=	/usr
+BUILDLINK_FILES.getopt=		include/getopt.h
 .else
-GETOPT_H=		${LOCALBASE}/include/getopt.h
-LIBGETOPT=		${LOCALBASE}/lib/libgetopt.a
-LIBGETOPT+=		${LOCALBASE}/lib/libgetopt_pic.a
-LIBGETOPT+=		${LOCALBASE}/lib/libgetopt.so*
-DEPENDS+=		libgetopt>=1.3:../../devel/libgetopt
+DEPENDS+=			libgetopt>=1.3:../../devel/libgetopt
+BUILDLINK_PREFIX.getopt=	${LOCALBASE}
+BUILDLINK_FILES.getopt=		include/getopt.h
+BUILDLINK_FILES.getopt+=	lib/libgetopt.*
+BUILDLINK_FILES.getopt+=	lib/libgetopt_pic.a
+
 .if defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		LIBS="${LIBS}"
-LIBS+=			-lgetopt
+CONFIGURE_ENV+=			LIBS="${LIBS}"
+LIBS+=				-lgetopt
 .endif
 .endif
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
-
-GETOPT_BUILDLINK_COOKIE=	${WRKDIR}/.getopt_buildlink_done
-GETOPT_BUILDLINK_TARGETS=	link-getopt-headers
-GETOPT_BUILDLINK_TARGETS+=	link-getopt-libs
-BUILDLINK_TARGETS+=		${GETOPT_BUILDLINK_COOKIE}
-
-pre-configure: ${GETOPT_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.getopt=	getopt-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.getopt}
 
-${GETOPT_BUILDLINK_COOKIE}: ${GETOPT_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${GETOPT_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.getopt}
+getopt-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-# 
-link-getopt-headers:
-	@${ECHO} "Linking getopt headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@${RM} -f ${BUILDLINK_INCDIR}/getopt.h
-	@${LN} -sf ${GETOPT_H} ${BUILDLINK_INCDIR}/getopt.h
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-getopt-libs:
-	@${ECHO} "Linking getopt libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-.if defined(LIBGETOPT)
-	@for lib in ${LIBGETOPT}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
-.endif
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# GETOPT_BUILDLINK_MK
diff --git a/devel/lwp/buildlink.mk b/devel/lwp/buildlink.mk
index 523daee00bb..7253624659a 100644
--- a/devel/lwp/buildlink.mk
+++ b/devel/lwp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:35 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lwp.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define LWP_REQD to the version of lwp desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(LWP_BUILDLINK_MK)
@@ -18,49 +17,16 @@ LWP_BUILDLINK_MK=	# defined
 LWP_REQD?=		1.6
 DEPENDS+=		lwp>=${LWP_REQD}:../../devel/lwp
 
-LWP_HEADERS=		${LOCALBASE}/include/lwp/*
-LWP_LIBS=		${LOCALBASE}/lib/liblwp.*
+BUILDLINK_PREFIX.lwp=	${LOCALBASE}
+BUILDLINK_FILES.lwp=	include/lwp/*
+BUILDLINK_FILES.lwp+=	lib/liblwp.*
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_TARGETS.lwp=	lwp-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.lwp}
 
-LWP_BUILDLINK_COOKIE=		${WRKDIR}/.lwp_buildlink_done
-LWP_BUILDLINK_TARGETS=		link-lwp-headers
-LWP_BUILDLINK_TARGETS+=		link-lwp-libs
-BUILDLINK_TARGETS+=		${LWP_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.lwp}
+lwp-buildlink: _BUILDLINK_USE
 
-pre-configure: ${LWP_BUILDLINK_COOKIE}
-
-${LWP_BUILDLINK_COOKIE}: ${LWP_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${LWP_BUILDLINK_COOKIE}
-
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-lwp-headers:
-	@${ECHO} "Linking lwp headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/lwp
-	@${RM} -f ${BUILDLINK_INCDIR}/lwp/*
-	@for inc in ${LWP_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/lwp/`${BASENAME} $${inc}`;	\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-lwp-libs:
-	@${ECHO} "Linking lwp libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${LWP_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# LWP_BUILDLINK_MK
diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk
index 980fa67c35f..e6d08b63a77 100644
--- a/devel/readline/buildlink.mk
+++ b/devel/readline/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/06/10 00:09:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/06/11 01:59:35 jlam Exp $
 #
 # This Makefile fragment is included by packages that use readline().
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define USE_GNU_READLINE to force use of GNU readline.
 # (2) Optionally define READLINE_REQD to the version of GNU readline desired.
 # (3) Include this Makefile fragment in the package Makefile,
-# (4) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 #
 # NOTE:	You may need to do some more work to get libedit recognized over
@@ -50,10 +49,7 @@ HISTORY_LIBS=		/usr/lib/libedit.*
 .endif
 .endif
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
-
-READLINE_BUILDLINK_COOKIE=	${WRKDIR}/.readline_buildlink_done
+READLINE_BUILDLINK_COOKIE=	${BUILDLINK_DIR}/.readline_buildlink_done
 READLINE_BUILDLINK_TARGETS=	link-readline-headers
 .if defined(HAVE_LIBEDIT_READLINE) && defined(USE_LIBTOOL)
 READLINE_BUILDLINK_TARGETS+=	editline-libtool-archive
@@ -66,30 +62,30 @@ pre-configure: ${READLINE_BUILDLINK_COOKIE}
 ${READLINE_BUILDLINK_COOKIE}: ${READLINE_BUILDLINK_TARGETS}
 	@${TOUCH} ${TOUCH_FLAGS} ${READLINE_BUILDLINK_COOKIE}
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
+# This target links the headers into ${BUILDLINK_DIR}/include, which should
 # be searched first by the C preprocessor.
 #
 link-readline-headers:
-	@${ECHO} "Linking readline headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/readline
-	@${RM} -f ${BUILDLINK_INCDIR}/readline/*
+	@${ECHO} "Linking readline headers into ${BUILDLINK_DIR}/include."
+	@${MKDIR} ${BUILDLINK_DIR}/include/readline
+	@${RM} -f ${BUILDLINK_DIR}/include/readline/*
 	@for inc in ${READLINE_HEADERS}; do				\
-		dest=${BUILDLINK_INCDIR}/readline/`${BASENAME} $${inc}`; \
+		dest=${BUILDLINK_DIR}/include/readline/`${BASENAME} $${inc}`; \
 		if [ -f $${inc} ]; then					\
 			${RM} -f $${dest};				\
 			${LN} -sf $${inc} $${dest};			\
 		fi;							\
 	done
 
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
+# This target links the libraries into ${BUILDLINK_DIR}/lib, which should
 # be searched first by the linker.
 #
 link-readline-libs:
-	@${ECHO} "Linking readline libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
+	@${ECHO} "Linking readline libraries into ${BUILDLINK_DIR}/lib."
+	@${MKDIR} ${BUILDLINK_DIR}/lib
 	@for lib in ${READLINE_LIBS}; do				\
 		name=`${BASENAME} $${lib} | ${SED} "s|libedit|libreadline|"`; \
-		dest=${BUILDLINK_LIBDIR}/$${name};			\
+		dest=${BUILDLINK_DIR}/lib/$${name};			\
 		if [ -f $${lib} ]; then					\
 			${RM} -f $${dest};				\
 			${LN} -sf $${lib} $${dest};			\
@@ -97,7 +93,7 @@ link-readline-libs:
 	done
 	@for lib in ${HISTORY_LIBS}; do					\
 		name=`${BASENAME} $${lib} | ${SED} "s|libedit|libhistory|"`; \
-		dest=${BUILDLINK_LIBDIR}/$${name};			\
+		dest=${BUILDLINK_DIR}/lib/$${name};			\
 		if [ -f $${lib} ]; then					\
 			${RM} -f $${dest};				\
 			${LN} -sf $${lib} $${dest};			\
@@ -106,20 +102,22 @@ link-readline-libs:
 
 .if defined(HAVE_LIBEDIT_READLINE) && defined(USE_LIBTOOL)
 editline-libtool-archive:
-	@${ECHO} "Creating editline libtool archive in ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
+	@${ECHO} "Creating editline libtool archive in ${BUILDLINK_DIR}/lib."
+	@${MKDIR} ${BUILDLINK_DIR}/lib
 	@cd /usr/lib; for lib in libedit.so.*.*; do			\
 		major=`${ECHO} $$lib | ${SED} "s|.*\.so\.||;s|\..*||"`;	\
 		minor=`${ECHO} $$lib | ${SED} "s|.*\.||"`;		\
 	done;								\
-	cd ${BUILDLINK_LIBDIR};						\
+	cd ${BUILDLINK_DIR}/lib;					\
 	${LIBTOOL} --quiet --mode=link ${CC} -o libedit.la		\
 		-version-info $$major:$$minor -rpath /usr/lib;		\
 	${LIBTOOL} --quiet --mode=install ${CP} libedit.la		\
-		${BUILDLINK_LIBDIR} 2>/dev/null;			\
+		${BUILDLINK_DIR}/lib 2>/dev/null;			\
 	${RM} -f libedit.a;						\
 	${RM} -f libreadline.la;					\
 	${LN} -sf libedit.la libreadline.la
 .endif
 
+.include "../../mk/bsd.buildlink.mk"
+
 .endif	# READLINE_BUILDLINK_MK
diff --git a/devel/rpc2/buildlink.mk b/devel/rpc2/buildlink.mk
index 12e634a737f..9de17fc246f 100644
--- a/devel/rpc2/buildlink.mk
+++ b/devel/rpc2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:35 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rpc2.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define RPC2_REQD to the version of rpc2 desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(RPC2_BUILDLINK_MK)
@@ -18,53 +17,20 @@ RPC2_BUILDLINK_MK=	# defined
 RPC2_REQD?=		1.10
 DEPENDS+=		rpc2>=${RPC2_REQD}:../../devel/rpc2
 
-RPC2_HEADERS=		${LOCALBASE}/include/rpc2/*
-RPC2_LIBS=		${LOCALBASE}/lib/libfail.*
-RPC2_LIBS+=		${LOCALBASE}/lib/librpc2.*
-RPC2_LIBS+=		${LOCALBASE}/lib/libse.*
-
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.rpc2=	${LOCALBASE}
+BUILDLINK_FILES.rpc2=	include/rpc2/*
+BUILDLINK_FILES.rpc2+=	lib/libfail.*
+BUILDLINK_FILES.rpc2+=	lib/librpc2.*
+BUILDLINK_FILES.rpc2+=	lib/libse.*
 
 .include "../../devel/lwp/buildlink.mk"
 
-RPC2_BUILDLINK_COOKIE=		${WRKDIR}/.rpc2_buildlink_done
-RPC2_BUILDLINK_TARGETS=		link-rpc2-headers
-RPC2_BUILDLINK_TARGETS+=	link-rpc2-libs
-BUILDLINK_TARGETS+=		${RPC2_BUILDLINK_COOKIE}
-
-pre-configure: ${RPC2_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.rpc2=		rpc2-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.rpc2}
 
-${RPC2_BUILDLINK_COOKIE}: ${RPC2_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${RPC2_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.rpc2}
+rpc2-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-rpc2-headers:
-	@${ECHO} "Linking rpc2 headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/rpc2
-	@${RM} -f ${BUILDLINK_INCDIR}/rpc2/*
-	@for inc in ${RPC2_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/rpc2/`${BASENAME} $${inc}`;	\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-rpc2-libs:
-	@${ECHO} "Linking rpc2 libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${RPC2_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# RPC2_BUILDLINK_MK
diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk
index 8ae5b8fab88..7a776b9f281 100644
--- a/devel/rvm/buildlink.mk
+++ b/devel/rvm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:35 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rvm.
 #
@@ -6,11 +6,9 @@
 #
 # (1) Optionally define RVM_REQD to the version of rvm desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(RVM_BUILDLINK_MK)
@@ -19,55 +17,22 @@ RVM_BUILDLINK_MK=	# defined
 RVM_REQD?=		1.3
 DEPENDS+=		rvm>=${RVM_REQD}:../../devel/rvm
 
-RVM_HEADERS=		${LOCALBASE}/include/rvm/*
-RVM_LIBS=		${LOCALBASE}/lib/librds.*
-RVM_LIBS+=		${LOCALBASE}/lib/librdslwp.*
-RVM_LIBS+=		${LOCALBASE}/lib/librvm.*
-RVM_LIBS+=		${LOCALBASE}/lib/librvmlwp.*
-RVM_LIBS+=		${LOCALBASE}/lib/libseg.*
-
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.rvm=	${LOCALBASE}
+BUILDLINK_FILES.rvm=	include/rvm/*
+BUILDLINK_FILES.rvm+=	lib/librds.*
+BUILDLINK_FILES.rvm+=	lib/librdslwp.*
+BUILDLINK_FILES.rvm+=	lib/librvm.*
+BUILDLINK_FILES.rvm+=	lib/librvmlwp.*
+BUILDLINK_FILES.rvm+=	lib/libseg.*
 
 .include "../../devel/lwp/buildlink.mk"
 
-RVM_BUILDLINK_COOKIE=		${WRKDIR}/.rvm_buildlink_done
-RVM_BUILDLINK_TARGETS=		link-rvm-headers
-RVM_BUILDLINK_TARGETS+=		link-rvm-libs
-BUILDLINK_TARGETS+=		${RVM_BUILDLINK_COOKIE}
-
-pre-configure: ${RVM_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.rvm=	rvm-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.rvm}
 
-${RVM_BUILDLINK_COOKIE}: ${RVM_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${RVM_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.rvm}
+rvm-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-rvm-headers:
-	@${ECHO} "Linking rvm headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/rvm
-	@${RM} -f ${BUILDLINK_INCDIR}/rvm/*
-	@for inc in ${RVM_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/rvm/`${BASENAME} $${inc}`;	\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-rvm-libs:
-	@${ECHO} "Linking rvm libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${RVM_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# RVM_BUILDLINK_MK
diff --git a/devel/zlib/buildlink.mk b/devel/zlib/buildlink.mk
index acc96935bee..3cca7764de8 100644
--- a/devel/zlib/buildlink.mk
+++ b/devel/zlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/11 01:59:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use zlib. 
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define ZLIB_REQD to the version of zlib desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(ZLIB_BUILDLINK_MK)
@@ -25,54 +24,21 @@ _NEED_ZLIB=		YES
 
 .if ${_NEED_ZLIB} == "YES"
 DEPENDS+=		zlib>=${ZLIB_REQD}:../../devel/zlib
-ZLIB_HEADERS=		${LOCALBASE}/include/zconf.h
-ZLIB_HEADERS=		${LOCALBASE}/include/zlib.h
-ZLIB_LIBS=		${LOCALBASE}/lib/libz.*
+BUILDLINK_PREFIX.zlib=	${LOCALBASE}
 .else
-ZLIB_HEADERS=		/usr/include/zconf.h
-ZLIB_HEADERS+=		/usr/include/zlib.h
-ZLIB_LIBS=		/usr/lib/libz.*
+BUILDLINK_PREFIX.zlib=	/usr
 .endif
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_FILES.zlib=	include/zconf.h
+BUILDLINK_FILES.zlib+=	include/zlib.h
+BUILDLINK_FILES.zlib+=	lib/libz.*
 
-ZLIB_BUILDLINK_COOKIE=		${WRKDIR}/.zlib_buildlink_done
-ZLIB_BUILDLINK_TARGETS=		link-zlib-headers
-ZLIB_BUILDLINK_TARGETS+=	link-zlib-libs
-BUILDLINK_TARGETS+=		${ZLIB_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.zlib=	zlib-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.zlib}
 
-pre-configure: ${ZLIB_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.zlib}
+zlib-buildlink: _BUILDLINK_USE
 
-${ZLIB_BUILDLINK_COOKIE}: ${ZLIB_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${ZLIB_BUILDLINK_COOKIE}
-
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-zlib-headers:
-	@${ECHO} "Linking zlib headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${ZLIB_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-zlib-libs:
-	@${ECHO} "Linking zlib libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${ZLIB_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# ZLIB_BUILDLINK_MK
diff --git a/graphics/Mesa/buildlink.mk b/graphics/Mesa/buildlink.mk
index ca1fa68a8df..67d4992da62 100644
--- a/graphics/Mesa/buildlink.mk
+++ b/graphics/Mesa/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Mesa.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define MESA_REQD to the version of Mesa desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(MESA_BUILDLINK_MK)
@@ -20,56 +19,28 @@ MESA_REQD?=		3.2.1
 # We double-list because we're not sure if the files are in ${X11BASE}
 # or in ${LOCALBASE}.
 
-MESA_HEADERS=		${X11BASE}/include/GL/*
-MESA_HEADERS+=		${LOCALBASE}/include/GL/*
+BUILDLINK_PREFIX.Mesa-1=	${X11BASE}
+BUILDLINK_FILES.Mesa-1=		include/GL/*
+BUILDLINK_FILES.Mesa-1+=	lib/libGL.*
+BUILDLINK_FILES.Mesa-1+=	lib/libGLU.*
+BUILDLINK_FILES.Mesa-1+=	lib/libglut.*
 
-MESA_LIBS=		${X11BASE}/lib/libGL.*
-MESA_LIBS+=		${X11BASE}/lib/libGLU.*
-MESA_LIBS+=		${X11BASE}/lib/libglut.*
-MESA_LIBS+=		${LOCALBASE}/lib/libGL.*
-MESA_LIBS+=		${LOCALBASE}/lib/libGLU.*
-MESA_LIBS+=		${LOCALBASE}/lib/libglut.*
+BUILDLINK_TARGETS.Mesa=		Mesa-1-buildlink
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.Mesa-2=	${LOCALBASE}
+BUILDLINK_FILES.Mesa-2=		include/GL/*
+BUILDLINK_FILES.Mesa-2+=	lib/libGL.*
+BUILDLINK_FILES.Mesa-2+=	lib/libGLU.*
+BUILDLINK_FILES.Mesa-2+=	lib/libglut.*
 
-MESA_BUILDLINK_COOKIE=		${WRKDIR}/.Mesa_buildlink_done
-MESA_BUILDLINK_TARGETS=		link-Mesa-headers
-MESA_BUILDLINK_TARGETS+=	link-Mesa-libs
-BUILDLINK_TARGETS+=		${MESA_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.Mesa+=	Mesa-2-buildlink
 
-pre-configure: ${MESA_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.Mesa}
 
-${MESA_BUILDLINK_COOKIE}: ${MESA_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${MESA_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.Mesa}
+Mesa-1-buildlink: _BUILDLINK_USE
+Mesa-2-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-Mesa-headers:
-	@${ECHO} "Linking Mesa headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/GL
-	@${RM} -f ${BUILDLINK_INCDIR}/GL/*
-	@for inc in ${MESA_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/GL/`${BASENAME} $${inc}`; \
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-Mesa-libs:
-	@${ECHO} "Linking Mesa libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${MESA_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# MESA_BUILDLINK_MK
diff --git a/graphics/freetype-lib/buildlink.mk b/graphics/freetype-lib/buildlink.mk
index d6fd563fb8e..b419cf82d20 100644
--- a/graphics/freetype-lib/buildlink.mk
+++ b/graphics/freetype-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetype.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define FREETYPE_REQD to the version of freetype desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(FREETYPE_BUILDLINK_MK)
@@ -18,51 +17,18 @@ FREETYPE_BUILDLINK_MK=	# defined
 FREETYPE_REQD?=		1.3.1
 DEPENDS+=		freetype-lib>=${FREETYPE_REQD}:../../graphics/freetype-lib
 
-FREETYPE_HEADERS=	${LOCALBASE}/include/freetype/*
-FREETYPE_LIBS=		${LOCALBASE}/lib/libttf.*
-
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.freetype=	${LOCALBASE}
+BUILDLINK_FILES.freetype=	include/freetype/*
+BUILDLINK_FILES.freetype+=	lib/libttf.*
 
 .include "../../devel/gettext-lib/buildlink.mk"
 
-FREETYPE_BUILDLINK_COOKIE=	${WRKDIR}/.freetype_buildlink_done
-FREETYPE_BUILDLINK_TARGETS=	link-freetype-headers
-FREETYPE_BUILDLINK_TARGETS+=	link-freetype-libs
-BUILDLINK_TARGETS+=		${FREETYPE_BUILDLINK_COOKIE}
-
-pre-configure: ${FREETYPE_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.freetype=	freetype-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.freetype}
 
-${FREETYPE_BUILDLINK_COOKIE}: ${FREETYPE_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${FREETYPE_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.freetype}
+freetype-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-freetype-headers:
-	@${ECHO} "Linking freetype headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/freetype
-	@${RM} -f ${BUILDLINK_INCDIR}/freetype/*
-	@for inc in ${FREETYPE_HEADERS}; do				\
-		dest=${BUILDLINK_INCDIR}/freetype/`${BASENAME} $${inc}`; \
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-freetype-libs:
-	@${ECHO} "Linking freetype libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${FREETYPE_LIBS}; do				\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# FREETYPE_BUILDLINK_MK
diff --git a/graphics/jpeg/buildlink.mk b/graphics/jpeg/buildlink.mk
index a9df6753ac2..31c665a77ac 100644
--- a/graphics/jpeg/buildlink.mk
+++ b/graphics/jpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libjpeg.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define JPEG_REQD to the version of libjpeg desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(JPEG_BUILDLINK_MK)
@@ -18,51 +17,19 @@ JPEG_BUILDLINK_MK=	# defined
 JPEG_REQD?=		6
 DEPENDS+=		jpeg>=${JPEG_REQD}:../../graphics/jpeg
 
-JPEG_HEADERS=		${LOCALBASE}/include/jconfig.h
-JPEG_HEADERS+=		${LOCALBASE}/include/jpeglib.h
-JPEG_HEADERS+=		${LOCALBASE}/include/jmorecfg.h
-JPEG_HEADERS+=		${LOCALBASE}/include/jerror.h
-JPEG_LIBS=		${LOCALBASE}/lib/libjpeg.*
+BUILDLINK_PREFIX.jpeg=	${LOCALBASE}
+BUILDLINK_FILES.jpeg=	include/jconfig.h
+BUILDLINK_FILES.jpeg+=	include/jpeglib.h
+BUILDLINK_FILES.jpeg+=	include/jmorecfg.h
+BUILDLINK_FILES.jpeg+=	include/jerror.h
+BUILDLINK_FILES.jpeg+=	lib/libjpeg.*
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_TARGETS.jpeg=	jpeg-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.jpeg}
 
-JPEG_BUILDLINK_COOKIE=		${WRKDIR}/.jpeg_buildlink_done
-JPEG_BUILDLINK_TARGETS=		link-jpeg-headers
-JPEG_BUILDLINK_TARGETS+=	link-jpeg-libs
-BUILDLINK_TARGETS+=		${JPEG_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.jpeg}
+jpeg-buildlink: _BUILDLINK_USE
 
-pre-configure: ${JPEG_BUILDLINK_COOKIE}
-
-${JPEG_BUILDLINK_COOKIE}: ${JPEG_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${JPEG_BUILDLINK_COOKIE}
-
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-jpeg-headers:
-	@${ECHO} "Linking jpeg headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${JPEG_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-jpeg-libs:
-	@${ECHO} "Linking jpeg libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${JPEG_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# JPEG_BUILDLINK_MK
diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk
index 5b4e57f76d6..b36119507b4 100644
--- a/graphics/png/buildlink.mk
+++ b/graphics/png/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/10 00:09:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libpng.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define PNG_REQD to the version of libpng desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(PNG_BUILDLINK_MK)
@@ -18,51 +17,19 @@ PNG_BUILDLINK_MK=	# defined
 PNG_REQD?=		1.0.11
 DEPENDS+=		png>=${PNG_REQD}:../../graphics/png
 
-PNG_HEADERS=		${LOCALBASE}/include/png.h
-PNG_HEADERS+=		${LOCALBASE}/include/pngconf.h
-PNG_LIBS=		${LOCALBASE}/lib/libpng.*
-
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.png=	${LOCALBASE}
+BUILDLINK_FILES.png=	include/png.h
+BUILDLINK_FILES.png+=	include/pngconf.h
+BUILDLINK_FILES.png+=	lib/libpng.*
 
 .include "../../devel/zlib/buildlink.mk"
 
-PNG_BUILDLINK_COOKIE=		${WRKDIR}/.png_buildlink_done
-PNG_BUILDLINK_TARGETS=		link-png-headers
-PNG_BUILDLINK_TARGETS+=		link-png-libs
-BUILDLINK_TARGETS+=		${PNG_BUILDLINK_COOKIE}
-
-pre-configure: ${PNG_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.png=	png-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.png}
 
-${PNG_BUILDLINK_COOKIE}: ${PNG_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${PNG_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.png}
+png-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-png-headers:
-	@${ECHO} "Linking png headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${PNG_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-png-libs:
-	@${ECHO} "Linking png libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${PNG_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# PNG_BUILDLINK_MK
diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk
index e700b3c5fc5..a428e8be831 100644
--- a/graphics/tiff/buildlink.mk
+++ b/graphics/tiff/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/10 00:09:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libtiff.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define TIFF_REQD to the version of libtiff desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(TIFF_BUILDLINK_MK)
@@ -18,53 +17,21 @@ TIFF_BUILDLINK_MK=	# defined
 TIFF_REQD?=		3.5.4
 DEPENDS+=		tiff>=${TIFF_REQD}:../../graphics/tiff
 
-TIFF_HEADERS=		${LOCALBASE}/include/tiff.h
-TIFF_HEADERS+=		${LOCALBASE}/include/tiffconf.h
-TIFF_HEADERS+=		${LOCALBASE}/include/tiffio.h
-TIFF_LIBS=		${LOCALBASE}/lib/libtiff.*
-
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.tiff=	${LOCALBASE}
+BUILDLINK_FILES.tiff=	include/tiff.h
+BUILDLINK_FILES.tiff+=	include/tiffconf.h
+BUILDLINK_FILES.tiff+=	include/tiffio.h
+BUILDLINK_FILES.tiff+=	lib/libtiff.*
 
 .include "../../devel/zlib/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 
-TIFF_BUILDLINK_COOKIE=		${WRKDIR}/.tiff_buildlink_done
-TIFF_BUILDLINK_TARGETS=		link-tiff-headers
-TIFF_BUILDLINK_TARGETS+=	link-tiff-libs
-BUILDLINK_TARGETS+=		${TIFF_BUILDLINK_COOKIE}
-
-pre-configure: ${TIFF_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.tiff=	tiff-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.tiff}
 
-${TIFF_BUILDLINK_COOKIE}: ${TIFF_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${TIFF_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.tiff}
+tiff-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-tiff-headers:
-	@${ECHO} "Linking tiff headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${TIFF_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-tiff-libs:
-	@${ECHO} "Linking tiff libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${TIFF_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# TIFF_BUILDLINK_MK
diff --git a/japanese/vflib-lib/buildlink.mk b/japanese/vflib-lib/buildlink.mk
index fb3170c85e8..dcfeabe0c90 100644
--- a/japanese/vflib-lib/buildlink.mk
+++ b/japanese/vflib-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use VFlib.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define VFLIB_REQD to the version of VFlib desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(VFLIB_BUILDLINK_MK)
@@ -18,50 +17,18 @@ VFLIB_BUILDLINK_MK=	# defined
 VFLIB_REQD?=		2.24.2
 DEPENDS+=		ja-vflib-lib>=${VFLIB_REQD}:../../japanese/vflib-lib
 
-VFLIB_HEADERS=		${LOCALBASE}/include/VF.h
-VFLIB_LIBS=		${LOCALBASE}/lib/libVFlib2.*
-
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.vflib=		${LOCALBASE}
+BUILDLINK_FILES.vflib=		include/VF.h
+BUILDLINK_FILES.vflib+=		lib/libVFlib2.*
 
 .include "../../graphics/freetype-lib/buildlink.mk"
 
-VFLIB_BUILDLINK_COOKIE=		${WRKDIR}/.vflib_buildlink_done
-VFLIB_BUILDLINK_TARGETS=	link-vflib-headers
-VFLIB_BUILDLINK_TARGETS+=	link-vflib-libs
-BUILDLINK_TARGETS+=		${VFLIB_BUILDLINK_COOKIE}
-
-pre-configure: ${VFLIB_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.vflib=	vflib-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.vflib}
 
-${VFLIB_BUILDLINK_COOKIE}: ${VFLIB_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${VFLIB_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.vflib}
+vflib-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-vflib-headers:
-	@${ECHO} "Linking vflib headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${VFLIB_HEADERS}; do				\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-vflib-libs:
-	@${ECHO} "Linking vflib libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${VFLIB_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# VFLIB_BUILDLINK_MK
diff --git a/print/cups/buildlink.mk b/print/cups/buildlink.mk
index 465b49c3d05..7d61f33c494 100644
--- a/print/cups/buildlink.mk
+++ b/print/cups/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/10 00:09:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/06/11 01:59:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libcups.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define CUPS_REQD to the version of cups desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(CUPS_BUILDLINK_MK)
@@ -18,50 +17,17 @@ CUPS_BUILDLINK_MK=	# defined
 CUPS_REQD?=		1.1.1
 DEPENDS+=		cups>=${CUPS_REQD}:../../print/cups
 
-CUPS_HEADERS=		${LOCALBASE}/include/cups/*
-CUPS_LIBS=		${LOCALBASE}/lib/libcups.*
-CUPS_LIBS+=		${LOCALBASE}/lib/libcupsimage.*
+BUILDLINK_PREFIX.cups=	${LOCALBASE}
+BUILDLINK_FILES.cups=	include/cups/*
+BUILDLINK_FILES.cups+=	lib/libcups.*
+BUILDLINK_FILES.cups+=	lib/libcupsimage.*
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_TARGETS.cups=	cups-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.cups}
 
-CUPS_BUILDLINK_COOKIE=		${WRKDIR}/.cups_buildlink_done
-CUPS_BUILDLINK_TARGETS=		link-cups-headers
-CUPS_BUILDLINK_TARGETS+=	link-cups-libs
-BUILDLINK_TARGETS+=		${CUPS_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.cups}
+cups-buildlink: _BUILDLINK_USE
 
-pre-configure: ${CUPS_BUILDLINK_COOKIE}
-
-${CUPS_BUILDLINK_COOKIE}: ${CUPS_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${CUPS_BUILDLINK_COOKIE}
-
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-cups-headers:
-	@${ECHO} "Linking cups headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/cups
-	@${RM} -f ${BUILDLINK_INCDIR}/cups/*
-	@for inc in ${CUPS_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/cups/`${BASENAME} $${inc}`;	\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-cups-libs:
-	@${ECHO} "Linking cups libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${CUPS_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# CUPS_BUILDLINK_MK
diff --git a/security/PAM/buildlink.mk b/security/PAM/buildlink.mk
index 881006efc81..e6617e50543 100644
--- a/security/PAM/buildlink.mk
+++ b/security/PAM/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/10 00:09:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/06/11 01:59:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libpam.
 #
@@ -6,10 +6,9 @@
 #
 # (1) Optionally define PAM_REQD to the version of pam desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(PAM_BUILDLINK_MK)
@@ -18,51 +17,18 @@ PAM_BUILDLINK_MK=	# defined
 PAM_REQD?=		0.72
 DEPENDS+=		PAM>=${PAM_REQD}:../../security/PAM
 
-PAM_HEADERS=		${LOCALBASE}/include/security/*
-PAM_LIBS=		${LOCALBASE}/lib/libpam.*
-PAM_LIBS+=		${LOCALBASE}/lib/libpamc.*
-PAM_LIBS+=		${LOCALBASE}/lib/libpam_misc.*
+BUILDLINK_PREFIX.pam=	${LOCALBASE}
+BUILDLINK_FILES.pam=	include/security/*
+BUILDLINK_FILES.pam+=	lib/libpam.*
+BUILDLINK_FILES.pam+=	lib/libpamc.*
+BUILDLINK_FILES.pam+=	lib/libpam_misc.*
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_TARGETS.pam=	pam-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.pam}
 
-PAM_BUILDLINK_COOKIE=		${WRKDIR}/.pam_buildlink_done
-PAM_BUILDLINK_TARGETS=		link-pam-headers
-PAM_BUILDLINK_TARGETS+=		link-pam-libs
-BUILDLINK_TARGETS+=		${PAM_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.pam}
+pam-buildlink: _BUILDLINK_USE
 
-pre-configure: ${PAM_BUILDLINK_COOKIE}
-
-${PAM_BUILDLINK_COOKIE}: ${PAM_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${PAM_BUILDLINK_COOKIE}
-
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-pam-headers:
-	@${ECHO} "Linking pam headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/security
-	@${RM} -f ${BUILDLINK_INCDIR}/security/*
-	@for inc in ${PAM_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/security/`${BASENAME} $${inc}`; \
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-pam-libs:
-	@${ECHO} "Linking pam libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${PAM_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# PAM_BUILDLINK_MK
diff --git a/x11/fltk/buildlink.mk b/x11/fltk/buildlink.mk
index ff9255cd4ab..eec267d2e38 100644
--- a/x11/fltk/buildlink.mk
+++ b/x11/fltk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/10 00:09:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use FLTK.
 #
@@ -6,66 +6,29 @@
 #
 # (1) Optionally define FLTK_REQD to the version of FLTK desired.
 # (2) Include this Makefile fragment in the package Makefile,
-# (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(FLTK_BUILDLINK_MK)
 FLTK_BUILDLINK_MK=	# defined
 
 FLTK_REQD?=		1.0.9
-
-FLTK_HEADERS=		${X11PREFIX}/include/FL/*
-FLTK_LIBS=		${X11PREFIX}/lib/libfltk.*
 DEPENDS+=		fltk>=${FLTK_REQD}:../../x11/fltk
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.fltk=	${X11PREFIX}
+BUILDLINK_FILES.fltk=	include/FL/*
+BUILDLINK_FILES.fltk+=	lib/libfltk.*
 
 .include "../../graphics/Mesa/buildlink.mk"
 
-FLTK_BUILDLINK_COOKIE=		${WRKDIR}/.fltk_buildlink_done
-FLTK_BUILDLINK_TARGETS+=	link-fltk-headers
-FLTK_BUILDLINK_TARGETS+=	link-fltk-libs
-BUILDLINK_TARGETS+=		${FLTK_BUILDLINK_COOKIE}
-
-pre-configure: ${FLTK_BUILDLINK_COOKIE}
-
-${FLTK_BUILDLINK_COOKIE}: ${FLTK_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${FLTK_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.fltk=	fltk-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.fltk}
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-fltk-headers:
-	@${ECHO} "Linking fltk headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/FL
-	@${RM} -f ${BUILDLINK_INCDIR}/FL/*
-	@for inc in ${FLTK_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/FL/`${BASENAME} $${inc}`;	\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-fltk-libs:
-	@${ECHO} "Linking fltk libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${FLTK_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+pre-configure: ${BUILDLINK_TARGETS.fltk}
+fltk-buildlink: _BUILDLINK_USE
 
-jlam: ${FLTK_BUILDLINK_COOKIE}
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# FLTK_BUILDLINK_MK