Changes 2.8.6:

* Preserve character properties when typing. This fixes a bad regression that
  was introduced in 2.8.5.

Changes 2.8.5:
* Fix paste of rich text from HTML and ODT, where previously some formatting
  properties were not closed properly.
* Add a number of robustness fixes to the layout engine.
* Fix a table selection bug.

4 files changed, 70 insertions, 119 deletions

diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 0b24f831ae8..527dd952a08 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -1,61 +1,29 @@
-# $NetBSD: Makefile,v 1.35 2010/11/25 10:28:34 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/11/26 14:49:50 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../editors/abiword/Makefile.common"
 
-DISTNAME=	abiword-plugins-${ABIWORD_VERSION}
-PKGREVISION=	6
-
+PKGNAME=	abiword-plugins-${ABIVERSION}
 COMMENT=	Plugins enhancing Abiword's capabilities
 
-DISTFILES=	${DEFAULT_DISTFILES}
-DISTFILES+=	abiword-2.6.8.tar.gz
+BUILD_DEPENDS+=	abiword-${ABIVERSION}{,nb*}:../../editors/abiword
 
-#WRKSRC=		${WRKDIR}/${DISTNAME}/abiword-plugins
+.include "../../mk/bsd.prefs.mk"
 
-BUILD_DEPENDS+=	abiword-${ABIWORD_VERSION}{,nb*}:../../editors/abiword
+# disabled plugins:
+#  aiksaurus mathview ots gda goffice grammar psiconv rsvg wordperfect wpg
+CONFIGURE_ARGS+=	--enable-plugins="applix babelfish bmp clarisworks collab command docbook eml freetranslation garble gdict gimp google hancom hrtext iscii kword latex loadbindings mht mif mswrite opendocument openwriter openxml opml paint passepartout pdb pdf presentation s5 sdw t602 urldict wikipedia wmf wml xslfo"
 
-.include "../../mk/bsd.prefs.mk"
+BUILD_DIRS=	plugins
 
-CONFIGURE_ARGS+=	--disable-all
-CONFIGURE_ARGS+=	--enable-OpenDocument
-CONFIGURE_ARGS+=	--enable-OpenWriter
-CONFIGURE_ARGS+=	--enable-abicapi
-CONFIGURE_ARGS+=	--enable-abicommand
-CONFIGURE_ARGS+=	--enable-abidash
-CONFIGURE_ARGS+=	--enable-applix
-CONFIGURE_ARGS+=	--enable-babelfish
-CONFIGURE_ARGS+=	--enable-bmp
-CONFIGURE_ARGS+=	--enable-bz2abw
-CONFIGURE_ARGS+=	--enable-clarisworks
-CONFIGURE_ARGS+=	--enable-docbook
-CONFIGURE_ARGS+=	--enable-eml
-CONFIGURE_ARGS+=	--enable-freetranslation
-CONFIGURE_ARGS+=	--enable-gdict
-CONFIGURE_ARGS+=	--enable-google
-CONFIGURE_ARGS+=	--enable-hancom
-CONFIGURE_ARGS+=	--enable-hrtext
-CONFIGURE_ARGS+=	--enable-iscii-text
-CONFIGURE_ARGS+=	--enable-jpeg
-CONFIGURE_ARGS+=	--enable-kword
-CONFIGURE_ARGS+=	--enable-latex
-CONFIGURE_ARGS+=	--enable-mif
-CONFIGURE_ARGS+=	--enable-mswrite
-CONFIGURE_ARGS+=	--enable-nroff
-CONFIGURE_ARGS+=	--enable-passepartout
-CONFIGURE_ARGS+=	--enable-sdw
-CONFIGURE_ARGS+=	--enable-t602
-CONFIGURE_ARGS+=	--enable-urldict
-CONFIGURE_ARGS+=	--enable-wikipedia
-CONFIGURE_ARGS+=	--enable-wmf
-CONFIGURE_ARGS+=	--enable-wml
-CONFIGURE_ARGS+=	--enable-wordperfect
-CONFIGURE_ARGS+=	--enable-xhtml
-CONFIGURE_ARGS+=	--enable-xsl-fo
-
-CONFIGURE_ARGS+=	--with-abiword=${WRKDIR}/abiword-2.6.8
-
-.include "../../converters/libwpd/buildlink3.mk"
+#.include "../../converters/libwpd/buildlink3.mk"
+#.include "../../converters/libwpg/buildlink3.mk"
+#.include "../../converters/libwps/buildlink3.mk"
+#.include "../../databases/libgda/buildlink3.mk"
+#.include "../../databases/libgnomedb/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+#.include "../../textproc/aiksaurus/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+#.include "../../textproc/link-grammar/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/abiword-plugins/PLIST b/editors/abiword-plugins/PLIST
index b31e2057e4f..3b0e5d763f0 100644
--- a/editors/abiword-plugins/PLIST
+++ b/editors/abiword-plugins/PLIST
@@ -1,40 +1,54 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:50:20 joerg Exp $
-lib/abiword-2.6/plugins/libAbiApplix.la
-lib/abiword-2.6/plugins/libAbiBMP.la
-lib/abiword-2.6/plugins/libAbiBabelfish.la
-lib/abiword-2.6/plugins/libAbiClarisWorks.la
-lib/abiword-2.6/plugins/libAbiCommand.la
-lib/abiword-2.6/plugins/libAbiDocBook.la
-lib/abiword-2.6/plugins/libAbiEML.la
-lib/abiword-2.6/plugins/libAbiFreeTranslation.la
-lib/abiword-2.6/plugins/libAbiGdict.la
-lib/abiword-2.6/plugins/libAbiGoogle.la
-lib/abiword-2.6/plugins/libAbiHRText.la
-lib/abiword-2.6/plugins/libAbiHancom.la
-lib/abiword-2.6/plugins/libAbiISCII.la
-lib/abiword-2.6/plugins/libAbiJPEG.la
-lib/abiword-2.6/plugins/libAbiKWord.la
-lib/abiword-2.6/plugins/libAbiLaTeX.la
-lib/abiword-2.6/plugins/libAbiMIF.la
-lib/abiword-2.6/plugins/libAbiMSWrite.la
-lib/abiword-2.6/plugins/libAbiNroff.la
-lib/abiword-2.6/plugins/libAbiOpenDocument.la
-lib/abiword-2.6/plugins/libAbiOpenWriter.la
-lib/abiword-2.6/plugins/libAbiPassepartout.la
-lib/abiword-2.6/plugins/libAbiSDW.la
-lib/abiword-2.6/plugins/libAbiT602.la
-lib/abiword-2.6/plugins/libAbiURLDict.la
-lib/abiword-2.6/plugins/libAbiWMF.la
-lib/abiword-2.6/plugins/libAbiWML.la
-lib/abiword-2.6/plugins/libAbiWikipedia.la
-lib/abiword-2.6/plugins/libAbiWordPerfect.la
-lib/abiword-2.6/plugins/libAbiXHTML.la
-lib/abiword-2.6/plugins/libAbiXSLFO.la
-share/abiword-2.6/xsltml/README
-share/abiword-2.6/xsltml/cmarkup.xsl
-share/abiword-2.6/xsltml/entities.xsl
-share/abiword-2.6/xsltml/glayout.xsl
-share/abiword-2.6/xsltml/mmltex.xsl
-share/abiword-2.6/xsltml/scripts.xsl
-share/abiword-2.6/xsltml/tables.xsl
-share/abiword-2.6/xsltml/tokens.xsl
+@comment $NetBSD: PLIST,v 1.13 2010/11/26 14:49:50 adam Exp $
+lib/abiword-2.8/plugins/applix.la
+lib/abiword-2.8/plugins/babelfish.la
+lib/abiword-2.8/plugins/bmp.la
+lib/abiword-2.8/plugins/clarisworks.la
+lib/abiword-2.8/plugins/collab.la
+lib/abiword-2.8/plugins/command.la
+lib/abiword-2.8/plugins/docbook.la
+lib/abiword-2.8/plugins/eml.la
+lib/abiword-2.8/plugins/freetranslation.la
+lib/abiword-2.8/plugins/garble.la
+lib/abiword-2.8/plugins/gdict.la
+lib/abiword-2.8/plugins/gimp.la
+lib/abiword-2.8/plugins/google.la
+lib/abiword-2.8/plugins/hancom.la
+lib/abiword-2.8/plugins/hrtext.la
+lib/abiword-2.8/plugins/iscii.la
+lib/abiword-2.8/plugins/kword.la
+lib/abiword-2.8/plugins/latex.la
+lib/abiword-2.8/plugins/loadbindings.la
+lib/abiword-2.8/plugins/mht.la
+lib/abiword-2.8/plugins/mif.la
+lib/abiword-2.8/plugins/mswrite.la
+lib/abiword-2.8/plugins/opendocument.la
+lib/abiword-2.8/plugins/openwriter.la
+lib/abiword-2.8/plugins/openxml.la
+lib/abiword-2.8/plugins/opml.la
+lib/abiword-2.8/plugins/paint.la
+lib/abiword-2.8/plugins/passepartout.la
+lib/abiword-2.8/plugins/pdb.la
+lib/abiword-2.8/plugins/pdf.la
+lib/abiword-2.8/plugins/presentation.la
+lib/abiword-2.8/plugins/s5.la
+lib/abiword-2.8/plugins/sdw.la
+lib/abiword-2.8/plugins/t602.la
+lib/abiword-2.8/plugins/urldict.la
+lib/abiword-2.8/plugins/wikipedia.la
+lib/abiword-2.8/plugins/wmf.la
+lib/abiword-2.8/plugins/wml.la
+lib/abiword-2.8/plugins/xslfo.la
+share/abiword-2.8/Presentation.xml
+share/abiword-2.8/ui/ap_UnixDialog_CollaborationAccounts.xml
+share/abiword-2.8/ui/ap_UnixDialog_CollaborationAddAccount.xml
+share/abiword-2.8/ui/ap_UnixDialog_CollaborationAddBuddy.xml
+share/abiword-2.8/ui/ap_UnixDialog_CollaborationJoin.xml
+share/abiword-2.8/ui/ap_UnixDialog_CollaborationShare.xml
+share/abiword-2.8/xsltml/README
+share/abiword-2.8/xsltml/cmarkup.xsl
+share/abiword-2.8/xsltml/entities.xsl
+share/abiword-2.8/xsltml/glayout.xsl
+share/abiword-2.8/xsltml/mmltex.xsl
+share/abiword-2.8/xsltml/scripts.xsl
+share/abiword-2.8/xsltml/tables.xsl
+share/abiword-2.8/xsltml/tokens.xsl
diff --git a/editors/abiword-plugins/distinfo b/editors/abiword-plugins/distinfo
deleted file mode 100644
index f1fd4399c61..00000000000
--- a/editors/abiword-plugins/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.21 2009/04/07 16:27:09 drochner Exp $
-
-SHA1 (abiword-2.6.8.tar.gz) = fc979982edc3445385705afdb1e2ebb1fa53a4f6
-RMD160 (abiword-2.6.8.tar.gz) = 8fcf455a5226a5525b9a89f88c9916b20e973607
-Size (abiword-2.6.8.tar.gz) = 9516443 bytes
-SHA1 (abiword-plugins-2.6.8.tar.gz) = fa8ad1985de5523f9993cef93af0dad174e8e5a5
-RMD160 (abiword-plugins-2.6.8.tar.gz) = be4e7b0fd87dfffc5f32f0a8a9d81f0ce403cc54
-Size (abiword-plugins-2.6.8.tar.gz) = 1991215 bytes
-SHA1 (patch-ab) = e79caa795c97a897dfe78061fcd6e0f790d082a8
diff --git a/editors/abiword-plugins/patches/patch-ab b/editors/abiword-plugins/patches/patch-ab
deleted file mode 100644
index a5b0be86924..00000000000
--- a/editors/abiword-plugins/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/04/07 16:27:09 drochner Exp $
-
---- configure.orig	2009-03-19 13:47:26.000000000 +0100
-+++ configure
-@@ -25370,7 +25370,7 @@ else
- 
- fi
- 
--if test "$abi_cv_libxslt" == "yes"; then
-+if test "$abi_cv_libxslt" = "yes"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for LIBXSLT" >&5
-@@ -25498,7 +25498,7 @@ fi
- LATEX_CFLAGS="$LATEX_CFLAGS "'${PLUGIN_CFLAGS}'
- LATEX_LIBS="$LATEX_LIBS "'${PLUGIN_LIBS}'
- 
--if test "$enable_latex_builtin" == "yes"; then
-+if test "$enable_latex_builtin" = "yes"; then
- 	LATEX_CFLAGS="$LATEX_CFLAGS -DABI_PLUGIN_BUILTIN"
- fi
-