- Update to 3.1.3

3 files changed, 17 insertions, 19 deletions

diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 13dec211260d..72b2b3ff6b52 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xiphos
-PORTVERSION=	3.1.2
-PORTREVISION=	2
+PORTVERSION=	3.1.3
 CATEGORIES=	misc gnome
 MASTER_SITES=	SF/gnomesword/Xiphos/${PORTVERSION}
 
@@ -15,7 +14,8 @@ MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A bible interface utilizing the sword framework
 
 RUN_DEPENDS=	${LOCALBASE}/lib/libsword-1.6.1.so:${PORTSDIR}/misc/sword
-BUILD_DEPENDS=	${RUN_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		nspr>=4.8:${PORTSDIR}/devel/nspr
 
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
@@ -24,7 +24,7 @@ USE_GNOME=	gnomehack gnomeprefix gnometarget gnomelibs gtkhtml3 \
 		intlhack libgsf
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/nspr" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--disable-maintainer-mode
 
diff --git a/misc/xiphos/distinfo b/misc/xiphos/distinfo
index 9e36d699ba1b..98112ceec0b8 100644
--- a/misc/xiphos/distinfo
+++ b/misc/xiphos/distinfo
@@ -1,3 +1,3 @@
-MD5 (xiphos-3.1.2.tar.gz) = 0de807c49db6e6f696ffd1cee8ec4b22
-SHA256 (xiphos-3.1.2.tar.gz) = 002f520db9aa833eab672daf68f7f75b3a9db687f2e8cd3d6c961405180fad8e
-SIZE (xiphos-3.1.2.tar.gz) = 4308575
+MD5 (xiphos-3.1.3.tar.gz) = aaded6bc81b29935edd989d204928ba3
+SHA256 (xiphos-3.1.3.tar.gz) = 345c04d3521239f8e8dff8d0a8447ce6eba6809d22fe699c69a0677894e87b4c
+SIZE (xiphos-3.1.3.tar.gz) = 4405305
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index a7fb96891271..2a2b167c3925 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -1,9 +1,7 @@
-bin/gnomesword2
 bin/xiphos
 share/applications/xiphos.desktop
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
-%%DOCSDIR%%/COPYING-DOCS
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/INSTALL
 %%DOCSDIR%%/NEWS
@@ -11,7 +9,6 @@ share/applications/xiphos.desktop
 %%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
@@ -50,7 +47,6 @@ 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
@@ -60,7 +56,6 @@ 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/fa/authors.xml
 share/gnome/help/xiphos/fa/figures/first_start.png
 share/gnome/help/xiphos/fa/figures/gtkhtml3-vs-mozembed.png
 share/gnome/help/xiphos/fa/figures/interface.png
@@ -98,7 +93,6 @@ share/gnome/help/xiphos/fa/figures/sword_sources.png
 share/gnome/help/xiphos/fa/interface.xml
 share/gnome/help/xiphos/fa/introduction.xml
 share/gnome/help/xiphos/fa/journals.xml
-share/gnome/help/xiphos/fa/license.xml
 share/gnome/help/xiphos/fa/modules.xml
 share/gnome/help/xiphos/fa/onlinehelp.xml
 share/gnome/help/xiphos/fa/originallanguage.xml
@@ -108,7 +102,6 @@ share/gnome/help/xiphos/fa/search.xml
 share/gnome/help/xiphos/fa/start.xml
 share/gnome/help/xiphos/fa/studypad.xml
 share/gnome/help/xiphos/fa/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
@@ -146,7 +139,6 @@ 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
@@ -160,21 +152,27 @@ share/icons/hicolor/icon-theme.cache
 share/icons/hicolor/scalable/apps/xiphos.svg
 share/locale/cs/LC_MESSAGES/xiphos.mo
 share/locale/cy/LC_MESSAGES/xiphos.mo
+share/locale/da/LC_MESSAGES/xiphos.mo
 share/locale/de/LC_MESSAGES/xiphos.mo
 share/locale/en_GB/LC_MESSAGES/xiphos.mo
 share/locale/es/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/nb_NO/LC_MESSAGES/xiphos.mo
+share/locale/he/LC_MESSAGES/xiphos.mo
+share/locale/hu/LC_MESSAGES/xiphos.mo
+share/locale/lv/LC_MESSAGES/xiphos.mo
+share/locale/nb/LC_MESSAGES/xiphos.mo
 share/locale/nl/LC_MESSAGES/xiphos.mo
+share/locale/pl/LC_MESSAGES/xiphos.mo
 share/locale/pt/LC_MESSAGES/xiphos.mo
+share/locale/pt_BR/LC_MESSAGES/xiphos.mo
 share/locale/ro/LC_MESSAGES/xiphos.mo
 share/locale/ru/LC_MESSAGES/xiphos.mo
 share/locale/sk/LC_MESSAGES/xiphos.mo
+share/locale/sl/LC_MESSAGES/xiphos.mo
 share/locale/sv/LC_MESSAGES/xiphos.mo
-share/locale/zh/LC_MESSAGES/xiphos.mo
+share/locale/zh_TW/LC_MESSAGES/xiphos.mo
 share/omf/xiphos/xiphos-C.omf
 share/omf/xiphos/xiphos-fa.omf
 share/omf/xiphos/xiphos-fr.omf
@@ -207,8 +205,8 @@ 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-big.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