Update AbiWord to 1.0.2. Changes:

    * Embedable AbiWord! Now you can view AbiWord documents in
      Evolution and Gnumeric. Is it not nifty?
    * Plugins.
          o GDict plugin now builds without libgdict installed.
          o Bugfixes in AbiPaint and AbiMagick for Win32 platforms.
          o Some AbiMagick and AbiGimp enhancements.
          o Wikipedia works again.
    * Internationalization
          o French documentation.
          o Documentation generation scripts now allow for multiple languages.
	  o Win32 now allows for Arabic and Hebrew lists, as well
	    as improved bidi list support.
          o Finnish system profile.
	  o Japanese, Swedish, Welsh, French, German, and Lithuanian
	    localization updates.
    * Build system
          o Minor fixes all around.
          o Improved build system documentation (BUILD.TXT).
          o Updated RPM spec for GNOME embedding.
    * Import/Export
          o RTF importer now handles /sectd.
          o Several LaTeX exporter fixes.
    * Miscellaneous
	  o Bug numbers fixed (not a complete list): 3301, 3171,
	    3215, 2223, 3332.
          o A number of unnumbered bugs.
          o Code cleanup.

Patch submitted by Dawid Szymanski <dawszy@tgr.lubin.edu.pl> in PR 17451

9 files changed, 145 insertions, 453 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 4a33c7ff6bf..1f63d4cb98e 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2002/04/12 14:32:50 martti Exp $
+# $NetBSD: Makefile,v 1.47 2002/07/03 21:59:07 hubertf Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -7,22 +7,30 @@
 
 DISTNAME=	abiword-${ABIWORD_VERS}
 PKGNAME=	abiword-personal-${ABIWORD_VERS}
-ABIWORD_VERS=	0.99.5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=abiword/}
-DIST_SUBDIR=	abisuite
 
-MAINTAINER=	jlam@netbsd.org
+MAINTAINER=	dawszy@arhea.net
 HOMEPAGE=	http://www.abisource.com/
 COMMENT=	Open Source cross-platform word processor
 
 DEPENDS+=	ispell-base-[0-9]*:../../textproc/ispell-base
 
-USE_BUILDLINK_ONLY=	# defined
+DIST_SUBDIR=	abisuite
+ABIWORD_VERS=	1.0.2
 
+USE_BUILDLINK_ONLY=	# defined
 USE_X11=	# defined
 USE_GMAKE=	# defined
-ALL_TARGET=	compile canonical
+HAS_CONFIGURE=	# defined
+MAKEFILE=	GNUmakefile
+
+CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-psiconv=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--without-libwmf
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 
 OS_CFLAGS=	${CFLAGS}
 
@@ -30,23 +38,13 @@ OS_CFLAGS=	${CFLAGS}
 OS_CFLAGS+=	-DHAVE_INTTYPE_H=1
 .endif
 
-# AbiWord expects the iconv functions to be in the system libraries, so
-# unconditionally link against the pkgsrc libiconv.so.
-#
-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
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 
-INSTALL_FILE=		${WRKDIR}/INSTALL
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-
 FILES_SUBST=		LN=${LN:Q}
 FILES_SUBST+=		MKDIR=${MKDIR:Q}
 FILES_SUBST+=		RM=${RM:Q}
@@ -54,16 +52,10 @@ FILES_SUBST+=		RMDIR=${RMDIR:Q}
 FILES_SUBST+=		TRUE=${TRUE:Q}
 FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 
-pre-install:
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-
-post-install:
-	${CHMOD} -R a+r ${PREFIX}/share/AbiSuite
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../converters/libiconv/buildlink.mk"
+.include "../../converters/psiconv/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
+.include "../../textproc/expat/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
diff --git a/editors/abiword/PLIST b/editors/abiword/PLIST
index 980890367ec..e908a0fab61 100644
--- a/editors/abiword/PLIST
+++ b/editors/abiword/PLIST
@@ -1,378 +1,96 @@
-@comment $NetBSD: PLIST,v 1.6 2002/04/12 14:32:50 martti Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/07/03 21:59:07 hubertf Exp $
 bin/AbiWord
+bin/AbiWord_d
+bin/AbiWord_s
 bin/abiword
-libexec/AbiSuite/AbiWord
-libexec/AbiSuite/AbiWord_d
-libexec/AbiSuite/cdump
-libexec/AbiSuite/pfa2afm
-libexec/AbiSuite/ttfadmin.sh
-libexec/AbiSuite/ttftool
-share/AbiSuite/AbiWord/help/de-DE/about.html
-share/AbiSuite/AbiWord/help/de-DE/aboutabi.html
-share/AbiSuite/AbiWord/help/de-DE/aboutos.html
-share/AbiSuite/AbiWord/help/de-DE/basis1.html
-share/AbiSuite/AbiWord/help/de-DE/basis2.html
-share/AbiSuite/AbiWord/help/de-DE/beos_intel.html
-share/AbiSuite/AbiWord/help/de-DE/beos_ppc.html
-share/AbiSuite/AbiWord/help/de-DE/check.html
-share/AbiSuite/AbiWord/help/de-DE/column.html
-share/AbiSuite/AbiWord/help/de-DE/comindex.html
-share/AbiSuite/AbiWord/help/de-DE/contents.html
-share/AbiSuite/AbiWord/help/de-DE/credits.html
-share/AbiSuite/AbiWord/help/de-DE/custom.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/about.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/aboutabi.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/aboutos.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/basis1.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/beos_intel.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/beos_ppc.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/check.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/column.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/contents.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/index.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/install.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/linux_intel.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/linux_ppc.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/sdi.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/sections.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/solaris.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/styles.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/tabs.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/why.html
-share/AbiSuite/AbiWord/help/de-DE/de_DE/windows.html
-share/AbiSuite/AbiWord/help/de-DE/faq.html
-share/AbiSuite/AbiWord/help/de-DE/find.html
-share/AbiSuite/AbiWord/help/de-DE/format.html
-share/AbiSuite/AbiWord/help/de-DE/general.html
-share/AbiSuite/AbiWord/help/de-DE/images/abiword.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/abiword.png
-share/AbiSuite/AbiWord/help/de-DE/images/bold.png
-share/AbiSuite/AbiWord/help/de-DE/images/break.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/browse.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/close_all.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/color-unix.png
-share/AbiSuite/AbiWord/help/de-DE/images/elevator.png
-share/AbiSuite/AbiWord/help/de-DE/images/faute1.gif
-share/AbiSuite/AbiWord/help/de-DE/images/faute2.gif
-share/AbiSuite/AbiWord/help/de-DE/images/find.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/finished.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/font-unix.png
-share/AbiSuite/AbiWord/help/de-DE/images/fonts.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/formatting.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/indent.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/italic.png
-share/AbiSuite/AbiWord/help/de-DE/images/kde1.gif
-share/AbiSuite/AbiWord/help/de-DE/images/kde2.gif
-share/AbiSuite/AbiWord/help/de-DE/images/kde3.gif
-share/AbiSuite/AbiWord/help/de-DE/images/kpack1.gif
-share/AbiSuite/AbiWord/help/de-DE/images/kpack2.gif
-share/AbiSuite/AbiWord/help/de-DE/images/line.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/margin.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/menubar.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/open.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/oppref.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/opspell.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/opview.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/overline.png
-share/AbiSuite/AbiWord/help/de-DE/images/panel.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/picture.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/print-unix.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/print-unix.png
-share/AbiSuite/AbiWord/help/de-DE/images/print.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/remove.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/removed.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/replace.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/rusure.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/save.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/space.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/spelling.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/standard.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/start.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/statusbar.png
-share/AbiSuite/AbiWord/help/de-DE/images/strikeout.png
-share/AbiSuite/AbiWord/help/de-DE/images/symbol.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/timedate.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/titlebar.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/underline.png
-share/AbiSuite/AbiWord/help/de-DE/images/wordcount.jpg
-share/AbiSuite/AbiWord/help/de-DE/images/zoom.jpg
-share/AbiSuite/AbiWord/help/de-DE/index.html
-share/AbiSuite/AbiWord/help/de-DE/install.html
-share/AbiSuite/AbiWord/help/de-DE/linux_intel.html
-share/AbiSuite/AbiWord/help/de-DE/linux_ppc.html
-share/AbiSuite/AbiWord/help/de-DE/new.html
-share/AbiSuite/AbiWord/help/de-DE/paragraph.html
-share/AbiSuite/AbiWord/help/de-DE/picture.html
-share/AbiSuite/AbiWord/help/de-DE/print.html
-share/AbiSuite/AbiWord/help/de-DE/saisie.html
-share/AbiSuite/AbiWord/help/de-DE/sdi.html
-share/AbiSuite/AbiWord/help/de-DE/search.html
-share/AbiSuite/AbiWord/help/de-DE/sections.html
-share/AbiSuite/AbiWord/help/de-DE/shortcuts.html
-share/AbiSuite/AbiWord/help/de-DE/solaris.html
-share/AbiSuite/AbiWord/help/de-DE/styles.html
-share/AbiSuite/AbiWord/help/de-DE/tabs.html
-share/AbiSuite/AbiWord/help/de-DE/why.html
-share/AbiSuite/AbiWord/help/de-DE/windows.html
-share/AbiSuite/AbiWord/help/de-DE/workspace.html
-share/AbiSuite/AbiWord/help/en-US/about.html
-share/AbiSuite/AbiWord/help/en-US/aboutabi.html
+bin/ttfadmin.sh
+bin/ttftool
 share/AbiSuite/AbiWord/help/en-US/aboutos.html
-share/AbiSuite/AbiWord/help/en-US/basis1.html
-share/AbiSuite/AbiWord/help/en-US/basis2.html
-share/AbiSuite/AbiWord/help/en-US/beos_intel.html
-share/AbiSuite/AbiWord/help/en-US/beos_ppc.html
-share/AbiSuite/AbiWord/help/en-US/bidi.html
-share/AbiSuite/AbiWord/help/en-US/check.html
-share/AbiSuite/AbiWord/help/en-US/column.html
-share/AbiSuite/AbiWord/help/en-US/comindex.html
-share/AbiSuite/AbiWord/help/en-US/contents.html
 share/AbiSuite/AbiWord/help/en-US/credits.html
-share/AbiSuite/AbiWord/help/en-US/custom.html
-share/AbiSuite/AbiWord/help/en-US/faq.html
-share/AbiSuite/AbiWord/help/en-US/find.html
-share/AbiSuite/AbiWord/help/en-US/format.html
-share/AbiSuite/AbiWord/help/en-US/freebsd_intel.htm
-share/AbiSuite/AbiWord/help/en-US/general.html
-share/AbiSuite/AbiWord/help/en-US/images/abiword.jpg
-share/AbiSuite/AbiWord/help/en-US/images/abiword.png
-share/AbiSuite/AbiWord/help/en-US/images/bold.png
-share/AbiSuite/AbiWord/help/en-US/images/break.jpg
-share/AbiSuite/AbiWord/help/en-US/images/browse.jpg
-share/AbiSuite/AbiWord/help/en-US/images/close_all.jpg
-share/AbiSuite/AbiWord/help/en-US/images/color-unix.png
-share/AbiSuite/AbiWord/help/en-US/images/elevator.png
-share/AbiSuite/AbiWord/help/en-US/images/faute1.gif
-share/AbiSuite/AbiWord/help/en-US/images/faute2.gif
-share/AbiSuite/AbiWord/help/en-US/images/find.jpg
-share/AbiSuite/AbiWord/help/en-US/images/finished.jpg
-share/AbiSuite/AbiWord/help/en-US/images/font-unix.png
-share/AbiSuite/AbiWord/help/en-US/images/fonts.jpg
-share/AbiSuite/AbiWord/help/en-US/images/formatting.jpg
-share/AbiSuite/AbiWord/help/en-US/images/indent.jpg
-share/AbiSuite/AbiWord/help/en-US/images/italic.png
-share/AbiSuite/AbiWord/help/en-US/images/kde1.gif
-share/AbiSuite/AbiWord/help/en-US/images/kde2.gif
-share/AbiSuite/AbiWord/help/en-US/images/kde3.gif
-share/AbiSuite/AbiWord/help/en-US/images/kpack1.gif
-share/AbiSuite/AbiWord/help/en-US/images/kpack2.gif
-share/AbiSuite/AbiWord/help/en-US/images/line.jpg
-share/AbiSuite/AbiWord/help/en-US/images/margin.jpg
-share/AbiSuite/AbiWord/help/en-US/images/menubar.jpg
-share/AbiSuite/AbiWord/help/en-US/images/open.jpg
-share/AbiSuite/AbiWord/help/en-US/images/oppref.jpg
-share/AbiSuite/AbiWord/help/en-US/images/opspell.jpg
-share/AbiSuite/AbiWord/help/en-US/images/opview.jpg
-share/AbiSuite/AbiWord/help/en-US/images/overline.png
-share/AbiSuite/AbiWord/help/en-US/images/panel.jpg
-share/AbiSuite/AbiWord/help/en-US/images/picture.jpg
-share/AbiSuite/AbiWord/help/en-US/images/print-unix.jpg
-share/AbiSuite/AbiWord/help/en-US/images/print-unix.png
-share/AbiSuite/AbiWord/help/en-US/images/print.jpg
-share/AbiSuite/AbiWord/help/en-US/images/remove.jpg
-share/AbiSuite/AbiWord/help/en-US/images/removed.jpg
-share/AbiSuite/AbiWord/help/en-US/images/replace.jpg
-share/AbiSuite/AbiWord/help/en-US/images/rusure.jpg
-share/AbiSuite/AbiWord/help/en-US/images/save.jpg
-share/AbiSuite/AbiWord/help/en-US/images/space.jpg
-share/AbiSuite/AbiWord/help/en-US/images/spelling.jpg
-share/AbiSuite/AbiWord/help/en-US/images/standard.jpg
-share/AbiSuite/AbiWord/help/en-US/images/start.jpg
-share/AbiSuite/AbiWord/help/en-US/images/statusbar.png
-share/AbiSuite/AbiWord/help/en-US/images/strikeout.png
-share/AbiSuite/AbiWord/help/en-US/images/symbol.jpg
-share/AbiSuite/AbiWord/help/en-US/images/timedate.jpg
-share/AbiSuite/AbiWord/help/en-US/images/titlebar.jpg
-share/AbiSuite/AbiWord/help/en-US/images/underline.png
-share/AbiSuite/AbiWord/help/en-US/images/wordcount.jpg
-share/AbiSuite/AbiWord/help/en-US/images/zoom.jpg
+share/AbiSuite/AbiWord/help/en-US/credits.txt
+share/AbiSuite/AbiWord/help/en-US/fdl.html
+share/AbiSuite/AbiWord/help/en-US/histyle.css
+share/AbiSuite/AbiWord/help/en-US/howto/howtonormaltemplate.html
+share/AbiSuite/AbiWord/help/en-US/howto/howtotables.html
+share/AbiSuite/AbiWord/help/en-US/howto/howtoweb.html
+share/AbiSuite/AbiWord/help/en-US/howto/howtoweb.xhtml_data/ruler.png
+share/AbiSuite/AbiWord/help/en-US/howto/howtoword.html
+share/AbiSuite/AbiWord/help/en-US/howto/howtoword.xhtml_data/gettingstarted.abw-0.png
+share/AbiSuite/AbiWord/help/en-US/howto/index.html
 share/AbiSuite/AbiWord/help/en-US/index.html
-share/AbiSuite/AbiWord/help/en-US/install.html
-share/AbiSuite/AbiWord/help/en-US/linux_intel.html
-share/AbiSuite/AbiWord/help/en-US/linux_ppc.html
-share/AbiSuite/AbiWord/help/en-US/new.html
-share/AbiSuite/AbiWord/help/en-US/paragraph.html
-share/AbiSuite/AbiWord/help/en-US/picture.html
-share/AbiSuite/AbiWord/help/en-US/print.html
-share/AbiSuite/AbiWord/help/en-US/saisie.html
-share/AbiSuite/AbiWord/help/en-US/sdi.html
+share/AbiSuite/AbiWord/help/en-US/info/index.html
+share/AbiSuite/AbiWord/help/en-US/info/inforequirements.html
+share/AbiSuite/AbiWord/help/en-US/info/infospelling.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogactivatewindow.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogbackgroundcolor.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogbookmark.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogbreak.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogchangecase.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogcolumns.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogdateandtime.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogfield.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogfind.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogfont.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogformatheaderfooters.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialoggoto.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialoghyperlink.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogimageproperties.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialoglanguage.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialoglists.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogmodifystyle.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialognew.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialognewstyle.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogopenlinux.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogpagenumbers.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogpagesetup.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogparagraph.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogplugins.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogpreferences.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogreplace.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogreplace.xhtml_data/replace.png
+share/AbiSuite/AbiWord/help/en-US/interface/dialogsavelinux.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogscreencolor.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogspelling.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogstyles.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogsymbol.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogtabs.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogwordcount.html
+share/AbiSuite/AbiWord/help/en-US/interface/dialogzoom.html
+share/AbiSuite/AbiWord/help/en-US/interface/index.html
+share/AbiSuite/AbiWord/help/en-US/interface/menucontextual.html
+share/AbiSuite/AbiWord/help/en-US/interface/menuedit.html
+share/AbiSuite/AbiWord/help/en-US/interface/menufile.html
+share/AbiSuite/AbiWord/help/en-US/interface/menuformat.html
+share/AbiSuite/AbiWord/help/en-US/interface/menuhelp.html
+share/AbiSuite/AbiWord/help/en-US/interface/menuinsert.html
+share/AbiSuite/AbiWord/help/en-US/interface/menutools.html
+share/AbiSuite/AbiWord/help/en-US/interface/menuview.html
+share/AbiSuite/AbiWord/help/en-US/interface/menuweb.html
+share/AbiSuite/AbiWord/help/en-US/interface/menuwindow.html
+share/AbiSuite/AbiWord/help/en-US/interface/rulers.html
+share/AbiSuite/AbiWord/help/en-US/interface/toolbarextra.html
+share/AbiSuite/AbiWord/help/en-US/interface/toolbarformatting.html
+share/AbiSuite/AbiWord/help/en-US/interface/toolbarstandard.html
+share/AbiSuite/AbiWord/help/en-US/interface/workspace.html
+share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/full_window.png
+share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/functionbars.png
+share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/functionbars_hiding.png
+share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/grabbar_shaded.png
+share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/ruler.png
+share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/statusbar.png
+share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/statusbar_quickhelp.png
+share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data/titlebar.png
+share/AbiSuite/AbiWord/help/en-US/introduction.html
+share/AbiSuite/AbiWord/help/en-US/problems/index.html
+share/AbiSuite/AbiWord/help/en-US/problems/problemsbugs.html
+share/AbiSuite/AbiWord/help/en-US/problems/problemsfaq.html
+share/AbiSuite/AbiWord/help/en-US/problems/problemsfonts.html
+share/AbiSuite/AbiWord/help/en-US/problems/problemshelp.html
 share/AbiSuite/AbiWord/help/en-US/search.html
-share/AbiSuite/AbiWord/help/en-US/sections.html
-share/AbiSuite/AbiWord/help/en-US/shortcuts.html
-share/AbiSuite/AbiWord/help/en-US/solaris.html
-share/AbiSuite/AbiWord/help/en-US/styles.html
-share/AbiSuite/AbiWord/help/en-US/tabs.html
-share/AbiSuite/AbiWord/help/en-US/vierge.html
-share/AbiSuite/AbiWord/help/en-US/why.html
-share/AbiSuite/AbiWord/help/en-US/windows.html
-share/AbiSuite/AbiWord/help/en-US/workspace.html
-share/AbiSuite/AbiWord/help/es-ES/about.html
-share/AbiSuite/AbiWord/help/es-ES/basis1.html
-share/AbiSuite/AbiWord/help/es-ES/basis2.html
-share/AbiSuite/AbiWord/help/es-ES/beos_intel.html
-share/AbiSuite/AbiWord/help/es-ES/beos_ppc.html
-share/AbiSuite/AbiWord/help/es-ES/column.html
-share/AbiSuite/AbiWord/help/es-ES/credits.html
-share/AbiSuite/AbiWord/help/es-ES/custom.html
-share/AbiSuite/AbiWord/help/es-ES/index.html
-share/AbiSuite/AbiWord/help/es-ES/why.html
-share/AbiSuite/AbiWord/help/fr-FR/about.html
-share/AbiSuite/AbiWord/help/fr-FR/basis1.html
-share/AbiSuite/AbiWord/help/fr-FR/basis2.html
-share/AbiSuite/AbiWord/help/fr-FR/beos_intel.html
-share/AbiSuite/AbiWord/help/fr-FR/beos_ppc.html
-share/AbiSuite/AbiWord/help/fr-FR/column.html
-share/AbiSuite/AbiWord/help/fr-FR/comindex.html
-share/AbiSuite/AbiWord/help/fr-FR/contents.html
-share/AbiSuite/AbiWord/help/fr-FR/credits.html
-share/AbiSuite/AbiWord/help/fr-FR/custom.html
-share/AbiSuite/AbiWord/help/fr-FR/faq.html
-share/AbiSuite/AbiWord/help/fr-FR/find.html
-share/AbiSuite/AbiWord/help/fr-FR/format.html
-share/AbiSuite/AbiWord/help/fr-FR/freebsd_intel.htm
-share/AbiSuite/AbiWord/help/fr-FR/general.html
-share/AbiSuite/AbiWord/help/fr-FR/images/abifr.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/abiword.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/bold.png
-share/AbiSuite/AbiWord/help/fr-FR/images/break.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/browse.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/close_all.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/color-unix-fr.png
-share/AbiSuite/AbiWord/help/fr-FR/images/columns.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/faute1.gif
-share/AbiSuite/AbiWord/help/fr-FR/images/faute2.gif
-share/AbiSuite/AbiWord/help/fr-FR/images/find.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/finished.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/font-unix.png
-share/AbiSuite/AbiWord/help/fr-FR/images/fonts.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/formatting.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/goto.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/indent.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/italic.png
-share/AbiSuite/AbiWord/help/fr-FR/images/kde1.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/kde2.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/kde3.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/kpack1.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/kpack2.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/line.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/margin.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/menubar.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/open.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/opother.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/oppref.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/opspell.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/opview.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/overline.png
-share/AbiSuite/AbiWord/help/fr-FR/images/panel.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/picture.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/print-unix.png
-share/AbiSuite/AbiWord/help/fr-FR/images/print.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/remove.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/removed.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/replace.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/rusure.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/save.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/space.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/spelling.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/start.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/strikeout.png
-share/AbiSuite/AbiWord/help/fr-FR/images/symbol.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/timedate.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/underline.png
-share/AbiSuite/AbiWord/help/fr-FR/images/wordcount.jpg
-share/AbiSuite/AbiWord/help/fr-FR/images/zoom.jpg
-share/AbiSuite/AbiWord/help/fr-FR/index.html
-share/AbiSuite/AbiWord/help/fr-FR/install.html
-share/AbiSuite/AbiWord/help/fr-FR/linux_intel.html
-share/AbiSuite/AbiWord/help/fr-FR/linux_ppc.html
-share/AbiSuite/AbiWord/help/fr-FR/paragraph.html
-share/AbiSuite/AbiWord/help/fr-FR/picture.html
-share/AbiSuite/AbiWord/help/fr-FR/print.html
-share/AbiSuite/AbiWord/help/fr-FR/saisie.html
-share/AbiSuite/AbiWord/help/fr-FR/sdi.html
-share/AbiSuite/AbiWord/help/fr-FR/sections.html
-share/AbiSuite/AbiWord/help/fr-FR/shortcuts.html
-share/AbiSuite/AbiWord/help/fr-FR/solaris.html
-share/AbiSuite/AbiWord/help/fr-FR/styles.html
-share/AbiSuite/AbiWord/help/fr-FR/tabs.html
-share/AbiSuite/AbiWord/help/fr-FR/why.html
-share/AbiSuite/AbiWord/help/fr-FR/windows.html
-share/AbiSuite/AbiWord/help/fr-FR/workspace.html
-share/AbiSuite/AbiWord/help/images/1column.png
-share/AbiSuite/AbiWord/help/images/2columns.png
-share/AbiSuite/AbiWord/help/images/3columns.png
-share/AbiSuite/AbiWord/help/images/abisource.gif
-share/AbiSuite/AbiWord/help/images/abiword.png
-share/AbiSuite/AbiWord/help/images/center.png
-share/AbiSuite/AbiWord/help/images/close.png
-share/AbiSuite/AbiWord/help/images/copy.png
-share/AbiSuite/AbiWord/help/images/cursor1.gif
-share/AbiSuite/AbiWord/help/images/cursor10.gif
-share/AbiSuite/AbiWord/help/images/cursor2.gif
-share/AbiSuite/AbiWord/help/images/cursor3.gif
-share/AbiSuite/AbiWord/help/images/cursor4.gif
-share/AbiSuite/AbiWord/help/images/cursor5.gif
-share/AbiSuite/AbiWord/help/images/cursor6.gif
-share/AbiSuite/AbiWord/help/images/cursor7.gif
-share/AbiSuite/AbiWord/help/images/cursor8.gif
-share/AbiSuite/AbiWord/help/images/cursor9.gif
-share/AbiSuite/AbiWord/help/images/cut.png
-share/AbiSuite/AbiWord/help/images/dir_ltr.png
-share/AbiSuite/AbiWord/help/images/dir_rtl.png
-share/AbiSuite/AbiWord/help/images/elevator.png
-share/AbiSuite/AbiWord/help/images/exmarg1.jpg
-share/AbiSuite/AbiWord/help/images/expose.png
-share/AbiSuite/AbiWord/help/images/exrul1.jpg
-share/AbiSuite/AbiWord/help/images/extabs1.jpg
-share/AbiSuite/AbiWord/help/images/extabs2.jpg
-share/AbiSuite/AbiWord/help/images/fonts.png
-share/AbiSuite/AbiWord/help/images/icon.png
-share/AbiSuite/AbiWord/help/images/indice.png
-share/AbiSuite/AbiWord/help/images/ins.png
-share/AbiSuite/AbiWord/help/images/justify.png
-share/AbiSuite/AbiWord/help/images/left.png
-share/AbiSuite/AbiWord/help/images/maximis.png
-share/AbiSuite/AbiWord/help/images/mdi.jpg
-share/AbiSuite/AbiWord/help/images/minim.png
-share/AbiSuite/AbiWord/help/images/new.png
-share/AbiSuite/AbiWord/help/images/open.png
-share/AbiSuite/AbiWord/help/images/ovr.png
-share/AbiSuite/AbiWord/help/images/para_dir.png
-share/AbiSuite/AbiWord/help/images/paste.png
-share/AbiSuite/AbiWord/help/images/print.png
-share/AbiSuite/AbiWord/help/images/redo.png
-share/AbiSuite/AbiWord/help/images/right.png
-share/AbiSuite/AbiWord/help/images/ruler.jpg
-share/AbiSuite/AbiWord/help/images/ruler.png
-share/AbiSuite/AbiWord/help/images/s_space0.png
-share/AbiSuite/AbiWord/help/images/s_space15.png
-share/AbiSuite/AbiWord/help/images/s_space2.png
-share/AbiSuite/AbiWord/help/images/save.png
-share/AbiSuite/AbiWord/help/images/save_un.png
-share/AbiSuite/AbiWord/help/images/sdi.jpg
-share/AbiSuite/AbiWord/help/images/sizcolumn.png
-share/AbiSuite/AbiWord/help/images/size.png
-share/AbiSuite/AbiWord/help/images/source.png
-share/AbiSuite/AbiWord/help/images/space_b0.png
-share/AbiSuite/AbiWord/help/images/space_b12.png
-share/AbiSuite/AbiWord/help/images/standard.jpg
-share/AbiSuite/AbiWord/help/images/statusbar.jpg
-share/AbiSuite/AbiWord/help/images/style.png
-share/AbiSuite/AbiWord/help/images/styles.jpg
-share/AbiSuite/AbiWord/help/images/symbol.png
-share/AbiSuite/AbiWord/help/images/tabs_d.gif
-share/AbiSuite/AbiWord/help/images/tabs_l.gif
-share/AbiSuite/AbiWord/help/images/tabs_m.gif
-share/AbiSuite/AbiWord/help/images/tabs_r.gif
-share/AbiSuite/AbiWord/help/images/titlebar.jpg
-share/AbiSuite/AbiWord/help/images/topbar_logo.png
-share/AbiSuite/AbiWord/help/images/topbar_right.png
-share/AbiSuite/AbiWord/help/images/undo.png
-share/AbiSuite/AbiWord/help/images/website.jpg
-share/AbiSuite/AbiWord/help/images/wedge_l.gif
-share/AbiSuite/AbiWord/help/images/zoom.png
-share/AbiSuite/AbiWord/help/index.html
+share/AbiSuite/AbiWord/help/en-US/style.css
+share/AbiSuite/AbiWord/help/en-US/tutorial/index.html
 share/AbiSuite/AbiWord/readme.txt
+share/AbiSuite/AbiWord/scripts/abw2html.pl
 share/AbiSuite/AbiWord/strings/bg-BG.strings
 share/AbiSuite/AbiWord/strings/ca-ES.strings
 share/AbiSuite/AbiWord/strings/cs-CZ.strings
@@ -433,6 +151,7 @@ share/AbiSuite/AbiWord/system.profile-en-US
 share/AbiSuite/AbiWord/system.profile-en-ZA
 share/AbiSuite/AbiWord/system.profile-es
 share/AbiSuite/AbiWord/system.profile-es-ES
+share/AbiSuite/AbiWord/system.profile-fi-FI
 share/AbiSuite/AbiWord/system.profile-fr
 share/AbiSuite/AbiWord/system.profile-fr-BE
 share/AbiSuite/AbiWord/system.profile-fr-CA
@@ -461,7 +180,8 @@ share/AbiSuite/AbiWord/system.profile-tr-TR
 share/AbiSuite/AbiWord/system.profile-tr-TR.CP1254
 share/AbiSuite/AbiWord/system.profile-zh-CN
 share/AbiSuite/AbiWord/system.profile-zh-TW
-share/AbiSuite/COPYING
+share/AbiSuite/GNOME_AbiWord_Control_1_0.oaf
+share/AbiSuite/README
 share/AbiSuite/clipart/book.png
 share/AbiSuite/clipart/chip.png
 share/AbiSuite/clipart/fun.png
@@ -489,6 +209,7 @@ share/AbiSuite/clipart/tree.png
 share/AbiSuite/clipart/tux_bordelais.png
 share/AbiSuite/clipart/weather.png
 share/AbiSuite/clipart/write.png
+share/AbiSuite/dictionary/american.hash
 share/AbiSuite/fonts/a010013l.afm
 share/AbiSuite/fonts/a010013l.pfb
 share/AbiSuite/fonts/a010015l.afm
@@ -575,34 +296,27 @@ share/AbiSuite/fonts/s050000l.u2g
 share/AbiSuite/fonts/symbol.e2u
 share/AbiSuite/fonts/z003034l.afm
 share/AbiSuite/fonts/z003034l.pfb
-share/AbiSuite/icons/abiword_16.xpm
 share/AbiSuite/icons/abiword_48.png
 share/AbiSuite/icons/abiword_48.tif
 share/AbiSuite/icons/abiword_48.xpm
-share/AbiSuite/icons/abiword_logo.xpm
-share/AbiSuite/readme.txt
-share/AbiSuite/templates/2-columns.awt
-share/AbiSuite/templates/Employee-Directory.awt
-share/AbiSuite/templates/Fax-Coversheet.awt
-share/AbiSuite/templates/a4.awt
 share/AbiSuite/templates/normal.awt
-share/AbiSuite/templates/us-letter.awt
-@dirrm libexec/AbiSuite
-@dirrm share/AbiSuite/AbiWord/help/de-DE/de_DE
-@dirrm share/AbiSuite/AbiWord/help/de-DE/images
-@dirrm share/AbiSuite/AbiWord/help/de-DE
-@dirrm share/AbiSuite/AbiWord/help/en-US/images
+@dirrm share/AbiSuite/templates
+@dirrm share/AbiSuite/icons
+@dirrm share/AbiSuite/fonts
+@dirrm share/AbiSuite/dictionary
+@dirrm share/AbiSuite/clipart
+@dirrm share/AbiSuite/AbiWord/strings
+@dirrm share/AbiSuite/AbiWord/scripts
+@dirrm share/AbiSuite/AbiWord/help/en-US/tutorial
+@dirrm share/AbiSuite/AbiWord/help/en-US/problems
+@dirrm share/AbiSuite/AbiWord/help/en-US/interface/workspace.xhtml_data
+@dirrm share/AbiSuite/AbiWord/help/en-US/interface/dialogreplace.xhtml_data
+@dirrm share/AbiSuite/AbiWord/help/en-US/interface
+@dirrm share/AbiSuite/AbiWord/help/en-US/info
+@dirrm share/AbiSuite/AbiWord/help/en-US/howto/howtoword.xhtml_data
+@dirrm share/AbiSuite/AbiWord/help/en-US/howto/howtoweb.xhtml_data
+@dirrm share/AbiSuite/AbiWord/help/en-US/howto
 @dirrm share/AbiSuite/AbiWord/help/en-US
-@dirrm share/AbiSuite/AbiWord/help/es-ES
-@dirrm share/AbiSuite/AbiWord/help/fr-FR/images
-@dirrm share/AbiSuite/AbiWord/help/fr-FR
-@dirrm share/AbiSuite/AbiWord/help/images
 @dirrm share/AbiSuite/AbiWord/help
-@dirrm share/AbiSuite/AbiWord/sample
-@dirrm share/AbiSuite/AbiWord/strings
 @dirrm share/AbiSuite/AbiWord
-@dirrm share/AbiSuite/clipart
-@dirrm share/AbiSuite/fonts
-@dirrm share/AbiSuite/icons
-@dirrm share/AbiSuite/templates
 @dirrm share/AbiSuite
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index a35ee20952b..7c1f93e16cf 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.13 2002/04/12 14:32:50 martti Exp $
+$NetBSD: distinfo,v 1.14 2002/07/03 21:59:08 hubertf Exp $
 
-SHA1 (abisuite/abiword-0.99.5.tar.gz) = 977bd9ba4ea0febd15fd965301c388e31d28bbeb
-Size (abisuite/abiword-0.99.5.tar.gz) = 17420673 bytes
-SHA1 (patch-ab) = 0c82a09cd845209601f2a4f240a2abaa6f537f30
-SHA1 (patch-ad) = d50303d72bc64b30e7e14c576e2f3a27e4b3cdbd
-SHA1 (patch-ae) = 29d768b6880c9de8ca69e73e0de7b54e78c71b05
+SHA1 (abisuite/abiword-1.0.2.tar.gz) = c7a3f2ee7b00d5e5f32b43514fa170521991d3c2
+Size (abisuite/abiword-1.0.2.tar.gz) = 15642705 bytes
+SHA1 (patch-ab) = 9336e537e81ad052bd5d3fef7f96ed47e4a10d60
+SHA1 (patch-ad) = 1b1cdab98c9b58b5395e0a43169fa54cac819b04
+SHA1 (patch-ae) = a8fbe68e56bed6881329632bb12173cb67b8d750
 SHA1 (patch-af) = 9bf0cb3abe338b7021acbf771b34b55bb7edcbae
-SHA1 (patch-ag) = 10652c6c72e71cbd0178fb715e083c3fc43af1d4
+SHA1 (patch-ag) = 9a9faa81fc5343c7f33e8148f30fbbb845b21c4c
 SHA1 (patch-ah) = 19e2e5def6d235ff44efc856346a4ae85b2bdbd5
 SHA1 (patch-ai) = ff616312cd542e1d8d4d08492bf3359f2209037c
-SHA1 (patch-ak) = d1785eaad54530aa16facc4630b4db7f69983058
-SHA1 (patch-al) = 246146fa0d45c094a7d82c255dc8011b136a74ce
+SHA1 (patch-ak) = 692401ca4f4d701b5eca3952ef300497d35f6b27
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab
index a1238c19175..3e612ecf6db 100644
--- a/editors/abiword/patches/patch-ab
+++ b/editors/abiword/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2001/11/26 13:08:25 martti Exp $
+$NetBSD: patch-ab,v 1.6 2002/07/03 21:59:09 hubertf Exp $
 
---- src/Makefile.orig	Sun Nov 11 15:59:25 2001
-+++ src/Makefile	Mon Nov 26 12:49:38 2001
-@@ -138,7 +138,7 @@
+--- src/Makefile.orig	Thu May 30 23:51:53 2002
++++ src/Makefile
+@@ -141,7 +141,7 @@
  endif
  
  # The generic target
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad
index 52f339e3869..f79c1735d3e 100644
--- a/editors/abiword/patches/patch-ad
+++ b/editors/abiword/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.8 2001/11/26 13:08:25 martti Exp $
+$NetBSD: patch-ad,v 1.9 2002/07/03 21:59:09 hubertf Exp $
 
 --- src/config/require/unix/Makefile.orig	Fri Oct 26 00:43:46 2001
-+++ src/config/require/unix/Makefile	Mon Nov 26 12:50:21 2001
++++ src/config/require/unix/Makefile
 @@ -187,7 +187,7 @@
  		fi								
  
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
index c9d4cdbe2be..a4fae7b0494 100644
--- a/editors/abiword/patches/patch-ae
+++ b/editors/abiword/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.9 2002/04/12 14:32:51 martti Exp $
+$NetBSD: patch-ae,v 1.10 2002/07/03 21:59:10 hubertf Exp $
 
 --- src/other/spell/xp/ispell.h.orig	Fri Mar 22 15:31:57 2002
-+++ src/other/spell/xp/ispell.h	Fri Apr 12 12:45:12 2002
++++ src/other/spell/xp/ispell.h
 @@ -257,7 +257,7 @@
  ** character counts as two!
  */
@@ -18,7 +18,7 @@ $NetBSD: patch-ae,v 1.9 2002/04/12 14:32:51 martti Exp $
 -    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 */
++    PTRSIZE lstringsize;			/* Size of lang. string table */
      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-ag b/editors/abiword/patches/patch-ag
index 4dd79825216..9b47ad7da61 100644
--- a/editors/abiword/patches/patch-ag
+++ b/editors/abiword/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.6 2001/11/26 13:08:25 martti Exp $
+$NetBSD: patch-ag,v 1.7 2002/07/03 21:59:10 hubertf Exp $
 
 --- src/other/spell/xp/lookup.c.orig	Mon Aug 27 21:06:30 2001
-+++ src/other/spell/xp/lookup.c	Mon Nov 26 12:54:18 2001
++++ src/other/spell/xp/lookup.c
 @@ -314,22 +314,22 @@
  	    if (dp->word == (char *) -1)
  		dp->word = NULL;
diff --git a/editors/abiword/patches/patch-ak b/editors/abiword/patches/patch-ak
index bed6f3c3c90..215c03fd8ab 100644
--- a/editors/abiword/patches/patch-ak
+++ b/editors/abiword/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.4 2001/11/26 13:08:25 martti Exp $
+$NetBSD: patch-ak,v 1.5 2002/07/03 21:59:11 hubertf Exp $
 
---- src/pkg/common/unix/scripts/install.sh.orig	Mon Nov 26 13:59:07 2001
-+++ src/pkg/common/unix/scripts/install.sh	Mon Nov 26 13:59:31 2001
+--- src/pkg/common/unix/scripts/install.sh.orig	Tue Apr 16 15:07:49 2002
++++ src/pkg/common/unix/scripts/install.sh
 @@ -131,15 +131,6 @@
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.4 2001/11/26 13:08:25 martti Exp $
 -
 -echo "Installing ttfadmin script [$TARGET/bin]"
 -cp -f $SCRIPTDIR/../../../../tools/scripts/unix/ttfadmin.sh $TARGET/bin/ttfadmin.sh
--chmod 500 $TARGET/bin/ttfadmin.sh
+-chmod 755 $TARGET/bin/ttfadmin.sh
 -
 -
 -########################################################################
diff --git a/editors/abiword/patches/patch-al b/editors/abiword/patches/patch-al
deleted file mode 100644
index f81b38eb2f0..00000000000
--- a/editors/abiword/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.3 2002/04/10 08:17:04 martti Exp $
-
---- src/af/util/xp/ut_iconv.cpp.orig	Wed Apr 10 09:46:24 2002
-+++ src/af/util/xp/ut_iconv.cpp	Wed Apr 10 09:46:56 2002
-@@ -115,7 +115,7 @@
-   // we special-case the win32 build, otherwise spelling and other stuff
-   // just doesn't work
-   return "UCS-2LE";
--#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-   // we special case the BSDs since spelling just doesn't work
-   return "UCS2";
- #else