Update to version 2.1.1

PR:		ports/70789
Submitted by:	Ports Fury

13 files changed, 123 insertions, 348 deletions

diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index e5a1a10d20e6..9817cb285489 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomesword
-PORTVERSION=	0.7.9
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,18 +14,22 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A bible interface utilizing the sword framework
 
-BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
-LIB_DEPENDS=	sword.1:${PORTSDIR}/misc/sword
-RUN_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
+LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
+RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gal gnomehack gnomeprefix gtkhtml
+USE_GNOME=	gnomehack gnomeprefix gnometarget gtkhtml3 intlhack
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DUSE_GTKHTML1" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|=share/pix|=share/gnome/pix|g ; \
+		 s|=share/app|=share/gnome/app|g' ${WRKSRC}/configure
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/misc/xiphos/distinfo b/misc/xiphos/distinfo
index 3544e01b0c65..45bceac835a4 100644
--- a/misc/xiphos/distinfo
+++ b/misc/xiphos/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnomesword-0.7.9.tar.gz) = bbd3a6c83d9c0321d004275b4d775375
-SIZE (gnomesword-0.7.9.tar.gz) = 796003
+MD5 (gnomesword-2.1.1.tar.gz) = 46b0c941e4f5780aaf8a72da87d0d045
+SIZE (gnomesword-2.1.1.tar.gz) = 1758480
diff --git a/misc/xiphos/files/patch-Makefile.in b/misc/xiphos/files/patch-Makefile.in
index 12a88106ee71..b629c1eae92d 100644
--- a/misc/xiphos/files/patch-Makefile.in
+++ b/misc/xiphos/files/patch-Makefile.in
@@ -1,11 +1,30 @@
---- Makefile.in.orig	Tue Mar 25 22:35:58 2003
-+++ Makefile.in	Sun May  4 08:12:53 2003
-@@ -388,7 +388,7 @@
- install-exec-am:
- install-exec: install-exec-recursive
+--- Makefile.in.orig	Wed Jul 14 23:34:10 2004
++++ Makefile.in	Sat Aug 21 16:34:24 2004
+@@ -61,7 +61,7 @@
+ 	install-recursive installcheck-recursive installdirs-recursive \
+ 	pdf-recursive ps-recursive uninstall-info-recursive \
+ 	uninstall-recursive
+-am__installdirs = "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(gnomesworddocdir)"
++am__installdirs = "$(DESTDIR)$(gnomemenudir)"
+ gnomemenuDATA_INSTALL = $(INSTALL_DATA)
+ gnomesworddocDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(gnomemenu_DATA) $(gnomesworddoc_DATA)
+@@ -627,7 +627,7 @@
+ all-am: Makefile $(DATA) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(gnomesworddocdir)"; do \
++	for dir in "$(DESTDIR)$(gnomemenudir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+ install: install-recursive
+@@ -674,8 +674,7 @@
+ 
+ info-am:
  
--install-data-am: install-gnomesworddocDATA install-data-local
-+install-data-am: install-data-local
- install-data: install-data-recursive
+-install-data-am: install-data-local install-gnomemenuDATA \
+-	install-gnomesworddocDATA
++install-data-am: install-data-local install-gnomemenuDATA
+ 
+ install-exec-am:
  
- install-am: all-am
diff --git a/misc/xiphos/files/patch-po_Makefile.in.in b/misc/xiphos/files/patch-po_Makefile.in.in
deleted file mode 100644
index 38d246eb52f7..000000000000
--- a/misc/xiphos/files/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Sun May  4 11:25:31 2003
-+++ po/Makefile.in.in	Sun May  4 11:42:10 2003
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/misc/xiphos/files/patch-po_bg.po b/misc/xiphos/files/patch-po_bg.po
deleted file mode 100644
index c77cbc86eac2..000000000000
--- a/misc/xiphos/files/patch-po_bg.po
+++ /dev/null
@@ -1,72 +0,0 @@
---- po/bg.po.orig	Wed Dec 18 08:15:09 2002
-+++ po/bg.po	Sun May  4 10:39:14 2003
-@@ -492,11 +492,6 @@
- msgstr "Отбелязани/изтрий всички"
- 
- # src/gs_gui.c
--# src/gs_html_editor.c
--msgid "Copy"
--msgstr "Копирай"
--
--# src/gs_gui.c
- msgid "Copy highlighted text from main window"
- msgstr "Копира маркирания в главния прозорец текст"
- 
-@@ -699,10 +694,6 @@
- msgstr "Файл"
- 
- # src/gs_html.c
--msgid "Show %s in main window"
--msgstr "Покажи %s в главния прозорецr"
--
--# src/gs_html.c
- #, fuzzy
- msgid "Go to Strongs %s"
- msgstr "Отиди на %s по Стронг"
-@@ -712,11 +703,6 @@
- msgstr "отиди на %s"
- 
- # src/gs_html_editor.c
--# src/gs_html_editor.c
--msgid "``%s'' has been modified.  Do you wish to save it?"
--msgstr "Промяна в ,,%s''. желаете ли промяната да бъде съхранена?"
--
--# src/gs_html_editor.c
- msgid "-untitled-"
- msgstr "-без име-"
- 
-@@ -1011,21 +997,6 @@
- msgstr "Не! Използвай настройките, с които съм работил последно"
- 
- # src/gs_preferences_dlg.c
--#, fuzzy
--msgid "Show Bible Texts notebook tabs"
--msgstr "покажи етикети за Библиите"
--
--# src/gs_preferences_dlg.c
--#, fuzzy
--msgid "Show Commentary notebook tabs"
--msgstr "покажи етикети за коментарите"
--
--# src/gs_preferences_dlg.c
--#, fuzzy
--msgid "Show Dict/Lex notebook tabs"
--msgstr "покажи етикети за речниците/лексиконите"
--
--# src/gs_preferences_dlg.c
- # src/gs_setup.c
- #, fuzzy
- msgid "Use Verse Style"
-@@ -1111,12 +1082,6 @@
- # src/gs_setup.c
- msgid "Commentary"
- msgstr "коментар"
--
--# src/gs_preferences_dlg.c
--# src/gs_setup.c
--# src/gs_shortcutbar.c x 2
--msgid "Dict/Lex"
--msgstr "Речик/лексикон"
- 
- # src/gs_preferences_dlg.c
- # src/gs_setup.c
diff --git a/misc/xiphos/files/patch-po_de.po b/misc/xiphos/files/patch-po_de.po
deleted file mode 100644
index 3eba0cf00886..000000000000
--- a/misc/xiphos/files/patch-po_de.po
+++ /dev/null
@@ -1,74 +0,0 @@
---- po/de.po.orig	Sat May  4 22:32:48 2002
-+++ po/de.po	Sun May  4 10:46:47 2003
-@@ -462,11 +462,6 @@
- msgstr "_Marken/Marken lцschen"
- 
- # src/gs_gui.c
--# src/gs_html_editor.c
--msgid "Copy"
--msgstr "Kopieren"
--
--# src/gs_gui.c
- msgid "Copy highlighted text from main window"
- msgstr "Markierten Text aus Hauptfenster kopieren"
- 
-@@ -658,10 +653,6 @@
- msgstr "Datei"
- 
- # src/gs_html.c
--msgid "Show %s in main window"
--msgstr "Zeige %s im Hauptfenster"
--
--# src/gs_html.c
- msgid "Go to Strongs %s"
- msgstr ""
- 
-@@ -670,11 +661,6 @@
- msgstr "Gehe zu %s"
- 
- # src/gs_html_editor.c
--# src/gs_html_editor.c
--msgid "``%s'' has been modified.  Do you wish to save it?"
--msgstr ",,%s'' wurde verдndert. Mцchten Sie es speichern?"
--
--# src/gs_html_editor.c
- msgid "-untitled-"
- msgstr "-namenlos-"
- 
-@@ -955,23 +941,6 @@
- msgstr "Nein, benutze Vorgaben von letzter GnomeSword Sitzung"
- 
- # src/gs_preferences_dlg.c
--msgid "Show Bible Texts notebook tabs"
--msgstr "Zeige Bibeltexte als Register"
--
--# src/gs_preferences_dlg.c
--msgid "Show Commentary notebook tabs"
--msgstr "Zeige Kommentare als Reiter"
--
--# src/gs_preferences_dlg.c
--msgid "Show Dict/Lex notebook tabs"
--msgstr "Zeige Wцrterbьcher/Lexika als Reiter"
--
--# src/gs_preferences_dlg.c
--# src/gs_setup.c
--msgid "Use Verse Style"
--msgstr "Benutze Versstil"
--
--# src/gs_preferences_dlg.c
- msgid "Show Daily Devotion"
- msgstr "Zeige Losung"
- 
-@@ -1048,12 +1017,6 @@
- # src/gs_setup.c
- msgid "Commentary"
- msgstr "Kommentar"
--
--# src/gs_preferences_dlg.c
--# src/gs_setup.c
--# src/gs_shortcutbar.c x 2
--msgid "Dict/Lex"
--msgstr "Wцrterbuch/Lexikon"
- 
- # src/gs_preferences_dlg.c
- # src/gs_setup.c
diff --git a/misc/xiphos/files/patch-po_es.po b/misc/xiphos/files/patch-po_es.po
deleted file mode 100644
index b1b813743fca..000000000000
--- a/misc/xiphos/files/patch-po_es.po
+++ /dev/null
@@ -1,69 +0,0 @@
---- po/es.po.orig	Tue May  7 06:01:07 2002
-+++ po/es.po	Sun May  4 11:13:14 2003
-@@ -454,11 +454,6 @@
- msgstr "_Marcas Rбpidas/Borrar Marcas Rбpidas"
- 
- # src/gs_gui.c
--# src/gs_html_editor.c
--msgid "Copy"
--msgstr "Copiar"
--
--# src/gs_gui.c
- msgid "Copy highlighted text from main window"
- msgstr "Copiar el texto resaltado de la ventana principal"
- 
-@@ -650,10 +645,6 @@
- msgstr "Archivo"
- 
- # src/gs_html.c
--msgid "Show %s in main window"
--msgstr "Mostrar %s en la ventana principal"
--
--# src/gs_html.c
- msgid "Go to Strongs %s"
- msgstr "Ir a %s de Strong"
- 
-@@ -662,11 +653,6 @@
- msgstr "Ir a %s"
- 
- # src/gs_html_editor.c
--# src/gs_html_editor.c
--msgid "``%s'' has been modified.  Do you wish to save it?"
--msgstr "``%s'' ha sido modificado.  їDesea guardarlo?"
--
--# src/gs_html_editor.c
- msgid "-untitled-"
- msgstr "-sin tнtulo-"
- 
-@@ -947,18 +933,6 @@
- msgstr "No, utilizar las opciones guardadas en la sesiуn anterior de GnomeSword"
- 
- # src/gs_preferences_dlg.c
--msgid "Show Bible Texts notebook tabs"
--msgstr "Mostrar las lenguetas de los Textos Bнblicos"
--
--# src/gs_preferences_dlg.c
--msgid "Show Commentary notebook tabs"
--msgstr "Mostrar las lenguetas de los Comentarios"
--
--# src/gs_preferences_dlg.c
--msgid "Show Dict/Lex notebook tabs"
--msgstr "Mostrar las lenguetas de los Diccionarios/Lйxica"
--
--# src/gs_preferences_dlg.c
- # src/gs_setup.c
- msgid "Use Verse Style"
- msgstr "Usar Estilo de Versos"
-@@ -1040,12 +1014,6 @@
- # src/gs_setup.c
- msgid "Commentary"
- msgstr "Comentario"
--
--# src/gs_preferences_dlg.c
--# src/gs_setup.c
--# src/gs_shortcutbar.c x 2
--msgid "Dict/Lex"
--msgstr "Diccionarios/Lexica"
- 
- # src/gs_preferences_dlg.c
- # src/gs_setup.c
diff --git a/misc/xiphos/files/patch-po_es_ES.po b/misc/xiphos/files/patch-po_es_ES.po
deleted file mode 100644
index 312d28101ca2..000000000000
--- a/misc/xiphos/files/patch-po_es_ES.po
+++ /dev/null
@@ -1,69 +0,0 @@
---- po/es_ES.po.orig	Tue May  7 06:01:07 2002
-+++ po/es_ES.po	Sun May  4 11:16:34 2003
-@@ -454,11 +454,6 @@
- msgstr "_Marcas Rбpidas/Borrar Marcas Rбpidas"
- 
- # src/gs_gui.c
--# src/gs_html_editor.c
--msgid "Copy"
--msgstr "Copiar"
--
--# src/gs_gui.c
- msgid "Copy highlighted text from main window"
- msgstr "Copiar el texto resaltado de la ventana principal"
- 
-@@ -650,10 +645,6 @@
- msgstr "Fichero"
- 
- # src/gs_html.c
--msgid "Show %s in main window"
--msgstr "Mostrar %s en la ventana principal"
--
--# src/gs_html.c
- msgid "Go to Strongs %s"
- msgstr "Ir a %s de Strong"
- 
-@@ -662,11 +653,6 @@
- msgstr "Ir a %s"
- 
- # src/gs_html_editor.c
--# src/gs_html_editor.c
--msgid "``%s'' has been modified.  Do you wish to save it?"
--msgstr "``%s'' ha sido modificado.  їDesea guardarlo?"
--
--# src/gs_html_editor.c
- msgid "-untitled-"
- msgstr "-sin tнtulo-"
- 
-@@ -947,18 +933,6 @@
- msgstr "No, utilizar las opciones guardadas en la sesiуn anterior de GnomeSword"
- 
- # src/gs_preferences_dlg.c
--msgid "Show Bible Texts notebook tabs"
--msgstr "Mostrar las lenguetas de los Textos Bнblicos"
--
--# src/gs_preferences_dlg.c
--msgid "Show Commentary notebook tabs"
--msgstr "Mostrar las lenguetas de los Comentarios"
--
--# src/gs_preferences_dlg.c
--msgid "Show Dict/Lex notebook tabs"
--msgstr "Mostrar las lenguetas de los Diccionarios/Lйxica"
--
--# src/gs_preferences_dlg.c
- # src/gs_setup.c
- msgid "Use Verse Style"
- msgstr "Usar Estilo de Versos"
-@@ -1040,12 +1014,6 @@
- # src/gs_setup.c
- msgid "Commentary"
- msgstr "Comentario"
--
--# src/gs_preferences_dlg.c
--# src/gs_setup.c
--# src/gs_shortcutbar.c x 2
--msgid "Dict/Lex"
--msgstr "Diccionarios/Lexica"
- 
- # src/gs_preferences_dlg.c
- # src/gs_setup.c
diff --git a/misc/xiphos/files/patch-src::gnome2::mod_mgr.c b/misc/xiphos/files/patch-src::gnome2::mod_mgr.c
new file mode 100644
index 000000000000..15d85dbfb7b7
--- /dev/null
+++ b/misc/xiphos/files/patch-src::gnome2::mod_mgr.c
@@ -0,0 +1,12 @@
+--- src/gnome2/mod_mgr.c.orig	Sun Mar 28 04:39:23 2004
++++ src/gnome2/mod_mgr.c	Sat Aug 21 15:56:12 2004
+@@ -1910,8 +1910,7 @@
+ 
+ 	GtkTreeModel *model;
+ 	GError *error = NULL;
+-	GtkTooltips *tooltips;
+-	tooltips = gtk_tooltips_new();
++	GtkTooltips *tooltips = gtk_tooltips_new();
+ 	GString *str = g_string_new(NULL);
+ 	GtkCellRenderer *renderer;
+ 	GtkTreeViewColumn *column;
diff --git a/misc/xiphos/files/patch-src::gnome2::tabbed_browser.c b/misc/xiphos/files/patch-src::gnome2::tabbed_browser.c
new file mode 100644
index 000000000000..52dd1d8f7527
--- /dev/null
+++ b/misc/xiphos/files/patch-src::gnome2::tabbed_browser.c
@@ -0,0 +1,17 @@
+--- src/gnome2/tabbed_browser.c.orig	Thu Jun 17 04:53:24 2004
++++ src/gnome2/tabbed_browser.c	Sat Aug 21 15:59:13 2004
+@@ -664,11 +664,13 @@
+  */
+ void gui_close_passage_tab(gint pagenum)
+ {
++	PASSAGE_TAB_INFO *pt;
++
+ 	if (-1 == pagenum)
+ 		pagenum = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets.notebook_main));
+ 	if (1 == gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main)))
+ 		return;
+-	PASSAGE_TAB_INFO *pt = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum);
++	pt = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum);
+ 	passage_list = g_list_remove(passage_list, pt);
+ 	if(pt->text_mod) g_free(pt->text_mod);
+ 	if(pt->commentary_mod) g_free(pt->commentary_mod);
diff --git a/misc/xiphos/files/patch-src_Makefile.in b/misc/xiphos/files/patch-src_Makefile.in
deleted file mode 100644
index 4b37f359d9a6..000000000000
--- a/misc/xiphos/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	Fri Feb 28 17:24:26 2003
-+++ src/Makefile.in	Fri Feb 28 17:24:48 2003
-@@ -144,6 +144,7 @@
-     $(PIXBUF_CFLAGS) \
-     $(SWORD_CPPFLAGS) \
-     $(PACKAGE_CFLAGS) \
-+    $(GNOME_APP_CFLAGS) \
-     -I/usr/include/gnome-1.0/
- 
- 
diff --git a/misc/xiphos/pkg-message b/misc/xiphos/pkg-message
deleted file mode 100644
index 14fd67452143..000000000000
--- a/misc/xiphos/pkg-message
+++ /dev/null
@@ -1,2 +0,0 @@
-To use gnomesword, you need to have bible, commentary and/or lexicon
-modules. Those are available in the sword-modules package/port.
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index cb9e11174ebd..03672f0d6bc7 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -1,39 +1,70 @@
-bin/gnomesword
+bin/gnomesword2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/apps/Applications/gnomesword.desktop
-share/gnome/help/gnomesword/C/index.html
-share/gnome/help/gnomesword/C/intro.html
-share/gnome/pixmaps/gnomesword/GnomeSword.png
-share/gnome/pixmaps/gnomesword/GnomeSword.xpm
+share/gnome/applications/gnomesword.desktop
+share/gnome/help/gnomesword/C/figures/gnomesword_interface.png
+share/gnome/help/gnomesword/C/figures/gnomesword_interface_biblepane.png
+share/gnome/help/gnomesword/C/figures/gnomesword_interface_commentarypane.png
+share/gnome/help/gnomesword/C/figures/gnomesword_interface_sidepane.png
+share/gnome/help/gnomesword/C/figures/gnomesword_interface_toolbar.png
+share/gnome/help/gnomesword/C/figures/gnomesword_preferences_font_colors.png
+share/gnome/help/gnomesword/C/figures/gnomesword_preferences_general.png
+share/gnome/help/gnomesword/C/figures/gnomesword_preferences_sword_config.png
+share/gnome/help/gnomesword/C/figures/gnomesword_studypad.png
+share/gnome/help/gnomesword/C/gnomesword.xml
+share/gnome/help/gnomesword/C/legal.xml
+share/gnome/help/gnomesword/fr/figures/gnomesword_interface.png
+share/gnome/help/gnomesword/fr/figures/gnomesword_interface_bible.png
+share/gnome/help/gnomesword/fr/figures/gnomesword_interface_commentarypane.png
+share/gnome/help/gnomesword/fr/figures/gnomesword_interface_shortcutbar.png
+share/gnome/help/gnomesword/fr/figures/gnomesword_interface_toolbar.png
+share/gnome/help/gnomesword/fr/figures/gnomesword_preferences_font_colors.png
+share/gnome/help/gnomesword/fr/figures/gnomesword_preferences_misc_settings.png
+share/gnome/help/gnomesword/fr/figures/gnomesword_preferences_sword_config.png
+share/gnome/help/gnomesword/fr/figures/gnomesword_studypad.png
+share/gnome/help/gnomesword/fr/gnomesword.xml
+share/gnome/help/gnomesword/fr/legal.xml
+share/gnome/omf/gnomesword/gnomesword-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnomesword/gnomesword-C.omf 2>/dev/null || true
+share/gnome/omf/gnomesword/gnomesword-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnomesword/gnomesword-fr.omf 2>/dev/null || true
 share/gnome/pixmaps/gnomesword/about.png
 share/gnome/pixmaps/gnomesword/book-bl.png
 share/gnome/pixmaps/gnomesword/book-gold.png
 share/gnome/pixmaps/gnomesword/book-green.png
 share/gnome/pixmaps/gnomesword/book-un.png
-share/gnome/pixmaps/gnomesword/dock.xpm
-share/gnome/pixmaps/gnomesword/exit2.xpm
-share/gnome/pixmaps/gnomesword/footnote3.xpm
-share/gnome/pixmaps/gnomesword/gnome-fontsel.xpm
-share/gnome/pixmaps/gnomesword/morphs.xpm
-share/gnome/pixmaps/gnomesword/search1.xpm
+share/gnome/pixmaps/gnomesword/dlg-bl.png
+share/gnome/pixmaps/gnomesword/dlg-un.png
+share/gnome/pixmaps/gnomesword/dock.png
+share/gnome/pixmaps/gnomesword/epiphany-bookmark-page.png
+share/gnome/pixmaps/gnomesword/epiphany-bookmarks.png
+share/gnome/pixmaps/gnomesword/epiphany-secure.png
+share/gnome/pixmaps/gnomesword/epiphany-unsecure.png
+share/gnome/pixmaps/gnomesword/gs2-48x48.png
+share/gnome/pixmaps/gnomesword/logo.png
+share/gnome/pixmaps/gnomesword/new_tab_button.png
 share/gnome/pixmaps/gnomesword/splash.png
-share/gnome/pixmaps/gnomesword/strongs.xpm
-share/gnome/pixmaps/gnomesword/sword.xpm
-share/gnome/pixmaps/gnomesword/sword2.xpm
-share/gnome/pixmaps/gnomesword/sword3.xpm
-share/gnome/pixmaps/gnomesword/yes.xpm
-share/locale/bg/LC_MESSAGES/gnomesword.mo
+share/gnome/pixmaps/gnomesword/sword.png
+share/gnome/pixmaps/gnomesword/sword3.png
+share/gnome/pixmaps/gnomesword/tt.png
+share/gnome/pixmaps/gnomesword/tt.xpm
 share/locale/de/LC_MESSAGES/gnomesword.mo
-share/locale/es/LC_MESSAGES/gnomesword.mo
-share/locale/es_ES/LC_MESSAGES/gnomesword.mo
-share/locale/fr/LC_MESSAGES/gnomesword.mo
-share/locale/sk/LC_MESSAGES/gnomesword.mo
+share/locale/de_DE/LC_MESSAGES/gnomesword.mo
+share/locale/en_GB/LC_MESSAGES/gnomesword.mo
+share/locale/fr_FR/LC_MESSAGES/gnomesword.mo
+share/locale/ru/LC_MESSAGES/gnomesword.mo
+share/locale/uk/LC_MESSAGES/gnomesword.mo
 @dirrm share/gnome/pixmaps/gnomesword
+@dirrm share/gnome/omf/gnomesword
+@dirrm share/gnome/help/gnomesword/fr/figures
+@dirrm share/gnome/help/gnomesword/fr
+@dirrm share/gnome/help/gnomesword/C/figures
 @dirrm share/gnome/help/gnomesword/C
 @dirrm share/gnome/help/gnomesword
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomesword/gnomesword-C.omf 2>/dev/null || true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomesword/gnomesword-fr.omf 2>/dev/null || true