aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authortabthorpe <tabthorpe@FreeBSD.org>2010-01-05 05:23:40 +0800
committertabthorpe <tabthorpe@FreeBSD.org>2010-01-05 05:23:40 +0800
commitdf13632b1e3adc9d2a47ea6e9f22ecc860852ea3 (patch)
tree697162732bb2bcaf4d8d8185c70c2f73fde20384 /misc
parent3cb6f63aed56e7c9a3fb236dac960c41ed32bdc5 (diff)
downloadfreebsd-ports-gnome-df13632b1e3adc9d2a47ea6e9f22ecc860852ea3.tar.gz
freebsd-ports-gnome-df13632b1e3adc9d2a47ea6e9f22ecc860852ea3.tar.zst
freebsd-ports-gnome-df13632b1e3adc9d2a47ea6e9f22ecc860852ea3.zip
- Update to 3.1.2
Diffstat (limited to 'misc')
-rw-r--r--misc/xiphos/Makefile22
-rw-r--r--misc/xiphos/distinfo6
-rw-r--r--misc/xiphos/files/patch-src__gecko__gecko-utils.cpp13
-rw-r--r--misc/xiphos/pkg-plist97
4 files changed, 42 insertions, 96 deletions
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 200b96275c63..e897b6f73e7e 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -6,30 +6,29 @@
#
PORTNAME= xiphos
-PORTVERSION= 3.1.1
-PORTREVISION= 1
+PORTVERSION= 3.1.2
CATEGORIES= misc gnome
MASTER_SITES= SF/gnomesword/Xiphos/${PORTVERSION}
MAINTAINER= tabthorpe@FreeBSD.org
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.6.0.so:${PORTSDIR}/misc/sword
+RUN_DEPENDS= ${LOCALBASE}/lib/libsword-1.6.0.so:${PORTSDIR}/misc/sword
BUILD_DEPENDS= ${RUN_DEPENDS}
-LIB_DEPENDS= MagickWand.2:${PORTSDIR}/graphics/ImageMagick
USE_GETTEXT= yes
INSTALLS_OMF= yes
-USE_GNOME= gnomehack gnomeprefix gnometarget gal2 gtkhtml3 gnomelibs intlhack gnomedocutils
+INSTALLS_ICONS= yes
+USE_GNOME= gnomehack gnomeprefix gnometarget gnomelibs gtkhtml3 \
+ intlhack libgsf
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+= --disable-maintainer-mode --enable-paratab
+CONFIGURE_ARGS+= --disable-maintainer-mode
-OPTIONS= LIBXUL "Build with libxul (default)" off \
- GTKHTML "Build with gtkhtml" off
+OPTIONS= LIBXUL "Build with libxul" on \
+ GTKHTML "Build with gtkhtml" off \
.include <bsd.port.pre.mk>
@@ -38,13 +37,12 @@ IGNORE= choose only one of LIBXUL or GTKHTML
.endif
.if defined(WITH_GTKHTML) || defined(WITHOUT_LIBXUL)
-CONFIGURE_ARGS+= --enable-gtkhtml --disable-gecko
+CONFIGURE_ARGS+= --without-gecko
.endif
.if !defined(WITHOUT_LIBXUL) || !defined(WITH_GTKHTML)
USE_GECKO= libxul
-CONFIGURE_ARGS+= --with-gecko=${GECKO} --disable-gtkhtml
-GTKHTML_CFLAGS+="-DXPCOM_GLUE"
+CONFIGURE_ARGS+= --with-gecko=${GECKO} --with-gecko-home=${LOCALBASE}/lib/libxul
.endif
.include <bsd.port.post.mk>
diff --git a/misc/xiphos/distinfo b/misc/xiphos/distinfo
index b190a0b6a93d..9e36d699ba1b 100644
--- a/misc/xiphos/distinfo
+++ b/misc/xiphos/distinfo
@@ -1,3 +1,3 @@
-MD5 (xiphos-3.1.1.tar.gz) = a968d57375f46ef1cae4a153600616a9
-SHA256 (xiphos-3.1.1.tar.gz) = 720c6184aa8a769d7b3842240672309c3ada31f6f336629158f6c945740a6458
-SIZE (xiphos-3.1.1.tar.gz) = 5407696
+MD5 (xiphos-3.1.2.tar.gz) = 0de807c49db6e6f696ffd1cee8ec4b22
+SHA256 (xiphos-3.1.2.tar.gz) = 002f520db9aa833eab672daf68f7f75b3a9db687f2e8cd3d6c961405180fad8e
+SIZE (xiphos-3.1.2.tar.gz) = 4308575
diff --git a/misc/xiphos/files/patch-src__gecko__gecko-utils.cpp b/misc/xiphos/files/patch-src__gecko__gecko-utils.cpp
deleted file mode 100644
index 31e4f3216306..000000000000
--- a/misc/xiphos/files/patch-src__gecko__gecko-utils.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/gecko/gecko-utils.cpp.orig 2009-08-09 18:52:26.000000000 -0400
-+++ ./src/gecko/gecko-utils.cpp 2009-09-28 13:36:48.000000000 -0400
-@@ -38,10 +38,6 @@
- # undef NS_EXPORT_
- #endif
-
--#ifdef HAVE_GECKO_1_9
--#include <gtkmozembed_glue.cpp>
--#endif
--
- #include <gtkmozembed.h>
- #include <gtkmozembed_internal.h>
- #include <nsCOMPtr.h>
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index 1087408fc4a2..a7fb96891271 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -11,7 +11,6 @@ share/applications/xiphos.desktop
%%DOCSDIR%%/RELEASE-NOTES
%%DOCSDIR%%/TODO
%%DOCSDIR%%/Xiphos.ogg
-%%DOCSDIR%%/xiphos.pdf
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
@@ -61,54 +60,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/de/authors.xml
-share/gnome/help/xiphos/de/figures/first_start.png
-share/gnome/help/xiphos/de/figures/gtkhtml3-vs-mozembed.png
-share/gnome/help/xiphos/de/figures/interface.png
-share/gnome/help/xiphos/de/figures/interface_biblepane-options.png
-share/gnome/help/xiphos/de/figures/interface_biblepane.png
-share/gnome/help/xiphos/de/figures/interface_commentarypane.png
-share/gnome/help/xiphos/de/figures/interface_dictionary.png
-share/gnome/help/xiphos/de/figures/interface_menubar-view.png
-share/gnome/help/xiphos/de/figures/interface_menubar.png
-share/gnome/help/xiphos/de/figures/interface_parallel-separate.png
-share/gnome/help/xiphos/de/figures/interface_parallel.png
-share/gnome/help/xiphos/de/figures/interface_searchpane.png
-share/gnome/help/xiphos/de/figures/interface_shortcut.png
-share/gnome/help/xiphos/de/figures/interface_sidepane.png
-share/gnome/help/xiphos/de/figures/interface_toolbar.png
-share/gnome/help/xiphos/de/figures/interface_viewer.png
-share/gnome/help/xiphos/de/figures/journal.png
-share/gnome/help/xiphos/de/figures/module.png
-share/gnome/help/xiphos/de/figures/personal.png
-share/gnome/help/xiphos/de/figures/preferences.png
-share/gnome/help/xiphos/de/figures/preferences_fonts-color.png
-share/gnome/help/xiphos/de/figures/preferences_fonts-misc.png
-share/gnome/help/xiphos/de/figures/preferences_general-misc.png
-share/gnome/help/xiphos/de/figures/preferences_general-tabs.png
-share/gnome/help/xiphos/de/figures/preferences_modules-main.png
-share/gnome/help/xiphos/de/figures/preferences_modules-misc.png
-share/gnome/help/xiphos/de/figures/preferences_modules-parallel.png
-share/gnome/help/xiphos/de/figures/search_search.png
-share/gnome/help/xiphos/de/figures/studypad.png
-share/gnome/help/xiphos/de/figures/sword3.png
-share/gnome/help/xiphos/de/figures/sword_config.png
-share/gnome/help/xiphos/de/figures/sword_install.png
-share/gnome/help/xiphos/de/figures/sword_remove.png
-share/gnome/help/xiphos/de/figures/sword_sources.png
-share/gnome/help/xiphos/de/interface.xml
-share/gnome/help/xiphos/de/introduction.xml
-share/gnome/help/xiphos/de/journals.xml
-share/gnome/help/xiphos/de/license.xml
-share/gnome/help/xiphos/de/modules.xml
-share/gnome/help/xiphos/de/onlinehelp.xml
-share/gnome/help/xiphos/de/originallanguage.xml
-share/gnome/help/xiphos/de/personal.xml
-share/gnome/help/xiphos/de/preferences.xml
-share/gnome/help/xiphos/de/search.xml
-share/gnome/help/xiphos/de/start.xml
-share/gnome/help/xiphos/de/studypad.xml
-share/gnome/help/xiphos/de/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
@@ -205,10 +156,13 @@ 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/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/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
@@ -216,10 +170,19 @@ share/locale/he_IL/LC_MESSAGES/xiphos.mo
share/locale/nb_NO/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/ro/LC_MESSAGES/xiphos.mo
+share/locale/ru/LC_MESSAGES/xiphos.mo
share/locale/sk/LC_MESSAGES/xiphos.mo
-share/locale/sv_SE/LC_MESSAGES/xiphos.mo
+share/locale/sv/LC_MESSAGES/xiphos.mo
+share/locale/zh/LC_MESSAGES/xiphos.mo
+share/omf/xiphos/xiphos-C.omf
+share/omf/xiphos/xiphos-fa.omf
+share/omf/xiphos/xiphos-fr.omf
share/pixmaps/xiphos/about.png
+share/pixmaps/xiphos/book_closed.png
+share/pixmaps/xiphos/book_closed_rtol.png
+share/pixmaps/xiphos/book_open.png
+share/pixmaps/xiphos/book_open_rtol.png
share/pixmaps/xiphos/chat_icon-16.png
share/pixmaps/xiphos/dlg-un-16.png
share/pixmaps/xiphos/dlg-un.png
@@ -251,39 +214,39 @@ share/pixmaps/xiphos/translation_icon-16.png
share/pixmaps/xiphos/tt.png
share/pixmaps/xiphos/window-close.png
share/pixmaps/xiphos/xiphos-x-16.png
-share/pixmaps/xiphos/xiphos.svg
share/pixmaps/xiphos/xiphos.xpm
-share/xiphos/chat_icon-16.png
-share/xiphos/dlg-un-16.png
-share/xiphos/epiphany-bookmarks.png
-share/xiphos/gnome-sound-properties.png
-share/xiphos/mailing_list_icon-16.png
-share/xiphos/markverse.glade
-share/xiphos/new_tab_button.png
-share/xiphos/silk-edit-bookmarks.png
-share/xiphos/sword_icon-16.png
-share/xiphos/translation_icon-16.png
-share/xiphos/xi-menus.glade
-share/xiphos/xiphos-x-16.png
%%DATADIR%%/arrow_down.png
%%DATADIR%%/arrow_down_box.png
%%DATADIR%%/arrow_up.png
%%DATADIR%%/arrow_up_box.png
%%DATADIR%%/bookmarks.glade
+%%DATADIR%%/chat_icon-16.png
+%%DATADIR%%/dlg-un-16.png
+%%DATADIR%%/editor_link_dialog.xml
%%DATADIR%%/editor_note.xml
%%DATADIR%%/editor_studypad.xml
+%%DATADIR%%/epiphany-bookmarks.png
%%DATADIR%%/export-dialog.glade
+%%DATADIR%%/gnome-sound-properties.png
%%DATADIR%%/languages
%%DATADIR%%/logo.png
+%%DATADIR%%/mailing_list_icon-16.png
+%%DATADIR%%/markverse.glade
%%DATADIR%%/module-manager.glade
%%DATADIR%%/navbar_versekey.glade
+%%DATADIR%%/new_tab_button.png
%%DATADIR%%/prefs.glade
%%DATADIR%%/search-dialog.glade
+%%DATADIR%%/silk-edit-bookmarks.png
%%DATADIR%%/sword3.png
+%%DATADIR%%/sword_icon-16.png
+%%DATADIR%%/translation_icon-16.png
+%%DATADIR%%/xi-export-bookmarks.glade
+%%DATADIR%%/xi-menus.glade
+%%DATADIR%%/xiphos-x-16.png
@dirrm %%DATADIR%%
@dirrm share/pixmaps/xiphos
-@dirrm share/locale/sv_SE/LC_MESSAGES
-@dirrm share/locale/sv_SE
+@dirrm share/omf/xiphos
@dirrm share/locale/nb_NO/LC_MESSAGES
@dirrm share/locale/nb_NO
@dirrm share/locale/he_IL/LC_MESSAGES
@@ -292,8 +255,6 @@ share/xiphos/xiphos-x-16.png
@dirrm share/gnome/help/xiphos/fr
@dirrm share/gnome/help/xiphos/fa/figures
@dirrm share/gnome/help/xiphos/fa
-@dirrm share/gnome/help/xiphos/de/figures
-@dirrm share/gnome/help/xiphos/de
@dirrm share/gnome/help/xiphos/C/figures
@dirrm share/gnome/help/xiphos/C
@dirrm share/gnome/help/xiphos