* Update to 1.1.4

* Enable optional GNOME 2 support

7 files changed, 148 insertions, 305 deletions

diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 8b6b6a6..8861850 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -20,9 +20,10 @@ COMMENT=	An open-source, cross-platform WYSIWYG word processor
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		iconv.3:${PORTSDIR}/converters/libiconv \
-		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
+		glade-2.0.0:${PORTSDIR}/devel/libglade2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		fribidi.0:${PORTSDIR}/converters/fribidi
+		fribidi.0:${PORTSDIR}/converters/fribidi \
+		aspell.15:${PORTSDIR}/textproc/aspell
 
 DIST_SUBDIR=	AbiWord
 
@@ -36,7 +37,6 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomehier
-WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv"
 CONFIGURE_ARGS=	--enable-xft
@@ -45,9 +45,33 @@ MAKEFILE=	GNUmakefile
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/include/wv.h)
-BROKEN=	"This port cannot be built when textproc/wv is installed because of a header conflict.  Please remove textproc/wv, and resume the build.  If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord build"
+BROKEN=	"This port cannot be built when textproc/wv is installed because of a header conflict.  Please remove textproc/wv, and resume the build.  If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord2 build"
 .endif
 
+.if defined(WITH_GNOME) || \
+	( exists(${X11BASE}/libdata/pkgconfig/libnautilus.pc) && \
+		exists(${X11BASE}/libdata/pkgconfig/gal-2.0.pc) )
+LIB_DEPENDS+=		nautilus.2:${PORTSDIR}/x11-fm/nautilus2 \
+			gal-2.0.1:${PORTSDIR}/x11-toolkits/gal2
+CONFIGURE_ARGS+=	--enable-gnome
+PLIST_SUB+=		GNOME:=""
+PKGNAMESUFFIX=		-gnome
+.else
+PLIST_SUB+=		GNOME:="@comment "
+.endif
+
+.if defined(WITH_GUCHARMAP) || exists(${X11BASE}/libdata/pkgconfig/gucharmap.pc)
+LIB_DEPENDS+=		gucharmap.1:${PORTSDIR}/misc/gucharmap
+.else
+CONFIGURE_ARGS+=	--disable-gucharmap
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "AbiWord2 has the following tunable option(s):"
+	@${ECHO_MSG} "	WITH_GUCHARMAP=yes	Enable use of Gucharmap as the symbol insertion tool (default: auto)"
+	@${ECHO_MSG} ""
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%AUTOMAKE%%|${AUTOMAKE}|g ; \
 		s|%%ACLOCAL%%|${ACLOCAL}|g ; \
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
index fa29979..9b9fe08 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword-devel/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-1.1.3.tar.gz) = 6fdaf7e3cbc5aed2eb80e2054f54381f
+MD5 (AbiWord/abiword-1.1.4.tar.gz) = a2933c1784035836bbe5b96e1fa22603
diff --git a/editors/abiword-devel/files/patch-src_af_ev_unix_ev_UnixToolbar.cpp b/editors/abiword-devel/files/patch-src_af_ev_unix_ev_UnixToolbar.cpp
new file mode 100644
index 0000000..2983c82
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_af_ev_unix_ev_UnixToolbar.cpp
@@ -0,0 +1,16 @@
+--- src/af/ev/unix/ev_UnixToolbar.cpp.orig	Mon Mar 24 01:55:52 2003
++++ src/af/ev/unix/ev_UnixToolbar.cpp	Mon Mar 24 01:51:14 2003
+@@ -881,11 +881,11 @@
+ 			    GtkWidget * combo;
+ 				GdkPixbuf * pixbuf;
+ 			    if (pAction->getItemType() == EV_TBIT_ColorFore) {
+-					pixbuf = gdk_pixbuf_new_from_xpm_data (static_cast<const char **>(tb_text_fgcolor_xpm));
++					pixbuf = gdk_pixbuf_new_from_xpm_data (static_cast<char **>(tb_text_fgcolor_xpm));
+ 					combo = color_combo_new (pixbuf, szToolTip, &e_black, color_group_fetch("foreground_color", NULL));
+ 			    }
+ 				else {
+-					pixbuf = gdk_pixbuf_new_from_xpm_data (static_cast<const char **>(tb_text_bgcolor_xpm));
++					pixbuf = gdk_pixbuf_new_from_xpm_data (static_cast<char **>(tb_text_bgcolor_xpm));
+ 					combo = color_combo_new (pixbuf, szToolTip, NULL, color_group_fetch("background_color", NULL));
+ 				}
+ 			    gtk_combo_box_set_title (GTK_COMBO_BOX (combo),
diff --git a/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixEncodingManager.cpp b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixEncodingManager.cpp
new file mode 100644
index 0000000..0013c3e
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixEncodingManager.cpp
@@ -0,0 +1,17 @@
+--- src/af/xap/unix/xap_UnixEncodingManager.cpp.orig	Fri Mar  7 02:33:39 2003
++++ src/af/xap/unix/xap_UnixEncodingManager.cpp	Tue Mar 25 19:49:09 2003
+@@ -475,6 +475,7 @@
+ 	NativeUnicodeEncodingName = "UTF-8";
+ 	LanguageISOName = "en";
+ 	LanguageISOTerritory = "US";   
++	XAP_EncodingManager::initialize();
+ 
+ 	if (!*locname || !strcmp(locname,"C"))
+ 	{ 	/* paranoic case - broken system */
+@@ -582,6 +583,5 @@
+ 			FREEP(mod);
+ 		}
+ 	}
+-	XAP_EncodingManager::initialize();
+ 	describe();
+ };
diff --git a/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp b/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
deleted file mode 100644
index 69aae90..0000000
--- a/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wp/ap/unix/ap_UnixApp.cpp.orig	Sat Feb 22 01:21:20 2003
-+++ src/wp/ap/unix/ap_UnixApp.cpp	Sat Feb 22 01:21:31 2003
-@@ -1241,7 +1241,7 @@
-     pMyUnixApp->shutdown();
-     delete pMyUnixApp;
-     
--    poptFreeContext (Args.poptcon);
-+    //poptFreeContext (Args.poptcon);
-     return 0;
- }
- 
diff --git a/editors/abiword-devel/pkg-message b/editors/abiword-devel/pkg-message
index 57ce22a..7b2e5c2 100644
--- a/editors/abiword-devel/pkg-message
+++ b/editors/abiword-devel/pkg-message
@@ -1,21 +1,10 @@
-In order to use AbiWord, you may have to add one or more lines to your
-XF86Config file, usually located in /etc/X11/XF86Config or /etc/XF86Config.
+###
+There is currently a bug that can cause AbiWord to crash on startup on
+FreeBSD -CURRENT.  To workaround this bug, issue the following the command
+as root:
 
-For XFree86 >= 4, add the following line to the "Module" section:
+ln -s aj /etc/malloc.conf
 
-	Load "type1"
-
-For other X servers, please consult your documentation.
-
-Also, if you are going to display AbiWord on a remote X server, besides
-following the instructions above, please make sure that the files in the
-${PREFIX}/share/AbiSuite-2.0/fonts directory are available to the remote X
-server and add the ${PREFIX}/share/AbiSuite-2.0/fonts into server's font
-path. For XFree86, add the following line to the "Files" section:
-
-	FontPath "${PREFIX}/share/AbiSuite-2.0/fonts"
-
-If you use a different X server, please see its documentation on how to
-do this.
-
-Finally, re-start your X server.
+More details on this bug can be found at 
+http://bugzilla.abisource.com/show_bug.cgi?id=4750.
+###
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index 540649c..fec069a 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -1,15 +1,73 @@
-bin/ttftool
-bin/ttfadmin.sh
 bin/AbiWord-2.0
 bin/abiword
-share/AbiSuite-2.0/AbiWord/bin/AbiWord_d
+bin/ttfadmin.sh
+bin/ttftool
+share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_Break.glade
+share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_HdrFtr.glade
+share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_InsertTable.glade
+share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_Insert_DateTime.glade
+share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_PageNumbers.glade
+share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_About.glade
+share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_Zoom.glade
 share/AbiSuite-2.0/AbiWord/readme.txt
+share/AbiSuite-2.0/AbiWord/scripts/abw2html.pl
+share/AbiSuite-2.0/AbiWord/strings/am-ET.strings
+share/AbiSuite-2.0/AbiWord/strings/art-lojban.strings
+share/AbiSuite-2.0/AbiWord/strings/bg-BG.strings
+share/AbiSuite-2.0/AbiWord/strings/ca-ES.strings
+share/AbiSuite-2.0/AbiWord/strings/cs-CZ.strings
+share/AbiSuite-2.0/AbiWord/strings/cy-GB.strings
+share/AbiSuite-2.0/AbiWord/strings/da-DK.strings
+share/AbiSuite-2.0/AbiWord/strings/de-CH.strings
+share/AbiSuite-2.0/AbiWord/strings/de-DE.strings
+share/AbiSuite-2.0/AbiWord/strings/el-GR.strings
+share/AbiSuite-2.0/AbiWord/strings/en-AU.strings
+share/AbiSuite-2.0/AbiWord/strings/en-GB.strings
+share/AbiSuite-2.0/AbiWord/strings/en-IE.strings
+share/AbiSuite-2.0/AbiWord/strings/es-ES.strings
+share/AbiSuite-2.0/AbiWord/strings/es-MX.strings
+share/AbiSuite-2.0/AbiWord/strings/eu-ES.strings
+share/AbiSuite-2.0/AbiWord/strings/fi-FI.strings
+share/AbiSuite-2.0/AbiWord/strings/fr-FR.strings
+share/AbiSuite-2.0/AbiWord/strings/ga-IE.strings
+share/AbiSuite-2.0/AbiWord/strings/gl-ES.strings
+share/AbiSuite-2.0/AbiWord/strings/he-IL.strings
+share/AbiSuite-2.0/AbiWord/strings/hu-HU.strings
+share/AbiSuite-2.0/AbiWord/strings/id-ID.strings
+share/AbiSuite-2.0/AbiWord/strings/it-IT.strings
+share/AbiSuite-2.0/AbiWord/strings/ja-JP.strings
+share/AbiSuite-2.0/AbiWord/strings/lt-LT.strings
+share/AbiSuite-2.0/AbiWord/strings/mh-MH.strings
+share/AbiSuite-2.0/AbiWord/strings/ms-MY.strings
+share/AbiSuite-2.0/AbiWord/strings/nb-NO.strings
+share/AbiSuite-2.0/AbiWord/strings/nl-NL.strings
+share/AbiSuite-2.0/AbiWord/strings/nn-NO.strings
+share/AbiSuite-2.0/AbiWord/strings/pl-PL.strings
+share/AbiSuite-2.0/AbiWord/strings/pt-BR.strings
+share/AbiSuite-2.0/AbiWord/strings/pt-PT.strings
+share/AbiSuite-2.0/AbiWord/strings/ro-RO.strings
+share/AbiSuite-2.0/AbiWord/strings/ru-RU.strings
+share/AbiSuite-2.0/AbiWord/strings/sk-SK.strings
+share/AbiSuite-2.0/AbiWord/strings/sl-SI.strings
+share/AbiSuite-2.0/AbiWord/strings/sq-AL.strings
+share/AbiSuite-2.0/AbiWord/strings/sr-SR.strings
+share/AbiSuite-2.0/AbiWord/strings/sv-SE.strings
+share/AbiSuite-2.0/AbiWord/strings/tr-TR.strings
+share/AbiSuite-2.0/AbiWord/strings/uk-UA.strings
+share/AbiSuite-2.0/AbiWord/strings/vi-VN.strings
+share/AbiSuite-2.0/AbiWord/strings/yi.strings
+share/AbiSuite-2.0/AbiWord/strings/zh-CN.strings
+share/AbiSuite-2.0/AbiWord/strings/zh-HK.strings
+share/AbiSuite-2.0/AbiWord/strings/zh-TW.strings
 share/AbiSuite-2.0/AbiWord/system.profile
 share/AbiSuite-2.0/AbiWord/system.profile-CP1254
 share/AbiSuite-2.0/AbiWord/system.profile-KOI8-R
 share/AbiSuite-2.0/AbiWord/system.profile-KOI8-U
 share/AbiSuite-2.0/AbiWord/system.profile-KOI8-UB
 share/AbiSuite-2.0/AbiWord/system.profile-am-ET
+share/AbiSuite-2.0/AbiWord/system.profile-ar
+share/AbiSuite-2.0/AbiWord/system.profile-ar-EG
+share/AbiSuite-2.0/AbiWord/system.profile-ar-SA
 share/AbiSuite-2.0/AbiWord/system.profile-bg-BG
 share/AbiSuite-2.0/AbiWord/system.profile-ca-ES
 share/AbiSuite-2.0/AbiWord/system.profile-cs-CZ
@@ -18,91 +76,7 @@ share/AbiSuite-2.0/AbiWord/system.profile-de
 share/AbiSuite-2.0/AbiWord/system.profile-de-AT
 share/AbiSuite-2.0/AbiWord/system.profile-de-CH
 share/AbiSuite-2.0/AbiWord/system.profile-de-DE
-share/AbiSuite-2.0/AbiWord/help/en-US/aboutos.html
-share/AbiSuite-2.0/AbiWord/help/en-US/credits.html
-share/AbiSuite-2.0/AbiWord/help/en-US/fdl.html
-share/AbiSuite-2.0/AbiWord/help/en-US/histyle.css
-share/AbiSuite-2.0/AbiWord/help/en-US/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/introduction.html
-share/AbiSuite-2.0/AbiWord/help/en-US/search.html
-share/AbiSuite-2.0/AbiWord/help/en-US/style.css
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtonormaltemplate.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtotables.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.xhtml_data/ruler.png
-share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.xhtml_data/gettingstarted.abw-0.png
-share/AbiSuite-2.0/AbiWord/help/en-US/info/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/info/inforequirements.html
-share/AbiSuite-2.0/AbiWord/help/en-US/info/infospelling.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogactivatewindow.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbackgroundcolor.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbookmark.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogbreak.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogchangecase.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogcolumns.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogdateandtime.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfield.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfind.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogfont.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogformatheaderfooters.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoggoto.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoghyperlink.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogimageproperties.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoglanguage.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialoglists.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogmodifystyle.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialognew.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialognewstyle.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogopenlinux.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpagenumbers.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpagesetup.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogparagraph.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogplugins.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogpreferences.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogsavelinux.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogscreencolor.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogspelling.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogstyles.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogsymbol.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogtabs.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogwordcount.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogzoom.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menucontextual.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuedit.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuformat.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuhelp.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuinsert.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menutools.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuview.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuweb.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menuwindow.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarextra.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarformatting.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/toolbarstandard.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.html
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.xhtml_data/replace.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.xhtml_data/menufile.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/full_window.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/functionbars.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/functionbars_hiding.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/grabbar_shaded.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/ruler.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/statusbar.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/statusbar_quickhelp.png
-share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data/titlebar.png
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsbugs.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsfaq.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemsfonts.html
-share/AbiSuite-2.0/AbiWord/help/en-US/problems/problemshelp.html
-share/AbiSuite-2.0/AbiWord/help/en-US/tutorial/index.html
-share/AbiSuite-2.0/AbiWord/help/en-US/credits.txt
+share/AbiSuite-2.0/AbiWord/system.profile-div-MV
 share/AbiSuite-2.0/AbiWord/system.profile-el-GR
 share/AbiSuite-2.0/AbiWord/system.profile-en
 share/AbiSuite-2.0/AbiWord/system.profile-en-AU
@@ -115,6 +89,7 @@ share/AbiSuite-2.0/AbiWord/system.profile-en-ZA
 share/AbiSuite-2.0/AbiWord/system.profile-es
 share/AbiSuite-2.0/AbiWord/system.profile-es-ES
 share/AbiSuite-2.0/AbiWord/system.profile-es-MX
+share/AbiSuite-2.0/AbiWord/system.profile-fa-IR
 share/AbiSuite-2.0/AbiWord/system.profile-fi-FI
 share/AbiSuite-2.0/AbiWord/system.profile-fr
 share/AbiSuite-2.0/AbiWord/system.profile-fr-BE
@@ -122,6 +97,8 @@ share/AbiSuite-2.0/AbiWord/system.profile-fr-CA
 share/AbiSuite-2.0/AbiWord/system.profile-fr-CH
 share/AbiSuite-2.0/AbiWord/system.profile-fr-FR
 share/AbiSuite-2.0/AbiWord/system.profile-gl-ES
+share/AbiSuite-2.0/AbiWord/system.profile-he
+share/AbiSuite-2.0/AbiWord/system.profile-he-IL
 share/AbiSuite-2.0/AbiWord/system.profile-hu-HU
 share/AbiSuite-2.0/AbiWord/system.profile-it-IT
 share/AbiSuite-2.0/AbiWord/system.profile-ja-JP
@@ -130,6 +107,7 @@ share/AbiSuite-2.0/AbiWord/system.profile-nb-NO
 share/AbiSuite-2.0/AbiWord/system.profile-nl-NL
 share/AbiSuite-2.0/AbiWord/system.profile-nn-NO
 share/AbiSuite-2.0/AbiWord/system.profile-pl-PL
+share/AbiSuite-2.0/AbiWord/system.profile-ps
 share/AbiSuite-2.0/AbiWord/system.profile-pt-BR
 share/AbiSuite-2.0/AbiWord/system.profile-pt-PT
 share/AbiSuite-2.0/AbiWord/system.profile-ru
@@ -139,151 +117,17 @@ share/AbiSuite-2.0/AbiWord/system.profile-sk-SK.CP1250
 share/AbiSuite-2.0/AbiWord/system.profile-sl
 share/AbiSuite-2.0/AbiWord/system.profile-sv
 share/AbiSuite-2.0/AbiWord/system.profile-sv-SE
+share/AbiSuite-2.0/AbiWord/system.profile-syr
 share/AbiSuite-2.0/AbiWord/system.profile-tr
 share/AbiSuite-2.0/AbiWord/system.profile-tr-TR
 share/AbiSuite-2.0/AbiWord/system.profile-tr-TR.CP1254
 share/AbiSuite-2.0/AbiWord/system.profile-uk-UA
+share/AbiSuite-2.0/AbiWord/system.profile-ur-PK
+share/AbiSuite-2.0/AbiWord/system.profile-yi
 share/AbiSuite-2.0/AbiWord/system.profile-zh-CN
 share/AbiSuite-2.0/AbiWord/system.profile-zh-TW
-share/AbiSuite-2.0/AbiWord/scripts/abw2html.pl
-share/AbiSuite-2.0/AbiWord/strings/am-ET.strings
-share/AbiSuite-2.0/AbiWord/strings/art-lojban.strings
-share/AbiSuite-2.0/AbiWord/strings/bg-BG.strings
-share/AbiSuite-2.0/AbiWord/strings/ca-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/cs-CZ.strings
-share/AbiSuite-2.0/AbiWord/strings/cy-GB.strings
-share/AbiSuite-2.0/AbiWord/strings/da-DK.strings
-share/AbiSuite-2.0/AbiWord/strings/de-CH.strings
-share/AbiSuite-2.0/AbiWord/strings/de-DE.strings
-share/AbiSuite-2.0/AbiWord/strings/el-GR.strings
-share/AbiSuite-2.0/AbiWord/strings/en-AU.strings
-share/AbiSuite-2.0/AbiWord/strings/en-GB.strings
-share/AbiSuite-2.0/AbiWord/strings/en-IE.strings
-share/AbiSuite-2.0/AbiWord/strings/es-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/es-MX.strings
-share/AbiSuite-2.0/AbiWord/strings/eu-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/fi-FI.strings
-share/AbiSuite-2.0/AbiWord/strings/fr-FR.strings
-share/AbiSuite-2.0/AbiWord/strings/ga-IE.strings
-share/AbiSuite-2.0/AbiWord/strings/gl-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/he-IL.strings
-share/AbiSuite-2.0/AbiWord/strings/hu-HU.strings
-share/AbiSuite-2.0/AbiWord/strings/id-ID.strings
-share/AbiSuite-2.0/AbiWord/strings/it-IT.strings
-share/AbiSuite-2.0/AbiWord/strings/ja-JP.strings
-share/AbiSuite-2.0/AbiWord/strings/lt-LT.strings
-share/AbiSuite-2.0/AbiWord/strings/mh-MH.strings
-share/AbiSuite-2.0/AbiWord/strings/ms-MY.strings
-share/AbiSuite-2.0/AbiWord/strings/nb-NO.strings
-share/AbiSuite-2.0/AbiWord/strings/nl-NL.strings
-share/AbiSuite-2.0/AbiWord/strings/nn-NO.strings
-share/AbiSuite-2.0/AbiWord/strings/pl-PL.strings
-share/AbiSuite-2.0/AbiWord/strings/pt-BR.strings
-share/AbiSuite-2.0/AbiWord/strings/pt-PT.strings
-share/AbiSuite-2.0/AbiWord/strings/ro-RO.strings
-share/AbiSuite-2.0/AbiWord/strings/ru-RU.strings
-share/AbiSuite-2.0/AbiWord/strings/sk-SK.strings
-share/AbiSuite-2.0/AbiWord/strings/sl-SI.strings
-share/AbiSuite-2.0/AbiWord/strings/sq-AL.strings
-share/AbiSuite-2.0/AbiWord/strings/sr-SR.strings
-share/AbiSuite-2.0/AbiWord/strings/sv-SE.strings
-share/AbiSuite-2.0/AbiWord/strings/tr-TR.strings
-share/AbiSuite-2.0/AbiWord/strings/uk-UA.strings
-share/AbiSuite-2.0/AbiWord/strings/vi-VN.strings
-share/AbiSuite-2.0/AbiWord/strings/yi.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-CN.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-HK.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-TW.strings
-share/AbiSuite-2.0/fonts/a010013l.afm
-share/AbiSuite-2.0/fonts/a010013l.pfb
-share/AbiSuite-2.0/fonts/a010015l.afm
-share/AbiSuite-2.0/fonts/a010015l.pfb
-share/AbiSuite-2.0/fonts/a010033l.afm
-share/AbiSuite-2.0/fonts/a010033l.pfb
-share/AbiSuite-2.0/fonts/a010035l.afm
-share/AbiSuite-2.0/fonts/a010035l.pfb
-share/AbiSuite-2.0/fonts/adobe-full.u2g
-share/AbiSuite-2.0/fonts/adobe-short.u2g
-share/AbiSuite-2.0/fonts/b018012l.afm
-share/AbiSuite-2.0/fonts/b018012l.pfb
-share/AbiSuite-2.0/fonts/b018015l.afm
-share/AbiSuite-2.0/fonts/b018015l.pfb
-share/AbiSuite-2.0/fonts/b018032l.afm
-share/AbiSuite-2.0/fonts/b018032l.pfb
-share/AbiSuite-2.0/fonts/b018035l.afm
-share/AbiSuite-2.0/fonts/b018035l.pfb
-share/AbiSuite-2.0/fonts/bchb.afm
-share/AbiSuite-2.0/fonts/bchb.pfa
-share/AbiSuite-2.0/fonts/bchbi.afm
-share/AbiSuite-2.0/fonts/bchbi.pfa
-share/AbiSuite-2.0/fonts/bchr.afm
-share/AbiSuite-2.0/fonts/bchr.pfa
-share/AbiSuite-2.0/fonts/bchri.afm
-share/AbiSuite-2.0/fonts/bchri.pfa
-share/AbiSuite-2.0/fonts/c059013l.afm
-share/AbiSuite-2.0/fonts/c059013l.pfb
-share/AbiSuite-2.0/fonts/c059016l.afm
-share/AbiSuite-2.0/fonts/c059016l.pfb
-share/AbiSuite-2.0/fonts/c059033l.afm
-share/AbiSuite-2.0/fonts/c059033l.pfb
-share/AbiSuite-2.0/fonts/c059036l.afm
-share/AbiSuite-2.0/fonts/c059036l.pfb
-share/AbiSuite-2.0/fonts/d050000l.afm
-share/AbiSuite-2.0/fonts/d050000l.pfb
-share/AbiSuite-2.0/fonts/d050000l.u2g
-share/AbiSuite-2.0/fonts/dingbats.e2u
-share/AbiSuite-2.0/fonts/fonts.dir
-share/AbiSuite-2.0/fonts/fonts.scale
-share/AbiSuite-2.0/fonts/n019003l.afm
-share/AbiSuite-2.0/fonts/n019003l.pfb
-share/AbiSuite-2.0/fonts/n019004l.afm
-share/AbiSuite-2.0/fonts/n019004l.pfb
-share/AbiSuite-2.0/fonts/n019023l.afm
-share/AbiSuite-2.0/fonts/n019023l.pfb
-share/AbiSuite-2.0/fonts/n019024l.afm
-share/AbiSuite-2.0/fonts/n019024l.pfb
-share/AbiSuite-2.0/fonts/n019043l.afm
-share/AbiSuite-2.0/fonts/n019043l.pfb
-share/AbiSuite-2.0/fonts/n019044l.afm
-share/AbiSuite-2.0/fonts/n019044l.pfb
-share/AbiSuite-2.0/fonts/n019063l.afm
-share/AbiSuite-2.0/fonts/n019063l.pfb
-share/AbiSuite-2.0/fonts/n019064l.afm
-share/AbiSuite-2.0/fonts/n019064l.pfb
-share/AbiSuite-2.0/fonts/n021003l.afm
-share/AbiSuite-2.0/fonts/n021003l.pfb
-share/AbiSuite-2.0/fonts/n021004l.afm
-share/AbiSuite-2.0/fonts/n021004l.pfb
-share/AbiSuite-2.0/fonts/n021023l.afm
-share/AbiSuite-2.0/fonts/n021023l.pfb
-share/AbiSuite-2.0/fonts/n021024l.afm
-share/AbiSuite-2.0/fonts/n021024l.pfb
-share/AbiSuite-2.0/fonts/n022003l.afm
-share/AbiSuite-2.0/fonts/n022003l.pfb
-share/AbiSuite-2.0/fonts/n022004l.afm
-share/AbiSuite-2.0/fonts/n022004l.pfb
-share/AbiSuite-2.0/fonts/n022023l.afm
-share/AbiSuite-2.0/fonts/n022023l.pfb
-share/AbiSuite-2.0/fonts/n022024l.afm
-share/AbiSuite-2.0/fonts/n022024l.pfb
-share/AbiSuite-2.0/fonts/p052003l.afm
-share/AbiSuite-2.0/fonts/p052003l.pfb
-share/AbiSuite-2.0/fonts/p052004l.afm
-share/AbiSuite-2.0/fonts/p052004l.pfb
-share/AbiSuite-2.0/fonts/p052023l.afm
-share/AbiSuite-2.0/fonts/p052023l.pfb
-share/AbiSuite-2.0/fonts/p052024l.afm
-share/AbiSuite-2.0/fonts/p052024l.pfb
-share/AbiSuite-2.0/fonts/s050000l.afm
-share/AbiSuite-2.0/fonts/s050000l.pfb
-share/AbiSuite-2.0/fonts/s050000l.u2g
-share/AbiSuite-2.0/fonts/symbol.e2u
-share/AbiSuite-2.0/fonts/z003034l.afm
-share/AbiSuite-2.0/fonts/z003034l.pfb
-share/AbiSuite-2.0/GNOME_AbiWord_Control_1_0.oaf
-share/AbiSuite-2.0/Nautilus_View_AbiWord.oaf
+share/AbiSuite-2.0/GNOME_AbiWord_Control_2_0.server
 share/AbiSuite-2.0/README
-share/AbiSuite-2.0/nautilus-abiword-content-view-ui.xml
 share/AbiSuite-2.0/clipart/book.png
 share/AbiSuite-2.0/clipart/chip.png
 share/AbiSuite-2.0/clipart/fun.png
@@ -311,12 +155,11 @@ share/AbiSuite-2.0/clipart/tree.png
 share/AbiSuite-2.0/clipart/tux_bordelais.png
 share/AbiSuite-2.0/clipart/weather.png
 share/AbiSuite-2.0/clipart/write.png
-share/AbiSuite-2.0/dictionary/american.hash
-share/AbiSuite-2.0/dictionary/ispell_dictionary_list.xml
 share/AbiSuite-2.0/icons/abiword_16.xpm
 share/AbiSuite-2.0/icons/abiword_48.png
 share/AbiSuite-2.0/icons/abiword_48.tif
 share/AbiSuite-2.0/icons/abiword_48.xpm
+%%GNOME:%%share/AbiSuite-2.0/icons/abiword_logo.xpm
 share/AbiSuite-2.0/templates/A4.awt
 share/AbiSuite-2.0/templates/Business-Report.awt
 share/AbiSuite-2.0/templates/Employee-Directory.awt
@@ -326,47 +169,12 @@ share/AbiSuite-2.0/templates/US-Letter.awt
 share/AbiSuite-2.0/templates/normal.awt
 share/gnome/apps/Applications/abiword.desktop
 share/gnome/pixmaps/abiword_48.png
-@dirrm share/AbiSuite-2.0/AbiWord/bin
-@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/de_DE
-@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE/images
-@dirrm share/AbiSuite-2.0/AbiWord/help/de-DE
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoweb.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto/howtoword.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/howto
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/images
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/info
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/dialogreplace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/menufile.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/rulers.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface/workspace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/interface
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/problems
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US/tutorial
-@dirrm share/AbiSuite-2.0/AbiWord/help/en-US
-@dirrm share/AbiSuite-2.0/AbiWord/help/es-ES
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoweb.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto/howtoword.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/howto
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/images
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/info
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/dialogreplace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/rulers.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface/workspace.xhtml_data
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/interface
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/plugins
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/problems
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR/tutorial
-@dirrm share/AbiSuite-2.0/AbiWord/help/fr-FR
-@dirrm share/AbiSuite-2.0/AbiWord/help/images
-@dirrm share/AbiSuite-2.0/AbiWord/help
-@dirrm share/AbiSuite-2.0/AbiWord/sample/en-US
-@dirrm share/AbiSuite-2.0/AbiWord/sample
-@dirrm share/AbiSuite-2.0/AbiWord/scripts
+@dirrm share/AbiSuite-2.0/templates
+@dirrm share/AbiSuite-2.0/icons
+@dirrm share/AbiSuite-2.0/dictionary
+@dirrm share/AbiSuite-2.0/clipart
 @dirrm share/AbiSuite-2.0/AbiWord/strings
+@dirrm share/AbiSuite-2.0/AbiWord/scripts
+@dirrm share/AbiSuite-2.0/AbiWord/glade
 @dirrm share/AbiSuite-2.0/AbiWord
-@dirrm share/AbiSuite-2.0/fonts
-@dirrm share/AbiSuite-2.0/clipart
-@dirrm share/AbiSuite-2.0/dictionary
-@dirrm share/AbiSuite-2.0/icons
-@dirrm share/AbiSuite-2.0/templates
 @dirrm share/AbiSuite-2.0