Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Jul 2001 13:28:02 +0200 (CEST)
From:      Christian Weisgerber <naddy@mips.inka.de>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/29036: update Ogg Vorbis to 1.0rc1
Message-ID:  <200107171128.f6HBS2t33884@kemoauc.mips.inka.de>

next in thread | raw e-mail | index | archive | help

>Number:         29036
>Category:       ports
>Synopsis:       update Ogg Vorbis to 1.0rc1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 17 04:50:17 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Christian Weisgerber
>Release:        FreeBSD 5.0-CURRENT alpha
>Organization:
>Environment:
System: FreeBSD kemoauc.mips.inka.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Thu Jul 12 23:53:44 CEST 2001 naddy@kemoauc.mips.inka.de:/home/obj/usr/src/sys/KEMOAUC alpha

>Description:

Update for the Ogg Vorbis ports:

audio/libao             0.7.0
audio/libogg            1.0rc1
audio/libvorbis         1.0rc1
audio/vorbis-tools      1.0rc1
audio/vorbis            1.0rc1    (meta port)

This also fixes the NOPORTDOCS installation.

>How-To-Repeat:

>Fix:

diff -uNr /usr/ports/audio/libao/Makefile libao/Makefile
--- /usr/ports/audio/libao/Makefile	Sat Mar 24 14:19:42 2001
+++ libao/Makefile	Tue Jul 17 12:42:33 2001
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	libao
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.7.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/beta4/unix/ \
-		http://home.student.utwente.nl/t.vanklaveren/distfiles/
+MASTER_SITES=	http://www.vorbis.com/files/rc1/unix/
 
 MAINTAINER=	naddy@mips.inka.de
 
@@ -18,6 +16,12 @@
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+
+.if defined(NOPORTDOCS)
+MAKE_ENV=	DOC=""
+.else
+MAKE_ENV=	DOC=doc
+.endif
 
 .include <bsd.port.pre.mk>
 
diff -uNr /usr/ports/audio/libao/distinfo libao/distinfo
--- /usr/ports/audio/libao/distinfo	Sun Mar  4 13:43:29 2001
+++ libao/distinfo	Sat Jun 30 15:40:11 2001
@@ -1 +1 @@
-MD5 (libao-0.6.0.tar.gz) = bab8b209a9440c8426d340ee8d4238ec
+MD5 (libao-0.7.0.tar.gz) = f4708f76c18cadc781ecbe0b9131d050
diff -uNr /usr/ports/audio/libao/files/patch-Makefile.in libao/files/patch-Makefile.in
--- /usr/ports/audio/libao/files/patch-Makefile.in	Thu Jan  1 01:00:00 1970
+++ libao/files/patch-Makefile.in	Tue Jul 17 02:32:03 2001
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- Makefile.in.orig	Tue Jul 17 02:31:20 2001
++++ Makefile.in	Tue Jul 17 02:31:31 2001
+@@ -87,7 +87,7 @@ plugindir = @plugindir@
+ 
+ AUTOMAKE_OPTIONS = foreign dist-zip
+ 
+-SUBDIRS = src include doc debian
++SUBDIRS = src include $(DOC) debian
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = ao.m4
diff -uNr /usr/ports/audio/libao/files/patch-configure libao/files/patch-configure
--- /usr/ports/audio/libao/files/patch-configure	Fri Mar 23 23:21:38 2001
+++ libao/files/patch-configure	Tue Jul 17 12:38:43 2001
@@ -1,29 +1,25 @@
-$FreeBSD: ports/audio/libao/files/patch-configure,v 1.1 2001/03/23 22:21:38 trevor Exp $
---- configure.orig	Wed Mar 21 16:27:24 2001
-+++ configure	Wed Mar 21 16:28:57 2001
-@@ -1501,9 +1501,9 @@ if test -z "$GCC"; then
-                 CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+$FreeBSD$
+--- configure.orig	Mon Jun 18 18:05:25 2001
++++ configure	Tue Jul 17 12:38:04 2001
+@@ -1510,7 +1510,7 @@ if test -z "$GCC"; then
                  PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
          *)
--                DEBUG="-g"
+                 DEBUG="-g"
 -                CFLAGS="-O"
--                PROFILE="-g -p" ;;
-+                DEBUG="$CFLAGS -g"
-+                CFLAGS="$CFLAGS"
-+                PROFILE="$CFLAGS -g -p" ;;
++                CFLAGS=""
+                 PROFILE="-g -p" ;;
          esac
  else
- 
-@@ -1517,9 +1517,9 @@ else
+@@ -1525,9 +1525,9 @@ else
                  CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
                  PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
          *)
 -                DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
 -                CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
 -                PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-+                DEBUG="$CFLAGS -g -Wall -fsigned-char"
-+                CFLAGS="$CFLAGS -fsigned-char"
-+                PROFILE="$CFLAGS -g -pg -fsigned-char" ;;
++                DEBUG="-g -Wall"
++                CFLAGS=""
++                PROFILE="-g -pg" ;;
          esac
  fi
- 
+ CFLAGS="$CFLAGS $cflags_save"
diff -uNr /usr/ports/audio/libao/files/patch-src_plugins_arts_Makefile.in libao/files/patch-src_plugins_arts_Makefile.in
--- /usr/ports/audio/libao/files/patch-src_plugins_arts_Makefile.in	Thu Jan  1 01:00:00 1970
+++ libao/files/patch-src_plugins_arts_Makefile.in	Tue Jul 17 02:31:09 2001
@@ -0,0 +1,26 @@
+$FreeBSD$
+--- src/plugins/arts/Makefile.in.orig	Tue Jul 17 02:29:03 2001
++++ src/plugins/arts/Makefile.in	Tue Jul 17 02:29:34 2001
+@@ -93,13 +93,12 @@ AUTOMAKE_OPTIONS = foreign
+ @HAVE_ARTS_TRUE@artssources = ao_arts.c
+ @HAVE_ARTS_FALSE@artssources = 
+ 
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @ARTS_CFLAGS@
+ 
+ libdir = $(plugindir)
+ lib_LTLIBRARIES = $(artsltlibs)
+ 
+ libarts_la_LDFLAGS = $(artsldflags)
+-CFLAGS = @ARTS_CFLAGS@
+ libarts_la_LIBADD = @ARTS_LIBS@
+ libarts_la_SOURCES = $(artssources)
+ 
+@@ -116,6 +115,7 @@ LIBS = @LIBS@
+ libarts_la_DEPENDENCIES = 
+ @HAVE_ARTS_FALSE@libarts_la_OBJECTS = 
+ @HAVE_ARTS_TRUE@libarts_la_OBJECTS =  ao_arts.lo
++CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
diff -uNr /usr/ports/audio/libogg/Makefile libogg/Makefile
--- /usr/ports/audio/libogg/Makefile	Sat Mar 24 14:19:42 2001
+++ libogg/Makefile	Tue Jul 17 12:42:49 2001
@@ -6,15 +6,20 @@
 #
 
 PORTNAME=	libogg
-PORTVERSION=	1.0b4
+PORTVERSION=	1.0.r1
 PORTEPOCH=	1
 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
 
 USE_LIBTOOL=	yes
+
+.if defined(NOPORTDOCS)
+MAKE_ENV=	DOC=""
+.else
+MAKE_ENV=	DOC=doc
+.endif
 
 .include <bsd.port.mk>
diff -uNr /usr/ports/audio/libogg/distinfo libogg/distinfo
--- /usr/ports/audio/libogg/distinfo	Sun Mar  4 13:43:29 2001
+++ libogg/distinfo	Sat Jun 30 16:29:05 2001
@@ -1 +1 @@
-MD5 (libogg-1.0beta4.tar.gz) = 1ffd9d6c02f824e50345920bd07366e9
+MD5 (libogg-1.0rc1.tar.gz) = fe25d090de826bc6f364240412cf1998
diff -uNr /usr/ports/audio/libogg/files/patch-Makefile.in libogg/files/patch-Makefile.in
--- /usr/ports/audio/libogg/files/patch-Makefile.in	Thu Jan  1 01:00:00 1970
+++ libogg/files/patch-Makefile.in	Tue Jul 17 02:37:08 2001
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- Makefile.in.orig	Tue Jul 17 02:36:25 2001
++++ Makefile.in	Tue Jul 17 02:36:39 2001
+@@ -85,7 +85,7 @@ VERSION = @VERSION@
+ 
+ AUTOMAKE_OPTIONS = foreign dist-zip
+ 
+-SUBDIRS = src include doc win32 debian
++SUBDIRS = src include $(DOC) win32 debian
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = ogg.m4
diff -uNr /usr/ports/audio/libogg/files/patch-configure libogg/files/patch-configure
--- /usr/ports/audio/libogg/files/patch-configure	Fri Mar 23 23:21:38 2001
+++ libogg/files/patch-configure	Tue Jul 17 03:08:49 2001
@@ -1,29 +1,25 @@
-$FreeBSD: ports/audio/libogg/files/patch-configure,v 1.1 2001/03/23 22:21:38 trevor Exp $
---- configure.orig	Mon Feb 26 05:30:03 2001
-+++ configure	Wed Mar 21 16:32:28 2001
-@@ -1489,9 +1489,9 @@
-                 PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
+$FreeBSD$
+--- configure.orig	Mon Jun 18 18:08:30 2001
++++ configure	Tue Jul 17 03:07:30 2001
+@@ -1492,7 +1492,7 @@ if test -z "$GCC"; then
  		;;
          *)
--                DEBUG="-g"
+                 DEBUG="-g"
 -                CFLAGS="-O"
--                PROFILE="-g -p" 
-+                DEBUG="$CFLAGS -g"
-+                CFLAGS="$CFLAGS"
-+                PROFILE="$CFLAGS -g -p" 
++                CFLAGS=""
+                 PROFILE="-g -p" 
  		;;
          esac
- else
-@@ -1512,9 +1512,9 @@
+@@ -1514,9 +1514,9 @@ else
  		PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
  		;;
          *)
 -                DEBUG="-g -Wall -fsigned-char"
 -                CFLAGS="-O20 -fsigned-char"
 -                PROFILE="-O20 -g -pg -fsigned-char" 
-+                DEBUG="$CFLAGS -g -Wall -fsigned-char"
-+                CFLAGS="$CFLAGS -fsigned-char"
-+                PROFILE="$CFLAGS -g -pg -fsigned-char" 
++                DEBUG="-g -Wall"
++                CFLAGS=""
++                PROFILE="-g -pg"
  		;;
          esac
  fi
diff -uNr /usr/ports/audio/libogg/pkg-plist libogg/pkg-plist
--- /usr/ports/audio/libogg/pkg-plist	Sat Mar 24 14:19:42 2001
+++ libogg/pkg-plist	Mon Jul 16 23:24:37 2001
@@ -4,7 +4,7 @@
 include/ogg/os_types.h
 lib/libogg.a
 lib/libogg.so
-lib/libogg.so.1
+lib/libogg.so.2
 share/aclocal/ogg.m4
 %%PORTDOCS%%share/doc/libogg/framing.html
 %%PORTDOCS%%share/doc/libogg/index.html
diff -uNr /usr/ports/audio/libvorbis/Makefile libvorbis/Makefile
--- /usr/ports/audio/libvorbis/Makefile	Sat Mar 24 14:19:43 2001
+++ libvorbis/Makefile	Tue Jul 17 13:15:51 2001
@@ -6,21 +6,25 @@
 #
 
 PORTNAME=	libvorbis
-PORTVERSION=	1.0b4
-PORTREVISION=	1
+PORTVERSION=	1.0.r1
 PORTEPOCH=	1
 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=	ogg.1:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	ogg.2:${PORTSDIR}/audio/libogg
 
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-ogg-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+
+.if defined(NOPORTDOCS)
+MAKE_ENV=	DOC=""
+.else
+MAKE_ENV=	DOC=doc
+.endif
 
 .include <bsd.port.mk>
diff -uNr /usr/ports/audio/libvorbis/distinfo libvorbis/distinfo
--- /usr/ports/audio/libvorbis/distinfo	Sun Mar  4 13:43:29 2001
+++ libvorbis/distinfo	Tue Jul 17 00:15:17 2001
@@ -1 +1 @@
-MD5 (libvorbis-1.0beta4.tar.gz) = 6954d72386cbf88c613e1ffebb7b4bac
+MD5 (libvorbis-1.0rc1.tar.gz) = 95b34a6a4f2b037fc6cca78a7ebe9758
diff -uNr /usr/ports/audio/libvorbis/files/patch-Makefile.in libvorbis/files/patch-Makefile.in
--- /usr/ports/audio/libvorbis/files/patch-Makefile.in	Thu Jan  1 01:00:00 1970
+++ libvorbis/files/patch-Makefile.in	Tue Jul 17 02:40:31 2001
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- Makefile.in.orig	Tue Jul 17 02:38:23 2001
++++ Makefile.in	Tue Jul 17 02:40:02 2001
+@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@
+ 
+ AUTOMAKE_OPTIONS = foreign dist-zip
+ 
+-SUBDIRS = lib include doc examples win32 debian vq
++SUBDIRS = lib include $(DOC) examples win32 debian vq
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = vorbis.m4
diff -uNr /usr/ports/audio/libvorbis/files/patch-configure libvorbis/files/patch-configure
--- /usr/ports/audio/libvorbis/files/patch-configure	Fri Mar 23 23:21:39 2001
+++ libvorbis/files/patch-configure	Tue Jul 17 00:26:59 2001
@@ -1,40 +1,36 @@
-$FreeBSD: ports/audio/libvorbis/files/patch-configure,v 1.1 2001/03/23 22:21:39 trevor Exp $
---- configure.orig	Mon Feb 26 14:34:27 2001
-+++ configure	Wed Mar 21 15:45:36 2001
-@@ -1617,9 +1617,9 @@
- 		CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+$FreeBSD$
+--- configure.orig	Mon Jun 18 18:12:43 2001
++++ configure	Tue Jul 17 00:26:16 2001
+@@ -1621,7 +1621,7 @@ if test -z "$GCC"; then
  		PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
  	*)
--		DEBUG="-g"
+ 		DEBUG="-g"
 -		CFLAGS="-O"
--		PROFILE="-g -p" ;;
-+		DEBUG="$CFLAGS -g"
-+		CFLAGS="$CFLAGS"
-+		PROFILE="$CFLAGS -g -p" ;;
++		CFLAGS=""
+ 		PROFILE="-g -p" ;;
          esac
  else
- 
-@@ -1709,9 +1709,9 @@
+@@ -1712,9 +1712,9 @@ rm -f conftest*
  		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
  		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
  	*)
 -		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
 -		CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
 -		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-+		DEBUG="$CFLAGS -g -Wall -D__NO_MATH_INLINES -fsigned-char"
-+		CFLAGS="$CFLAGS -fsigned-char"
-+		PROFILE="$CFLAGS -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
++		DEBUG="-g -Wall"
++		CFLAGS=""
++		PROFILE="-g -pg"
          esac
  fi
- 
-@@ -1795,14 +1795,14 @@
+ CFLAGS="$CFLAGS $cflags_save"
+@@ -1800,14 +1800,14 @@ else
  LIBS=""
  fi
  
 -echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
--echo "configure:1800: checking for pthread_create in -lpthread" >&5
+-echo "configure:1805: checking for pthread_create in -lpthread" >&5
 +echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6
-+echo "configure:1800: checking for pthread_create in -pthread" >&5
++echo "configure:1805: checking for pthread_create in -pthread" >&5
  ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +39,9 @@
 -LIBS="-lpthread  $LIBS"
 +LIBS="-pthread  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 1808 "configure"
+ #line 1813 "configure"
  #include "confdefs.h"
-@@ -1830,7 +1830,7 @@
+@@ -1835,7 +1835,7 @@ LIBS="$ac_save_LIBS"
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
diff -uNr /usr/ports/audio/libvorbis/files/patch-lib_psy.c libvorbis/files/patch-lib_psy.c
--- /usr/ports/audio/libvorbis/files/patch-lib_psy.c	Fri Mar 23 23:21:39 2001
+++ libvorbis/files/patch-lib_psy.c	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
-$FreeBSD: ports/audio/libvorbis/files/patch-lib_psy.c,v 1.1 2001/03/23 22:21:39 trevor Exp $
---- lib/psy.c.orig	Mon Feb 26 05:37:59 2001
-+++ lib/psy.c	Wed Mar 21 15:50:10 2001
-@@ -191,7 +191,7 @@
-   p->total_octave_lines=maxoc-p->firstoc+1;
- 
-   p->ath=_ogg_malloc(n*sizeof(float));
--  p->octave=_ogg_malloc(n*sizeof(int));
-+  p->octave=_ogg_malloc(n*sizeof(long));
-   p->bark=_ogg_malloc(n*sizeof(float));
-   p->vi=vi;
-   p->n=n;
diff -uNr /usr/ports/audio/libvorbis/pkg-plist libvorbis/pkg-plist
--- /usr/ports/audio/libvorbis/pkg-plist	Sat Mar 24 01:41:27 2001
+++ libvorbis/pkg-plist	Tue Jul 17 00:20:17 2001
@@ -10,66 +10,66 @@
 lib/libvorbisenc.so.0
 lib/libvorbisfile.a
 lib/libvorbisfile.so
-lib/libvorbisfile.so.0
+lib/libvorbisfile.so.1
 share/aclocal/vorbis.m4
-share/doc/libvorbis/programming.html
-share/doc/libvorbis/v-comment.html
-share/doc/libvorbis/vorbis-clip.txt
-share/doc/libvorbis/vorbis-errors.txt
-share/doc/libvorbis/vorbis.html
-share/doc/libvorbis/vorbisenc/index.html
-share/doc/libvorbis/vorbisenc/overview.html
-share/doc/libvorbis/vorbisenc/reference.html
-share/doc/libvorbis/vorbisenc/style.css
-share/doc/libvorbis/vorbisenc/vorbis_encode_ctl.html
-share/doc/libvorbis/vorbisenc/vorbis_encode_init.html
-share/doc/libvorbis/vorbisenc/vorbis_info.html
-share/doc/libvorbis/vorbisfile/OggVorbis_File.html
-share/doc/libvorbis/vorbisfile/chaining_example_c.html
-share/doc/libvorbis/vorbisfile/chainingexample.html
-share/doc/libvorbis/vorbisfile/datastructures.html
-share/doc/libvorbis/vorbisfile/decoding.html
-share/doc/libvorbis/vorbisfile/example.html
-share/doc/libvorbis/vorbisfile/exampleindex.html
-share/doc/libvorbis/vorbisfile/fileinfo.html
-share/doc/libvorbis/vorbisfile/index.html
-share/doc/libvorbis/vorbisfile/initialization.html
-share/doc/libvorbis/vorbisfile/ov_bitrate.html
-share/doc/libvorbis/vorbisfile/ov_bitrate_instant.html
-share/doc/libvorbis/vorbisfile/ov_callbacks.html
-share/doc/libvorbis/vorbisfile/ov_clear.html
-share/doc/libvorbis/vorbisfile/ov_comment.html
-share/doc/libvorbis/vorbisfile/ov_info.html
-share/doc/libvorbis/vorbisfile/ov_open.html
-share/doc/libvorbis/vorbisfile/ov_open_callbacks.html
-share/doc/libvorbis/vorbisfile/ov_pcm_seek.html
-share/doc/libvorbis/vorbisfile/ov_pcm_tell.html
-share/doc/libvorbis/vorbisfile/ov_pcm_total.html
-share/doc/libvorbis/vorbisfile/ov_raw_seek.html
-share/doc/libvorbis/vorbisfile/ov_raw_tell.html
-share/doc/libvorbis/vorbisfile/ov_raw_total.html
-share/doc/libvorbis/vorbisfile/ov_read.html
-share/doc/libvorbis/vorbisfile/ov_seekable.html
-share/doc/libvorbis/vorbisfile/ov_serialnumber.html
-share/doc/libvorbis/vorbisfile/ov_streams.html
-share/doc/libvorbis/vorbisfile/ov_time_seek.html
-share/doc/libvorbis/vorbisfile/ov_time_tell.html
-share/doc/libvorbis/vorbisfile/ov_time_total.html
-share/doc/libvorbis/vorbisfile/overview.html
-share/doc/libvorbis/vorbisfile/reference.html
-share/doc/libvorbis/vorbisfile/seekexample.html
-share/doc/libvorbis/vorbisfile/seeking.html
-share/doc/libvorbis/vorbisfile/seeking_test_c.html
-share/doc/libvorbis/vorbisfile/style.css
-share/doc/libvorbis/vorbisfile/seekingexample.html
-share/doc/libvorbis/vorbisfile/vorbis_comment.html
-share/doc/libvorbis/vorbisfile/vorbis_info.html
-share/doc/libvorbis/vorbisfile/vorbisfile_example_c.html
-share/doc/libvorbis/vorbisword2.png
-share/doc/libvorbis/wait.png
-share/doc/libvorbis/white-ogg.png
-share/doc/libvorbis/white-xifish.png
+%%PORTDOCS%%share/doc/libvorbis/programming.html
+%%PORTDOCS%%share/doc/libvorbis/v-comment.html
+%%PORTDOCS%%share/doc/libvorbis/vorbis-clip.txt
+%%PORTDOCS%%share/doc/libvorbis/vorbis-errors.txt
+%%PORTDOCS%%share/doc/libvorbis/vorbis.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisenc/index.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisenc/overview.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisenc/reference.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisenc/style.css
+%%PORTDOCS%%share/doc/libvorbis/vorbisenc/vorbis_encode_ctl.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisenc/vorbis_encode_init.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisenc/vorbis_info.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/OggVorbis_File.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/chaining_example_c.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/chainingexample.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/datastructures.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/decoding.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/example.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/exampleindex.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/fileinfo.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/index.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/initialization.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_bitrate.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_bitrate_instant.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_callbacks.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_clear.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_comment.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_info.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_open.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_open_callbacks.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_pcm_seek.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_pcm_tell.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_pcm_total.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_raw_seek.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_raw_tell.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_raw_total.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_read.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_seekable.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_serialnumber.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_streams.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_time_seek.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_time_tell.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_time_total.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/overview.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/reference.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seekexample.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seeking.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seeking_test_c.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/style.css
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seekingexample.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/vorbis_comment.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/vorbis_info.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisfile/vorbisfile_example_c.html
+%%PORTDOCS%%share/doc/libvorbis/vorbisword2.png
+%%PORTDOCS%%share/doc/libvorbis/wait.png
+%%PORTDOCS%%share/doc/libvorbis/white-ogg.png
+%%PORTDOCS%%share/doc/libvorbis/white-xifish.png
 @dirrm include/vorbis
-@dirrm share/doc/libvorbis/vorbisenc
-@dirrm share/doc/libvorbis/vorbisfile
-@dirrm share/doc/libvorbis
+%%PORTDOCS%%@dirrm share/doc/libvorbis/vorbisenc
+%%PORTDOCS%%@dirrm share/doc/libvorbis/vorbisfile
+%%PORTDOCS%%@dirrm share/doc/libvorbis
diff -uNr /usr/ports/audio/vorbis-tools/Makefile vorbis-tools/Makefile
--- /usr/ports/audio/vorbis-tools/Makefile	Sat Mar 24 01:41:30 2001
+++ vorbis-tools/Makefile	Tue Jul 17 13:15:59 2001
@@ -6,18 +6,16 @@
 #
 
 PORTNAME=	vorbis-tools
-PORTVERSION=	1.0b4
-PORTREVISION=	1
+PORTVERSION=	1.0.r1
 PORTEPOCH=	1
 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,9 @@
 		--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
 
 .include <bsd.port.mk>
diff -uNr /usr/ports/audio/vorbis-tools/distinfo vorbis-tools/distinfo
--- /usr/ports/audio/vorbis-tools/distinfo	Sun Mar  4 13:43:31 2001
+++ vorbis-tools/distinfo	Tue Jul 17 00:46:28 2001
@@ -1 +1 @@
-MD5 (vorbis-tools-1.0beta4.tar.gz) = 5222a18972276f0bf42256c221453d0e
+MD5 (vorbis-tools-1.0rc1.tar.gz) = 40f19902e7b31571615952c29fce8389
diff -uNr /usr/ports/audio/vorbis-tools/files/patch-aclocal.m4 vorbis-tools/files/patch-aclocal.m4
--- /usr/ports/audio/vorbis-tools/files/patch-aclocal.m4	Wed Mar 28 23:55:31 2001
+++ vorbis-tools/files/patch-aclocal.m4	Tue Jul 17 01:39:27 2001
@@ -1,16 +1,7 @@
-$FreeBSD: ports/audio/vorbis-tools/files/patch-aclocal.m4,v 1.1 2001/03/28 21:55:31 trevor Exp $
---- 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 @@
+$FreeBSD$
+--- 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 @@
  # 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 -uNr /usr/ports/audio/vorbis-tools/files/patch-ogg123_Makefile.am vorbis-tools/files/patch-ogg123_Makefile.am
--- /usr/ports/audio/vorbis-tools/files/patch-ogg123_Makefile.am	Wed Mar 28 23:55:31 2001
+++ vorbis-tools/files/patch-ogg123_Makefile.am	Tue Jul 17 03:23:18 2001
@@ -1,14 +1,15 @@
-$FreeBSD: ports/audio/vorbis-tools/files/patch-ogg123_Makefile.am,v 1.1 2001/03/28 21:55:31 trevor Exp $
---- ogg123/Makefile.am.orig	Mon Feb 19 23:27:52 2001
-+++ ogg123/Makefile.am	Wed Mar 21 16:04:07 2001
+$FreeBSD$
+--- 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 -uNr /usr/ports/audio/vorbis-tools/files/patch-ogg123_Makefile.in vorbis-tools/files/patch-ogg123_Makefile.in
--- /usr/ports/audio/vorbis-tools/files/patch-ogg123_Makefile.in	Wed Mar 28 23:55:31 2001
+++ vorbis-tools/files/patch-ogg123_Makefile.in	Tue Jul 17 03:24:39 2001
@@ -1,15 +1,23 @@
-$FreeBSD: ports/audio/vorbis-tools/files/patch-ogg123_Makefile.in,v 1.1 2001/03/28 21:55:31 trevor Exp $
---- 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 @@
+$FreeBSD$
+--- 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 -uNr /usr/ports/audio/vorbis-tools/files/patch-ogg123_buffer.c vorbis-tools/files/patch-ogg123_buffer.c
--- /usr/ports/audio/vorbis-tools/files/patch-ogg123_buffer.c	Tue Apr 10 01:26:47 2001
+++ vorbis-tools/files/patch-ogg123_buffer.c	Tue Jul 17 01:37:12 2001
@@ -1,7 +1,7 @@
-$FreeBSD: ports/audio/vorbis-tools/files/patch-ogg123_buffer.c,v 1.1 2001/04/09 23:26:47 trevor Exp $
---- 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 @@
+$FreeBSD$
+--- 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 @@
 +#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 @@
  #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 @@
    /* 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 -uNr /usr/ports/audio/vorbis-tools/files/patch-ogg123_ogg123.1 vorbis-tools/files/patch-ogg123_ogg123.1
--- /usr/ports/audio/vorbis-tools/files/patch-ogg123_ogg123.1	Thu Jan  1 01:00:00 1970
+++ vorbis-tools/files/patch-ogg123_ogg123.1	Tue Jul 17 01:31:19 2001
@@ -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 -uNr /usr/ports/audio/vorbis-tools/files/patch-ogg123_ogg123.c vorbis-tools/files/patch-ogg123_ogg123.c
--- /usr/ports/audio/vorbis-tools/files/patch-ogg123_ogg123.c	Wed Mar 28 23:55:31 2001
+++ vorbis-tools/files/patch-ogg123_ogg123.c	Tue Jul 17 01:44:14 2001
@@ -1,6 +1,6 @@
-$FreeBSD: ports/audio/vorbis-tools/files/patch-ogg123_ogg123.c,v 1.1 2001/03/28 21:55:31 trevor Exp $
---- ogg123/ogg123.c.orig	Sat Feb 24 01:52:22 2001
-+++ ogg123/ogg123.c	Wed Mar 21 15:30:42 2001
+$FreeBSD$
+--- 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 @@
  #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 -uNr /usr/ports/audio/vorbis-tools/files/patch-ogginfo_Makefile.am vorbis-tools/files/patch-ogginfo_Makefile.am
--- /usr/ports/audio/vorbis-tools/files/patch-ogginfo_Makefile.am	Thu Jan  1 01:00:00 1970
+++ vorbis-tools/files/patch-ogginfo_Makefile.am	Tue Jul 17 01:24:47 2001
@@ -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 -uNr /usr/ports/audio/vorbis-tools/files/patch-ogginfo_Makefile.in vorbis-tools/files/patch-ogginfo_Makefile.in
--- /usr/ports/audio/vorbis-tools/files/patch-ogginfo_Makefile.in	Thu Jan  1 01:00:00 1970
+++ vorbis-tools/files/patch-ogginfo_Makefile.in	Tue Jul 17 01:24:56 2001
@@ -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 -uNr /usr/ports/audio/vorbis-tools/pkg-plist vorbis-tools/pkg-plist
--- /usr/ports/audio/vorbis-tools/pkg-plist	Thu Mar 29 03:37:39 2001
+++ vorbis-tools/pkg-plist	Tue Jul 17 03:24:48 2001
@@ -1,6 +1,7 @@
 @comment $FreeBSD: ports/audio/vorbis-tools/pkg-plist,v 1.3 2001/03/28 21:55:30 trevor Exp $
 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
diff -uNr /usr/ports/audio/vorbis/Makefile vorbis/Makefile
--- /usr/ports/audio/vorbis/Makefile	Sat Mar 24 14:19:44 2001
+++ vorbis/Makefile	Tue Jul 17 13:16:07 2001
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vorbis
-PORTVERSION=	1.0b4
+PORTVERSION=	1.0.r1
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	# empty
@@ -16,7 +16,7 @@
 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
 RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
 
@@ -26,7 +26,7 @@
 SUBPORTS=	libao libogg libvorbis vorbis-tools
 
 pre-install:
-		${ECHO} "@comment intentionally left empty" > ${PLIST}
+		@${ECHO} "@comment intentionally left empty" > ${PLIST}
 
 do-install:	# empty
 
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107171128.f6HBS2t33884>