6 files changed, 58 insertions, 32 deletions

diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 48d0609779eb..0019478291ae 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vorbis-tools
-PORTVERSION=	1.2.0
-PORTREVISION=	7
+PORTVERSION=	1.4.0
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
@@ -15,22 +14,29 @@ MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Play, encode, and manage Ogg Vorbis files
 
-LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
+LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao \
 		curl.6:${PORTSDIR}/ftp/curl \
 		FLAC.10:${PORTSDIR}/audio/flac \
+		kate.3:${PORTSDIR}/multimedia/libkate \
 		speex.1:${PORTSDIR}/audio/speex \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 
-USE_GETTEXT=	yes
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-vcut
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKE_JOBS_SAFE=	yes
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=    yes
+PLIST_SUB+=     NLS=""
+.else
+USE_ICONV=	yes
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=     NLS="@comment "
+.endif
+
 MAN1=		ogg123.1 oggdec.1 oggenc.1 ogginfo.1 vcut.1 vorbiscomment.1
 
 post-install:
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index a89c6d0afcea..a6a70790f453 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (vorbis-tools-1.2.0.tar.gz) = df976d24e51ef3d87cd462edf747bf9a
-SHA256 (vorbis-tools-1.2.0.tar.gz) = dbe753ce0ae0797f25117720bb2ba0d848388d3f47af8db31ebc35552c3de07b
-SIZE (vorbis-tools-1.2.0.tar.gz) = 1076814
+MD5 (vorbis-tools-1.4.0.tar.gz) = 567e0fb8d321b2cd7124f8208b8b90e6
+SHA256 (vorbis-tools-1.4.0.tar.gz) = a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc
+SIZE (vorbis-tools-1.4.0.tar.gz) = 1346532
diff --git a/audio/vorbis-tools/files/patch-ogg123_speex_format.c b/audio/vorbis-tools/files/patch-ogg123_speex_format.c
deleted file mode 100644
index db3ac5de45c5..000000000000
--- a/audio/vorbis-tools/files/patch-ogg123_speex_format.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ogg123/speex_format.c.orig	2008-05-11 17:57:48.000000000 +0200
-+++ ogg123/speex_format.c	2008-05-11 17:58:19.000000000 +0200
-@@ -475,7 +475,7 @@ void *process_header(ogg_packet *op, int
-            cb->printf_error(callback_arg, ERROR, _("Cannot read header"));
-      return NULL;
-    }
--   if ((*header)->mode >= SPEEX_NB_MODES) {
-+   if ((*header)->mode >= SPEEX_NB_MODES || (*header)->mode < 0) {
-      cb->printf_error(callback_arg, ERROR, 
- 		      _("Mode number %d does not (any longer) exist in this version"),
- 	      (*header)->mode);
diff --git a/audio/vorbis-tools/files/patch-ogg123_vorbis_comments.c b/audio/vorbis-tools/files/patch-ogg123_vorbis_comments.c
new file mode 100644
index 000000000000..2a57c64d013f
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-ogg123_vorbis_comments.c
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- ogg123/vorbis_comments.c.orig	2010-06-05 16:48:23.000000000 +0200
++++ ogg123/vorbis_comments.c	2010-06-05 16:55:21.000000000 +0200
+@@ -72,7 +72,7 @@ char *lookup_comment_prettyprint (char *
+ 
+   /* Use default formatting */
+   j = strcspn(comment, "=");
+-  if (j) {
++  if (j != strlen(comment)) {
+     *offset = j + 1;
+     s = malloc(j + 2);
+     if (s == NULL) {
diff --git a/audio/vorbis-tools/files/patch-oggenc_lyrics.c b/audio/vorbis-tools/files/patch-oggenc_lyrics.c
new file mode 100644
index 000000000000..a496678c03fc
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-oggenc_lyrics.c
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- oggenc/lyrics.c.orig	2010-06-05 17:00:07.000000000 +0200
++++ oggenc/lyrics.c	2010-06-05 17:00:17.000000000 +0200
+@@ -16,7 +16,7 @@
+ #endif
+ 
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+ 
diff --git a/audio/vorbis-tools/pkg-plist b/audio/vorbis-tools/pkg-plist
index 333f425b53dc..7eeadc084fb3 100644
--- a/audio/vorbis-tools/pkg-plist
+++ b/audio/vorbis-tools/pkg-plist
@@ -6,16 +6,23 @@ 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
-share/locale/uk/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/be/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/da/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/es/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/vorbis-tools.mo
+%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en_GB
 @dirrm share/examples/vorbis-tools