3 files changed, 27 insertions, 33 deletions
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index 266ff1bc377..e19b4a91aca 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:55 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/04/26 22:07:06 snj Exp $
 #
 
 DISTNAME=	gnomemm-1.2.4
@@ -16,10 +16,10 @@ USE_PERL5=	build
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 USE_X11BASE=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 REPLACE_PERL=	docgen/pce2
 
-.include "../../devel/libsigc++10/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../x11/gtk--/buildlink2.mk"
+.include "../../devel/libsigc++10/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+.include "../../x11/gtk--/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome--/buildlink2.mk b/x11/gnome--/buildlink2.mk
deleted file mode 100644
index 38f77e43e98..00000000000
--- a/x11/gnome--/buildlink2.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/03/29 05:05:48 jlam Exp $
-
-.if !defined(GNOMEMM_BUILDLINK2_MK)
-GNOMEMM_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		gnomemm
-BUILDLINK_PKGBASE.gnomemm?=	gnome--
-BUILDLINK_DEPENDS.gnomemm?=	gnome-->=1.2.4nb1
-BUILDLINK_PKGSRCDIR.gnomemm?=	../../x11/gnome--
-
-EVAL_PREFIX+=				BUILDLINK_PREFIX.gnomemm=gnome--
-BUILDLINK_PREFIX.gnomemm_DEFAULT=	${X11PREFIX}
-
-BUILDLINK_FILES.gnomemm=	include/gnome--/private/*
-BUILDLINK_FILES.gnomemm+=	include/gnome--/*
-BUILDLINK_FILES.gnomemm+=	include/gnome--.h
-BUILDLINK_FILES.gnomemm+=	lib/libgnomemm-1.1.*
-BUILDLINK_FILES.gnomemm+=	lib/libgnomemm.*
-
-.include "../../devel/libsigc++10/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../x11/gtk--/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	gnomemm-buildlink
-
-gnomemm-buildlink: _BUILDLINK_USE
-
-.endif	# GNOMEMM_BUILDLINK2_MK
diff --git a/x11/gnome--/buildlink3.mk b/x11/gnome--/buildlink3.mk
new file mode 100644
index 00000000000..bf5b704035d
--- /dev/null
+++ b/x11/gnome--/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 22:07:06 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GNOMEMM_BUILDLINK3_MK:=	${GNOMEMM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gnomemm
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnomemm}
+BUILDLINK_PACKAGES+=	gnomemm
+
+.if !empty(GNOMEMM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gnomemm+=	gnome-->=1.2.4nb1
+BUILDLINK_PKGSRCDIR.gnomemm?=	../../x11/gnome--
+.endif	# GNOMEMM_BUILDLINK3_MK
+
+.include "../../devel/libsigc++10/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+.include "../../x11/gtk--/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}