10 files changed, 63 insertions, 95 deletions

diff --git a/audio/vorbis-tools/files/patch-ab b/audio/vorbis-tools/files/patch-ab
deleted file mode 100644
index 4207e753c0e2..000000000000
--- a/audio/vorbis-tools/files/patch-ab
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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 @@
-  */
- 
- #include <sys/types.h>
-+#if HAVE_SMMAP
-+#include <sys/mman.h>
-+#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*/
- #include <fcntl.h>
- 
--#ifndef DARWIN
--#include <malloc.h>
--#endif
--
- #include "ogg123.h"
- #include "buffer.h"
- 
-@@ -73,10 +72,26 @@ buf_t *fork_writer (long size, devices_t
-   int childpid;
-   buf_t *buf;
- 
-+#if HAVE_SMMAP
-+  int fd;
-+
-+  if ((fd = open("/dev/zero", O_RDWR)) < 0)
-+    {
-+      perror ("cannot open /dev/zero");
-+      exit (1);
-+    }
-+  if ((buf = (buf_t *) mmap (0, sizeof(buf_t) + sizeof (chunk_t) * (size - 1),
-+                             PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) < 0)
-+    {
-+      perror("mmap");
-+      exit(1);
-+    }
-+  close(fd);
-+#else
-   /* 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);
- 
-   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);
-+#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-ae b/audio/vorbis-tools/files/patch-aclocal.m4
index 1b4b681f78f1..4c0783fe9e0b 100644
--- a/audio/vorbis-tools/files/patch-ae
+++ b/audio/vorbis-tools/files/patch-aclocal.m4
@@ -1,6 +1,7 @@
+$FreeBSD$
 --- aclocal.m4.orig	Mon Feb 26 06:51:03 2001
-+++ aclocal.m4	Sat Mar 17 17:06:03 2001
-@@ -222,7 +222,7 @@ AC_ARG_ENABLE(aotest, [  --disable-aotes
++++ aclocal.m4	Wed Mar 21 15:31:39 2001
+@@ -222,7 +222,7 @@
      AO_LIBS="-L$ao_prefix/lib"
    fi
  
@@ -9,11 +10,10 @@
  
    AC_MSG_CHECKING(for ao)
    no_ao=""
-@@ -292,6 +292,68 @@ int main ()
-   AC_SUBST(AO_LIBS)
+@@ -293,6 +293,68 @@
    rm -f conf.aotest
  ])
-+
+ 
 +dnl Shamelessly stolen from Joerg Schilling's star.
 +dnl Copyright 1998 J. Schilling
 +
@@ -75,6 +75,26 @@
 +if test $ac_cv_func_smmap = yes; then
 +  AC_DEFINE(HAVE_SMMAP)
 +fi])
- 
++
  # 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-ad b/audio/vorbis-tools/files/patch-ad
deleted file mode 100644
index 8175c5f454f3..000000000000
--- a/audio/vorbis-tools/files/patch-ad
+++ /dev/null
@@ -1,8 +0,0 @@
---- ogg123/ogg123.c.orig	Sat Feb 24 09:52:22 2001
-+++ ogg123/ogg123.c	Thu Mar  1 17:51:28 2001
-@@ -25,4 +25,5 @@
- #include <stdio.h>
- #include <netdb.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
diff --git a/audio/vorbis-tools/files/patch-af b/audio/vorbis-tools/files/patch-af
deleted file mode 100644
index 1d17313f4d81..000000000000
--- a/audio/vorbis-tools/files/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
---- ogg123/Makefile.am.orig	Sat Mar 17 15:55:09 2001
-+++ ogg123/Makefile.am	Sat Mar 17 15:55:13 2001
-@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
- bin_PROGRAMS = ogg123
- docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
- doc_DATA = ogg123rc-example
--mandir = $(datadir)/man
- man_MANS = ogg123.1
- 
- INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@
diff --git a/audio/vorbis-tools/files/patch-aa b/audio/vorbis-tools/files/patch-configure.in
index e568ca3628a1..de11cc0b7442 100644
--- a/audio/vorbis-tools/files/patch-aa
+++ b/audio/vorbis-tools/files/patch-configure.in
@@ -1,3 +1,4 @@
+$FreeBSD$
 --- configure.in.orig	Mon Feb 26 06:51:00 2001
 +++ configure.in	Sun Mar 18 23:21:51 2001
 @@ -67,7 +68,7 @@ dnl ------------------------------------
diff --git a/audio/vorbis-tools/files/patch-ogg123_Makefile.am b/audio/vorbis-tools/files/patch-ogg123_Makefile.am
new file mode 100644
index 000000000000..678a353c6f1e
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-ogg123_Makefile.am
@@ -0,0 +1,14 @@
+$FreeBSD$
+--- ogg123/Makefile.am.orig	Mon Feb 19 23:27:52 2001
++++ ogg123/Makefile.am	Wed Mar 21 16:04:07 2001
+@@ -3,9 +3,8 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+ bin_PROGRAMS = ogg123
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ doc_DATA = ogg123rc-example
+-mandir = $(datadir)/man
+ man_MANS = ogg123.1
+ 
+ INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@
diff --git a/audio/vorbis-tools/files/patch-ac b/audio/vorbis-tools/files/patch-ogg123_Makefile.in
index 3f5eec7db1f6..83525219f514 100644
--- a/audio/vorbis-tools/files/patch-ac
+++ b/audio/vorbis-tools/files/patch-ogg123_Makefile.in
@@ -1,8 +1,12 @@
+$FreeBSD$
 --- ogg123/Makefile.in.orig	Mon Feb 26 12:02:14 2001
-+++ ogg123/Makefile.in	Tue Feb 27 15:02:56 2001
-@@ -85,7 +85,7 @@
++++ ogg123/Makefile.in	Wed Mar 21 16:04:22 2001
+@@ -83,9 +83,9 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
  bin_PROGRAMS = ogg123
- docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
  doc_DATA = ogg123rc-example
 -mandir = $(datadir)/man
 +mandir = $(prefix)/man
diff --git a/audio/vorbis-tools/files/patch-ogg123_ogg123.c b/audio/vorbis-tools/files/patch-ogg123_ogg123.c
new file mode 100644
index 000000000000..994a3afc34a1
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-ogg123_ogg123.c
@@ -0,0 +1,11 @@
+$FreeBSD$
+--- ogg123/ogg123.c.orig	Sat Feb 24 01:52:22 2001
++++ ogg123/ogg123.c	Wed Mar 21 15:30:42 2001
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <netdb.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+ #include <errno.h>
diff --git a/audio/vorbis-tools/pkg-comment b/audio/vorbis-tools/pkg-comment
index 67aab61bde73..a1e29a207588 100644
--- a/audio/vorbis-tools/pkg-comment
+++ b/audio/vorbis-tools/pkg-comment
@@ -1 +1 @@
-MP3-comparable audio compression codec library
+Play, encode, and manage Ogg Vorbis files
diff --git a/audio/vorbis-tools/pkg-plist b/audio/vorbis-tools/pkg-plist
index 9bec82fd1344..827a3f99e876 100644
--- a/audio/vorbis-tools/pkg-plist
+++ b/audio/vorbis-tools/pkg-plist
@@ -1,5 +1,6 @@
+@comment $FreeBSD$
 bin/ogg123
 bin/oggenc
 bin/vorbiscomment
-share/doc/vorbis-tools-1.0beta4/ogg123rc-example
-@dirrm share/doc/vorbis-tools-1.0beta4
+share/doc/vorbis-tools/ogg123rc-example
+@dirrm share/doc/vorbis-tools