From 6de7cd0f8c7f2e9c976e5cd43cbb2bbadec8f5d7 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Wed, 7 Dec 2005 16:45:47 +0000
Subject: Add DragonFly support. The libiconv conditional is nasty -- libiconv
 adopts the iconv interface of the underlaying OS and DragonFly follows SUS
 there.

---
 editors/abiword/distinfo         |  5 +++--
 editors/abiword/patches/patch-ab |  4 ++--
 editors/abiword/patches/patch-ac | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 editors/abiword/patches/patch-ac

diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index f10587f063b..9f39a4cab8e 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.46 2005/10/17 08:33:57 adam Exp $
+$NetBSD: distinfo,v 1.47 2005/12/07 16:45:47 joerg Exp $
 
 SHA1 (abiword-2.4.1.tar.bz2) = 825b0598bb14a4fb8e8580f780b38be3d159d434
 RMD160 (abiword-2.4.1.tar.bz2) = e2405283da61696fa966775d46a241bdeea6c668
 Size (abiword-2.4.1.tar.bz2) = 24630989 bytes
 SHA1 (patch-aa) = feed8a9f506279fd1873210ab967abd487eff85d
-SHA1 (patch-ab) = 61e52dd0597568a4e66f646cc1f35084c2326298
+SHA1 (patch-ab) = ffe111a9e13b70d273fa52981353114eaf25a0d4
+SHA1 (patch-ac) = 4ab819ee5465a89607d4882f7cf00e8b4daf1f3b
 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5
 SHA1 (patch-ae) = 5eab37824f36bfd21238d5cd11507062ac8dccdb
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab
index 90de7ff9add..a1c19884a0e 100644
--- a/editors/abiword/patches/patch-ab
+++ b/editors/abiword/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.12 2005/10/04 09:55:06 adam Exp $
+$NetBSD: patch-ab,v 1.13 2005/12/07 16:45:47 joerg Exp $
 
 --- src/af/util/xp/ut_iconv.cpp.orig	2005-07-08 16:22:11.000000000 +0000
 +++ src/af/util/xp/ut_iconv.cpp
@@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.12 2005/10/04 09:55:06 adam Exp $
  defined (__AIX__) || \
 -(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
 +(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) || \
-+defined(__NetBSD__) || (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x0109)
++defined(__NetBSD__) || (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x0109 && !defined(__DragonFly__))
  
  #define ICONV_CONST const
  #else
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
new file mode 100644
index 00000000000..0aecbd21553
--- /dev/null
+++ b/editors/abiword/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.15 2005/12/07 16:45:47 joerg Exp $
+
+--- src/af/util/xp/ut_endian.h.orig	2005-12-06 22:03:57.000000000 +0000
++++ src/af/util/xp/ut_endian.h
+@@ -47,6 +47,13 @@
+ 	#else
+ 		#define UT_BIG_ENDIAN
+ 	#endif
++#elif defined(__DragonFly__)
++	#include <sys/endian.h>
++	#if _BYTE_ORDER == _LITTLE_ENDIAN		
++		#define UT_LITTLE_ENDIAN
++	#else
++		#define UT_BIG_ENDIAN
++	#endif
+ #elif defined(__sgi)
+ 	#include <sys/endian.h>
+ 	#if BYTE_ORDER == LITTLE_ENDIAN
-- 
cgit v1.2.3