summaryrefslogtreecommitdiff
path: root/audio/libvorbis
diff options
context:
space:
mode:
Diffstat (limited to 'audio/libvorbis')
-rw-r--r--audio/libvorbis/Makefile8
-rw-r--r--audio/libvorbis/PLIST2
-rw-r--r--audio/libvorbis/buildlink.mk2
-rw-r--r--audio/libvorbis/buildlink2.mk23
-rw-r--r--audio/libvorbis/distinfo2
-rw-r--r--audio/libvorbis/patches/patch-ae2
6 files changed, 30 insertions, 9 deletions
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index b90d51aec9e..43c73a97090 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/08/05 13:11:22 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 18:38:16 jlam Exp $
DISTNAME= libvorbis-1.0
PKGNAME= libvorbis-1.0.0.8
@@ -11,10 +11,8 @@ COMMENT= Library for the Ogg Vorbis audio encoding format
#BUILD_DEPENDS+= automake>=1.4:../../devel/automake
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_DIR}
-
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
@@ -26,5 +24,5 @@ GCC_VERSION!=gcc --version
.include "../../lang/gcc/Makefile.gcc"
.endif
-.include "../../audio/libogg/buildlink.mk"
+.include "../../audio/libogg/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvorbis/PLIST b/audio/libvorbis/PLIST
index 59722451714..69fa3f4342e 100644
--- a/audio/libvorbis/PLIST
+++ b/audio/libvorbis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:11:22 lukem Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:16 jlam Exp $
include/vorbis/codec.h
include/vorbis/vorbisenc.h
include/vorbis/vorbisfile.h
diff --git a/audio/libvorbis/buildlink.mk b/audio/libvorbis/buildlink.mk
index abca44beb6c..ced6444feb9 100644
--- a/audio/libvorbis/buildlink.mk
+++ b/audio/libvorbis/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2002/08/05 13:11:22 lukem Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:38:16 jlam Exp $
#
# This Makefile fragment is included by packages that use libvorbis.
#
diff --git a/audio/libvorbis/buildlink2.mk b/audio/libvorbis/buildlink2.mk
new file mode 100644
index 00000000000..66da4cfcfa7
--- /dev/null
+++ b/audio/libvorbis/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:17 jlam Exp $
+
+.if !defined(LIBVORBIS_BUILDLINK2_MK)
+LIBVORBIS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libvorbis
+BUILDLINK_DEPENDS.libvorbis?= libvorbis>=1.0.0.8
+BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libvorbis=libvorbis
+BUILDLINK_PREFIX.libvorbis_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libvorbis= include/vorbis/*
+BUILDLINK_FILES.libvorbis+= lib/libvorbis.*
+BUILDLINK_FILES.libvorbis+= lib/libvorbisenc.*
+BUILDLINK_FILES.libvorbis+= lib/libvorbisfile.*
+
+.include "../../audio/libogg/buildlink2.mk"
+
+BUILDLINK_TARGETS+= libvorbis-buildlink
+
+libvorbis-buildlink: _BUILDLINK_USE
+
+.endif # LIBVORBIS_BUILDLINK2_MK
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index be8d2d3d752..73fe88e99af 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/05 13:11:22 lukem Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 18:38:17 jlam Exp $
SHA1 (libvorbis-1.0.tar.gz) = 2b414cb4cf7d022d39b7be7049f2c84a287a4fc7
Size (libvorbis-1.0.tar.gz) = 749064 bytes
diff --git a/audio/libvorbis/patches/patch-ae b/audio/libvorbis/patches/patch-ae
index 33298f82349..7942707baa5 100644
--- a/audio/libvorbis/patches/patch-ae
+++ b/audio/libvorbis/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/08/05 13:11:23 lukem Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 18:38:17 jlam Exp $
--- doc/Makefile.in.orig Sat Jul 20 00:12:33 2002
+++ doc/Makefile.in