Convert to buildlink3.

3 files changed, 29 insertions, 32 deletions

diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index f5126fff0bc..49842ab34ed 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/18 22:51:02 snj Exp $
 #
 
 DISTNAME=		librsvg-1.0.1
@@ -11,16 +11,16 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.levien.com/svg/
 COMMENT=		Raph's SVG library
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../textproc/libxml/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../textproc/libxml/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/librsvg/buildlink2.mk b/graphics/librsvg/buildlink2.mk
deleted file mode 100644
index bf25526eecb..00000000000
--- a/graphics/librsvg/buildlink2.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/01/03 18:49:43 reed Exp $
-#
-
-.if !defined(LIBRSVG_BUILDLINK2_MK)
-LIBRSVG_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			librsvg
-BUILDLINK_DEPENDS.librsvg?=		librsvg>=1.0.1nb5
-BUILDLINK_PKGSRCDIR.librsvg?=		../../graphics/librsvg
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.librsvg=librsvg
-BUILDLINK_PREFIX.librsvg_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.librsvg+=	include/librsvg/*.h
-BUILDLINK_FILES.librsvg+=	lib/librsvg.*
-BUILDLINK_FILES.librsvg+=	lib/librsvgConf.sh
-
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../textproc/libxml/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	librsvg-buildlink
-
-librsvg-buildlink: _BUILDLINK_USE
-
-.endif	# LIBRSVG_BUILDLINK2_MK
diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk
new file mode 100644
index 00000000000..85b5f861b61
--- /dev/null
+++ b/graphics/librsvg/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/18 22:51:02 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBRSVG_BUILDLINK3_MK:=	${LIBRSVG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	librsvg
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsvg}
+BUILDLINK_PACKAGES+=	librsvg
+
+.if !empty(LIBRSVG_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.librsvg+=	librsvg>=1.0.1nb5
+BUILDLINK_PKGSRCDIR.librsvg?=	../../graphics/librsvg
+.endif	# LIBRSVG_BUILDLINK3_MK
+
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../textproc/libxml/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}