Update to Ogg Vorbis 1.0.1.

Major user-visible change: vorbis-tools now integrates some support for
flac and speex files.

9 files changed, 46 insertions, 58 deletions

diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 132368ec40cc..f5497fe47dce 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	vorbis-tools
-PORTVERSION=	1.0
-PORTREVISION=	4
+PORTVERSION=	1.0.1
 PORTEPOCH=	3
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/1.0/unix/ \
-		ftp://ftp.wiles.org/pub/mirrors/Vorbis/unix/ \
-		http://www.casterclub.com/vorbis/unix/ \
-		http://www.math.utoledo.edu/~chaese/Vorbis/unix/
+MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Play, encode, and manage Ogg Vorbis files
 
 LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		curl.2:${PORTSDIR}/ftp/curl \
+		FLAC.5:${PORTSDIR}/audio/flac \
 		intl.5:${PORTSDIR}/devel/gettext \
-		vorbis.2:${PORTSDIR}/audio/libvorbis
+		speex.2:${PORTSDIR}/audio/speex \
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index 823144c91a14..d4dc03cce779 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1 +1 @@
-MD5 (vorbis-tools-1.0.tar.gz) = c0a9fee54835e9c5b32d1f42c02964c9
+MD5 (vorbis-tools-1.0.1.tar.gz) = 80d3ae3bbae2a488d433d86b8fd64777
diff --git a/audio/vorbis-tools/files/patch-ogg123_Makefile.in b/audio/vorbis-tools/files/patch-ogg123_Makefile.in
index d967db0ebb44..a0dfdffa6092 100644
--- a/audio/vorbis-tools/files/patch-ogg123_Makefile.in
+++ b/audio/vorbis-tools/files/patch-ogg123_Makefile.in
@@ -1,14 +1,23 @@
 
 $FreeBSD$
 
---- ogg123/Makefile.in.orig	Tue Aug 14 19:42:20 2001
-+++ ogg123/Makefile.in	Tue Aug 14 19:42:31 2001
-@@ -323,7 +323,7 @@
- install-exec-am: install-binPROGRAMS
- install-exec: install-exec-am
+--- ogg123/Makefile.in.orig	Mon Nov 17 17:50:56 2003
++++ ogg123/Makefile.in	Sun Dec 14 00:27:38 2003
+@@ -135,7 +135,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ localedir = $(datadir)/locale
+-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
++DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ 
+ docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ 
+@@ -486,7 +486,7 @@
  
--install-data-am: install-man install-docDATA
+ info-am:
+ 
+-install-data-am: install-docDATA install-man
 +install-data-am: install-man
- install-data: install-data-am
  
- install-am: all-am
+ install-exec-am: install-binPROGRAMS
+ 
diff --git a/audio/vorbis-tools/files/patch-ogg123_cfgfile__options.c b/audio/vorbis-tools/files/patch-ogg123_cfgfile__options.c
new file mode 100644
index 000000000000..8f022ebd1fd4
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-ogg123_cfgfile__options.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ogg123/cfgfile_options.c.orig	Sun Dec 14 00:26:21 2003
++++ ogg123/cfgfile_options.c	Sun Dec 14 00:26:41 2003
+@@ -441,7 +441,7 @@
+   char filename[FILENAME_MAX];
+   char *homedir = getenv("HOME");
+ 
+-  parse_config_file(opts, "/etc/ogg123rc");
++  parse_config_file(opts, SYSCONFDIR "/ogg123rc");
+   if (homedir && strlen(homedir) < FILENAME_MAX - 10) {
+     /* Try ~/.ogg123 */
+     strncpy(filename, homedir, FILENAME_MAX);
diff --git a/audio/vorbis-tools/files/patch-oggdec_oggdec.c b/audio/vorbis-tools/files/patch-oggdec_oggdec.c
deleted file mode 100644
index 23b33b97defa..000000000000
--- a/audio/vorbis-tools/files/patch-oggdec_oggdec.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- oggdec/oggdec.c.orig	Mon Sep 23 13:20:52 2002
-+++ oggdec/oggdec.c	Mon Sep 23 13:21:04 2002
-@@ -99,6 +99,7 @@
-                 break;
-             case 'o':
-                 outfilename = strdup(optarg);
-+                break;
-             case 'R':
-                 raw = atoi(optarg);
-                 break;
diff --git a/audio/vorbis-tools/files/patch-ogginfo_ogginfo2.c b/audio/vorbis-tools/files/patch-ogginfo_ogginfo2.c
deleted file mode 100644
index a425ae9b6471..000000000000
--- a/audio/vorbis-tools/files/patch-ogginfo_ogginfo2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ogginfo/ogginfo2.c.orig	Tue Jun 17 01:19:29 2003
-+++ ogginfo/ogginfo2.c	Tue Jun 17 01:20:35 2003
-@@ -27,7 +27,7 @@
- #ifdef _WIN32
- #define INT64FORMAT "%I64d"
- #else
--#define INT64FORMAT "%Ld"
-+#define INT64FORMAT "%lld"
- #endif
- 
- struct vorbis_release {
diff --git a/audio/vorbis-tools/files/patch-vcut_vcut.c b/audio/vorbis-tools/files/patch-vcut_vcut.c
deleted file mode 100644
index 422ce50ee10a..000000000000
--- a/audio/vorbis-tools/files/patch-vcut_vcut.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- vcut/vcut.c.orig	Tue Jun 17 01:19:13 2003
-+++ vcut/vcut.c	Tue Jun 17 01:20:27 2003
-@@ -26,7 +26,7 @@
- #ifdef _WIN32
- #define FORMAT_INT64 "%I64d"
- #else
--#define FORMAT_INT64 "%Ld"
-+#define FORMAT_INT64 "%lld"
- #endif
- 
- static vcut_packet *save_packet(ogg_packet *packet)
diff --git a/audio/vorbis-tools/pkg-descr b/audio/vorbis-tools/pkg-descr
index 9c856b6f1b17..ef2dd7d8d1cf 100644
--- a/audio/vorbis-tools/pkg-descr
+++ b/audio/vorbis-tools/pkg-descr
@@ -10,4 +10,4 @@ patent concerns.
 This package contains utilities to encode, decode, and cut vorbis
 streams, and to add comments to them.
 
-WWW: http://www.vorbis.com/
+WWW: http://www.xiph.org/ogg/vorbis/
diff --git a/audio/vorbis-tools/pkg-plist b/audio/vorbis-tools/pkg-plist
index 85a5e126d508..033334cf9317 100644
--- a/audio/vorbis-tools/pkg-plist
+++ b/audio/vorbis-tools/pkg-plist
@@ -6,7 +6,15 @@ bin/ogginfo
 bin/vcut
 bin/vorbiscomment
 share/examples/vorbis-tools/ogg123rc
+share/locale/be/LC_MESSAGES/vorbis-tools.mo
+share/locale/cs/LC_MESSAGES/vorbis-tools.mo
+share/locale/da/LC_MESSAGES/vorbis-tools.mo
+share/locale/es/LC_MESSAGES/vorbis-tools.mo
 share/locale/fr/LC_MESSAGES/vorbis-tools.mo
+share/locale/hr/LC_MESSAGES/vorbis-tools.mo
+share/locale/hu/LC_MESSAGES/vorbis-tools.mo
 share/locale/nl/LC_MESSAGES/vorbis-tools.mo
+share/locale/ro/LC_MESSAGES/vorbis-tools.mo
+share/locale/ru/LC_MESSAGES/vorbis-tools.mo
 share/locale/sv/LC_MESSAGES/vorbis-tools.mo
 @dirrm share/examples/vorbis-tools