Convert to buildlink3.

6 files changed, 44 insertions, 47 deletions

diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 39aba18a0cb..859e3d7c2c3 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/22 08:24:29 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/18 22:51:02 snj Exp $
 #
 
 DISTNAME=		eel-1.0.1
@@ -14,7 +14,7 @@ COMMENT=		Eazel Extensions Library
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
@@ -24,9 +24,9 @@ USE_GNU_TOOLS+=		make
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/oaf/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../graphics/librsvg/buildlink2.mk"
-.include "../../sysutils/gnome-vfs/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/oaf/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile
index bba33dfa05f..0e431160629 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/22 08:24:31 grant Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/18 22:53:18 snj Exp $
 #
 
 DISTNAME=		xdelta-1.1.1
@@ -10,13 +10,13 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.xcf.berkeley.edu/~jmacd/xdelta.html
 COMMENT=		Enhanced diff that works on binary files
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 INFO_FILES=		xdelta.info
 
-.include "../../devel/glib/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
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/+$//}
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
index 6af43184b3a..b56d0eb0981 100644
--- a/sysutils/vifm/Makefile
+++ b/sysutils/vifm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 15:06:58 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/18 22:56:11 snj Exp $
 #
 
 DISTNAME=	vifm-0.1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://vifm.sourceforge.net/
 COMMENT=	Ncurses based file manager with vi like keybindings
 
 GNU_CONFIGURE=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 
 INCOMPAT_CURSES=	NetBSD-1.5* NetBSD-1.6[-_.]*
@@ -26,6 +26,6 @@ pre-configure:
 		${WRKSRC}/src/vifmrc0.1 > ${WRKSRC}/src/vifmrc0.1.new && \
 		${MV} ${WRKSRC}/src/vifmrc0.1.new ${WRKSRC}/src/vifmrc0.1
 
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"