update to 0.9.4

changes:
Fully editable styles on Windows and Unix.
New and improved import/export filters. This includes the initial
release of a Word Perfect import filter.
Dramatically faster spell checking.
Plus new artwork, many bug fixes, speed ups and behind the scenes work.

7 files changed, 29 insertions, 53 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 00bba939c9e..77360a268d4 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2001/10/24 22:10:53 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2001/10/30 17:47:19 drochner Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -7,7 +7,7 @@
 
 DISTNAME=	abiword-${ABIWORD_VERS}
 PKGNAME=	abiword-personal-${ABIWORD_VERS}
-ABIWORD_VERS=	0.9.0
+ABIWORD_VERS=	0.9.4
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=abiword/}
 DIST_SUBDIR=	abisuite
@@ -37,6 +37,7 @@ XLDFLAGS=	${LDFLAGS} -liconv
 
 MAKE_ENV+=	OS_CFLAGS="${OS_CFLAGS}"
 MAKE_ENV+=	XLDFLAGS="${XLDFLAGS}"
+MAKE_ENV+=	prefix="${PREFIX}"
 
 MAKE_FLAGS+=	ABI_BUILD_VERSION="${ABIWORD_VERS}"
 MAKE_FLAGS+=	UNIX_CAN_BUILD_STATIC=0
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 19776cad7f6..550a95edebe 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.6 2001/10/22 05:25:24 mycroft Exp $
+$NetBSD: distinfo,v 1.7 2001/10/30 17:47:19 drochner Exp $
 
-SHA1 (abisuite/abiword-0.9.0.tar.gz) = 0525f5c869f6c36c7e3afeb90be86079c5b18b5b
-Size (abisuite/abiword-0.9.0.tar.gz) = 13214804 bytes
-SHA1 (patch-aa) = b16ed42c28c8cd15b9eae852da328f89ce39e21c
+SHA1 (abisuite/abiword-0.9.4.tar.gz) = 6c15467afb42712a3c3cf75821d587522c8ddc8e
+Size (abisuite/abiword-0.9.4.tar.gz) = 15115515 bytes
 SHA1 (patch-ab) = 1112a184b3c4188ab944790a85f4fd7e15ffed17
-SHA1 (patch-ac) = 57518856114832e47258db457b3a29178873910d
-SHA1 (patch-ad) = 223f452642681c25cae67871fa25b05c2a5fe937
+SHA1 (patch-ad) = e121179448796a1db08fd3f70f8c50807fbea778
 SHA1 (patch-ae) = 83dd6f983e304a6a542b645eba1b7187a1e8250a
 SHA1 (patch-af) = 9bf0cb3abe338b7021acbf771b34b55bb7edcbae
 SHA1 (patch-ag) = 4c14bf09bc33b99adbf127b795fa8349cfbdc33b
 SHA1 (patch-ah) = 19e2e5def6d235ff44efc856346a4ae85b2bdbd5
 SHA1 (patch-ai) = ff616312cd542e1d8d4d08492bf3359f2209037c
-SHA1 (patch-aj) = ec0ab574ed2963c17c3c72253a4ddeb81e63e92c
+SHA1 (patch-aj) = 21d4024aaf0862a00dce6c3f0db092f8c41b9fe9
 SHA1 (patch-ak) = 2b68bb8fd0d8748becdc291f711860a487f628f0
diff --git a/editors/abiword/patches/patch-aa b/editors/abiword/patches/patch-aa
deleted file mode 100644
index 3173ed2261b..00000000000
--- a/editors/abiword/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/05/24 04:28:19 jlam Exp $
-
---- Makefile.orig	Mon Mar  5 10:59:38 2001
-+++ Makefile
-@@ -20,7 +20,7 @@
- ## 02111-1307, USA.
- 
- ABI_ROOT	:=$(shell pwd)
--prefix		:=/usr/local
-+prefix		:=${PREFIX}
- 
- ##################################################################
- ## Useful options:
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
deleted file mode 100644
index f74e2eaa748..00000000000
--- a/editors/abiword/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2001/08/10 04:50:08 jlam Exp $
-
---- src/af/util/xp/ut_endian.h.orig	Wed Jul 18 10:48:29 2001
-+++ src/af/util/xp/ut_endian.h
-@@ -48,6 +48,13 @@
-         #elif defined(_LITTLE_ENDIAN)
-                 #define UT_LITTLE_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 e3be685910d..ea3111e8306 100644
--- a/editors/abiword/patches/patch-ad
+++ b/editors/abiword/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2001/05/24 04:28:20 jlam Exp $
+$NetBSD: patch-ad,v 1.7 2001/10/30 17:47:20 drochner Exp $
 
---- src/config/require/unix/Makefile.orig	Tue Oct 31 21:23:23 2000
-+++ src/config/require/unix/Makefile
-@@ -180,7 +180,7 @@
+--- src/config/require/unix/Makefile.orig	Fri Aug 10 15:54:54 2001
++++ src/config/require/unix/Makefile	Tue Oct 30 16:16:17 2001
+@@ -185,7 +185,7 @@
  		fi								
  
  else
@@ -10,4 +10,4 @@ $NetBSD: patch-ad,v 1.6 2001/05/24 04:28:20 jlam Exp $
 +	@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  \
+ 			if [ ! -r $(ABI_ROOT)/../libiconv/lib/config.h ]; then  \
diff --git a/editors/abiword/patches/patch-aj b/editors/abiword/patches/patch-aj
index db38898540a..bf5b8a02721 100644
--- a/editors/abiword/patches/patch-aj
+++ b/editors/abiword/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.3 2001/08/10 04:50:09 jlam Exp $
+$NetBSD: patch-aj,v 1.4 2001/10/30 17:47:20 drochner Exp $
 
---- src/config/abi_defs.mk.orig	Wed Jul 18 09:01:58 2001
-+++ src/config/abi_defs.mk
-@@ -584,7 +584,7 @@
+--- src/config/abi_defs.mk.orig	Sat Sep 22 00:16:17 2001
++++ src/config/abi_defs.mk	Tue Oct 30 16:55:51 2001
+@@ -587,7 +587,7 @@
  ABI_OPTIONS  +=GnomeVFS:On
  endif
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aj,v 1.3 2001/08/10 04:50:09 jlam Exp $
  
  # the bonobo target is known not to work properly yet
  ifdef ABI_OPT_BONOBO
-@@ -614,7 +614,7 @@
+@@ -617,7 +617,7 @@
  ABI_OPT_GNOME=
  GTK_CFLAGS	:=	$(shell $(GTK_CONFIG) --cflags)
  GTK_LIBS	:=	$(shell $(GTK_CONFIG) --libs)
@@ -20,3 +20,12 @@ $NetBSD: patch-aj,v 1.3 2001/08/10 04:50:09 jlam Exp $
  CFLAGS 		+=	$(GTK_CFLAGS) $(GLIB_CFLAGS)
  EXTRA_LIBS	+=	$(GTK_LIBS)
  #
+@@ -705,7 +705,7 @@
+ # it's the easiest way to ensure that we always include iconv.h 
+ # with it set (to prevent linker mismatches with wv's version)
+ #  
+-CFLAGS += -DLIBICONV_PLUG
++#CFLAGS += -DLIBICONV_PLUG
+ 
+ ifeq ($(ABI_NATIVE),unix)
+ CFLAGS += -DSUPPORTS_UT_IDLE=1
diff --git a/editors/abiword/pkg/PLIST b/editors/abiword/pkg/PLIST
index 00312dc05fa..7a2155c3419 100644
--- a/editors/abiword/pkg/PLIST
+++ b/editors/abiword/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2001/08/24 23:48:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/10/30 17:47:20 drochner Exp $
 bin/AbiWord
 bin/abiword
 libexec/AbiSuite/AbiWord
@@ -369,7 +369,6 @@ share/AbiSuite/AbiWord/help/images/wedge_l.gif
 share/AbiSuite/AbiWord/help/images/zoom.png
 share/AbiSuite/AbiWord/help/index.html
 share/AbiSuite/AbiWord/readme.txt
-share/AbiSuite/AbiWord/sample/en-US/Latin1.abw
 share/AbiSuite/AbiWord/strings/ca-ES.strings
 share/AbiSuite/AbiWord/strings/cs-CZ.strings
 share/AbiSuite/AbiWord/strings/cy-CY.strings
@@ -395,6 +394,7 @@ share/AbiSuite/AbiWord/strings/pt-BR.strings
 share/AbiSuite/AbiWord/strings/pt-PT.strings
 share/AbiSuite/AbiWord/strings/ru-RU.strings
 share/AbiSuite/AbiWord/strings/sl-SI.strings
+share/AbiSuite/AbiWord/strings/sk.strings
 share/AbiSuite/AbiWord/strings/sv-SE.strings
 share/AbiSuite/AbiWord/strings/uk-UA.strings
 share/AbiSuite/AbiWord/strings/zh-CN.strings
@@ -562,7 +562,6 @@ share/AbiSuite/readme.txt
 @dirrm share/AbiSuite/fonts
 @dirrm share/AbiSuite/clipart
 @dirrm share/AbiSuite/AbiWord/strings
-@dirrm share/AbiSuite/AbiWord/sample/en-US
 @dirrm share/AbiSuite/AbiWord/sample
 @dirrm share/AbiSuite/AbiWord/help/images
 @dirrm share/AbiSuite/AbiWord/help/fr-FR/images