Changes 2.2.4:

* A new detection method has been added to repair importer mistakes.
  This should prevent crashes on importing documents.
* Lots of improvements again to the Mac OS X port
* Handle all platform supported graphics formats by default in the GTK port
* Improved HTML export, including the handling of Tables of Contents
* Improved WordPerfect import, including support for WordPerfect 3.0-3.5(e)
  for Mac documents
* and much more

8 files changed, 41 insertions, 48 deletions

diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index f51389cbc08..e074788bf55 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2005/02/10 19:27:32 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/02/24 09:55:48 adam Exp $
 
 .include "../../editors/abiword/Makefile.common"
 
-PKGNAME=	abiword-plugins-${ABIWORD_DIST_VERSION}
-PKGREVISION=	1
+PKGNAME=	abiword-plugins-${ABIWORD_VERSION}
 COMMENT=	Plugins enhancing Abiword's capabilities
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abiword-plugins
 
-BUILD_DEPENDS+=	abiword-${ABIWORD_DIST_VERSION}*:../../editors/abiword
+BUILD_DEPENDS+=	abiword-${ABIWORD_VERSION}*:../../editors/abiword
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--disable-all --enable-AbiGdkPixbuf --enable-abicommand
+CONFIGURE_ARGS+=	--disable-all --enable-abicommand
 CONFIGURE_ARGS+=	--enable-applix --enable-bmp --enable-bz2abw
 CONFIGURE_ARGS+=	--enable-clarisworks --enable-docbook --enable-eml
 CONFIGURE_ARGS+=	--enable-jpeg --enable-kword --enable-latex
diff --git a/editors/abiword-plugins/PLIST b/editors/abiword-plugins/PLIST
index 90a290af83d..09eeeb22caf 100644
--- a/editors/abiword-plugins/PLIST
+++ b/editors/abiword-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/01/11 11:09:36 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/02/24 09:55:48 adam Exp $
 lib/AbiWord-2.2/plugins/libAbiApplix.la
 lib/AbiWord-2.2/plugins/libAbiBMP.la
 lib/AbiWord-2.2/plugins/libAbiBZ2.la
@@ -6,7 +6,6 @@ lib/AbiWord-2.2/plugins/libAbiClarisWorks.la
 lib/AbiWord-2.2/plugins/libAbiCommand.la
 lib/AbiWord-2.2/plugins/libAbiDocBook.la
 lib/AbiWord-2.2/plugins/libAbiEML.la
-lib/AbiWord-2.2/plugins/libAbiGdkPixbuf.la
 lib/AbiWord-2.2/plugins/libAbiJPEG.la
 lib/AbiWord-2.2/plugins/libAbiKWord.la
 lib/AbiWord-2.2/plugins/libAbiNroff.la
diff --git a/editors/abiword-plugins/distinfo b/editors/abiword-plugins/distinfo
index afeee48c4d6..c5b7d27ac5b 100644
--- a/editors/abiword-plugins/distinfo
+++ b/editors/abiword-plugins/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 17:15:10 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/02/24 09:55:48 adam Exp $
 
-SHA1 (abiword-2.2.3/abiword-2.2.3.tar.bz2) = 0ad900f13e535a4b55faed41b8ab8d63400c7712
-RMD160 (abiword-2.2.3/abiword-2.2.3.tar.bz2) = cdc48feb50be73e2ee0799a1275d0bbb6f6a6693
-Size (abiword-2.2.3/abiword-2.2.3.tar.bz2) = 23472285 bytes
+SHA1 (abiword-2.2.4.tar.bz2) = 28fa658b1f2fe355cab974778ee9f1ee9dff27cd
+RMD160 (abiword-2.2.4.tar.bz2) = fe8ccb1306bd1d879525d00a9ab8a76d0a215b2b
+Size (abiword-2.2.4.tar.bz2) = 23736805 bytes
diff --git a/editors/abiword/DESCR b/editors/abiword/DESCR
index 749a9c9cee0..8c5b5da235c 100644
--- a/editors/abiword/DESCR
+++ b/editors/abiword/DESCR
@@ -1,18 +1,17 @@
 AbiWord is an open-source, cross-platform WYSIWYG word processor.
 This version uses GTK+2.
 
-Features include: 
-
- - Basic character formatting (bold, underline, italics, etc.) 
- - Paragraph alignment 
- - Spell-check 
- - Import of Word97 and RTF documents 
- - Export to RTF, Text, HTML, and LaTeX formats 
- - Interactive rulers and tabs 
- - Styles 
- - Unlimited undo/redo 
- - Multiple column control 
- - Widow/orphan control 
- - Find/Replace 
- - Anti-aliased fonts
- - Images
+Features include:
+- Basic character formatting (bold, underline, italics, etc.)
+- Paragraph alignment
+- Spell-check
+- Import of Word97 and RTF documents
+- Export to RTF, Text, HTML, and LaTeX formats
+- Interactive rulers and tabs
+- Styles
+- Unlimited undo/redo
+- Multiple column control
+- Widow/orphan control
+- Find/Replace
+- Anti-aliased fonts
+- Images
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 4df1b39fbcb..2ea10e59e6c 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2005/02/10 19:27:32 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2005/02/24 09:55:34 adam Exp $
 
 .include "Makefile.common"
-PKGNAME=	abiword-${ABIWORD_DIST_VERSION}
-PKGREVISION=	1
+PKGNAME=	abiword-${ABIWORD_VERSION}
 COMMENT=	Open Source cross-platform word processor
 
 # GTK1 version and previous name of the GTK2 version
@@ -29,6 +28,8 @@ CONFIGURE_ARGS+=	--without-epath
 # Use X11 instead of Cocoa API
 CONFIGURE_ARGS+=	--disable-Cocoa
 .endif
+CONFIGURE_ARGS+=	--enable-threads --with-libxml2
+CONFIGURE_ARGS+=	--with-libjpeg-prefix=${BUILDLINK_PREFIX.jpeg}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
 post-install:
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index 81764b2356d..33eded517f8 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile.common,v 1.12 2005/02/10 19:27:32 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/02/24 09:55:34 adam Exp $
 
 # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
-ABIWORD_DIST_VERSION=	2.2.3
-DISTNAME=	abiword-${ABIWORD_DIST_VERSION}
+ABIWORD_VERSION=	2.2.4
+DISTNAME=	abiword-${ABIWORD_VERSION}
 
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=abiword/}
+MASTER_SITES=	http://www.abisource.com/downloads/abiword/${ABIWORD_VERSION}/source/ \
+		${MASTER_SITE_SOURCEFORGE:=abiword/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -13,10 +14,6 @@ HOMEPAGE=	http://www.abisource.com/
 
 BUILD_USES_MSGFMT=	yes
 
-# there were two versions of abiword-2.2.3 -- you can
-# remove this line during the next update
-DIST_SUBDIR=		abiword-2.2.3
-
 MAKEFILE=		GNUmakefile
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
@@ -25,9 +22,6 @@ USE_DIRS+=		xdg-1.1
 USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
-CONFIGURE_ARGS+=        --enable-threads
-CONFIGURE_ARGS+=        --with-libxml2
-CONFIGURE_ARGS+=        --with-libjpeg-prefix=${BUILDLINK_PREFIX.jpeg}
 CONFIGURE_ARGS+=        --with-libpng=${BUILDLINK_PREFIX.png}
 
 .include "../../converters/fribidi/buildlink3.mk"
diff --git a/editors/abiword/PLIST b/editors/abiword/PLIST
index 2db88a0aae4..9e07881e2ca 100644
--- a/editors/abiword/PLIST
+++ b/editors/abiword/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/01/13 09:29:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/02/24 09:55:34 adam Exp $
 bin/AbiWord-2.2
 bin/abiword
 bin/ttfadmin.sh
@@ -8,8 +8,8 @@ share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_Break.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_Field.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_FormatFootnotes.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_FormatFrame.glade
-share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_FormatTable.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_FormatTOC.glade
+share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_FormatTable.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_HdrFtr.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_InsertTable.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_Insert_DateTime.glade
@@ -21,6 +21,7 @@ share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_Options_ColorSel.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_PageNumbers.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_PageSetup.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_Replace.glade
+share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_Spell.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_Styles.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_Stylist.glade
 share/AbiSuite-2.2/AbiWord/glade/ap_UnixDialog_Stylist_modal.glade
@@ -870,10 +871,10 @@ share/AbiSuite-2.2/templates/Employee-Directory.awt
 share/AbiSuite-2.2/templates/Fax-Coversheet.awt
 share/AbiSuite-2.2/templates/Friendly-Letter.awt
 share/AbiSuite-2.2/templates/Memo.awt
-share/AbiSuite-2.2/templates/Two-Columns.awt
-share/AbiSuite-2.2/templates/US-Letter.awt
 share/AbiSuite-2.2/templates/Press-Release.awt
 share/AbiSuite-2.2/templates/Resume.awt
+share/AbiSuite-2.2/templates/Two-Columns.awt
+share/AbiSuite-2.2/templates/US-Letter.awt
 share/AbiSuite-2.2/templates/normal.awt
 share/AbiSuite-2.2/templates/normal.awt-am_ET
 share/AbiSuite-2.2/templates/normal.awt-ar
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index f04071f9a20..5e31b44cb14 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2005/02/23 17:15:09 agc Exp $
+$NetBSD: distinfo,v 1.37 2005/02/24 09:55:34 adam Exp $
 
-SHA1 (abiword-2.2.3/abiword-2.2.3.tar.bz2) = 0ad900f13e535a4b55faed41b8ab8d63400c7712
-RMD160 (abiword-2.2.3/abiword-2.2.3.tar.bz2) = cdc48feb50be73e2ee0799a1275d0bbb6f6a6693
-Size (abiword-2.2.3/abiword-2.2.3.tar.bz2) = 23472285 bytes
+SHA1 (abiword-2.2.4.tar.bz2) = 28fa658b1f2fe355cab974778ee9f1ee9dff27cd
+RMD160 (abiword-2.2.4.tar.bz2) = fe8ccb1306bd1d879525d00a9ab8a76d0a215b2b
+Size (abiword-2.2.4.tar.bz2) = 23736805 bytes
 SHA1 (patch-aa) = e54908d64747a3fc78e13036ebbd909b2b1b64aa
 SHA1 (patch-ab) = 5957635eb05d4b6f9d623c8585ae252d9c484408
 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5