diff options
| author | drochner <drochner> | 2008-03-02 13:13:48 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2008-03-02 13:13:48 +0000 |
| commit | a6ad257368f6659fc73a1745643aae1f4d872a89 (patch) | |
| tree | 5ac4b7b728372b27984062542b58308d20b3b5d1 | |
| parent | 91cd79fedb62bf64b2de75f52ef32b92de7d4a28 (diff) | |
| download | pkgsrc-a6ad257368f6659fc73a1745643aae1f4d872a89.tar.gz | |
NetBSD's iconv(3) doesn't understand "UCS4", so use "UCS-4",
should fix copy-and-paste, reported by Andreas Burghardt in PR pkg/38133,
bump PKGREVISION
| -rw-r--r-- | editors/abiword/Makefile | 4 | ||||
| -rw-r--r-- | editors/abiword/distinfo | 4 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-ab | 15 |
3 files changed, 18 insertions, 5 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 7a4da7087ce..218db899d0d 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.114 2008/01/18 05:06:31 tnn Exp $ +# $NetBSD: Makefile,v 1.115 2008/03/02 13:13:48 drochner Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "Makefile.common" -PKGREVISION= 5 +PKGREVISION= 6 COMMENT= Open Source cross-platform word processor diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index 6f1c581333c..75712b0f4f0 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.57 2007/11/29 02:49:11 rillig Exp $ +$NetBSD: distinfo,v 1.58 2008/03/02 13:13:48 drochner Exp $ SHA1 (abiword-2.4.6.tar.bz2) = 3011d221d09336f09f4bb0732add3405961a8623 RMD160 (abiword-2.4.6.tar.bz2) = ca56800d811b3aca0af6b2fb6cd70cbea29ab792 Size (abiword-2.4.6.tar.bz2) = 24994889 bytes SHA1 (patch-aa) = b305b8a5dcf16c76e4bc858b6b484592b68aaca1 -SHA1 (patch-ab) = 94191b278b6c5d0a37231efde9dc11097d6c1590 +SHA1 (patch-ab) = 45f222f9c2918379d7190b1c8b523966285fb3a5 SHA1 (patch-ac) = 8fe244939c96a322a4db61463b8f66af0fc61e35 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5 SHA1 (patch-af) = d3fe1c03fe80648afb729b3dbc4721c413220a0d diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab index 3bca3ce2ac0..5fc639247c8 100644 --- a/editors/abiword/patches/patch-ab +++ b/editors/abiword/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.14 2006/01/17 08:07:38 adam Exp $ +$NetBSD: patch-ab,v 1.15 2008/03/02 13:13:48 drochner Exp $ --- src/af/util/xp/ut_iconv.cpp.orig 2005-10-08 12:53:33.000000000 +0200 +++ src/af/util/xp/ut_iconv.cpp @@ -12,3 +12,16 @@ $NetBSD: patch-ab,v 1.14 2006/01/17 08:07:38 adam Exp $ #define ICONV_CONST const #else +@@ -290,9 +291,11 @@ const char * ucs4Internal () + #elif defined(_LIBICONV_H) + // libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE + return "UCS-4-INTERNAL"; +-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#elif defined(__FreeBSD__) || defined(__OpenBSD__) + // we special case the BSDs since spelling just doesn't work + return "UCS4"; ++#elif defined(__NetBSD__) ++ return "UCS-4"; + #else + // general case, found by hub and dom + if (s_ucs4_internal == 0) |