update vorbistools from 1.0beta4 to 1.0rc1, including:

- use buildlink
- remove unnecessary patches for stuff now fixed in main distribution
- modify patch-aa to fix ogginfo man page installation

5 files changed, 27 insertions, 40 deletions

diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 3b732aaf8dc..e8a26c9e555 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,18 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2001/04/05 13:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/08 10:05:30 lukem Exp $
 
-DISTNAME=	vorbis-tools-1.0beta4
-PKGNAME=	vorbis-tools-1.0.0.4
+DISTNAME=	vorbis-tools-1.0rc1
+PKGNAME=	vorbis-tools-1.0.0.5
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/beta4/unix/
+MASTER_SITES=	http://www.vorbis.com/files/rc1/unix/
 
 MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.vorbis.com/
 COMMENT=	Ogg Vorbis encoder and player
 
-DEPENDS+=	libao>=0.6.0:../../audio/libao
-DEPENDS+=	libogg>=1.0.0.4:../../audio/libogg
-DEPENDS+=	libvorbis>=1.0.0.4:../../audio/libvorbis
-
 CONFLICTS=	vorbis-*
 
 GNU_CONFIGURE=		yes
@@ -22,4 +18,8 @@ CONFIGURE_ARGS+=	--with-ogg-prefix=${PREFIX} \
 			--with-vorbis-prefix=${PREFIX} \
 			--with-ao-prefix=${PREFIX}
 
+.include "../../audio/libao/buildlink.mk"
+.include "../../audio/libogg/buildlink.mk"
+.include "../../audio/libvorbis/buildlink.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index 8be5cf40ebc..a5a8d000400 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:39 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/08 10:05:30 lukem Exp $
 
-SHA1 (vorbis-tools-1.0beta4.tar.gz) = 58fd74ed0c8c814052e5c713736fb2df99bb89e6
-Size (vorbis-tools-1.0beta4.tar.gz) = 184561 bytes
-SHA1 (patch-aa) = aab33b5461b56f912ee7cb551c90612d20461323
+SHA1 (vorbis-tools-1.0rc1.tar.gz) = fe26867939d06e84fde67bc591200a98f7a964c2
+Size (vorbis-tools-1.0rc1.tar.gz) = 190000 bytes
+SHA1 (patch-aa) = 8758756eefa1965e2778dea5c1bf9773da630584
 SHA1 (patch-ab) = fc23be24de8b2e43f0a3fd2ce73d47bf3fe2196b
-SHA1 (patch-ac) = 069843ac1db8badd3fb6032678116041b0507184
diff --git a/audio/vorbis-tools/patches/patch-aa b/audio/vorbis-tools/patches/patch-aa
index 5b0fb278d71..28f712b97aa 100644
--- a/audio/vorbis-tools/patches/patch-aa
+++ b/audio/vorbis-tools/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/15 20:53:06 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/08 10:05:30 lukem Exp $
 
---- ../vorbis-tools-1.0beta4.orig/configure	Sun Feb 25 21:51:05 2001
-+++ configure	Thu Mar 15 09:52:40 2001
-@@ -1822,7 +1822,7 @@
-     AO_LIBS="-L$ao_prefix/lib"
-   fi
+--- ogginfo/Makefile.in.orig	Wed Aug  8 16:09:49 2001
++++ ogginfo/Makefile.in	Wed Aug  8 16:09:55 2001
+@@ -83,7 +83,7 @@
+ AUTOMAKE_OPTIONS = foreign
  
--  AO_LIBS="$AO_LIBS -lao -ldl"
-+  AO_LIBS="$AO_LIBS -lao -lossaudio"
+ bin_PROGRAMS = ogginfo
+-mandir = $(datadir)/man
++mandir = $(prefix)/man
+ man_MANS = ogginfo.1
  
-   echo $ac_n "checking for ao""... $ac_c" 1>&6
- echo "configure:1829: checking for ao" >&5
+ INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
diff --git a/audio/vorbis-tools/patches/patch-ac b/audio/vorbis-tools/patches/patch-ac
deleted file mode 100644
index f86e1c6decc..00000000000
--- a/audio/vorbis-tools/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/03/23 16:18:56 wiz Exp $
-
---- ogg123/buffer.c.orig	Tue Jan 30 11:42:48 2001
-+++ ogg123/buffer.c
-@@ -92,6 +92,9 @@
-       perror ("shmat");
-       exit (1);
-     }
-+
-+  /* Remove segment after last process detaches it or terminates. */
-+  shmctl(shmid, IPC_RMID, 0);
-   
-   buffer_init (buf, size);
-   
diff --git a/audio/vorbis-tools/pkg/PLIST b/audio/vorbis-tools/pkg/PLIST
index d9f8c9472bc..103aa8e19b9 100644
--- a/audio/vorbis-tools/pkg/PLIST
+++ b/audio/vorbis-tools/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/15 20:53:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/08/08 10:05:31 lukem Exp $
 bin/ogg123
 bin/oggenc
+bin/ogginfo
 bin/vorbiscomment
 man/man1/ogg123.1
 man/man1/oggenc.1
-share/doc/vorbis-tools-1.0beta4/ogg123rc-example
-@dirrm share/doc/vorbis-tools-1.0beta4
+man/man1/ogginfo.1
+share/doc/vorbis-tools-1.0rc1/ogg123rc-example
+@dirrm share/doc/vorbis-tools-1.0rc1