From 1c57323789a922a7182ba378831f2c0a336a6959 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 25 Aug 2002 21:48:57 +0000
Subject: Merge packages from the buildlink2 branch back into the main trunk
 that have been converted to USE_BUILDLINK2.

---
 audio/vorbis-tools/Makefile | 18 +++++++++---------
 audio/vorbis-tools/distinfo |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'audio')

diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 537bbec368d..f1183b54aa1 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/08/05 13:12:43 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 21:49:29 jlam Exp $
 
 DISTNAME=	vorbis-tools-1.0
 PKGNAME=	vorbis-tools-1.0.0.8
@@ -16,21 +16,21 @@ DEPENDS=	curl>=7.9.1:../../www/curl
 
 CONFLICTS=	vorbis-[0-9]*
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-CONFIGURE_ARGS+=	--with-ogg-prefix=${BUILDLINK_DIR}		\
-			--with-vorbis-prefix=${BUILDLINK_DIR}		\
-			--with-ao-prefix=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-ogg-prefix=${BUILDLINK_PREFIX.libogg}	\
+			--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
+			--with-ao-prefix=${BUILDLINK_PREFIX.libao}
 
 PLIST_SUBST+=	DISTNAME="${DISTNAME}"
 
 PTHREAD_OPTS+=	require
 
-.include "../../audio/libao/buildlink.mk"
-.include "../../audio/libogg/buildlink.mk"
-.include "../../audio/libvorbis/buildlink.mk"
+.include "../../audio/libao/buildlink2.mk"
+.include "../../audio/libogg/buildlink2.mk"
+.include "../../audio/libvorbis/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 
-.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index a741f1c5ac0..61fadd6634f 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/05 13:12:43 lukem Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 21:49:29 jlam Exp $
 
 SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d
 Size (vorbis-tools-1.0.tar.gz) = 425404 bytes
-- 
cgit v1.2.3