Convert to buildlink3.

3 files changed, 22 insertions, 26 deletions

diff --git a/editors/sam/buildlink2.mk b/editors/sam/buildlink2.mk
deleted file mode 100644
index bc4f7ffb9d4..00000000000
--- a/editors/sam/buildlink2.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:53 jlam Exp $
-
-.if !defined(SAM_BUILDLINK2_MK)
-SAM_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		sam
-BUILDLINK_DEPENDS.sam?=		sam>=4.3nb1
-BUILDLINK_PKGSRCDIR.sam?=	../../editors/sam
-
-# This adds a build-dependency as sam only has static libraries.
-BUILDLINK_DEPMETHOD.sam?=	build
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.sam=sam
-BUILDLINK_PREFIX.sam_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.sam=	include/sam/*
-BUILDLINK_FILES.sam+=	lib/libXg.a
-BUILDLINK_FILES.sam+=	lib/libframe.a
-
-BUILDLINK_TARGETS+=	sam-buildlink
-
-sam-buildlink: _BUILDLINK_USE
-
-.endif	# SAM_BUILDLINK2_MK
diff --git a/editors/sam/buildlink3.mk b/editors/sam/buildlink3.mk
new file mode 100644
index 00000000000..506560858f2
--- /dev/null
+++ b/editors/sam/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/18 04:19:49 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+SAM_BUILDLINK3_MK:=	${SAM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	sam
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsam}
+BUILDLINK_PACKAGES+=	sam
+
+.if !empty(SAM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.sam+=	sam>=4.3nb1
+BUILDLINK_PKGSRCDIR.sam?=	../../editors/sam
+BUILDLINK_DEPMETHOD.sam?=	build
+.endif	# SAM_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 51b245c7c1b..8f6e54793ea 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 12:28:26 agc Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/18 04:19:49 snj Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
 #
 
@@ -16,11 +16,11 @@ BUILDLINK_DEPMETHOD.sam=	full
 NOT_FOR_PLATFORM=	*-*-alpha	#LP64 Problems
 
 WRKSRC=			${WRKDIR}
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_X11=		yes
 
 MANCOMPRESSED=		yes
 MAKE_ENV+=		SAM_DIR=${BUILDLINK_PREFIX.sam}
 
-.include "../../editors/sam/buildlink2.mk"
+.include "../../editors/sam/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"