Changes 2.4.2:

* Added an OpenDocument exportes, and substantially updated the OpenDocument
  importer
* Greatly improved the print quality of images (Unix)
* Fixed a substantial number of memory leaks

6 files changed, 30 insertions, 32 deletions

diff --git a/editors/abiword-plugins/distinfo b/editors/abiword-plugins/distinfo
index 4d1eb75ef9a..c928adb1451 100644
--- a/editors/abiword-plugins/distinfo
+++ b/editors/abiword-plugins/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2005/10/17 08:33:43 adam Exp $
+$NetBSD: distinfo,v 1.16 2006/01/17 08:08:00 adam 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 (abiword-2.4.2.tar.bz2) = a28b3a355d265223a651a43d51d550a7b97efe0a
+RMD160 (abiword-2.4.2.tar.bz2) = 1b30dd7da238bd282abcce814a0b4d7c93e17199
+Size (abiword-2.4.2.tar.bz2) = 24729796 bytes
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index efe618a044b..5a7bb2577e3 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2005/12/21 22:04:59 reed Exp $
+# $NetBSD: Makefile,v 1.94 2006/01/17 08:07:38 adam Exp $
 
 .include "Makefile.common"
-PKGNAME=	abiword-${ABIWORD_VERSION}
-PKGREVISION=	1
 COMMENT=	Open Source cross-platform word processor
 
 # GTK1 version and previous name of the GTK2 version
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index b4ce360fb83..986363f036a 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.27 2005/10/17 08:33:57 adam Exp $
+# $NetBSD: Makefile.common,v 1.28 2006/01/17 08:07:38 adam Exp $
 
 # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
-ABIWORD_VERSION=	2.4.1
+ABIWORD_VERSION=	2.4.2
 DISTNAME=	abiword-${ABIWORD_VERSION}
 
 CATEGORIES=	editors
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index db643863ef3..4c6796ae373 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.48 2005/12/21 22:04:59 reed Exp $
+$NetBSD: distinfo,v 1.49 2006/01/17 08:07:38 adam 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 (abiword-2.4.2.tar.bz2) = a28b3a355d265223a651a43d51d550a7b97efe0a
+RMD160 (abiword-2.4.2.tar.bz2) = 1b30dd7da238bd282abcce814a0b4d7c93e17199
+Size (abiword-2.4.2.tar.bz2) = 24729796 bytes
 SHA1 (patch-aa) = feed8a9f506279fd1873210ab967abd487eff85d
-SHA1 (patch-ab) = ffe111a9e13b70d273fa52981353114eaf25a0d4
+SHA1 (patch-ab) = 94191b278b6c5d0a37231efde9dc11097d6c1590
 SHA1 (patch-ac) = 4ab819ee5465a89607d4882f7cf00e8b4daf1f3b
 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5
-SHA1 (patch-ae) = 5eab37824f36bfd21238d5cd11507062ac8dccdb
+SHA1 (patch-ae) = 5151b11af67796b62cff9c9518ead0fdd36b80c5
 SHA1 (patch-af) = d3fe1c03fe80648afb729b3dbc4721c413220a0d
 SHA1 (patch-ag) = a4d4569e2bb67110aa160f2f596c32bbd5bac9c4
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab
index a1c19884a0e..3bca3ce2ac0 100644
--- a/editors/abiword/patches/patch-ab
+++ b/editors/abiword/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.13 2005/12/07 16:45:47 joerg Exp $
+$NetBSD: patch-ab,v 1.14 2006/01/17 08:07:38 adam Exp $
 
---- src/af/util/xp/ut_iconv.cpp.orig	2005-07-08 16:22:11.000000000 +0000
+--- src/af/util/xp/ut_iconv.cpp.orig	2005-10-08 12:53:33.000000000 +0200
 +++ src/af/util/xp/ut_iconv.cpp
 @@ -68,7 +68,8 @@ extern "C" {
  (defined (__MACH__) && defined (__APPLE__)) || \
  (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
- defined (__AIX__) || \
+ defined (__AIX__) || defined(__OpenBSD__) || \
 -(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(__DragonFly__))
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
index 33f574a0c40..c85a627f867 100644
--- a/editors/abiword/patches/patch-ae
+++ b/editors/abiword/patches/patch-ae
@@ -1,22 +1,22 @@
-$NetBSD: patch-ae,v 1.15 2005/03/07 10:16:43 adam Exp $
+$NetBSD: patch-ae,v 1.16 2006/01/17 08:07:38 adam Exp $
 
---- src/af/xap/unix/xap_UnixEncodingManager.cpp.orig	2005-03-01 00:14:21.000000000 +0000
+--- src/af/xap/unix/xap_UnixEncodingManager.cpp.orig	2005-10-16 04:50:52.000000000 +0200
 +++ src/af/xap/unix/xap_UnixEncodingManager.cpp
 @@ -546,7 +546,7 @@ void  XAP_UnixEncodingManager::initializ
- 					MYLANG += LanguageISOName;
- 					MYLANG += "_";
- 					MYLANG += LanguageISOTerritory;
--					putenv(MYLANG.utf8_str());
-+					putenv(const_cast<char*>MYLANG.utf8_str());
+ 				MYLANG += LanguageISOName;
+ 				MYLANG += "_";
+ 				MYLANG += LanguageISOTerritory;
+-				putenv(MYLANG.utf8_str());
++				putenv(const_cast<char*>MYLANG.utf8_str());
  #else
- 					UT_UTF8String MYLANG (LanguageISOName);
- 					MYLANG += "_";
+ 				UT_UTF8String MYLANG (LanguageISOName);
+ 				MYLANG += "_";
 @@ -569,7 +569,7 @@ void  XAP_UnixEncodingManager::initializ
  #if defined(SETENV_MISSING)
- 					MYLANG = "LANG=";
- 					MYLANG += OLDLANG;
--					putenv(MYLANG.utf8_str());
-+					putenv(const_cast<char*>MYLANG.utf8_str());
+ 				MYLANG = "LANG=";
+ 				MYLANG += OLDLANG;
+-				putenv(MYLANG.utf8_str());
++				putenv(const_cast<char*>MYLANG.utf8_str());
  #else
- 					setenv("LANG", OLDLANG.utf8_str(), 1);
+ 				setenv("LANG", OLDLANG.utf8_str(), 1);
  #endif