diff options
| author | marino <marino> | 2011-12-11 20:51:48 +0000 |
|---|---|---|
| committer | marino <marino> | 2011-12-11 20:51:48 +0000 |
| commit | bbb15d2036647218fb207f613f0f9b2ed5b8eaad (patch) | |
| tree | 225d20b1d7d5b1531de0ccb4afddab0c54bae552 /games/hex-a-hop | |
| parent | 425592a7ee6f08613a2e22d507de7d77331377b2 (diff) | |
| download | pkgsrc-bbb15d2036647218fb207f613f0f9b2ed5b8eaad.tar.gz | |
games/hex-a-hop: Fix iconv NetBSDism so DragonFly can build
I would wager that more platforms than just DragonFly need the original
unpatched code for this to build. I would like to have the patch conditional
on __NetBSD__, but because it's been patched like this so long, I'm leaving
the NetBSDism as the default and the original code switched on with
__DragonFly__. Other platforms will have to tag on as they get identified.
Diffstat (limited to 'games/hex-a-hop')
| -rw-r--r-- | games/hex-a-hop/distinfo | 4 | ||||
| -rw-r--r-- | games/hex-a-hop/patches/patch-aa | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/games/hex-a-hop/distinfo b/games/hex-a-hop/distinfo index 0dcdba27cdd..b6aeb7c9a38 100644 --- a/games/hex-a-hop/distinfo +++ b/games/hex-a-hop/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/03/01 11:15:47 wiz Exp $ +$NetBSD: distinfo,v 1.2 2011/12/11 20:51:48 marino Exp $ SHA1 (hex-a-hop-1.1.0.tar.gz) = 5e1994caaa4974ba87bb5676aed1e44c81dec85d RMD160 (hex-a-hop-1.1.0.tar.gz) = af89e8da428d8b79e71a77b9750a10b1b303b9e4 Size (hex-a-hop-1.1.0.tar.gz) = 9249269 bytes -SHA1 (patch-aa) = 6282509134e3b3057a60f972ead66f8e010c74bf +SHA1 (patch-aa) = e5701d1a80e85ff947894e430c2a0b876192065b SHA1 (patch-ab) = ad560c67520e3be4eba657c60713e25e4c24f2a6 diff --git a/games/hex-a-hop/patches/patch-aa b/games/hex-a-hop/patches/patch-aa index eedfdac2ee8..6dc70ac9b06 100644 --- a/games/hex-a-hop/patches/patch-aa +++ b/games/hex-a-hop/patches/patch-aa @@ -1,13 +1,16 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/03/01 11:15:47 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2011/12/11 20:51:48 marino Exp $ --- src/text.cpp.orig 2009-10-02 22:26:15.000000000 +0000 +++ src/text.cpp -@@ -441,7 +441,7 @@ void ConvertToUTF8(const std::string &te +@@ -441,7 +441,11 @@ void ConvertToUTF8(const std::string &te iconv_t cd = iconv_open("UTF-8", locale_enc); char *in_buf = const_cast<char *>(&text_locally_encoded[0]); char *out_buf = &text_utf8[0]; -- iconv(cd, &in_buf, &text_length, &out_buf, &text_utf8_length); ++#if defined(__DragonFly__) + iconv(cd, &in_buf, &text_length, &out_buf, &text_utf8_length); ++#else + iconv(cd, (const char **)&in_buf, &text_length, &out_buf, &text_utf8_length); ++#endif iconv_close(cd); if (errno != 0) std::cerr << "An error occurred recoding " << text_locally_encoded << " to UTF8" << std::endl; |