Update abiword to 0.7.14. There were a large number of changes from version

0.7.10, both in bugfixes and in feature additions.  No list of changes is
provided, but from gleaning the CVS logs, this is update is a large step
forward for this application.

10 files changed, 112 insertions, 81 deletions

diff --git a/editors/abiword/patches/patch-aa b/editors/abiword/patches/patch-aa
index 35df96fe066..3173ed2261b 100644
--- a/editors/abiword/patches/patch-aa
+++ b/editors/abiword/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2000/02/29 18:31:30 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/05/24 04:28:19 jlam Exp $
 
---- Makefile.orig	Sat Dec 11 01:23:53 1999
-+++ Makefile	Tue Feb 29 12:05:03 2000
+--- Makefile.orig	Mon Mar  5 10:59:38 2001
++++ Makefile
 @@ -20,7 +20,7 @@
  ## 02111-1307, USA.
  
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab
index b1fed849819..1bceaf9ca8d 100644
--- a/editors/abiword/patches/patch-ab
+++ b/editors/abiword/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2000/02/29 18:31:30 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2001/05/24 04:28:20 jlam Exp $
 
---- src/Makefile.orig	Fri Jul  9 15:13:56 1999
-+++ src/Makefile	Tue Feb 29 12:05:03 2000
-@@ -121,7 +121,7 @@
+--- src/Makefile.orig	Mon Mar 19 20:18:57 2001
++++ src/Makefile
+@@ -132,7 +132,7 @@
  endif
  
  # The generic target
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
index c16e27b5a2a..b52cd1d5062 100644
--- a/editors/abiword/patches/patch-ac
+++ b/editors/abiword/patches/patch-ac
@@ -1,13 +1,18 @@
-$NetBSD: patch-ac,v 1.4 2000/05/02 23:35:56 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2001/05/24 04:28:20 jlam Exp $
 
---- src/config/abi_defs.mk.orig	Mon Mar 13 17:48:16 2000
-+++ src/config/abi_defs.mk	Tue May  2 18:12:28 2000
-@@ -325,7 +325,7 @@
- ##			a date stamp in a nightly build system).
- ##
- 
--ABI_BUILD_VERSION	= unnumbered
-+ABI_BUILD_VERSION	?= unnumbered
- ABI_BUILD_ID		=
- 
- ##################################################################
+--- src/af/util/xp/ut_endian.h.orig	Sat Feb 24 03:49:29 2001
++++ src/af/util/xp/ut_endian.h
+@@ -28,6 +28,13 @@
+ 	#else
+ 		#define UT_BIG_ENDIAN
+ 	#endif
++#elif defined(__NetBSD__)
++	#include <machine/endian.h>
++	#if BYTE_ORDER == LITTLE_ENDIAN		
++		#define UT_LITTLE_ENDIAN
++	#elif BYTE_ORDER == BIG_ENDIAN
++		#define UT_BIG_ENDIAN
++	#endif
+ #else /* this is for Linux */
+ 	#include <endian.h>
+ 	#if __BYTE_ORDER == __LITTLE_ENDIAN		
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad
index ff07847e9cf..e3be685910d 100644
--- a/editors/abiword/patches/patch-ad
+++ b/editors/abiword/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.5 2000/05/02 23:35:56 jlam Exp $
+$NetBSD: patch-ad,v 1.6 2001/05/24 04:28:20 jlam Exp $
 
---- src/config/platforms/netbsd.mk.orig	Tue Feb 29 16:37:56 2000
-+++ src/config/platforms/netbsd.mk	Tue May  2 18:14:13 2000
-@@ -85,7 +85,7 @@
- # Which links can this platform create.  Define one or
- # both of these options.
- UNIX_CAN_BUILD_DYNAMIC=1
--UNIX_CAN_BUILD_STATIC=1
-+UNIX_CAN_BUILD_STATIC=0
+--- src/config/require/unix/Makefile.orig	Tue Oct 31 21:23:23 2000
++++ src/config/require/unix/Makefile
+@@ -180,7 +180,7 @@
+ 		fi								
  
- ##################################################################
- ## Here you can choice if you want to use the gnome stuff.
+ else
+-	@if [ ! -r /usr/include/iconv.h -a ! -r /usr/local/include/iconv.h ]; then	\
++	@if [ ! -r /usr/include/iconv.h -a ! -r /usr/local/include/iconv.h -a ! -r ${LOCALBASE}/include/iconv.h ]; then	\
+ 		if [ -d $(ABI_ROOT)/../libiconv ]; then                        	\
+ 			echo Found libiconv in peer directory;                  \
+ 			if [ ! -r $(ABI_ROOT)/../libiconv/src/config.h ]; then  \
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
index 655a5c0e001..55a35f389ab 100644
--- a/editors/abiword/patches/patch-ae
+++ b/editors/abiword/patches/patch-ae
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.3 2000/05/02 23:35:56 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2001/05/24 04:28:20 jlam Exp $
 
---- src/config/require/unix/Makefile.orig	Tue Feb 29 16:37:57 2000
-+++ src/config/require/unix/Makefile	Tue May  2 18:16:28 2000
-@@ -159,7 +159,7 @@
- # was something you installed yourself.  
- 
- _LIBICONV_:
--	@if [ ! -r /usr/include/iconv.h -a ! -r /usr/local/include/iconv.h ]; then	\
-+	@if true; then	\
- 		if [ -d $(ABI_ROOT)/../libiconv ]; then                        	\
- 			echo Found libiconv in peer directory;                  \
- 			if [ ! -r $(ABI_ROOT)/../libiconv/src/config.h ]; then  \
+--- src/other/spell/ispell.h.orig	Sat Mar 24 20:30:02 2001
++++ src/other/spell/ispell.h
+@@ -517,8 +517,8 @@
+     short maxstringcharlen;			/* Max strchr len supported */
+     short compoundmin;				/* Min lth of compound parts */
+     short compoundbit;				/* Flag 4 compounding roots */
+-    int stringsize;				/* Size of string table */
+-    int lstringsize;				/* Size of lang. str tbl */
++    PTRSIZE stringsize;				/* Size of string table */
++    PTRSIZE lstringsize;				/* Size of lang. str tbl */
+     int tblsize;				/* No. entries in hash tbl */
+     int stblsize;				/* No. entries in sfx tbl */
+     int ptblsize;				/* No. entries in pfx tbl */
diff --git a/editors/abiword/patches/patch-af b/editors/abiword/patches/patch-af
index f687bda7257..421999fdb00 100644
--- a/editors/abiword/patches/patch-af
+++ b/editors/abiword/patches/patch-af
@@ -1,12 +1,18 @@
-$NetBSD: patch-af,v 1.4 2001/05/17 19:57:03 jlam Exp $
+$NetBSD: patch-af,v 1.5 2001/05/24 04:28:20 jlam Exp $
 
---- src/config/abi_rules.mk.orig	Thu May 17 15:36:47 2001
-+++ src/config/abi_rules.mk
-@@ -36,6 +36,7 @@
- ##################################################################
- ##################################################################
- 
-+CFLAGS+=	$(OS_EXTRA_CFLAGS)
- 
- ifdef LIBRARY_NAME
- ifeq ($(OS_NAME), WIN32)
+--- src/other/spell/ispell_def.h.orig	Sat Mar 24 20:30:02 2001
++++ src/other/spell/ispell_def.h
+@@ -2,3 +2,13 @@
+ #ifndef	INPUTWORDLEN
+ #define INPUTWORDLEN 100
+ #endif
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#define PTRSIZE intptr_t
++#else
++#define PTRSIZE int
++#endif
++#if !defined(HAVE_INTTYPES_H) && defined(__alpha) && defined(__NetBSD__)
++#define PTRSIZE long
++#endif /* hack for 1.3 */
diff --git a/editors/abiword/patches/patch-ag b/editors/abiword/patches/patch-ag
new file mode 100644
index 00000000000..f569cebc3f0
--- /dev/null
+++ b/editors/abiword/patches/patch-ag
@@ -0,0 +1,31 @@
+$NetBSD: patch-ag,v 1.4 2001/05/24 04:28:20 jlam Exp $
+
+--- src/other/spell/lookup.c.orig	Wed Sep 29 19:33:32 1999
++++ src/other/spell/lookup.c
+@@ -285,22 +285,22 @@
+ 	    if (dp->word == (char *) -1)
+ 		dp->word = NULL;
+ 	    else
+-		dp->word = &hashstrings [ (int)(dp->word) ];
++		dp->word = &hashstrings [ (PTRSIZE)(dp->word) ];
+ 	    if (dp->next == (struct dent *) -1)
+ 		dp->next = NULL;
+ 	    else
+-		dp->next = &hashtbl [ (int)(dp->next) ];
++		dp->next = &hashtbl [ (PTRSIZE)(dp->next) ];
+ 	    }
+ 	}
+ 
+     for (i = numsflags + numpflags, entry = sflaglist; --i >= 0; entry++)
+ 	{
+ 	if (entry->stripl)
+-	    entry->strip = (ichar_t *) &hashstrings[(int) entry->strip];
++	    entry->strip = (ichar_t *) &hashstrings[(PTRSIZE) entry->strip];
+ 	else
+ 	    entry->strip = NULL;
+ 	if (entry->affl)
+-	    entry->affix = (ichar_t *) &hashstrings[(int) entry->affix];
++	    entry->affix = (ichar_t *) &hashstrings[(PTRSIZE) entry->affix];
+ 	else
+ 	    entry->affix = NULL;
+ 	}
diff --git a/editors/abiword/patches/patch-ak b/editors/abiword/patches/patch-ah
index 50e6671d5a7..74932439c83 100644
--- a/editors/abiword/patches/patch-ak
+++ b/editors/abiword/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1 2000/05/02 23:35:58 jlam Exp $
+$NetBSD: patch-ah,v 1.4 2001/05/24 04:28:20 jlam Exp $
 
 --- src/pkg/netbsd/Makefile.orig	Tue Feb 29 16:37:58 2000
-+++ src/pkg/netbsd/Makefile	Tue May  2 18:36:23 2000
++++ src/pkg/netbsd/Makefile
 @@ -4,6 +4,7 @@
  
  # The plain "install" common to all Unix targets
diff --git a/editors/abiword/patches/patch-ai b/editors/abiword/patches/patch-ai
new file mode 100644
index 00000000000..08429feca2b
--- /dev/null
+++ b/editors/abiword/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.4 2001/05/24 04:28:20 jlam Exp $
+
+--- ../psiconv/psiconv/generate_layout.c.orig	Mon Mar  5 22:46:15 2001
++++ ../psiconv/psiconv/generate_layout.c
+@@ -78,7 +78,7 @@
+     return res;
+   if ((res = psiconv_write_color(buf,value->color)))
+     return res;
+-  // Unknown byte
++  /* Unknown byte */
+   return psiconv_write_u8(buf,1);
+ }
+ 
diff --git a/editors/abiword/patches/patch-al b/editors/abiword/patches/patch-al
deleted file mode 100644
index d9fad37cdf3..00000000000
--- a/editors/abiword/patches/patch-al
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-al,v 1.1 2000/12/03 04:31:50 mycroft Exp $
-
---- src/other/spell/ispell.h.orig	Tue Dec 21 18:46:29 1999
-+++ src/other/spell/ispell.h	Sun Dec  3 04:07:24 2000
-@@ -136,6 +136,10 @@
- #include <stdio.h>
- /*  #include "ut_types.h" */
- 
-+#ifndef PTRSIZE
-+#define	PTRSIZE	long
-+#endif
-+
- /* largest word accepted from a file by any input routine, plus one */
- #ifndef	INPUTWORDLEN
- #define INPUTWORDLEN 100
-@@ -500,8 +504,8 @@
-     short maxstringcharlen;			/* Max strchr len supported */
-     short compoundmin;				/* Min lth of compound parts */
-     short compoundbit;				/* Flag 4 compounding roots */
--    int stringsize;				/* Size of string table */
--    int lstringsize;				/* Size of lang. str tbl */
-+    PTRSIZE stringsize;				/* Size of string table */
-+    PTRSIZE lstringsize;			/* Size of lang. str tbl */
-     int tblsize;				/* No. entries in hash tbl */
-     int stblsize;				/* No. entries in sfx tbl */
-     int ptblsize;				/* No. entries in pfx tbl */