Changes 2.2.8:

* Make Text Folding actually work
* Fix text justification on MacOSX
* Initial support for the OpenDocument (.odt) file format

5 files changed, 20 insertions, 17 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 6242b60b2c4..60c2096d332 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.90 2005/04/18 16:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2005/06/30 13:16:51 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
 CONFLICTS=	abiword-personal-[0-9]* abiword2-[0-9]*
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abi
-USE_PERL5=	run
+USE_TOOLS+=	perl
 
 REPLACE_PERL=	user/wp/scripts/abw2html.pl
 
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index 25c539c8aea..489cf2b1ccc 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.20 2005/06/01 18:02:45 jlam Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/06/30 13:16:51 adam Exp $
 
 # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
-ABIWORD_VERSION=	2.2.7
+ABIWORD_VERSION=	2.2.8
 DISTNAME=	abiword-${ABIWORD_VERSION}
 
 CATEGORIES=	editors
@@ -15,11 +15,10 @@ HOMEPAGE=	http://www.abisource.com/
 BUILD_USES_MSGFMT=	yes
 
 MAKEFILE=		GNUmakefile
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
 USE_DIRS+=		xdg-1.1
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
-
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=        --with-libpng=${BUILDLINK_PREFIX.png}
 
 .include "../../converters/fribidi/buildlink3.mk"
diff --git a/editors/abiword/PLIST b/editors/abiword/PLIST
index c0068a6acdf..5fe97d89212 100644
--- a/editors/abiword/PLIST
+++ b/editors/abiword/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2005/03/07 10:16:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2005/06/30 13:16:51 adam Exp $
 bin/AbiWord-2.2
 bin/abiword
 bin/ttfadmin.sh
@@ -197,6 +197,8 @@ share/AbiSuite-2.2/AbiWord/help/en-US/howtodocument.info
 share/AbiSuite-2.2/AbiWord/help/en-US/howtoexporthtml.abw
 share/AbiSuite-2.2/AbiWord/help/en-US/howtoexporthtml.html
 share/AbiSuite-2.2/AbiWord/help/en-US/howtoexporthtml.info
+share/AbiSuite-2.2/AbiWord/help/en-US/howtohistory.abw
+share/AbiSuite-2.2/AbiWord/help/en-US/howtohistory.html
 share/AbiSuite-2.2/AbiWord/help/en-US/howtolists.abw
 share/AbiSuite-2.2/AbiWord/help/en-US/howtolists.html
 share/AbiSuite-2.2/AbiWord/help/en-US/howtolists.info
@@ -211,6 +213,8 @@ share/AbiSuite-2.2/AbiWord/help/en-US/howtonormaltemplate.info
 share/AbiSuite-2.2/AbiWord/help/en-US/howtoprefs.abw
 share/AbiSuite-2.2/AbiWord/help/en-US/howtoprefs.html
 share/AbiSuite-2.2/AbiWord/help/en-US/howtoprefs.info
+share/AbiSuite-2.2/AbiWord/help/en-US/howtorevisions.abw
+share/AbiSuite-2.2/AbiWord/help/en-US/howtorevisions.html
 share/AbiSuite-2.2/AbiWord/help/en-US/howtotables.abw
 share/AbiSuite-2.2/AbiWord/help/en-US/howtotables.html
 share/AbiSuite-2.2/AbiWord/help/en-US/howtotables.info
@@ -898,6 +902,7 @@ share/AbiSuite-2.2/templates/normal.awt-en_IE
 share/AbiSuite-2.2/templates/normal.awt-en_NZ
 share/AbiSuite-2.2/templates/normal.awt-en_ZA
 share/AbiSuite-2.2/templates/normal.awt-es
+share/AbiSuite-2.2/templates/normal.awt-es_AR
 share/AbiSuite-2.2/templates/normal.awt-es_ES
 share/AbiSuite-2.2/templates/normal.awt-es_IR
 share/AbiSuite-2.2/templates/normal.awt-es_MX
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 77e4554cd5b..a5c560472ec 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.41 2005/04/13 20:15:55 drochner Exp $
+$NetBSD: distinfo,v 1.42 2005/06/30 13:16:51 adam Exp $
 
-SHA1 (abiword-2.2.7.tar.bz2) = d056632c311bc116098e022da28e2ca222be6207
-RMD160 (abiword-2.2.7.tar.bz2) = 670c8c5f0bec4f57cd6a2429f9a14d3bf1e5850f
-Size (abiword-2.2.7.tar.bz2) = 23896960 bytes
-SHA1 (patch-aa) = e54908d64747a3fc78e13036ebbd909b2b1b64aa
+SHA1 (abiword-2.2.8.tar.bz2) = e97aacc9b623a2ab2ff9e23502f4367072114be7
+RMD160 (abiword-2.2.8.tar.bz2) = 63df8496a609dcf3b32bdb7b377a618a67b633e6
+Size (abiword-2.2.8.tar.bz2) = 23918235 bytes
+SHA1 (patch-aa) = 41dd03ee29a2fca8955de8809f14169135b77d59
 SHA1 (patch-ab) = 927cbe95f5ea892d57ead96938d631ee1ad2c9a3
 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5
 SHA1 (patch-ae) = 5eab37824f36bfd21238d5cd11507062ac8dccdb
diff --git a/editors/abiword/patches/patch-aa b/editors/abiword/patches/patch-aa
index a004d247bb7..1581ad78039 100644
--- a/editors/abiword/patches/patch-aa
+++ b/editors/abiword/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2005/01/11 11:09:27 adam Exp $
+$NetBSD: patch-aa,v 1.8 2005/06/30 13:16:51 adam Exp $
 
---- configure.orig	2004-12-13 10:28:57.000000000 +0000
+--- configure.orig	2005-06-06 00:43:22.000000000 +0000
 +++ configure
-@@ -4114,7 +4114,7 @@ case "$OS_NAME" in
+@@ -4118,7 +4118,7 @@ case "$OS_NAME" in
  		WARNING_CFLAGS=""
  		;;
  	*BSD|DragonFly)