11 files changed, 162 insertions, 73 deletions

diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 24307d124f57..6a9b0be81cbd 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -6,18 +6,16 @@
 #
 
 PORTNAME=	vorbis-tools
-PORTVERSION=	1.0b4
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	1.0.r1
+PORTEPOCH=	2
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/beta4/unix/ \
-		http://home.student.utwente.nl/t.vanklaveren/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
+MASTER_SITES=	http://www.vorbis.com/files/rc1/unix/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	naddy@mips.inka.de
 
 LIB_DEPENDS=	ao.1:${PORTSDIR}/audio/libao \
-		ogg.1:${PORTSDIR}/audio/libogg \
+		ogg.2:${PORTSDIR}/audio/libogg \
 		vorbis.0:${PORTSDIR}/audio/libvorbis
 
 USE_AUTOCONF=	yes
@@ -27,6 +25,11 @@ CONFIGURE_ARGS=	--with-ao=${LOCALBASE} \
 		--with-ogg=${LOCALBASE} \
 		--with-vorbis=${LOCALBASE}
 
-MAN1=		ogg123.1 oggenc.1
+MAN1=		ogg123.1 oggenc.1 ogginfo.1
+
+post-extract:
+	@(cd ${WRKSRC}/ogg123 ;\
+	  ${MV} ogg123rc-example ogg123rc ;\
+	  ${PERL} -pi.orig -e 's/
//' ogg123.1)
 
 .include <bsd.port.mk>
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index c33a6eeb7125..f3cb45479ee0 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1 +1 @@
-MD5 (vorbis-tools-1.0beta4.tar.gz) = 5222a18972276f0bf42256c221453d0e
+MD5 (vorbis-tools-1.0rc1.tar.gz) = 40f19902e7b31571615952c29fce8389
diff --git a/audio/vorbis-tools/files/patch-aclocal.m4 b/audio/vorbis-tools/files/patch-aclocal.m4
index 4c0783fe9e0b..3758df37c8c6 100644
--- a/audio/vorbis-tools/files/patch-aclocal.m4
+++ b/audio/vorbis-tools/files/patch-aclocal.m4
@@ -1,16 +1,7 @@
 $FreeBSD$
---- aclocal.m4.orig	Mon Feb 26 06:51:03 2001
-+++ aclocal.m4	Wed Mar 21 15:31:39 2001
-@@ -222,7 +222,7 @@
-     AO_LIBS="-L$ao_prefix/lib"
-   fi
- 
--  AO_LIBS="$AO_LIBS -lao -ldl"
-+  AO_LIBS="$AO_LIBS -lao"
- 
-   AC_MSG_CHECKING(for ao)
-   no_ao=""
-@@ -293,6 +293,68 @@
+--- aclocal.m4.orig	Mon Jun 18 06:43:11 2001
++++ aclocal.m4	Tue Jul 17 01:38:36 2001
+@@ -313,6 +313,68 @@ int main ()
    rm -f conf.aotest
  ])
  
@@ -79,22 +70,3 @@ $FreeBSD$
  # Do all the work for Automake.  This macro actually does too much --
  # some checks are only needed if your package does certain things.
  # But this isn't really a big deal.
-@@ -398,15 +460,15 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
- || AC_MSG_ERROR([libtool configure failed])
- 
- # Reload cache, that may have been modified by ltconfig
- AC_CACHE_LOAD
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/vorbis-tools/files/patch-ogg123_Makefile.am b/audio/vorbis-tools/files/patch-ogg123_Makefile.am
index 678a353c6f1e..7b39cc2b74a8 100644
--- a/audio/vorbis-tools/files/patch-ogg123_Makefile.am
+++ b/audio/vorbis-tools/files/patch-ogg123_Makefile.am
@@ -1,14 +1,15 @@
 $FreeBSD$
---- ogg123/Makefile.am.orig	Mon Feb 19 23:27:52 2001
-+++ ogg123/Makefile.am	Wed Mar 21 16:04:07 2001
+--- ogg123/Makefile.am.orig	Sun Mar 25 17:59:31 2001
++++ ogg123/Makefile.am	Tue Jul 17 03:22:47 2001
 @@ -3,9 +3,8 @@
  AUTOMAKE_OPTIONS = foreign
  
  bin_PROGRAMS = ogg123
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/$(PACKAGE)
- doc_DATA = ogg123rc-example
+-doc_DATA = ogg123rc-example
 -mandir = $(datadir)/man
++docdir = $(datadir)/examples/$(PACKAGE)
++doc_DATA = ogg123rc
  man_MANS = ogg123.1
  
  INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@
diff --git a/audio/vorbis-tools/files/patch-ogg123_Makefile.in b/audio/vorbis-tools/files/patch-ogg123_Makefile.in
index 83525219f514..93bad3091e39 100644
--- a/audio/vorbis-tools/files/patch-ogg123_Makefile.in
+++ b/audio/vorbis-tools/files/patch-ogg123_Makefile.in
@@ -1,15 +1,23 @@
 $FreeBSD$
---- ogg123/Makefile.in.orig	Mon Feb 26 12:02:14 2001
-+++ ogg123/Makefile.in	Wed Mar 21 16:04:22 2001
-@@ -83,9 +83,9 @@
+--- ogg123/Makefile.in.orig	Mon Jun 18 18:18:19 2001
++++ ogg123/Makefile.in	Tue Jul 17 03:23:27 2001
+@@ -28,6 +28,7 @@ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+ infodir = @infodir@
++mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+ 
+@@ -83,9 +84,8 @@ VORBIS_LIBS = @VORBIS_LIBS@
  AUTOMAKE_OPTIONS = foreign
  
  bin_PROGRAMS = ogg123
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/$(PACKAGE)
- doc_DATA = ogg123rc-example
+-doc_DATA = ogg123rc-example
 -mandir = $(datadir)/man
-+mandir = $(prefix)/man
++docdir = $(datadir)/examples/$(PACKAGE)
++doc_DATA = ogg123rc
  man_MANS = ogg123.1
  
  INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@
diff --git a/audio/vorbis-tools/files/patch-ogg123_buffer.c b/audio/vorbis-tools/files/patch-ogg123_buffer.c
index 9c89a82719de..56d0403daff2 100644
--- a/audio/vorbis-tools/files/patch-ogg123_buffer.c
+++ b/audio/vorbis-tools/files/patch-ogg123_buffer.c
@@ -1,7 +1,7 @@
 $FreeBSD$
---- ogg123/buffer.c.orig	Tue Jan 30 11:42:48 2001
-+++ ogg123/buffer.c	Sat Mar 17 17:12:02 2001
-@@ -6,17 +6,16 @@
+--- ogg123/buffer.c.orig	Sat Jun 30 13:57:20 2001
++++ ogg123/buffer.c	Sat Jun 30 14:01:55 2001
+@@ -6,16 +6,16 @@
   */
  
  #include <sys/types.h>
@@ -10,7 +10,6 @@ $FreeBSD$
 +#else
  #include <sys/ipc.h>
  #include <sys/shm.h>
--#include <sys/stat.h>
 +#endif
  #include <sys/time.h>
  #include <unistd.h> /* for fork and pipe*/
@@ -23,7 +22,7 @@ $FreeBSD$
  #include "ogg123.h"
  #include "buffer.h"
  
-@@ -73,10 +72,26 @@ buf_t *fork_writer (long size, devices_t
+@@ -72,6 +72,22 @@ buf_t *fork_writer (long size, devices_t
    int childpid;
    buf_t *buf;
  
@@ -46,21 +45,11 @@ $FreeBSD$
    /* Get the shared memory segment. */
    int shmid = shmget (IPC_PRIVATE,
  			  sizeof(buf_t) + sizeof (chunk_t) * (size - 1),
--			  IPC_CREAT|S_IREAD|S_IWRITE);
-+			  IPC_CREAT|SHM_R|SHM_W);
+@@ -94,6 +110,7 @@ buf_t *fork_writer (long size, devices_t
  
-   if (shmid == -1)
-     {
-@@ -92,7 +107,11 @@ buf_t *fork_writer (long size, devices_t
-       perror ("shmat");
-       exit (1);
-     }
--  
-+
-+  /* Remove segment after last process detaches it or terminates. */
-+  shmctl(shmid, IPC_RMID, 0);
+   /* Remove segment after last process detaches it or terminates. */
+   shmctl(shmid, IPC_RMID, 0);
 +#endif /* HAVE_SMMAP */
-+
+ 
    buffer_init (buf, size);
    
-   /* Create a pipe for communication between the two processes. Unlike
diff --git a/audio/vorbis-tools/files/patch-ogg123_ogg123.1 b/audio/vorbis-tools/files/patch-ogg123_ogg123.1
new file mode 100644
index 000000000000..360bd101d6e5
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-ogg123_ogg123.1
@@ -0,0 +1,74 @@
+$FreeBSD$
+--- ogg123/ogg123.1.orig	Sat Jun 30 14:48:43 2001
++++ ogg123/ogg123.1	Sat Jun 30 15:02:46 2001
+@@ -76,7 +76,7 @@ written to 
+ output overhead. 
+ 
+ .IP oss
+-Open Sound System driver for Linux and {Net,Free,Open}BSD.
++Open Sound System driver for Linux and FreeBSD.
+ .RS
+ Options:
+ .RS 
+@@ -86,6 +86,17 @@ DSP device for soundcard.  Defaults to  
+ .RE
+ .RE
+ 
++.IP sun
++Sun Audio driver for NetBSD, OpenBSD, and Solaris.
++.RS
++Options:
++.RS
++.IP dev
++Audio device for soundcard.  Defaults to  
++.B /dev/audio.
++.RE
++.RE
++
+ .IP alsa
+ Advanced Linux Sound Architecture.
+ .RS
+@@ -100,6 +111,14 @@ Override the default buffer size (in byt
+ .RE
+ .RE
+ 
++.IP irix
++IRIX audio driver.  Note that this driver has
++.B not 
++been tested!
++
++.IP arts
++aRts Sound Daemon.
++
+ .IP esd
+ Enlightened Sound Daemon.
+ .RS
+@@ -111,15 +130,19 @@ after a colon, as in "whizbang.com:555".
+ .RE
+ .RE
+ 
+-.IP solaris
+-Solaris audio driver.  Note that this driver has
+-.B not 
+-been tested!
+-
+-.IP irix
+-IRIX audio driver.  Note that this driver has
+-.B not 
+-been tested!
++.IP raw
++Raw sample output.  Writes raw audio samples to a file.
++.RS
++Options:
++.RS
++.IP file
++Sets the output file.  (Default = "output.raw")
++.RE
++.RS
++.IP byteorder
++Choose big endian, little endian, or native byte order.  (Default = "native")
++.RE
++.RE
+ 
+ .IP wav
+ WAV file output.  Writes the sound data to disk in uncompressed form.
diff --git a/audio/vorbis-tools/files/patch-ogg123_ogg123.c b/audio/vorbis-tools/files/patch-ogg123_ogg123.c
index 994a3afc34a1..b67b088396b4 100644
--- a/audio/vorbis-tools/files/patch-ogg123_ogg123.c
+++ b/audio/vorbis-tools/files/patch-ogg123_ogg123.c
@@ -1,6 +1,6 @@
 $FreeBSD$
---- ogg123/ogg123.c.orig	Sat Feb 24 01:52:22 2001
-+++ ogg123/ogg123.c	Wed Mar 21 15:30:42 2001
+--- ogg123/ogg123.c.orig	Mon Jun 18 18:16:50 2001
++++ ogg123/ogg123.c	Tue Jul 17 01:43:22 2001
 @@ -24,6 +24,7 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -9,3 +9,16 @@ $FreeBSD$
  #include <netinet/in.h>
  #include <sys/socket.h>
  #include <errno.h>
+@@ -85,8 +86,10 @@ void usage(void)
+ 	    "  -V, --version  display Ogg123 version\n"
+ 	    "  -d, --device=d uses 'd' as an output device\n"
+ 	    "      Possible devices are (some may not be compiled):\n"
+-	    "      null (output nothing), oss (for Linux and *BSD),\n"
+-	    "      irix, solaris, wav (write to a .WAV file)\n"
++	    "      null (output nothing), oss (for Linux and FreeBSD),\n"
++	    "      alsa (for Linux), sun (for NetBSD, OpenBSD, Solaris),\n"
++	    "      irix, arts (aRts sound daemon), esd (ESounD daemon),\n"
++	    "      raw (write to a file), wav (write to a .WAV file)\n"
+ 	    "  -k n, --skip n  Skip the first 'n' seconds\n"
+ 	    "  -o, --device-option=k:v passes special option k with value\n"
+ 	    "      v to previously specified device (with -d).  See\n"
diff --git a/audio/vorbis-tools/files/patch-ogginfo_Makefile.am b/audio/vorbis-tools/files/patch-ogginfo_Makefile.am
new file mode 100644
index 000000000000..1523395fa550
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-ogginfo_Makefile.am
@@ -0,0 +1,10 @@
+--- ogginfo/Makefile.am.orig	Tue Jul 17 01:23:47 2001
++++ ogginfo/Makefile.am	Tue Jul 17 01:24:00 2001
+@@ -3,7 +3,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+ bin_PROGRAMS = ogginfo
+-mandir = $(datadir)/man
+ man_MANS = ogginfo.1
+ 
+ INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
diff --git a/audio/vorbis-tools/files/patch-ogginfo_Makefile.in b/audio/vorbis-tools/files/patch-ogginfo_Makefile.in
new file mode 100644
index 000000000000..0cc9192e8fef
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-ogginfo_Makefile.in
@@ -0,0 +1,18 @@
+--- ogginfo/Makefile.in.orig	Tue Jul 17 01:23:50 2001
++++ ogginfo/Makefile.in	Tue Jul 17 01:24:14 2001
+@@ -28,6 +28,7 @@ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+ infodir = @infodir@
++mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+ 
+@@ -83,7 +84,6 @@ VORBIS_LIBS = @VORBIS_LIBS@
+ AUTOMAKE_OPTIONS = foreign
+ 
+ bin_PROGRAMS = ogginfo
+-mandir = $(datadir)/man
+ man_MANS = ogginfo.1
+ 
+ INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
diff --git a/audio/vorbis-tools/pkg-plist b/audio/vorbis-tools/pkg-plist
index 827a3f99e876..e98e931a0f33 100644
--- a/audio/vorbis-tools/pkg-plist
+++ b/audio/vorbis-tools/pkg-plist
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 bin/ogg123
 bin/oggenc
+bin/ogginfo
 bin/vorbiscomment
-share/doc/vorbis-tools/ogg123rc-example
-@dirrm share/doc/vorbis-tools
+share/examples/vorbis-tools/ogg123rc
+@dirrm share/examples/vorbis-tools