Update to 2.6.0. In the next release 2.6.1 should have fix reduce

dependencies. Do not complain to me for extra dependencies. Anyway, see
release notes:

	http://www.abisource.com/release-notes/2.6.0.phtml

Addition details for abiword-plugins:
	-Remove bz2abw plugins, no longer exists.
	-Add MathView and OpenXML plugins.
	-Add all --disable-* in there in case if they add autocheck.

15 files changed, 483 insertions, 532 deletions

diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 106faae4edd5..efbd00cc406e 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -6,41 +6,34 @@
 #   $MCom: ports/editors/abiword-plugins/Makefile,v 1.18 2006/07/18 12:45:43 ahze Exp $
 #
 
-PORTNAME=	abiword
-PORTVERSION=	2.4.6
-PORTREVISION=	1
+PORTNAME=	abiword-plugins
+PORTVERSION=	2.6.0
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
-PKGNAMESUFFIX=	-plugins
 DIST_SUBDIR=	AbiWord
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
+		${PORTNAME:S/-plugins//}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multi-plugins for AbiWord
 
-BUILD_DEPENDS=	AbiWord-${ABIVERSION}:${PORTSDIR}/editors/abiword
-RUN_DEPENDS=	AbiWord-${ABIVERSION}:${PORTSDIR}/editors/abiword
+BUILD_DEPENDS=	abiword:${PORTSDIR}/editors/abiword
+RUN_DEPENDS=	abiword:${PORTSDIR}/editors/abiword
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-all
+CONFIGURE_ARGS=	--disable-all \
+		--with-abiword=${WRKDIR}/${PORTNAME:S/-plugins//}-${PORTVERSION}
 MAKEFILE=	GNUmakefile
 
-WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abiword-plugins
-MD5_FILE=	${.CURDIR}/usr/ports/editors/abiword/distinfo
-
-ABIVERSION=	2.4
+ABIVERSION=	2.6
 PLIST_SUB+=	ABIVERSION=${ABIVERSION}
 
-EXTERNALS=	MSVC* abipbx abiword-docs expat fribidi libiconv libpng pbx \
-		popt wv zlib
-EXTRACT_AFTER_ARGS=| ${TAR} -xpf - ${EXTERNALS:C,^,--exclude ${DISTNAME}/,}
-
 .if !defined(WITHOUT_OPTIONS)
 .include "${.CURDIR}/options"
 .endif
@@ -54,6 +47,7 @@ LIB_DEPENDS+=		AiksaurusGTK-1.2.0:${PORTSDIR}/textproc/aiksaurus-gtk
 CONFIGURE_ARGS+=	--enable-aiksaurus
 PLIST_SUB+=		AIKSAURUS:=""
 .else
+CONFIGURE_ARGS+=	--disable-aiksaurus
 PLIST_SUB+=		AIKSAURUS:="@comment "
 .endif
 
@@ -61,6 +55,7 @@ PLIST_SUB+=		AIKSAURUS:="@comment "
 CONFIGURE_ARGS+=	--enable-applix
 PLIST_SUB+=		APPLIX:=""
 .else
+CONFIGURE_ARGS+=	--disable-applix
 PLIST_SUB+=		APPLIX:="@comment "
 .endif
 
@@ -68,6 +63,7 @@ PLIST_SUB+=		APPLIX:="@comment "
 CONFIGURE_ARGS+=	--enable-babelfish
 PLIST_SUB+=		BABELFISH:=""
 .else
+CONFIGURE_ARGS+=	--disable-babelfish
 PLIST_SUB+=		BABELFISH:="@comment "
 .endif
 
@@ -75,21 +71,15 @@ PLIST_SUB+=		BABELFISH:="@comment "
 CONFIGURE_ARGS+=	--enable-bmp
 PLIST_SUB+=		BMP:=""
 .else
+CONFIGURE_ARGS+=	--disable-bmp
 PLIST_SUB+=		BMP:="@comment "
 .endif
 
-.if !defined(WITHOUT_BZ2ABW)
-CONFIGURE_ARGS+=	--enable-bz2abw \
-			--with-bzip2=/usr
-PLIST_SUB+=		BZ2ABW:=""
-.else
-PLIST_SUB+=		BZ2ABW:="@comment "
-.endif
-
 .if defined(WITH_CLARISWORKS) # Need to be tested
 CONFIGURE_ARGS+=	--enable-clarisworks
 PLIST_SUB+=		CLARISWORKS:=""
 .else
+CONFIGURE_ARGS+=	--disable-clarisworks
 PLIST_SUB+=		CLARISWORKS:="@comment "
 .endif
 
@@ -97,6 +87,7 @@ PLIST_SUB+=		CLARISWORKS:="@comment "
 CONFIGURE_ARGS+=	--enable-abicommand
 PLIST_SUB+=		COMMAND:=""
 .else
+CONFIGURE_ARGS+=	--disable-abicommand
 PLIST_SUB+=		COMMAND:="@comment "
 .endif
 
@@ -104,6 +95,7 @@ PLIST_SUB+=		COMMAND:="@comment "
 CONFIGURE_ARGS+=	--enable-docbook
 PLIST_SUB+=		DOCBOOK:=""
 .else
+CONFIGURE_ARGS+=	--disable-docbook
 PLIST_SUB+=		DOCBOOK:="@comment "
 .endif
 
@@ -111,6 +103,7 @@ PLIST_SUB+=		DOCBOOK:="@comment "
 CONFIGURE_ARGS+=	--enable-eml
 PLIST_SUB+=		EML:=""
 .else
+CONFIGURE_ARGS+=	--disable-eml
 PLIST_SUB+=		EML:="@comment "
 .endif
 
@@ -118,6 +111,7 @@ PLIST_SUB+=		EML:="@comment "
 CONFIGURE_ARGS+=	--enable-freetranslation
 PLIST_SUB+=		FREETRANSLATION:=""
 .else
+CONFIGURE_ARGS+=	--disable-freetranslation
 PLIST_SUB+=		FREETRANSLATION:="@comment "
 .endif
 
@@ -126,6 +120,7 @@ RUN_DEPENDS+=		gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils
 CONFIGURE_ARGS+=	--enable-gdict
 PLIST_SUB+=		GDICT:=""
 .else
+CONFIGURE_ARGS+=	--disable-gdict
 PLIST_SUB+=		GDICT:="@comment "
 .endif
 
@@ -133,6 +128,7 @@ PLIST_SUB+=		GDICT:="@comment "
 CONFIGURE_ARGS+=	--enable-google
 PLIST_SUB+=		GOOGLE:=""
 .else
+CONFIGURE_ARGS+=	--disable-google
 PLIST_SUB+=		GOOGLE:="@comment "
 .endif
 
@@ -141,6 +137,7 @@ LIB_DEPENDS+=		link-grammar.4:${PORTSDIR}/textproc/link-grammar
 CONFIGURE_ARGS+=	--enable-abigrammar
 PLIST_SUB+=		GRAMMAR:=""
 .else
+CONFIGURE_ARGS+=	--disable-abigrammar
 PLIST_SUB+=		GRAMMAR:="@comment "
 .endif
 
@@ -148,6 +145,7 @@ PLIST_SUB+=		GRAMMAR:="@comment "
 CONFIGURE_ARGS+=	--enable-hancom
 PLIST_SUB+=		HANCOM:=""
 .else
+CONFIGURE_ARGS+=	--disable-hancom
 PLIST_SUB+=		HANCOM:="@comment "
 .endif
 
@@ -155,6 +153,7 @@ PLIST_SUB+=		HANCOM:="@comment "
 CONFIGURE_ARGS+=	--enable-hrtext
 PLIST_SUB+=		HRTEXT:=""
 .else
+CONFIGURE_ARGS+=	--disable-hrtext
 PLIST_SUB+=		HRTEXT:="@comment "
 .endif
 
@@ -162,6 +161,7 @@ PLIST_SUB+=		HRTEXT:="@comment "
 CONFIGURE_ARGS+=	--enable-jpeg
 PLIST_SUB+=		JPEG:=""
 .else
+CONFIGURE_ARGS+=	--disable-jpeg
 PLIST_SUB+=		JPEG:="@comment "
 .endif
 
@@ -169,13 +169,24 @@ PLIST_SUB+=		JPEG:="@comment "
 CONFIGURE_ARGS+=	--enable-latex
 PLIST_SUB+=		LATEX:=""
 .else
+CONFIGURE_ARGS+=	--disable-latex
 PLIST_SUB+=		LATEX:="@comment "
 .endif
 
+.if defined(WITH_MATHVIEW) || defined(PACKAGE_BUILDING)
+LIB_DEPENDS+=		mathview_backend_gtk.7:${PORTSDIR}/x11-toolkits/gtkmathview
+CONFIGURE_ARGS+=	--enable-abimathview
+PLIST_SUB+=		MATHVIEW:=""
+.else
+CONFIGURE_ARGS+=	--disable-abimathview
+PLIST_SUB+=		MATHVIEW:="@comment "
+.endif
+
 .if !defined(WITHOUT_MSWRITE)
 CONFIGURE_ARGS+=	--enable-mswrite
 PLIST_SUB+=		MSWRITE:=""
 .else
+CONFIGURE_ARGS+=	--disable-mswrite
 PLIST_SUB+=		MSWRITE:="@comment "
 .endif
 
@@ -183,6 +194,7 @@ PLIST_SUB+=		MSWRITE:="@comment "
 CONFIGURE_ARGS+=	--enable-nroff
 PLIST_SUB+=		NROFF:=""
 .else
+CONFIGURE_ARGS+=	--disable-nroff
 PLIST_SUB+=		NROFF:="@comment "
 .endif
 
@@ -191,6 +203,7 @@ USE_GNOME+=		libgsf
 CONFIGURE_ARGS+=	--enable-OpenDocument
 PLIST_SUB+=		OPENDOCUMENT:=""
 .else
+CONFIGURE_ARGS+=	--disable-OpenDocument
 PLIST_SUB+=		OPENDOCUMENT:="@comment "
 .endif
 
@@ -199,13 +212,24 @@ USE_GNOME+=		libgsf
 CONFIGURE_ARGS+=	--enable-OpenWriter
 PLIST_SUB+=		OPENWRITER:=""
 .else
+CONFIGURE_ARGS+=	--disable-OpenWriter
 PLIST_SUB+=		OPENWRITER:="@comment "
 .endif
 
+.if defined(WITH_OPENXML) || defined(PACKAGE_BUILDING)
+USE_GNOME+=		libgsf
+CONFIGURE_ARGS+=	--enable-OpenXML
+PLIST_SUB+=		OPENXML:=""
+.else
+CONFIGURE_ARGS+=	--disable-OpenXML
+PLIST_SUB+=		OPENXML:="@comment "
+.endif
+
 .if defined(WITH_PDB) # Need to be tested
 CONFIGURE_ARGS+=	--enable-pdb
 PLIST_SUB+=		PDB:=""
 .else
+CONFIGURE_ARGS+=	--disable-pdb
 PLIST_SUB+=		PDB:="@comment "
 .endif
 
@@ -214,6 +238,7 @@ LIB_DEPENDS+=		psiconv.10:${PORTSDIR}/converters/psiconv
 CONFIGURE_ARGS+=	--with-psion
 PLIST_SUB+=		PSION:=""
 .else
+CONFIGURE_ARGS+=	--disable-psion
 PLIST_SUB+=		PSION:="@comment "
 .endif
 
@@ -222,6 +247,7 @@ USE_GNOME+=		libgsf
 CONFIGURE_ARGS+=	--enable-sdw
 PLIST_SUB+=		SDW:=""
 .else
+CONFIGURE_ARGS+=	--disable-sdw
 PLIST_SUB+=		SDW:="@comment "
 .endif
 
@@ -229,6 +255,7 @@ PLIST_SUB+=		SDW:="@comment "
 CONFIGURE_ARGS+=	--enable-shell
 PLIST_SUB+=		SHELL:=""
 .else
+CONFIGURE_ARGS+=	--disable-shell
 PLIST_SUB+=		SHELL:="@comment "
 .endif
 
@@ -236,6 +263,7 @@ PLIST_SUB+=		SHELL:="@comment "
 CONFIGURE_ARGS+=	--enable-t602
 PLIST_SUB+=		T602:=""
 .else
+CONFIGURE_ARGS+=	--disable-t602
 PLIST_SUB+=		T602:="@comment "
 .endif
 
@@ -243,6 +271,7 @@ PLIST_SUB+=		T602:="@comment "
 CONFIGURE_ARGS+=	--enable-urldict
 PLIST_SUB+=		URLDICT:=""
 .else
+CONFIGURE_ARGS+=	--disable-urldict
 PLIST_SUB+=		URLDICT:="@comment "
 .endif
 
@@ -250,6 +279,7 @@ PLIST_SUB+=		URLDICT:="@comment "
 CONFIGURE_ARGS+=	--enable-wikipedia
 PLIST_SUB+=		WIKIPEDIA:=""
 .else
+CONFIGURE_ARGS+=	--disable-wikipedia
 PLIST_SUB+=		WIKIPEDIA:="@comment "
 .endif
 
@@ -258,6 +288,7 @@ LIB_DEPENDS+=		wmf.2:${PORTSDIR}/graphics/libwmf
 CONFIGURE_ARGS+=	--enable-wmf
 PLIST_SUB+=		WMF:=""
 .else
+CONFIGURE_ARGS+=	--disable-wmf
 PLIST_SUB+=		WMF:="@comment "
 .endif
 
@@ -266,6 +297,7 @@ LIB_DEPENDS+=		wpd-0.8.8:${PORTSDIR}/textproc/libwpd
 CONFIGURE_ARGS+=	--enable-wordperfect
 PLIST_SUB+=		WORDPERFECT:=""
 .else
+CONFIGURE_ARGS+=	--disable-wordperfect
 PLIST_SUB+=		WORDPERFECT:="@comment "
 .endif
 
@@ -273,6 +305,7 @@ PLIST_SUB+=		WORDPERFECT:="@comment "
 CONFIGURE_ARGS+=	--enable-xsl-fo
 PLIST_SUB+=		XSLFO:=""
 .else
+CONFIGURE_ARGS+=	--disable-xsl-fo
 PLIST_SUB+=		XSLFO:="@comment "
 .endif
 
@@ -285,6 +318,7 @@ PLIST_SUB+=		XSLFO:="@comment "
 CONFIGURE_ARGS+=	--enable-librsvg
 PLIST_SUB+=		SVG:=""
 .else
+CONFIGURE_ARGS+=	--disable-librsvg
 PLIST_SUB+=		SVG:="@comment "
 .endif
 
@@ -324,6 +358,9 @@ pre-everything::
 .if !defined(WITH_LATEX)
 	@${ECHO_MSG} "WITH_LATEX=yes		LaTeX export."
 .endif
+.if !defined(WITH_MATHVIEW)
+	@${ECHO_MSG} "WITH_MATHVIEW=yes	Enables AbiWord to embed some maths."
+.endif
 .if !defined(WITH_NROFF)
 	@${ECHO_MSG} "WITH_NROFF=yes		Nroff/Man file format."
 .endif
@@ -333,6 +370,9 @@ pre-everything::
 .if !defined(WITH_OPENWRITER)
 	@${ECHO_MSG} "WITH_OPENWRITER=yes	Import/export OpenOffice files."
 .endif
+.if !defined(WITH_OPENXML)
+	@${ECHO_MSG} "WITH_OPENXML=yes	Allow AbiWord to read OpenXML .docx files."
+.endif
 .if !defined(WITH_PDB)
 	@${ECHO_MSG} "WITH_PDB=yes		Import/export Palm Database files."
 .endif
@@ -363,9 +403,6 @@ pre-everything::
 .if !defined(WITHOUT_BMP)
 	@${ECHO_MSG} "WITHOUT_BMP=yes		View Bitmap Images."
 .endif
-.if !defined(WITHOUT_BZ2ABW)
-	@${ECHO_MSG} "WITHOUT_BZ2ABW=yes	Import/Export BZ2 compressed AbiWord files."
-.endif
 .if !defined(WITHOUT_COMMAND)
 	@${ECHO_MSG} "WITHOUT_COMMAND=yes	Allows command line control of AbiWord."
 .endif
@@ -392,9 +429,4 @@ pre-everything::
 .endif
 .endif # WITH_OPTIONS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|[$$]abi_plugin_source/../wv|${LOCALBASE}/include/wv|g ; \
-	    	s|echo aout|echo elf|g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/editors/abiword-plugins/distinfo b/editors/abiword-plugins/distinfo
new file mode 100644
index 000000000000..f3eabea9f67b
--- /dev/null
+++ b/editors/abiword-plugins/distinfo
@@ -0,0 +1,6 @@
+MD5 (AbiWord/abiword-plugins-2.6.0.tar.gz) = ebdc165d1b6c3c69f11148cf7841f257
+SHA256 (AbiWord/abiword-plugins-2.6.0.tar.gz) = 329521398105348ff466b90e1a7567574bd690639b048b6356ddc353d864b785
+SIZE (AbiWord/abiword-plugins-2.6.0.tar.gz) = 1758231
+MD5 (AbiWord/abiword-2.6.0.tar.gz) = d627a5d1061160c683f2257da498355b
+SHA256 (AbiWord/abiword-2.6.0.tar.gz) = 35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb
+SIZE (AbiWord/abiword-2.6.0.tar.gz) = 9210157
diff --git a/editors/abiword-plugins/options b/editors/abiword-plugins/options
index 5e0fe31bf6c9..7ca36aa1b3e8 100644
--- a/editors/abiword-plugins/options
+++ b/editors/abiword-plugins/options
@@ -1,7 +1,6 @@
 OPTIONS=	APPLIX "Import/Export Applix Word files" on \
 		BABELFISH "Translate selected text" on \
 		BMP "View Bitmap Images" on \
-		BZ2ABW "Import/Export BZ2 compressed AbiWord files" on \
 		COMMAND "Allows command line control of AbiWord" on \
 		FREETRANSLATION "Translate selected text" on \
 		GOOGLE "Search Google for your selected text" on \
@@ -20,9 +19,11 @@ OPTIONS=	APPLIX "Import/Export Applix Word files" on \
 		HRTEXT "Export text with \"newsgroup\" markup" off \
 		JPEG "View JPEG Images" off \
 		LATEX "LaTeX export" off \
+		MATHVIEW "Enables AbiWord to embed some maths" off \
 		NROFF "Nroff/Man file format" off \
 		OPENDOCUMENT "Iport/export OpenDocument files" off \
 		OPENWRITER "Import/export OpenOffice files" off \
+		OPENXML "Allow AbiWord to read OpenXML .docx files" off \
 		PDB "Import/export Palm Database files" off \
 		PSION "Import/export Psion files" off \
 		SDW "Import StarOffice 5.x files" off \
diff --git a/editors/abiword-plugins/pkg-plist b/editors/abiword-plugins/pkg-plist
index b5443d4427b6..374d498b8d11 100644
--- a/editors/abiword-plugins/pkg-plist
+++ b/editors/abiword-plugins/pkg-plist
@@ -1,64 +1,66 @@
-%%AIKSAURUS:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiAikSaurus.la
-%%AIKSAURUS:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiAikSaurus.so
-%%APPLIX:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiApplix.la
-%%APPLIX:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiApplix.so
-%%BMP:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiBMP.la
-%%BMP:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiBMP.so
-%%BZ2ABW:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiBZ2.la
-%%BZ2ABW:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiBZ2.so
-%%BABELFISH:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiBabelfish.la
-%%BABELFISH:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiBabelfish.so
-%%CLARISWORKS:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiClarisWorks.la
-%%CLARISWORKS:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiClarisWorks.so
-%%COMMAND:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiCommand.la
-%%COMMAND:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiCommand.so
-%%DOCBOOK:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiDocBook.la
-%%DOCBOOK:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiDocBook.so
-%%EML:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiEML.la
-%%EML:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiEML.so
-%%FREETRANSLATION:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiFreeTranslation.la
-%%FREETRANSLATION:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiFreeTranslation.so
-%%GDICT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGdict.la
-%%GDICT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGdict.so
-%%GOOGLE:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGoogle.la
-%%GOOGLE:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGoogle.so
-%%GRAMMAR:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGrammar.la
-%%GRAMMAR:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGrammar.so
-%%HRTEXT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiHRText.la
-%%HRTEXT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiHRText.so
-%%HANCOM:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiHancom.la
-%%HANCOM:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiHancom.so
-%%JPEG:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiJPEG.la
-%%JPEG:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiJPEG.so
-%%LATEX:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiLaTeX.la
-%%LATEX:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiLaTeX.so
-%%MSWRITE:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiMSWrite.la
-%%MSWRITE:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiMSWrite.so
-%%NROFF:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiNroff.la
-%%NROFF:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiNroff.so
-%%OPENDOCUMENT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiOpenDocument.la
-%%OPENDOCUMENT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiOpenDocument.so
-%%OPENWRITER:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiOpenWriter.la
-%%OPENWRITER:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiOpenWriter.so
-%%PDB:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiPalmDoc.la
-%%PDB:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiPalmDoc.so
-%%PSION:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiPsion.la
-%%PSION:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiPsion.so
-%%SVG:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiRSVG.la
-%%SVG:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiRSVG.so
-%%SDW:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiSDW.la
-%%SDW:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiSDW.so
-%%SHELL:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiScriptHappy.la
-%%SHELL:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiScriptHappy.so
-%%T602:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiT602.la
-%%T602:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiT602.so
-%%URLDICT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiURLDict.la
-%%URLDICT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiURLDict.so
-%%WMF:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiWMF.la
-%%WMF:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiWMF.so
-%%WIKIPEDIA:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiWikipedia.la
-%%WIKIPEDIA:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiWikipedia.so
-%%WORDPERFECT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiWordPerfect.la
-%%WORDPERFECT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiWordPerfect.so
-%%XSLFO:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiXSLFO.la
-%%XSLFO:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiXSLFO.so
+%%AIKSAURUS:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiAikSaurus.la
+%%AIKSAURUS:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiAikSaurus.so
+%%APPLIX:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiApplix.la
+%%APPLIX:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiApplix.so
+%%BMP:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiBMP.la
+%%BMP:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiBMP.so
+%%BABELFISH:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiBabelfish.la
+%%BABELFISH:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiBabelfish.so
+%%CLARISWORKS:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiClarisWorks.la
+%%CLARISWORKS:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiClarisWorks.so
+%%COMMAND:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiCommand.la
+%%COMMAND:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiCommand.so
+%%DOCBOOK:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiDocBook.la
+%%DOCBOOK:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiDocBook.so
+%%EML:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiEML.la
+%%EML:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiEML.so
+%%FREETRANSLATION:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiFreeTranslation.la
+%%FREETRANSLATION:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiFreeTranslation.so
+%%GDICT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiGdict.la
+%%GDICT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiGdict.so
+%%GOOGLE:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiGoogle.la
+%%GOOGLE:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiGoogle.so
+%%GRAMMAR:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiGrammar.la
+%%GRAMMAR:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiGrammar.so
+%%HRTEXT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiHRText.la
+%%HRTEXT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiHRText.so
+%%HANCOM:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiHancom.la
+%%HANCOM:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiHancom.so
+%%JPEG:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiJPEG.la
+%%JPEG:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiJPEG.so
+%%LATEX:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiLaTeX.la
+%%LATEX:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiLaTeX.so
+%%MSWRITE:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiMSWrite.la
+%%MSWRITE:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiMSWrite.so
+%%MATHVIEW:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiMathView.la
+%%MATHVIEW:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiMathView.so
+%%NROFF:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiNroff.la
+%%NROFF:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiNroff.so
+%%OPENDOCUMENT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiOpenDocument.la
+%%OPENDOCUMENT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiOpenDocument.so
+%%OPENWRITER:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiOpenWriter.la
+%%OPENWRITER:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiOpenWriter.so
+%%OPENXML:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiOpenXML.la
+%%OPENXML:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiOpenXML.so
+%%PDB:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiPalmDoc.la
+%%PDB:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiPalmDoc.so
+%%PSION:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiPsion.la
+%%PSION:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiPsion.so
+%%SVG:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiRSVG.la
+%%SVG:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiRSVG.so
+%%SDW:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiSDW.la
+%%SDW:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiSDW.so
+%%SHELL:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiScriptHappy.la
+%%SHELL:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiScriptHappy.so
+%%T602:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiT602.la
+%%T602:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiT602.so
+%%URLDICT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiURLDict.la
+%%URLDICT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiURLDict.so
+%%WMF:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiWMF.la
+%%WMF:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiWMF.so
+%%WIKIPEDIA:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiWikipedia.la
+%%WIKIPEDIA:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiWikipedia.so
+%%WORDPERFECT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiWordPerfect.la
+%%WORDPERFECT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiWordPerfect.so
+%%XSLFO:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiXSLFO.la
+%%XSLFO:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiXSLFO.so
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index b0f5e4622378..8719feceffb4 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.4.6
-PORTREVISION=	3
+PORTVERSION=	2.6.0
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
@@ -22,61 +21,57 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		png.5:${PORTSDIR}/graphics/png \
 		wv-1.2:${PORTSDIR}/textproc/wv \
-		fribidi.0:${PORTSDIR}/converters/fribidi
+		fribidi.0:${PORTSDIR}/converters/fribidi \
+		goffice-0.4:${PORTSDIR}/devel/goffice04
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_GNOME=	libglade2 libxml2 libgnomeprintui desktopfileutils
+USE_GNOME=	gnomehack libglade2 libxml2 libgnomeprintui desktopfileutils
 WANT_GNOME=	yes
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-xft \
-		--with-sys-wv \
-		--with-popt=${LOCALBASE} \
+CONFIGURE_ARGS=	--with-popt=${LOCALBASE} \
 		--with-zlib=${LOCALBASE} \
 		--with-libpng=${LOCALBASE} \
 		--with-libiconv=${LOCALBASE} \
 		--with-libjpeg-prefix=${LOCALBASE} \
 		--disable-peer-config
 MAKEFILE=	GNUmakefile
+GNOME_MAKEFILEIN=GNUmakefile.in
 
-ABIVERSION=	2.4
+ABIVERSION=	2.6
 PLIST_SUB+=	ABIVERSION=${ABIVERSION}
-WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
-
-EXTERNALS=	MSVC* abipbx abiword-docs abiword-plugins expat fribidi \
-		libiconv libpng pbx popt wv zlib
-EXTRACT_AFTER_ARGS=| ${TAR} -xpf - ${EXTERNALS:C,^,--exclude ${DISTNAME}/,}
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug \
 			--enable-symbols
-CFLAGS+=		-g
-STRIP=
 .endif
 
 .ifndef(WITHOUT_GTKSPELL)
 LIB_DEPENDS+=		enchant.1:${PORTSDIR}/textproc/enchant
-PLIST_SUB+=		DICT:="@comment "
-.else
-CONFIGURE_ARGS+=	--disable-enchant
+CONFIGURE_ARGS+=	--enable-spellcheck
 PLIST_SUB+=		DICT:=""
+.else
+CONFIGURE_ARGS+=	--disable-spellcheck
+PLIST_SUB+=		DICT:="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+=		libgnomeui
-CONFIGURE_ARGS+=	--enable-gnome
-PKGNAMESUFFIX:=		-gnome
-GNOME_ENABLED=		yes
-.endif
+#.if ${HAVE_GNOME:Mlibgnomeui}!=""
+#USE_GNOME+=		libgnomeui
+#CONFIGURE_ARGS+=	--enable-gnomeui
+#PKGNAMESUFFIX:=		-gnome
+#.else
+#CONFIGURE_ARGS+=	--disable-gnomeui
+#.endif
 
-.if defined(WITH_GUCHARMAP) || exists(${LOCALBASE}/libdata/pkgconfig/gucharmap.pc)
+.if (defined(WITH_GUCHARMAP) || \
+	exists(${LOCALBASE}/libdata/pkgconfig/gucharmap.pc)) && \
+	!defined(WITHOUT_GUCHARMAP)
 LIB_DEPENDS+=		gucharmap.6:${PORTSDIR}/deskutils/gucharmap
+CONFIGURE_ARGS+=	--enable-gucharmap
 .else
-CONFIGURE_ARGS+=	--enable-cmap=no
+CONFIGURE_ARGS+=	--disable-gucharmap
 .endif
 
 pre-everything::
@@ -88,32 +83,17 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ansi||g ; s|-pedantic||g' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-ansi||g ; s|-pedantic||g ; \
+		s|/usr/X11R6|${LOCALBASE}|g' \
+			${WRKSRC}/configure
 	@${FIND} ${WRKSRC}/src/config/platforms -name "*.mk" | ${XARGS} \
 		${REINPLACE_CMD} 's|-ansi||g ; s|-pedantic||g'
 	@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@.*PEER.*@||g ; \
-		 s|WV_INCLUDES = |#WV_INCLUDES = |g ; \
-		 s|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
-		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
+		's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
+		s|[(]datadir[)]/icons|(datadir)/pixmaps|g'
 
 post-install:
-	@${MKDIR} ${PREFIX}/lib/AbiWord-${ABIVERSION}/plugins
-	@${MKDIR} ${LOCALBASE}/share/applications
-	@${INSTALL_DATA} ${WRKSRC}/abiword.desktop \
-		${LOCALBASE}/share/applications/abiword.desktop
-	@${MKDIR} ${LOCALBASE}/share/pixmaps
-	@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/icons/abiword_48.png \
-		${LOCALBASE}/share/pixmaps/abiword_48.png
-.if defined(GNOME_ENABLED)
-	@${MKDIR} ${LOCALBASE}/libdata/bonobo/servers
-	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
-		${LOCALBASE}/libdata/bonobo/servers/
-	@${MKDIR} ${LOCALBASE}/share/gnome-2.0/ui
-	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/abi-nautilus-view-file.xml \
-		${LOCALBASE}/share/gnome-2.0/ui/
-.endif
+	@${MKDIR} ${PREFIX}/lib/${PORTNAME}-${ABIVERSION}/plugins
 	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 3791a5c1f512..c4be2cc05774 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,3 +1,3 @@
-MD5 (AbiWord/abiword-2.4.6.tar.bz2) = 8ed5fb282b9741aca75b9e47500d39a1
-SHA256 (AbiWord/abiword-2.4.6.tar.bz2) = 1ca509814d1ce939c98f2776f95351a2a6ea216d12c20be30d40eefd13f43020
-SIZE (AbiWord/abiword-2.4.6.tar.bz2) = 24994889
+MD5 (AbiWord/abiword-2.6.0.tar.gz) = d627a5d1061160c683f2257da498355b
+SHA256 (AbiWord/abiword-2.6.0.tar.gz) = 35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb
+SIZE (AbiWord/abiword-2.6.0.tar.gz) = 9210157
diff --git a/editors/abiword/files/patch-GNUmakefile.in b/editors/abiword/files/patch-GNUmakefile.in
deleted file mode 100644
index 6385aea4d9af..000000000000
--- a/editors/abiword/files/patch-GNUmakefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
---- GNUmakefile.in.orig	Wed Jul 20 22:21:46 2005
-+++ GNUmakefile.in	Wed Jul 20 22:23:12 2005
-@@ -337,15 +337,15 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = src
--expat_peerdir = $(top_builddir)/../expat
--wv_peerdir = $(top_builddir)/../wv
--libiconv_peerdir = $(top_builddir)/../libiconv
--libpng_peerdir = @LIBPNG_PEERDIR@
--libpopt_peerdir = $(top_builddir)/../popt
--desktop_DATA = abiword.desktop
--desktopdir = $(datadir)/applications
--icon_DATA = abiword_48.png
--icondir = $(datadir)/icons
-+#expat_peerdir = $(top_builddir)/../expat
-+#wv_peerdir = $(top_builddir)/../wv
-+#libiconv_peerdir = $(top_builddir)/../libiconv
-+#libpng_peerdir = @LIBPNG_PEERDIR@
-+#libpopt_peerdir = $(top_builddir)/../popt
-+#desktop_DATA = abiword.desktop
-+#desktopdir = $(datadir)/applications
-+#icon_DATA = abiword_48.png
-+#icondir = $(datadir)/icons
- @BIGENDIAN_FALSE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/LittleEndian32.american.hash
- @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash
- @WITH_ISPELL_FALSE@INSTALLDICTIONARY = no
-@@ -844,7 +844,6 @@
- 
- # Install the datafiles. This is quick-and-dirty.
- install-data-local:
--	@$(mkinstalldirs) $(DESTDIR)$(bonobodir)
- 	if test -d $(top_srcdir)/../abidistfiles ; then \
- 	  for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
- 	    $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
-@@ -857,11 +856,7 @@
- 	      for file in `echo $(top_srcdir)/../abidistfiles/$$dir/* | grep -v MANIFEST`; do \
- 	        if test -f $$file ; then \
- 		  sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
--		  if test "$$sfile.server" = $$file; then \
--		    $(INSTALL_DATA) $$file $(DESTDIR)$(bonobodir); \
--		  else \
- 		    $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/$$dir; \
--		  fi; \
- 	        fi; \
- 	      done; \
- 	    fi; \
diff --git a/editors/abiword/files/patch-abiword.desktop b/editors/abiword/files/patch-abiword.desktop
index 7eff00d9c6e4..427bc52c7b10 100644
--- a/editors/abiword/files/patch-abiword.desktop
+++ b/editors/abiword/files/patch-abiword.desktop
@@ -1,5 +1,5 @@
---- abiword.desktop.orig	Fri Apr 14 12:43:24 2006
-+++ abiword.desktop	Fri Apr 14 12:45:03 2006
+--- abiword.desktop.orig	2008-04-01 15:30:19.000000000 -0500
++++ abiword.desktop	2008-04-01 15:31:19.000000000 -0500
 @@ -3,11 +3,11 @@
  Icon=abiword_48.png
  Terminal=false
@@ -9,8 +9,8 @@
  StartupNotify=true
  Encoding=UTF-8
  X-Desktop-File-Install-Version=0.9
--MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
-+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;
++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;
  Name=AbiWord
  GenericName=Word Processor
  Comment=AbiWord Word Processor
diff --git a/editors/abiword/files/patch-an b/editors/abiword/files/patch-an
index 54d3de78eb22..5e9e8c01d301 100644
--- a/editors/abiword/files/patch-an
+++ b/editors/abiword/files/patch-an
@@ -1,9 +1,9 @@
---- src/Makefile.orig	Mon Dec 22 13:06:12 2003
-+++ src/Makefile	Sun Mar 28 15:29:40 2004
+--- src/Makefile.orig	2008-04-01 15:43:32.000000000 -0500
++++ src/Makefile	2008-04-01 15:45:09.000000000 -0500
 @@ -52,6 +52,7 @@
  
  ## Set the following to a list of pathnames to be copied to $(CANONDIR)
- CANON_TOPLEVELFILES=	$(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt
+ CANON_TOPLEVELFILES=	$(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt $(ABI_ROOT)/user/wp/readme.abw
 +CANON_TLF_NOTDIR=	$(notdir $(CANON_TOPLEVELFILES))
  
  ## Set the following to a list of directories (probably a subset of DIRS)
diff --git a/editors/abiword/files/patch-aq b/editors/abiword/files/patch-aq
index 98ce2809346a..41ad3e2580b4 100644
--- a/editors/abiword/files/patch-aq
+++ b/editors/abiword/files/patch-aq
@@ -1,6 +1,6 @@
---- src/config/abi_defs.mk.orig	Sun Jun 12 16:07:25 2005
-+++ src/config/abi_defs.mk	Sun Jun 12 16:08:49 2005
-@@ -202,11 +202,11 @@
+--- src/config/abi_defs.mk.orig	2008-04-01 15:33:21.000000000 -0500
++++ src/config/abi_defs.mk	2008-04-01 15:34:24.000000000 -0500
+@@ -213,11 +213,11 @@
  ## INSTALL program...
  
  define MAKE_OBJDIR
@@ -14,7 +14,7 @@
  endef
  
  ifeq ($(OS_NAME), WIN32)
-@@ -251,7 +251,9 @@
+@@ -262,7 +262,9 @@
  ##################################################################
  ##################################################################
  
diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
index 9e95194c18bf..634dbfd9c8e3 100644
--- a/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
@@ -1,11 +1,28 @@
---- src/af/util/xp/ut_iconv.cpp.orig	Tue Jan 10 00:18:13 2006
-+++ src/af/util/xp/ut_iconv.cpp	Tue Jan 10 00:18:31 2006
-@@ -67,7 +67,7 @@
- #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) ||  \
- (defined (__MACH__) && defined (__APPLE__)) || \
- (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
--defined (__AIX__) || defined(__OpenBSD__) || \
-+defined (__AIX__) || defined(__OpenBSD__) || defined (__FreeBSD__) || \
- (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
- 
- #define ICONV_CONST const
+--- src/af/util/xp/ut_iconv.cpp.orig	2008-04-04 09:41:47.000000000 -0500
++++ src/af/util/xp/ut_iconv.cpp	2008-04-04 09:43:43.000000000 -0500
+@@ -230,10 +230,10 @@
+   // we special-case the win32 build, otherwise spelling and other stuff
+   // just doesn't work
+   return "UCS-2LE";
+-#elif defined(_LIBICONV_H)
++#elif defined(_LIBICONV_H) || defined(__FreeBSD__)
+   // libiconv seems to prefer UCS-2-INTERNAL to UCS-2BE and UCS-2LE
+   return "UCS-2-INTERNAL";
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNXNTO__) || defined(__NetBSD__)
++#elif defined(__OpenBSD__) || defined(__QNXNTO__) || defined(__NetBSD__)
+   // we special case the BSDs since spelling just doesn't work
+   return "UCS2";
+ #else
+@@ -253,10 +253,10 @@
+   // we special-case the win32 build, otherwise spelling and other stuff
+   // just doesn't work
+   return "UCS-4LE";
+-#elif defined(_LIBICONV_H)
++#elif defined(_LIBICONV_H) || defined(__FreeBSD__)
+   // libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE
+   return "UCS-4-INTERNAL";
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__OpenBSD__) || defined(__NetBSD__)
+   // we special case the BSDs since spelling just doesn't work
+   return "UCS4";
+ #else
diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp
deleted file mode 100644
index 97fad9259f8f..000000000000
--- a/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/af/util/xp/ut_string_class.cpp.orig	Mon Jan 17 14:38:20 2005
-+++ src/af/util/xp/ut_string_class.cpp	Mon Jan 17 14:38:43 2005
-@@ -352,9 +352,6 @@
- #  else /* va_list is a pointer */
- #  define VA_COPY(ap1, ap2)	  ((ap1) = (ap2))
- #  endif /* va_list is a pointer */
--#  if defined (__GNUC__)
--#  define VA_COPY(ap1,ap2)     __va_copy((ap1),(ap2))
--#  endif
- #endif /* !VA_COPY */
- 
- UT_String& UT_String_vprintf (UT_String & inStr, const char *format,
diff --git a/editors/abiword/files/patch-src_af_xap_unix_xap_UnixTableWidget.cpp b/editors/abiword/files/patch-src_af_xap_unix_xap_UnixTableWidget.cpp
new file mode 100644
index 000000000000..352357fb5df8
--- /dev/null
+++ b/editors/abiword/files/patch-src_af_xap_unix_xap_UnixTableWidget.cpp
@@ -0,0 +1,13 @@
+--- abiword/trunk/src/af/xap/unix/xap_UnixTableWidget.cpp	2007/03/04 23:35:03	20016
++++ src/af/xap/unix/xap_UnixTableWidget.cpp	2007/09/21 04:03:45	21991
+@@ -123,7 +123,9 @@
+ 	g_return_if_fail(table);
+ 
+ 	if (table->selected_rows == 0 && table->selected_cols == 0)
+-		text = g_strdup_printf(table->szCancel);
++		// RIVERA changed as suggested by uwog (OSX X11 was crashing)
++		//text = g_strdup_printf(table->szCancel);
++		text = (table->szCancel ? g_strdup_printf(table->szCancel) : NULL);
+ 	else
+ 	{
+ 		UT_UTF8String prText =  "%d x %d ";
diff --git a/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp b/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
index c0ff7430562f..8d22dcbebefa 100644
--- a/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
+++ b/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
@@ -1,11 +1,11 @@
---- src/wp/ap/unix/ap_UnixApp.cpp.orig	2007-12-30 18:44:50.000000000 -0500
-+++ src/wp/ap/unix/ap_UnixApp.cpp	2007-12-30 18:41:23.000000000 -0500
-@@ -1405,7 +1405,7 @@ int AP_UnixApp::main(const char * szAppN
- 												   GNOME_PARAM_APP_DATADIR,	ABIWORD_DATADIR,
- 												   GNOME_PARAM_APP_LIBDIR, ABIWORD_APP_LIBDIR,
- 												   GNOME_PARAM_POPT_TABLE, AP_Args::options, 
--												   GNOME_PARAM_NONE);
-+												   (void *)0);
+--- src/wp/ap/unix/ap_UnixApp.cpp.orig	2008-04-01 15:41:39.000000000 -0500
++++ src/wp/ap/unix/ap_UnixApp.cpp	2008-04-01 15:41:46.000000000 -0500
+@@ -1240,7 +1240,7 @@
+ 														 GNOME_PARAM_APP_DATADIR,	PREFIX "/" PACKAGE "-" ABIWORD_SERIES,
+ 														 GNOME_PARAM_APP_LIBDIR, PREFIX "/" PACKAGE "-" ABIWORD_SERIES,
+ 														 GNOME_PARAM_POPT_TABLE, AP_Args::options, 
+-														 GNOME_PARAM_NONE);
++														 (void *)0);
  #ifdef LOGFILE
- 	fprintf(logfile,"gnome_program_init completed \n");
+ 			fprintf(logfile,"gnome_program_init completed \n");
  #endif
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 2a020dbec5c8..19b7e0f209ac 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -1,299 +1,258 @@
-bin/AbiWord-%%ABIVERSION%%
 bin/abiword
-bin/ttfadmin.sh
-bin/ttftool
-%%GNOME:%%libdata/bonobo/servers/GNOME_AbiWord_Control_2_4.server
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Break.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Field.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_FormatFootnotes.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_FormatFrame.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_FormatTOC.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_FormatTable.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Goto.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_HdrFtr.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_InsertTable.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Insert_DateTime.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Latex.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_MailMerge.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_MetaData.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_New.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Options.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Options_ColorSel.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_PageNumbers.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_PageSetup.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Replace.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Spell.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Styles.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Stylist.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Stylist_modal.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Tab.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_WordCount.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_About.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_DocComparison.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_Encoding.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_History.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_Image.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_Language.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_ListDocuments.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_Password.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_PluginManager.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_WindowMore.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_Zoom.glade
-share/AbiSuite-%%ABIVERSION%%/AbiWord/readme.txt
-share/AbiSuite-%%ABIVERSION%%/AbiWord/scripts/abw2html.pl
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/am-ET.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ar.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ast-ES.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/be-BY.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/bg-BG.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/br-FR.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ca-ES.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/cs-CZ.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/cy-GB.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/da-DK.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/de-CH.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/de-DE.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/el-GR.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/en-AU.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/en-CA.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/en-GB.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/en-IE.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/es-ES.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/es-MX.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/et.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/eu-ES.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/fi-FI.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/fr-FR.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ga-IE.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/gl-ES.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/he-IL.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/hr-HR.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/hu-HU.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/id-ID.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/it-IT.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ja-JP.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/jbo.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ku.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/lt-LT.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/lv-LV.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/mg-MG.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/mh-MH.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/mk-MK.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ms-MY.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/nb-NO.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ne-NP.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/nl-NL.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/nn-NO.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/pl-PL.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/pt-BR.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/pt-PT.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/qu-BO.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ro-RO.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ru-RU.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sc-IT.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sk-SK.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sl-SI.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sq-AL.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sr.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/sv-SE.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ta-IN.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/tr-TR.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/uk-UA.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/vi-VN.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/yi.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/zh-CN.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/zh-HK.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/zh-TW.strings
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-CP1254
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-KOI8-R
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-KOI8-U
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-KOI8-UB
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-am-ET
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-ar
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-ar-EG
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-ar-SA
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-bg-BG
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-ca-ES
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-cs-CZ
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-da-DK
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-de
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-de-AT
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-de-CH
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-de-DE
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-div-MV
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-el-GR
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-en
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-en-AU
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-en-CA
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-en-GB
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-en-IE
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-en-NZ
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-en-US
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-en-ZA
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-es
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-es-ES
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-es-MX
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-eu
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-eu-ES
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-fa-IR
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-fi-FI
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-fr
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-fr-BE
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-fr-CA
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-fr-CH
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-fr-FR
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-gl-ES
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-he
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-he-IL
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-hu-HU
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-it-IT
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-ja-JP
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-lt-LT
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-nb-NO
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-nl-NL
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-nn-NO
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-pl-PL
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-ps
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-pt-BR
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-pt-PT
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-ru
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-ru-RU
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-sk-SK
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-sk-SK.CP1250
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-sl
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-sv
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-sv-SE
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-syr
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-tr
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-tr-TR
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-tr-TR.CP1254
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-uk-UA
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-ur-PK
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-yi
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-zh-CN
-share/AbiSuite-%%ABIVERSION%%/AbiWord/system.profile-zh-TW
-share/AbiSuite-%%ABIVERSION%%/clipart/book.png
-share/AbiSuite-%%ABIVERSION%%/clipart/chip.png
-share/AbiSuite-%%ABIVERSION%%/clipart/fun.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gear.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gnomea.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gnomeb.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gnomec.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gnomecorner.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gnomed.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gnomedecor1.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gnomedecor2.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gnomee.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gnomeflowers.png
-share/AbiSuite-%%ABIVERSION%%/clipart/gnomeline.png
-share/AbiSuite-%%ABIVERSION%%/clipart/idea.png
-share/AbiSuite-%%ABIVERSION%%/clipart/lamp.png
-share/AbiSuite-%%ABIVERSION%%/clipart/monitor.png
-share/AbiSuite-%%ABIVERSION%%/clipart/music1.png
-share/AbiSuite-%%ABIVERSION%%/clipart/pinceau.png
-share/AbiSuite-%%ABIVERSION%%/clipart/simca.png
-share/AbiSuite-%%ABIVERSION%%/clipart/surprise.png
-share/AbiSuite-%%ABIVERSION%%/clipart/together.png
-share/AbiSuite-%%ABIVERSION%%/clipart/toolbox.png
-share/AbiSuite-%%ABIVERSION%%/clipart/tree.png
-share/AbiSuite-%%ABIVERSION%%/clipart/tux_bordelais.png
-share/AbiSuite-%%ABIVERSION%%/clipart/weather.png
-share/AbiSuite-%%ABIVERSION%%/clipart/write.png
-%%DICT:%%share/AbiSuite-%%ABIVERSION%%/dictionary/american.hash
-%%DICT:%%share/AbiSuite-%%ABIVERSION%%/dictionary/ispell_dictionary_list.xml
-share/AbiSuite-%%ABIVERSION%%/icons/abiword_16.xpm
-share/AbiSuite-%%ABIVERSION%%/icons/abiword_48.png
-share/AbiSuite-%%ABIVERSION%%/icons/abiword_48.tif
-share/AbiSuite-%%ABIVERSION%%/icons/abiword_48.xpm
-%%GNOME:%%share/AbiSuite-%%ABIVERSION%%/icons/abiword_logo.xpm
-share/AbiSuite-%%ABIVERSION%%/templates/A4.awt
-share/AbiSuite-%%ABIVERSION%%/templates/Business-Letter.awt
-share/AbiSuite-%%ABIVERSION%%/templates/Business-Report.awt
-share/AbiSuite-%%ABIVERSION%%/templates/Employee-Directory.awt
-share/AbiSuite-%%ABIVERSION%%/templates/Fax-Coversheet.awt
-share/AbiSuite-%%ABIVERSION%%/templates/Friendly-Letter.awt
-share/AbiSuite-%%ABIVERSION%%/templates/Memo.awt
-share/AbiSuite-%%ABIVERSION%%/templates/Press-Release.awt
-share/AbiSuite-%%ABIVERSION%%/templates/Resume.awt
-share/AbiSuite-%%ABIVERSION%%/templates/Two-Columns.awt
-share/AbiSuite-%%ABIVERSION%%/templates/US-Letter.awt
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-am_ET
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ar
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ar_EG
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ar_SA
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-bg_BG
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ca_ES
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-cs_CZ
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-da_DK
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-de
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-de_AT
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-de_CH
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-de_DE
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-div_MV
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-el_GR
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-en_AU
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-en_CA
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-en_GB
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-en_IE
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-en_NZ
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-en_ZA
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-es
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-es_AR
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-es_ES
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-es_IR
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-es_MX
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-fa_IR
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-fi_FI
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-fr
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-fr_BE
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-fr_CA
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-fr_CH
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-fr_FR
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-gl_ES
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-he
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-he_IL
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-hu_HU
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-it_IT
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ja_JP
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-lt_LT
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-nb_NO
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-nl_NL
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-nn_NO
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-pl_PL
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ps
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-pt_BR
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-pt_PT
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ru
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ru_RU
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-sk_SK
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-sl
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-sv
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-sv_SE
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-syr
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-tr
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-tr_TR
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-uk_UA
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ur_PK
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-yi
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_CN
-share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
+include/abiword-%%ABIVERSION%%/abiwidget.h
+include/abiword-%%ABIVERSION%%/xap_UnixTableWidget.h
+libdata/pkgconfig/abiword-%%ABIVERSION%%.pc
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Break.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Field.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_FormatFootnotes.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_FormatFrame.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_FormatTOC.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_FormatTable.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Goto.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_HdrFtr.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_InsertTable.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Insert_DateTime.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Latex.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_MailMerge.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_MetaData.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_New.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Options.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Options_ColorSel.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_PageNumbers.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_PageSetup.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Replace.glade
+%%DICT:%%share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Spell.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Styles.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Stylist.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Stylist_modal.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Tab.glade
+share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_WordCount.glade
+share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_DocComparison.glade
+share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Encoding.glade
+share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_History.glade
+share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Image.glade
+share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Language.glade
+share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_ListDocuments.glade
+share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Password.glade
+share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_PluginManager.glade
+share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_WindowMore.glade
+share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Zoom.glade
+share/abiword-%%ABIVERSION%%/readme.abw
+share/abiword-%%ABIVERSION%%/readme.txt
+share/abiword-%%ABIVERSION%%/scripts/abw2html.pl
+share/abiword-%%ABIVERSION%%/strings/am-ET.strings
+share/abiword-%%ABIVERSION%%/strings/ar.strings
+share/abiword-%%ABIVERSION%%/strings/ast-ES.strings
+share/abiword-%%ABIVERSION%%/strings/ayc-BO.strings
+share/abiword-%%ABIVERSION%%/strings/aym-BO.strings
+share/abiword-%%ABIVERSION%%/strings/be-BY.strings
+share/abiword-%%ABIVERSION%%/strings/bg-BG.strings
+share/abiword-%%ABIVERSION%%/strings/br-FR.strings
+share/abiword-%%ABIVERSION%%/strings/ca-ES.strings
+share/abiword-%%ABIVERSION%%/strings/cs-CZ.strings
+share/abiword-%%ABIVERSION%%/strings/cy-GB.strings
+share/abiword-%%ABIVERSION%%/strings/da-DK.strings
+share/abiword-%%ABIVERSION%%/strings/de-CH.strings
+share/abiword-%%ABIVERSION%%/strings/de-DE.strings
+share/abiword-%%ABIVERSION%%/strings/el-GR.strings
+share/abiword-%%ABIVERSION%%/strings/en-AU.strings
+share/abiword-%%ABIVERSION%%/strings/en-CA.strings
+share/abiword-%%ABIVERSION%%/strings/en-GB.strings
+share/abiword-%%ABIVERSION%%/strings/en-IE.strings
+share/abiword-%%ABIVERSION%%/strings/eo.strings
+share/abiword-%%ABIVERSION%%/strings/es-ES.strings
+share/abiword-%%ABIVERSION%%/strings/es-MX.strings
+share/abiword-%%ABIVERSION%%/strings/et.strings
+share/abiword-%%ABIVERSION%%/strings/eu-ES.strings
+share/abiword-%%ABIVERSION%%/strings/fi-FI.strings
+share/abiword-%%ABIVERSION%%/strings/fr-FR.strings
+share/abiword-%%ABIVERSION%%/strings/ga-IE.strings
+share/abiword-%%ABIVERSION%%/strings/gl.strings
+share/abiword-%%ABIVERSION%%/strings/he-IL.strings
+share/abiword-%%ABIVERSION%%/strings/hr-HR.strings
+share/abiword-%%ABIVERSION%%/strings/hu-HU.strings
+share/abiword-%%ABIVERSION%%/strings/id-ID.strings
+share/abiword-%%ABIVERSION%%/strings/it-IT.strings
+share/abiword-%%ABIVERSION%%/strings/ja-JP.strings
+share/abiword-%%ABIVERSION%%/strings/jbo.strings
+share/abiword-%%ABIVERSION%%/strings/ko.strings
+share/abiword-%%ABIVERSION%%/strings/ku.strings
+share/abiword-%%ABIVERSION%%/strings/lt-LT.strings
+share/abiword-%%ABIVERSION%%/strings/lv-LV.strings
+share/abiword-%%ABIVERSION%%/strings/mg-MG.strings
+share/abiword-%%ABIVERSION%%/strings/mh-MH.strings
+share/abiword-%%ABIVERSION%%/strings/mk-MK.strings
+share/abiword-%%ABIVERSION%%/strings/ms-MY.strings
+share/abiword-%%ABIVERSION%%/strings/nb-NO.strings
+share/abiword-%%ABIVERSION%%/strings/ne-NP.strings
+share/abiword-%%ABIVERSION%%/strings/nl-NL.strings
+share/abiword-%%ABIVERSION%%/strings/nn-NO.strings
+share/abiword-%%ABIVERSION%%/strings/pl-PL.strings
+share/abiword-%%ABIVERSION%%/strings/ps.strings
+share/abiword-%%ABIVERSION%%/strings/pt-BR.strings
+share/abiword-%%ABIVERSION%%/strings/pt-PT.strings
+share/abiword-%%ABIVERSION%%/strings/quh-BO.strings
+share/abiword-%%ABIVERSION%%/strings/qul-BO.strings
+share/abiword-%%ABIVERSION%%/strings/ro-RO.strings
+share/abiword-%%ABIVERSION%%/strings/ru-RU.strings
+share/abiword-%%ABIVERSION%%/strings/sc-IT.strings
+share/abiword-%%ABIVERSION%%/strings/sk-SK.strings
+share/abiword-%%ABIVERSION%%/strings/sl-SI.strings
+share/abiword-%%ABIVERSION%%/strings/sq-AL.strings
+share/abiword-%%ABIVERSION%%/strings/sr.strings
+share/abiword-%%ABIVERSION%%/strings/sv-SE.strings
+share/abiword-%%ABIVERSION%%/strings/ta-IN.strings
+share/abiword-%%ABIVERSION%%/strings/tr-TR.strings
+share/abiword-%%ABIVERSION%%/strings/uk-UA.strings
+share/abiword-%%ABIVERSION%%/strings/ur.strings
+share/abiword-%%ABIVERSION%%/strings/vi-VN.strings
+share/abiword-%%ABIVERSION%%/strings/wo-SN.strings
+share/abiword-%%ABIVERSION%%/strings/yi.strings
+share/abiword-%%ABIVERSION%%/strings/zh-CN.strings
+share/abiword-%%ABIVERSION%%/strings/zh-HK.strings
+share/abiword-%%ABIVERSION%%/strings/zh-TW.strings
+share/abiword-%%ABIVERSION%%/system.profile
+share/abiword-%%ABIVERSION%%/system.profile-CP1254
+share/abiword-%%ABIVERSION%%/system.profile-KOI8-R
+share/abiword-%%ABIVERSION%%/system.profile-KOI8-U
+share/abiword-%%ABIVERSION%%/system.profile-KOI8-UB
+share/abiword-%%ABIVERSION%%/system.profile-am-ET
+share/abiword-%%ABIVERSION%%/system.profile-ar
+share/abiword-%%ABIVERSION%%/system.profile-ar-EG
+share/abiword-%%ABIVERSION%%/system.profile-ar-SA
+share/abiword-%%ABIVERSION%%/system.profile-bg-BG
+share/abiword-%%ABIVERSION%%/system.profile-ca-ES
+share/abiword-%%ABIVERSION%%/system.profile-cs-CZ
+share/abiword-%%ABIVERSION%%/system.profile-da-DK
+share/abiword-%%ABIVERSION%%/system.profile-de
+share/abiword-%%ABIVERSION%%/system.profile-de-AT
+share/abiword-%%ABIVERSION%%/system.profile-de-CH
+share/abiword-%%ABIVERSION%%/system.profile-de-DE
+share/abiword-%%ABIVERSION%%/system.profile-div-MV
+share/abiword-%%ABIVERSION%%/system.profile-el-GR
+share/abiword-%%ABIVERSION%%/system.profile-en
+share/abiword-%%ABIVERSION%%/system.profile-en-AU
+share/abiword-%%ABIVERSION%%/system.profile-en-CA
+share/abiword-%%ABIVERSION%%/system.profile-en-GB
+share/abiword-%%ABIVERSION%%/system.profile-en-IE
+share/abiword-%%ABIVERSION%%/system.profile-en-NZ
+share/abiword-%%ABIVERSION%%/system.profile-en-US
+share/abiword-%%ABIVERSION%%/system.profile-en-ZA
+share/abiword-%%ABIVERSION%%/system.profile-es
+share/abiword-%%ABIVERSION%%/system.profile-es-ES
+share/abiword-%%ABIVERSION%%/system.profile-es-MX
+share/abiword-%%ABIVERSION%%/system.profile-eu
+share/abiword-%%ABIVERSION%%/system.profile-eu-ES
+share/abiword-%%ABIVERSION%%/system.profile-fa-IR
+share/abiword-%%ABIVERSION%%/system.profile-fi-FI
+share/abiword-%%ABIVERSION%%/system.profile-fr
+share/abiword-%%ABIVERSION%%/system.profile-fr-BE
+share/abiword-%%ABIVERSION%%/system.profile-fr-CA
+share/abiword-%%ABIVERSION%%/system.profile-fr-CH
+share/abiword-%%ABIVERSION%%/system.profile-fr-FR
+share/abiword-%%ABIVERSION%%/system.profile-gl-ES
+share/abiword-%%ABIVERSION%%/system.profile-he
+share/abiword-%%ABIVERSION%%/system.profile-he-IL
+share/abiword-%%ABIVERSION%%/system.profile-hu-HU
+share/abiword-%%ABIVERSION%%/system.profile-it-IT
+share/abiword-%%ABIVERSION%%/system.profile-ja-JP
+share/abiword-%%ABIVERSION%%/system.profile-lt-LT
+share/abiword-%%ABIVERSION%%/system.profile-nb-NO
+share/abiword-%%ABIVERSION%%/system.profile-nl-NL
+share/abiword-%%ABIVERSION%%/system.profile-nn-NO
+share/abiword-%%ABIVERSION%%/system.profile-pl-PL
+share/abiword-%%ABIVERSION%%/system.profile-ps
+share/abiword-%%ABIVERSION%%/system.profile-pt-BR
+share/abiword-%%ABIVERSION%%/system.profile-pt-PT
+share/abiword-%%ABIVERSION%%/system.profile-ru
+share/abiword-%%ABIVERSION%%/system.profile-ru-RU
+share/abiword-%%ABIVERSION%%/system.profile-sk-SK
+share/abiword-%%ABIVERSION%%/system.profile-sk-SK.CP1250
+share/abiword-%%ABIVERSION%%/system.profile-sl
+share/abiword-%%ABIVERSION%%/system.profile-sv
+share/abiword-%%ABIVERSION%%/system.profile-sv-SE
+share/abiword-%%ABIVERSION%%/system.profile-syr
+share/abiword-%%ABIVERSION%%/system.profile-tr
+share/abiword-%%ABIVERSION%%/system.profile-tr-TR
+share/abiword-%%ABIVERSION%%/system.profile-tr-TR.CP1254
+share/abiword-%%ABIVERSION%%/system.profile-uk-UA
+share/abiword-%%ABIVERSION%%/system.profile-ur-PK
+share/abiword-%%ABIVERSION%%/system.profile-yi
+share/abiword-%%ABIVERSION%%/system.profile-zh-CN
+share/abiword-%%ABIVERSION%%/system.profile-zh-TW
+share/abiword-%%ABIVERSION%%/templates/normal.awt
+share/abiword-%%ABIVERSION%%/templates/normal.awt-am_ET
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ar
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ar_EG
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ar_SA
+share/abiword-%%ABIVERSION%%/templates/normal.awt-bg_BG
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ca_ES
+share/abiword-%%ABIVERSION%%/templates/normal.awt-cs_CZ
+share/abiword-%%ABIVERSION%%/templates/normal.awt-da_DK
+share/abiword-%%ABIVERSION%%/templates/normal.awt-de
+share/abiword-%%ABIVERSION%%/templates/normal.awt-de_AT
+share/abiword-%%ABIVERSION%%/templates/normal.awt-de_CH
+share/abiword-%%ABIVERSION%%/templates/normal.awt-de_DE
+share/abiword-%%ABIVERSION%%/templates/normal.awt-div_MV
+share/abiword-%%ABIVERSION%%/templates/normal.awt-el_GR
+share/abiword-%%ABIVERSION%%/templates/normal.awt-en_AU
+share/abiword-%%ABIVERSION%%/templates/normal.awt-en_CA
+share/abiword-%%ABIVERSION%%/templates/normal.awt-en_GB
+share/abiword-%%ABIVERSION%%/templates/normal.awt-en_IE
+share/abiword-%%ABIVERSION%%/templates/normal.awt-en_NZ
+share/abiword-%%ABIVERSION%%/templates/normal.awt-en_ZA
+share/abiword-%%ABIVERSION%%/templates/normal.awt-es
+share/abiword-%%ABIVERSION%%/templates/normal.awt-es_AR
+share/abiword-%%ABIVERSION%%/templates/normal.awt-es_ES
+share/abiword-%%ABIVERSION%%/templates/normal.awt-es_IR
+share/abiword-%%ABIVERSION%%/templates/normal.awt-es_MX
+share/abiword-%%ABIVERSION%%/templates/normal.awt-fa_IR
+share/abiword-%%ABIVERSION%%/templates/normal.awt-fi_FI
+share/abiword-%%ABIVERSION%%/templates/normal.awt-fr
+share/abiword-%%ABIVERSION%%/templates/normal.awt-fr_BE
+share/abiword-%%ABIVERSION%%/templates/normal.awt-fr_CA
+share/abiword-%%ABIVERSION%%/templates/normal.awt-fr_CH
+share/abiword-%%ABIVERSION%%/templates/normal.awt-fr_FR
+share/abiword-%%ABIVERSION%%/templates/normal.awt-gl_ES
+share/abiword-%%ABIVERSION%%/templates/normal.awt-he
+share/abiword-%%ABIVERSION%%/templates/normal.awt-he_IL
+share/abiword-%%ABIVERSION%%/templates/normal.awt-hu_HU
+share/abiword-%%ABIVERSION%%/templates/normal.awt-it_IT
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ja_JP
+share/abiword-%%ABIVERSION%%/templates/normal.awt-lt_LT
+share/abiword-%%ABIVERSION%%/templates/normal.awt-nb_NO
+share/abiword-%%ABIVERSION%%/templates/normal.awt-nl_NL
+share/abiword-%%ABIVERSION%%/templates/normal.awt-nn_NO
+share/abiword-%%ABIVERSION%%/templates/normal.awt-pl_PL
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ps
+share/abiword-%%ABIVERSION%%/templates/normal.awt-pt_BR
+share/abiword-%%ABIVERSION%%/templates/normal.awt-pt_PT
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ru
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ru_RU
+share/abiword-%%ABIVERSION%%/templates/normal.awt-sk_SK
+share/abiword-%%ABIVERSION%%/templates/normal.awt-sl
+share/abiword-%%ABIVERSION%%/templates/normal.awt-sv
+share/abiword-%%ABIVERSION%%/templates/normal.awt-sv_SE
+share/abiword-%%ABIVERSION%%/templates/normal.awt-syr
+share/abiword-%%ABIVERSION%%/templates/normal.awt-tr
+share/abiword-%%ABIVERSION%%/templates/normal.awt-tr_TR
+share/abiword-%%ABIVERSION%%/templates/normal.awt-uk_UA
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ur_PK
+share/abiword-%%ABIVERSION%%/templates/normal.awt-yi
+share/abiword-%%ABIVERSION%%/templates/normal.awt-zh_CN
+share/abiword-%%ABIVERSION%%/templates/normal.awt-zh_TW
 share/applications/abiword.desktop
-%%GNOME:%%share/gnome-2.0/ui/abi-nautilus-view-file.xml
+share/mime-info/abiword.keys
 share/pixmaps/abiword_48.png
 @dirrmtry share/applications
-@dirrm share/AbiSuite-%%ABIVERSION%%/templates
-@dirrm share/AbiSuite-%%ABIVERSION%%/icons
-@dirrm share/AbiSuite-%%ABIVERSION%%/dictionary
-@dirrm share/AbiSuite-%%ABIVERSION%%/clipart
-@dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord/strings
-@dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord/scripts
-@dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord/glade
-@dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord
-@dirrm share/AbiSuite-%%ABIVERSION%%
-@exec /bin/mkdir -p %D/lib/AbiWord-%%ABIVERSION%%/plugins
-@dirrmtry lib/AbiWord-%%ABIVERSION%%/plugins
-@dirrmtry lib/AbiWord-%%ABIVERSION%%
+@dirrm share/abiword-%%ABIVERSION%%/templates
+@dirrm share/abiword-%%ABIVERSION%%/strings
+@dirrm share/abiword-%%ABIVERSION%%/scripts
+@dirrm share/abiword-%%ABIVERSION%%/glade
+@dirrm share/abiword-%%ABIVERSION%%
+@exec /bin/mkdir -p %D/lib/abiword-%%ABIVERSION%%/plugins
+@dirrmtry lib/abiword-%%ABIVERSION%%/plugins
+@dirrmtry lib/abiword-%%ABIVERSION%%
+@dirrm include/abiword-%%ABIVERSION%%
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true