4 files changed, 183 insertions, 213 deletions

diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index f0fb45ef8f09..1787f50e2f71 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for: xiphos
-# Date created:   April 27, 2007
+# Date created:   February 2, 2009
 # Whom:           Thomas Abthorpe <tabthorpe@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xiphos
-PORTVERSION=	2.4.1
+PORTVERSION=	3.0.0
 CATEGORIES=	misc gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	gnomesword
-DISTNAME=	gnomesword-${PORTVERSION}
 
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A bible interface utilizing the sword framework
@@ -18,6 +17,7 @@ COMMENT=	A bible interface utilizing the sword framework
 RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell \
 		${LOCALBASE}/lib/libsword-1.5.11.so:${PORTSDIR}/misc/sword
 BUILD_DEPENDS=	${RUN_DEPENDS}
+LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
@@ -26,14 +26,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=	--enable-gtkhtml --enable-exporter
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS ChangeLog INSTALL NEWS README TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+CONFIGURE_ARGS+=	--enable-gtkhtml --disable-maintainer-mode --enable-paratab
 
 .include <bsd.port.mk>
diff --git a/misc/xiphos/distinfo b/misc/xiphos/distinfo
index daef57ded794..df2d6b3f5e6a 100644
--- a/misc/xiphos/distinfo
+++ b/misc/xiphos/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnomesword-2.4.1.tar.gz) = bfbbc00b1b5196269a26674e8ff24796
-SHA256 (gnomesword-2.4.1.tar.gz) = c87f31fe24448b32f497ec513db797182d8c662629d4e209e82a08079d048500
-SIZE (gnomesword-2.4.1.tar.gz) = 4495792
+MD5 (xiphos-3.0.0.tar.gz) = c432b62b3187de8fa5f958b425230355
+SHA256 (xiphos-3.0.0.tar.gz) = 5a99fdf092b2bafe6b1f3f0536b67875ec90eead690780786d0c079ef4706199
+SIZE (xiphos-3.0.0.tar.gz) = 3383043
diff --git a/misc/xiphos/files/patch-Makefile.in b/misc/xiphos/files/patch-Makefile.in
deleted file mode 100644
index f18a2bfe7fe9..000000000000
--- a/misc/xiphos/files/patch-Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.in.orig	2007-12-18 09:55:52.000000000 -0500
-+++ Makefile.in	2007-12-18 09:55:52.000000000 -0500
-@@ -66,8 +66,7 @@
-     *) f=$$p;; \
-   esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(gnomemenudir)" \
--	"$(DESTDIR)$(gnomesworddocdir)"
-+am__installdirs = "$(DESTDIR)$(gnomemenudir)"
- gnomemenuDATA_INSTALL = $(INSTALL_DATA)
- gnomesworddocDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(gnomemenu_DATA) $(gnomesworddoc_DATA)
-@@ -690,7 +689,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
-@@ -738,8 +737,7 @@
- 
- info-am:
- 
--install-data-am: install-data-local install-gnomemenuDATA \
--	install-gnomesworddocDATA
-+install-data-am: install-data-local install-gnomemenuDATA
- 
- install-dvi: install-dvi-recursive
- 
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index 7ef1daf2af33..0a9f413b1fc5 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -1,172 +1,181 @@
 bin/gnomesword2
-share/applications/gnomesword.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/help/gnomesword/C/authors.xml
-share/gnome/help/gnomesword/C/figures/first_start.png
-share/gnome/help/gnomesword/C/figures/gtkhtml3-vs-mozembed.png
-share/gnome/help/gnomesword/C/figures/interface.png
-share/gnome/help/gnomesword/C/figures/interface_biblepane-options.png
-share/gnome/help/gnomesword/C/figures/interface_biblepane.png
-share/gnome/help/gnomesword/C/figures/interface_commentarypane.png
-share/gnome/help/gnomesword/C/figures/interface_dictionary.png
-share/gnome/help/gnomesword/C/figures/interface_menubar-view.png
-share/gnome/help/gnomesword/C/figures/interface_menubar.png
-share/gnome/help/gnomesword/C/figures/interface_parallel-separate.png
-share/gnome/help/gnomesword/C/figures/interface_parallel.png
-share/gnome/help/gnomesword/C/figures/interface_searchpane.png
-share/gnome/help/gnomesword/C/figures/interface_shortcut.png
-share/gnome/help/gnomesword/C/figures/interface_sidepane.png
-share/gnome/help/gnomesword/C/figures/interface_toolbar.png
-share/gnome/help/gnomesword/C/figures/interface_viewer.png
-share/gnome/help/gnomesword/C/figures/journal.png
-share/gnome/help/gnomesword/C/figures/module.png
-share/gnome/help/gnomesword/C/figures/personal.png
-share/gnome/help/gnomesword/C/figures/preferences.png
-share/gnome/help/gnomesword/C/figures/preferences_fonts-color.png
-share/gnome/help/gnomesword/C/figures/preferences_fonts-misc.png
-share/gnome/help/gnomesword/C/figures/preferences_general-misc.png
-share/gnome/help/gnomesword/C/figures/preferences_general-tabs.png
-share/gnome/help/gnomesword/C/figures/preferences_modules-main.png
-share/gnome/help/gnomesword/C/figures/preferences_modules-misc.png
-share/gnome/help/gnomesword/C/figures/preferences_modules-parallel.png
-share/gnome/help/gnomesword/C/figures/search_search.png
-share/gnome/help/gnomesword/C/figures/studypad.png
-share/gnome/help/gnomesword/C/figures/sword3.png
-share/gnome/help/gnomesword/C/figures/sword_config.png
-share/gnome/help/gnomesword/C/figures/sword_install.png
-share/gnome/help/gnomesword/C/figures/sword_remove.png
-share/gnome/help/gnomesword/C/figures/sword_sources.png
-share/gnome/help/gnomesword/C/gnomesword.xml
-share/gnome/help/gnomesword/C/interface.xml
-share/gnome/help/gnomesword/C/introduction.xml
-share/gnome/help/gnomesword/C/journals.xml
-share/gnome/help/gnomesword/C/legal.xml
-share/gnome/help/gnomesword/C/license.xml
-share/gnome/help/gnomesword/C/modules.xml
-share/gnome/help/gnomesword/C/personal.xml
-share/gnome/help/gnomesword/C/preferences.xml
-share/gnome/help/gnomesword/C/search.xml
-share/gnome/help/gnomesword/C/start.xml
-share/gnome/help/gnomesword/C/studypad.xml
-share/gnome/help/gnomesword/fr/authors.xml
-share/gnome/help/gnomesword/fr/figures/first_start.png
-share/gnome/help/gnomesword/fr/figures/gtkhtml3-vs-mozembed.png
-share/gnome/help/gnomesword/fr/figures/interface.png
-share/gnome/help/gnomesword/fr/figures/interface_biblepane-options.png
-share/gnome/help/gnomesword/fr/figures/interface_biblepane.png
-share/gnome/help/gnomesword/fr/figures/interface_commentarypane.png
-share/gnome/help/gnomesword/fr/figures/interface_dictionary.png
-share/gnome/help/gnomesword/fr/figures/interface_menubar-view.png
-share/gnome/help/gnomesword/fr/figures/interface_menubar.png
-share/gnome/help/gnomesword/fr/figures/interface_parallel-separate.png
-share/gnome/help/gnomesword/fr/figures/interface_parallel.png
-share/gnome/help/gnomesword/fr/figures/interface_searchpane.png
-share/gnome/help/gnomesword/fr/figures/interface_shortcut.png
-share/gnome/help/gnomesword/fr/figures/interface_sidepane.png
-share/gnome/help/gnomesword/fr/figures/interface_toolbar.png
-share/gnome/help/gnomesword/fr/figures/interface_viewer.png
-share/gnome/help/gnomesword/fr/figures/journal.png
-share/gnome/help/gnomesword/fr/figures/module.png
-share/gnome/help/gnomesword/fr/figures/personal.png
-share/gnome/help/gnomesword/fr/figures/preferences.png
-share/gnome/help/gnomesword/fr/figures/preferences_fonts-color.png
-share/gnome/help/gnomesword/fr/figures/preferences_fonts-misc.png
-share/gnome/help/gnomesword/fr/figures/preferences_general-misc.png
-share/gnome/help/gnomesword/fr/figures/preferences_general-tabs.png
-share/gnome/help/gnomesword/fr/figures/preferences_modules-main.png
-share/gnome/help/gnomesword/fr/figures/preferences_modules-misc.png
-share/gnome/help/gnomesword/fr/figures/preferences_modules-parallel.png
-share/gnome/help/gnomesword/fr/figures/search_search.png
-share/gnome/help/gnomesword/fr/figures/studypad.png
-share/gnome/help/gnomesword/fr/figures/sword3.png
-share/gnome/help/gnomesword/fr/figures/sword_config.png
-share/gnome/help/gnomesword/fr/figures/sword_install.png
-share/gnome/help/gnomesword/fr/figures/sword_remove.png
-share/gnome/help/gnomesword/fr/figures/sword_sources.png
-share/gnome/help/gnomesword/fr/gnomesword.xml
-share/gnome/help/gnomesword/fr/interface.xml
-share/gnome/help/gnomesword/fr/introduction.xml
-share/gnome/help/gnomesword/fr/journals.xml
-share/gnome/help/gnomesword/fr/license.xml
-share/gnome/help/gnomesword/fr/modules.xml
-share/gnome/help/gnomesword/fr/personal.xml
-share/gnome/help/gnomesword/fr/preferences.xml
-share/gnome/help/gnomesword/fr/search.xml
-share/gnome/help/gnomesword/fr/start.xml
-share/gnome/help/gnomesword/fr/studypad.xml
-share/gnomesword/arrow_down.png
-share/gnomesword/arrow_down_box.png
-share/gnomesword/arrow_up.png
-share/gnomesword/arrow_up_box.png
-share/gnomesword/bookmarks.glade
-share/gnomesword/editor_note.xml
-share/gnomesword/editor_studypad.xml
-share/gnomesword/export-dialog.glade
-share/gnomesword/languages
-share/gnomesword/logo.png
-share/gnomesword/module-manager.glade
-share/gnomesword/navbar_versekey.glade
-share/gnomesword/prefs.glade
-share/gnomesword/search-dialog.glade
-share/gnomesword/sword3.png
-share/locale/bg/LC_MESSAGES/gnomesword.mo
-share/locale/cs/LC_MESSAGES/gnomesword.mo
-share/locale/de/LC_MESSAGES/gnomesword.mo
-share/locale/en_GB/LC_MESSAGES/gnomesword.mo
-share/locale/es/LC_MESSAGES/gnomesword.mo
-share/locale/fa/LC_MESSAGES/gnomesword.mo
-share/locale/fi/LC_MESSAGES/gnomesword.mo
-share/locale/fr/LC_MESSAGES/gnomesword.mo
-share/locale/he_IL/LC_MESSAGES/gnomesword.mo
-share/locale/nb_NO/LC_MESSAGES/gnomesword.mo
-share/locale/nl/LC_MESSAGES/gnomesword.mo
-share/locale/pt/LC_MESSAGES/gnomesword.mo
-share/locale/pt_PT/LC_MESSAGES/gnomesword.mo
-share/locale/ru/LC_MESSAGES/gnomesword.mo
-share/locale/sk/LC_MESSAGES/gnomesword.mo
-share/locale/sv_SE/LC_MESSAGES/gnomesword.mo
-share/locale/uk/LC_MESSAGES/gnomesword.mo
-share/pixmaps/gnomesword/about.png
-share/pixmaps/gnomesword/dlg-un-16.png
-share/pixmaps/gnomesword/dlg-un.png
-share/pixmaps/gnomesword/epiphany-bookmark-page.png
-share/pixmaps/gnomesword/epiphany-bookmarks.png
-share/pixmaps/gnomesword/epiphany-secure.png
-share/pixmaps/gnomesword/epiphany-unsecure.png
-share/pixmaps/gnomesword/gnome-session.png
-share/pixmaps/gnomesword/gnome-window-manager.png
-share/pixmaps/gnomesword/gnome-windows.png
-share/pixmaps/gnomesword/gnomesword.svg
-share/pixmaps/gnomesword/gs2-48x48-old.ico
-share/pixmaps/gnomesword/gs2-48x48-old.png
-share/pixmaps/gnomesword/gs2-48x48.ico
-share/pixmaps/gnomesword/gs2-48x48.png
-share/pixmaps/gnomesword/gs2.xpm
-share/pixmaps/gnomesword/init-settings.png
-share/pixmaps/gnomesword/logo.png
-share/pixmaps/gnomesword/mozilla-icon.png
-share/pixmaps/gnomesword/new_tab_button.png
-share/pixmaps/gnomesword/splash.png
-share/pixmaps/gnomesword/splash2.png
-share/pixmaps/gnomesword/sword.png
-share/pixmaps/gnomesword/sword3.png
-share/pixmaps/gnomesword/tt.png
-@dirrm share/gnomesword
-@dirrm share/pixmaps/gnomesword
+bin/xiphos
+share/applications/xiphos.desktop
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/COPYING-DOCS
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/RELEASE-NOTES
+%%DOCSDIR%%/TODO
+%%DOCSDIR%%/Xiphos.ogg
+share/gnome/help/xiphos/C/authors.xml
+share/gnome/help/xiphos/C/figures/first_start.png
+share/gnome/help/xiphos/C/figures/gtkhtml3-vs-mozembed.png
+share/gnome/help/xiphos/C/figures/interface.png
+share/gnome/help/xiphos/C/figures/interface_biblepane-options.png
+share/gnome/help/xiphos/C/figures/interface_biblepane.png
+share/gnome/help/xiphos/C/figures/interface_commentarypane.png
+share/gnome/help/xiphos/C/figures/interface_dictionary.png
+share/gnome/help/xiphos/C/figures/interface_menubar-view.png
+share/gnome/help/xiphos/C/figures/interface_menubar.png
+share/gnome/help/xiphos/C/figures/interface_parallel-separate.png
+share/gnome/help/xiphos/C/figures/interface_parallel.png
+share/gnome/help/xiphos/C/figures/interface_searchpane.png
+share/gnome/help/xiphos/C/figures/interface_shortcut.png
+share/gnome/help/xiphos/C/figures/interface_sidepane.png
+share/gnome/help/xiphos/C/figures/interface_toolbar.png
+share/gnome/help/xiphos/C/figures/interface_viewer.png
+share/gnome/help/xiphos/C/figures/journal.png
+share/gnome/help/xiphos/C/figures/module.png
+share/gnome/help/xiphos/C/figures/personal.png
+share/gnome/help/xiphos/C/figures/preferences.png
+share/gnome/help/xiphos/C/figures/preferences_fonts-color.png
+share/gnome/help/xiphos/C/figures/preferences_fonts-misc.png
+share/gnome/help/xiphos/C/figures/preferences_general-misc.png
+share/gnome/help/xiphos/C/figures/preferences_general-tabs.png
+share/gnome/help/xiphos/C/figures/preferences_modules-main.png
+share/gnome/help/xiphos/C/figures/preferences_modules-misc.png
+share/gnome/help/xiphos/C/figures/preferences_modules-parallel.png
+share/gnome/help/xiphos/C/figures/search_search.png
+share/gnome/help/xiphos/C/figures/studypad.png
+share/gnome/help/xiphos/C/figures/sword3.png
+share/gnome/help/xiphos/C/figures/sword_config.png
+share/gnome/help/xiphos/C/figures/sword_install.png
+share/gnome/help/xiphos/C/figures/sword_remove.png
+share/gnome/help/xiphos/C/figures/sword_sources.png
+share/gnome/help/xiphos/C/interface.xml
+share/gnome/help/xiphos/C/introduction.xml
+share/gnome/help/xiphos/C/journals.xml
+share/gnome/help/xiphos/C/legal.xml
+share/gnome/help/xiphos/C/license.xml
+share/gnome/help/xiphos/C/modules.xml
+share/gnome/help/xiphos/C/onlinehelp.xml
+share/gnome/help/xiphos/C/originallanguage.xml
+share/gnome/help/xiphos/C/personal.xml
+share/gnome/help/xiphos/C/preferences.xml
+share/gnome/help/xiphos/C/search.xml
+share/gnome/help/xiphos/C/start.xml
+share/gnome/help/xiphos/C/studypad.xml
+share/gnome/help/xiphos/C/xiphos.xml
+share/gnome/help/xiphos/fr/authors.xml
+share/gnome/help/xiphos/fr/figures/first_start.png
+share/gnome/help/xiphos/fr/figures/gtkhtml3-vs-mozembed.png
+share/gnome/help/xiphos/fr/figures/interface.png
+share/gnome/help/xiphos/fr/figures/interface_biblepane-options.png
+share/gnome/help/xiphos/fr/figures/interface_biblepane.png
+share/gnome/help/xiphos/fr/figures/interface_commentarypane.png
+share/gnome/help/xiphos/fr/figures/interface_dictionary.png
+share/gnome/help/xiphos/fr/figures/interface_menubar-view.png
+share/gnome/help/xiphos/fr/figures/interface_menubar.png
+share/gnome/help/xiphos/fr/figures/interface_parallel-separate.png
+share/gnome/help/xiphos/fr/figures/interface_parallel.png
+share/gnome/help/xiphos/fr/figures/interface_searchpane.png
+share/gnome/help/xiphos/fr/figures/interface_shortcut.png
+share/gnome/help/xiphos/fr/figures/interface_sidepane.png
+share/gnome/help/xiphos/fr/figures/interface_toolbar.png
+share/gnome/help/xiphos/fr/figures/interface_viewer.png
+share/gnome/help/xiphos/fr/figures/journal.png
+share/gnome/help/xiphos/fr/figures/module.png
+share/gnome/help/xiphos/fr/figures/personal.png
+share/gnome/help/xiphos/fr/figures/preferences.png
+share/gnome/help/xiphos/fr/figures/preferences_fonts-color.png
+share/gnome/help/xiphos/fr/figures/preferences_fonts-misc.png
+share/gnome/help/xiphos/fr/figures/preferences_general-misc.png
+share/gnome/help/xiphos/fr/figures/preferences_general-tabs.png
+share/gnome/help/xiphos/fr/figures/preferences_modules-main.png
+share/gnome/help/xiphos/fr/figures/preferences_modules-misc.png
+share/gnome/help/xiphos/fr/figures/preferences_modules-parallel.png
+share/gnome/help/xiphos/fr/figures/search_search.png
+share/gnome/help/xiphos/fr/figures/studypad.png
+share/gnome/help/xiphos/fr/figures/sword3.png
+share/gnome/help/xiphos/fr/figures/sword_config.png
+share/gnome/help/xiphos/fr/figures/sword_install.png
+share/gnome/help/xiphos/fr/figures/sword_remove.png
+share/gnome/help/xiphos/fr/figures/sword_sources.png
+share/gnome/help/xiphos/fr/interface.xml
+share/gnome/help/xiphos/fr/introduction.xml
+share/gnome/help/xiphos/fr/journals.xml
+share/gnome/help/xiphos/fr/license.xml
+share/gnome/help/xiphos/fr/modules.xml
+share/gnome/help/xiphos/fr/onlinehelp.xml
+share/gnome/help/xiphos/fr/originallanguage.xml
+share/gnome/help/xiphos/fr/personal.xml
+share/gnome/help/xiphos/fr/preferences.xml
+share/gnome/help/xiphos/fr/search.xml
+share/gnome/help/xiphos/fr/start.xml
+share/gnome/help/xiphos/fr/studypad.xml
+share/gnome/help/xiphos/fr/xiphos.xml
+share/locale/cs/LC_MESSAGES/xiphos.mo
+share/locale/de/LC_MESSAGES/xiphos.mo
+share/locale/en_GB/LC_MESSAGES/xiphos.mo
+share/locale/fa/LC_MESSAGES/xiphos.mo
+share/locale/fi/LC_MESSAGES/xiphos.mo
+share/locale/fr/LC_MESSAGES/xiphos.mo
+share/locale/he_IL/LC_MESSAGES/xiphos.mo
+share/locale/nl/LC_MESSAGES/xiphos.mo
+share/locale/pt/LC_MESSAGES/xiphos.mo
+share/locale/pt_PT/LC_MESSAGES/xiphos.mo
+share/locale/sv_SE/LC_MESSAGES/xiphos.mo
+share/pixmaps/xiphos/about.png
+share/pixmaps/xiphos/chat_icon-16.png
+share/pixmaps/xiphos/dlg-un-16.png
+share/pixmaps/xiphos/dlg-un.png
+share/pixmaps/xiphos/epiphany-bookmark-page.png
+share/pixmaps/xiphos/epiphany-bookmarks.png
+share/pixmaps/xiphos/epiphany-secure.png
+share/pixmaps/xiphos/epiphany-unsecure.png
+share/pixmaps/xiphos/gnome-session.png
+share/pixmaps/xiphos/gnome-window-manager.png
+share/pixmaps/xiphos/gnome-windows.png
+share/pixmaps/xiphos/gs2-48x48-old.ico
+share/pixmaps/xiphos/gs2-48x48-old.png
+share/pixmaps/xiphos/gs2-48x48.ico
+share/pixmaps/xiphos/gs2-48x48.png
+share/pixmaps/xiphos/gs2.xpm
+share/pixmaps/xiphos/indexed-16.png
+share/pixmaps/xiphos/indexed.png
+share/pixmaps/xiphos/init-settings.png
+share/pixmaps/xiphos/logo.png
+share/pixmaps/xiphos/mailing_list_icon-16.png
+share/pixmaps/xiphos/mozilla-icon.png
+share/pixmaps/xiphos/new_tab_button.png
+share/pixmaps/xiphos/silk-edit-bookmarks.png
+share/pixmaps/xiphos/splash.png
+share/pixmaps/xiphos/sword.png
+share/pixmaps/xiphos/sword3.png
+share/pixmaps/xiphos/sword_icon-16.png
+share/pixmaps/xiphos/translation_icon-16.png
+share/pixmaps/xiphos/tt.png
+share/pixmaps/xiphos/xiphos-x-16.png
+share/pixmaps/xiphos/xiphos.svg
+share/pixmaps/xiphos/xiphos.xpm
+%%DATADIR%%/arrow_down.png
+%%DATADIR%%/arrow_down_box.png
+%%DATADIR%%/arrow_up.png
+%%DATADIR%%/arrow_up_box.png
+%%DATADIR%%/bookmarks.glade
+%%DATADIR%%/editor_note.xml
+%%DATADIR%%/editor_studypad.xml
+%%DATADIR%%/export-dialog.glade
+%%DATADIR%%/languages
+%%DATADIR%%/logo.png
+%%DATADIR%%/module-manager.glade
+%%DATADIR%%/navbar_versekey.glade
+%%DATADIR%%/prefs.glade
+%%DATADIR%%/search-dialog.glade
+%%DATADIR%%/sword3.png
+@dirrm %%DATADIR%%
+@dirrm share/pixmaps/xiphos
 @dirrm share/locale/sv_SE/LC_MESSAGES
 @dirrm share/locale/sv_SE
-@dirrm share/locale/nb_NO/LC_MESSAGES
-@dirrm share/locale/nb_NO
 @dirrm share/locale/he_IL/LC_MESSAGES
 @dirrm share/locale/he_IL
-@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%%
+@dirrm share/gnome/help/xiphos/fr/figures
+@dirrm share/gnome/help/xiphos/fr
+@dirrm share/gnome/help/xiphos/C/figures
+@dirrm share/gnome/help/xiphos/C
+@dirrm share/gnome/help/xiphos
+@dirrm %%DOCSDIR%%