aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/vorbis-tools/Makefile2
-rw-r--r--audio/vorbis-tools/files/patch-share::iconvert.c29
2 files changed, 30 insertions, 1 deletions
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 35428c0f959f..040b291a6d48 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vorbis-tools
PORTVERSION= 1.0.r3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= audio
MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/ \
diff --git a/audio/vorbis-tools/files/patch-share::iconvert.c b/audio/vorbis-tools/files/patch-share::iconvert.c
new file mode 100644
index 000000000000..407ea9d47a91
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-share::iconvert.c
@@ -0,0 +1,29 @@
+
+$FreeBSD$
+
+--- share/iconvert.c.orig Wed Dec 19 03:57:31 2001
++++ share/iconvert.c Thu Feb 14 16:52:41 2002
+@@ -105,10 +105,12 @@
+ obl = utflen;
+ for (;;) {
+ k = iconv(cd1, &ib, &ibl, &ob, &obl);
++#if 0 /* mistaken assumptions */
+ assert((!k && !ibl) ||
+ (k == (size_t)(-1) && errno == E2BIG && ibl && obl < 6) ||
+ (k == (size_t)(-1) &&
+ (errno == EILSEQ || errno == EINVAL) && ibl));
++#endif
+ if (!ibl)
+ break;
+ if (obl < 6) {
+@@ -216,8 +218,10 @@
+ }
+ }
+ k = iconv(cd2, 0, 0, &ob, &obl);
++#if 0
+ assert(!k);
+ assert(!obl);
++#endif
+ *ob = '\0';
+
+ free(utfbuf);