4 files changed, 12 insertions, 48 deletions
diff --git a/net/ORBit/buildlink2.mk b/net/ORBit/buildlink2.mk
index 41650bcb35b..1a449cc686a 100644
--- a/net/ORBit/buildlink2.mk
+++ b/net/ORBit/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.1 2002/06/06 06:54:44 jlam Exp $
-#
-# This Makefile fragment is included by packages that use ORBit.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.ORBit to the dependency pattern
-#     for the version of ORBit desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/21 23:00:36 jlam Exp $
 
 .if !defined(ORBIT_BUILDLINK2_MK)
 ORBIT_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		ORBit
 BUILDLINK_DEPENDS.ORBit?=	ORBit>=0.5.12
-DEPENDS+=	${BUILDLINK_DEPENDS.ORBit}:../../net/ORBit
+BUILDLINK_PKGSRCDIR.ORBit?=	../../net/ORBit
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.ORBit=ORBit
 BUILDLINK_PREFIX.ORBit_DEFAULT=	${LOCALBASE}
diff --git a/net/openslp/buildlink2.mk b/net/openslp/buildlink2.mk
index cf04a7e8e79..5eaae709af0 100644
--- a/net/openslp/buildlink2.mk
+++ b/net/openslp/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:45 jlam Exp $
-#
-# This Makefile fragment is included by packages that use openslp.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.openslp to the dependency pattern
-#     for the version of openslp desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:36 jlam Exp $
 
 .if !defined(OPENSLP_BUILDLINK2_MK)
 OPENSLP_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		openslp
 BUILDLINK_DEPENDS.openslp?=	openslp>=1.0.1
-DEPENDS+=	${BUILDLINK_DEPENDS.openslp}:../../net/openslp
+BUILDLINK_PKGSRCDIR.openslp?=	../../net/openslp
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.openslp=openslp
 BUILDLINK_PREFIX.openslp_DEFAULT=	${LOCALBASE}
diff --git a/net/socks4/buildlink2.mk b/net/socks4/buildlink2.mk
index 2c4ac4dd9f9..3b72a784070 100644
--- a/net/socks4/buildlink2.mk
+++ b/net/socks4/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:46 jlam Exp $
-#
-# This Makefile fragment is included by packages that use socks4.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.socks4 to the dependency pattern
-#     for the version of socks4 desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:36 jlam Exp $
 
 .if !defined(SOCKS4_BUILDLINK2_MK)
 SOCKS4_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		socks4
 BUILDLINK_DEPENDS.socks4?=	socks4>=2.2
-DEPENDS+=	${BUILDLINK_DEPENDS.socks4}:../../net/socks4
+BUILDLINK_PKGSRCDIR.socks4?=	../../net/socks4
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.socks4=socks4
 BUILDLINK_PREFIX.socks4_DEFAULT=	${LOCALBASE}
diff --git a/net/socks5/buildlink2.mk b/net/socks5/buildlink2.mk
index a5d838c06f9..54fd33b7d40 100644
--- a/net/socks5/buildlink2.mk
+++ b/net/socks5/buildlink2.mk
@@ -1,20 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.2.2 2002/06/06 06:54:46 jlam Exp $
-#
-# This Makefile fragment is included by packages that use socks5.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.socks5 to the dependency pattern
-#     for the version of socks5 desired.
-# (2) Include this Makefile fragment in the package Makefile.
+# $NetBSD: buildlink2.mk,v 1.1.2.3 2002/06/21 23:00:36 jlam Exp $
 
 .if !defined(SOCKS5_BUILDLINK2_MK)
 SOCKS5_BUILDLINK2_MK=	# defined
 
-.include "../../mk/bsd.buildlink2.mk"
-
+BUILDLINK_PACKAGES+=		socks5
 BUILDLINK_DEPENDS.socks5?=	socks5>=1.0.2
-DEPENDS+=	${BUILDLINK_DEPENDS.socks5}:../../net/socks5
+BUILDLINK_PKGSRCDIR.socks5?=	../../net/socks5
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.socks5=socks5
 BUILDLINK_PREFIX.socks5_DEFAULT=	${LOCALBASE}