diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2005-07-11 11:29:42 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2005-07-11 11:29:42 +0000 |
| commit | cfa51ce34c2bb94535cac73a04dfc3e4c14f85ed (patch) | |
| tree | 014d58aefeff59a71645785361d2c71154b48c24 /audio | |
| parent | f9d49e113c38e06ee4b2f129cb418aa9949e3445 (diff) | |
| download | ports-cfa51ce34c2bb94535cac73a04dfc3e4c14f85ed.tar.gz ports-cfa51ce34c2bb94535cac73a04dfc3e4c14f85ed.zip | |
Fix build on 4.x.
Noticed by: pointyhat via kris and Ingmar Gebert <ingmar dot gebert At uni-rostock dot de> (ports/83227)
Notes
Notes:
svn path=/head/; revision=138905
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/wavpack/Makefile | 5 | ||||
| -rw-r--r-- | audio/wavpack/files/patch-utils.c | 19 |
2 files changed, 24 insertions, 0 deletions
diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile index e7b8301555f2..b0e4658e3237 100644 --- a/audio/wavpack/Makefile +++ b/audio/wavpack/Makefile @@ -22,9 +22,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes +FILES= wavpack.h unpack3.c words.c md5.c post-patch: @${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile.in +.for i in ${FILES} + @cd ${WRKSRC} && cp ${i} ${i}.orig && \ + col < ${i}.orig > ${i} +.endfor .include <bsd.port.mk> diff --git a/audio/wavpack/files/patch-utils.c b/audio/wavpack/files/patch-utils.c new file mode 100644 index 000000000000..3eae9bbed400 --- /dev/null +++ b/audio/wavpack/files/patch-utils.c @@ -0,0 +1,19 @@ +--- utils.c.orig Sun Mar 20 08:16:38 2005 ++++ utils.c Mon Jul 11 13:25:37 2005 +@@ -613,6 +613,7 @@ + MultiByteToWideChar (CP_ACP, 0, string, -1, temp, max_chars + 1);
+ WideCharToUTF8 (temp, (uchar *) string, len);
+ #else
++ iconv_t converter; + char *temp = malloc (len);
+ // memset(temp, 0, len);
+ char *outp = temp;
+@@ -624,7 +625,7 @@ +
+ memset(temp, 0, len);
+ old_locale = setlocale (LC_CTYPE, "");
+- iconv_t converter = iconv_open ("UTF-8", "");
++ converter = iconv_open ("UTF-8", "");
+ err = iconv (converter, &inp, &insize, &outp, &outsize);
+ iconv_close (converter);
+ setlocale (LC_CTYPE, old_locale);
|