diff options
| author | marino <marino@pkgsrc.org> | 2012-07-13 08:15:59 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-07-13 08:15:59 +0000 |
| commit | f7f5433490d50a2b1cf61105d5fc0fbdea9c45f7 (patch) | |
| tree | 128368df8e48d7cec416815a0b3ef73ee6e64cbe | |
| parent | c069d7155a96923fe86ebbc33cb4cebe61118576 (diff) | |
| download | pkgsrc-f7f5433490d50a2b1cf61105d5fc0fbdea9c45f7.tar.gz | |
news/pan: break caused by NetBSD iconv patch
There have been several packages with patches that directly change an
iconv function without the use of a __NetBSD__ macro. This is a NetBSD-
specific modification and changing iconv to match the NetBSD prototype
breaks the package on other platforms.
| -rw-r--r-- | news/pan/distinfo | 4 | ||||
| -rw-r--r-- | news/pan/patches/patch-pan_usenet-utils_mime-utils.cc | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/news/pan/distinfo b/news/pan/distinfo index cf3f87f83dc..7cfe79036ee 100644 --- a/news/pan/distinfo +++ b/news/pan/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.23 2012/07/12 21:11:06 wiz Exp $ +$NetBSD: distinfo,v 1.24 2012/07/13 08:15:59 marino Exp $ SHA1 (pan-0.139.tar.bz2) = 01ea0361a6d81489888e6abb075fd552999c3c60 RMD160 (pan-0.139.tar.bz2) = e0e2963b2d11b362201639ca755ad9ae43581c2f Size (pan-0.139.tar.bz2) = 1523907 bytes -SHA1 (patch-pan_usenet-utils_mime-utils.cc) = 3e807f25924907744fcffc6a857d9b8f55449243 +SHA1 (patch-pan_usenet-utils_mime-utils.cc) = fb3703e8e5ddd24b337b583e3f4348358a0098f5 diff --git a/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc b/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc index 9bd903bc0e8..b6a17f7fb28 100644 --- a/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc +++ b/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc @@ -1,15 +1,18 @@ -$NetBSD: patch-pan_usenet-utils_mime-utils.cc,v 1.1 2012/04/09 23:00:49 wiz Exp $ +$NetBSD: patch-pan_usenet-utils_mime-utils.cc,v 1.2 2012/07/13 08:16:00 marino Exp $ Fix build with NetBSD's iconv(). ---- pan/usenet-utils/mime-utils.cc.orig 2012-04-08 15:30:36.000000000 +0000 +--- pan/usenet-utils/mime-utils.cc.orig 2012-06-29 22:24:54.000000000 +0000 +++ pan/usenet-utils/mime-utils.cc -@@ -77,7 +77,7 @@ namespace pan +@@ -77,7 +77,11 @@ namespace pan outbuf = out + converted; outleft = outlen - converted; -- converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft); ++#if defined(__NetBSD__) + converted = iconv (cd, (const char **) &inbuf, &inleft, &outbuf, &outleft); ++#else + converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft); ++#endif if (converted != (size_t) -1 && errno == 0) { /* |