- bl3ify

- correct INFO_FILES
- add buildlink3.mk

3 files changed, 32 insertions, 10 deletions

diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index 9e0a1c4e43e..8accaef5160 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/04/08 17:45:47 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/09 10:34:52 recht Exp $
 #
 
 DISTNAME=	vcdimager-0.7.20
@@ -9,14 +9,15 @@ MAINTAINER=	ben@NetBSD.org
 HOMEPAGE=	http://www.vcdimager.org/
 COMMENT=	Mastering suite for Video CDs
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	yes
-INFO_FILES=	vcdimager.info
+INFO_FILES=	vcd-info.info vcdimager.info vcdxrip.info
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../misc/libcdio/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../misc/libcdio/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vcdimager-devel/PLIST b/sysutils/vcdimager-devel/PLIST
index 309469ca9da..ba0c3f8dd39 100644
--- a/sysutils/vcdimager-devel/PLIST
+++ b/sysutils/vcdimager-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/04/08 17:45:47 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/09 10:34:52 recht Exp $
 bin/cdxa2mpeg
 bin/vcd-info
 bin/vcdimager
@@ -14,8 +14,6 @@ include/libvcd/logging.h
 include/libvcd/sector.h
 include/libvcd/types.h
 include/libvcd/version.h
-info/vcd-info.info
-info/vcdxrip.info
 lib/libvcdinfo.a
 lib/libvcdinfo.la
 lib/libvcdinfo.so
diff --git a/sysutils/vcdimager-devel/buildlink3.mk b/sysutils/vcdimager-devel/buildlink3.mk
new file mode 100644
index 00000000000..bdeb6265ed0
--- /dev/null
+++ b/sysutils/vcdimager-devel/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/09 10:34:52 recht Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+VCDIMAGER_BUILDLINK3_MK:=	${VCDIMAGER_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	vcdimager
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvcdimager}
+BUILDLINK_PACKAGES+=	vcdimager
+
+.if !empty(VCDIMAGER_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.vcdimager+=	vcdimager>=0.7.20
+BUILDLINK_PKGSRCDIR.vcdimager?=	../../sysutils/vcdimager-devel
+.endif	# VCDIMAGER_BUILDLINK3_MK
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../misc/libcdio/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}