Index: head/misc/xiphos/Makefile =================================================================== --- head/misc/xiphos/Makefile (revision 539670) +++ head/misc/xiphos/Makefile (revision 539671) @@ -1,41 +1,43 @@ # $FreeBSD$ PORTNAME= xiphos -DISTVERSION= 4.1.0-72 -DISTVERSIONSUFFIX= -g9e573336 -PORTREVISION= 2 +DISTVERSION= 4.2.1 CATEGORIES= misc gnome +# Don't use USE_GITHUB: the sources downloaded by USE_GITHUB cannot be +# built as they miss the file ${WRKSRC}/cmake/source_version.txt. +# See also: https://github.com/crosswire/xiphos/issues/1037 +MASTER_SITES= https://github.com/crosswire/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= salvadore@FreeBSD.org COMMENT= Bible interface utilizing the sword framework LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= appstream-util:devel/appstream-glib \ desktop-file-validate:devel/desktop-file-utils \ itstool:textproc/itstool \ yelp-build:textproc/yelp-tools LIB_DEPENDS= libbiblesync.so:misc/biblesync \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libenchant.so:textproc/enchant \ libicui18n.so:devel/icu \ + libminizip.so:archivers/minizip \ libsoup-2.4.so:devel/libsoup \ libsword.so:misc/sword \ libuuid.so:misc/e2fsprogs-libuuid \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 +# gettext is always needed, even if NLS is off USES= cmake gettext gnome pkgconfig -USE_GITHUB= yes -GH_ACCOUNT= crosswire USE_GNOME= cairo gconf2 gtk30 gtkhtml4 intltool libgsf INSTALLS_ICONS= yes CMAKE_OFF= EPUB CMAKE_ON= GTKHTML OPTIONS_DEFINE= NLS OPTIONS_SUB= NLS .include Index: head/misc/xiphos/distinfo =================================================================== --- head/misc/xiphos/distinfo (revision 539670) +++ head/misc/xiphos/distinfo (revision 539671) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584113731 -SHA256 (crosswire-xiphos-4.1.0-72-g9e573336_GH0.tar.gz) = 316b41a400638dca784d53d2e0292fc693a3f61744ca488a523fe78f52fb7e09 -SIZE (crosswire-xiphos-4.1.0-72-g9e573336_GH0.tar.gz) = 28353269 +TIMESTAMP = 1592502269 +SHA256 (xiphos-4.2.1.tar.gz) = e13e367f511ab719c1fc815ee88fe5172a10ec76fa637131edb67e0c1b6dd123 +SIZE (xiphos-4.2.1.tar.gz) = 28373966 Index: head/misc/xiphos/pkg-descr =================================================================== --- head/misc/xiphos/pkg-descr (revision 539670) +++ head/misc/xiphos/pkg-descr (revision 539671) @@ -1,7 +1,7 @@ Xiphos (formerly known as GnomeSword) is a Bible study application for Linux, UNIX, and Windows operating systems. It uses Sword to display Bibles, commentaries, dictionary, and other texts and images. Xiphos includes features such as searching, biblesync, bookmarks, parallel study, and original language study. -WWW: http://xiphos.org +WWW: https://xiphos.org Index: head/misc/xiphos/pkg-plist =================================================================== --- head/misc/xiphos/pkg-plist (revision 539670) +++ head/misc/xiphos/pkg-plist (revision 539671) @@ -1,336 +1,338 @@ bin/xiphos bin/xiphos-nav man/man1/xiphos-nav.1.gz man/man1/xiphos.1.gz share/appdata/xiphos.appdata.xml share/applications/xiphos.desktop share/help/C/xiphos/figures/first_start.png share/help/C/xiphos/figures/interface.png share/help/C/xiphos/figures/interface_biblepane-options.png share/help/C/xiphos/figures/interface_biblepane.png share/help/C/xiphos/figures/interface_commentarypane.png share/help/C/xiphos/figures/interface_dictionary.png share/help/C/xiphos/figures/interface_menubar-view.png share/help/C/xiphos/figures/interface_menubar.png share/help/C/xiphos/figures/interface_parallel-separate.png share/help/C/xiphos/figures/interface_parallel.png share/help/C/xiphos/figures/interface_searchpane.png share/help/C/xiphos/figures/interface_shortcut.png share/help/C/xiphos/figures/interface_sidepane.png share/help/C/xiphos/figures/interface_toolbar.png share/help/C/xiphos/figures/interface_viewer.png share/help/C/xiphos/figures/journal.png share/help/C/xiphos/figures/module.png share/help/C/xiphos/figures/personal.png share/help/C/xiphos/figures/preferences_fonts-color.png share/help/C/xiphos/figures/preferences_fonts-misc.png share/help/C/xiphos/figures/preferences_general-biblesync.png share/help/C/xiphos/figures/preferences_general-misc.png share/help/C/xiphos/figures/preferences_modules-misc.png share/help/C/xiphos/figures/preferences_modules-parallel.png share/help/C/xiphos/figures/search_search.png share/help/C/xiphos/figures/studypad.png share/help/C/xiphos/figures/sword3.png share/help/C/xiphos/figures/sword_config.png share/help/C/xiphos/figures/sword_install.png share/help/C/xiphos/figures/sword_remove.png share/help/C/xiphos/figures/sword_sources.png share/help/C/xiphos/figures/xiphos-icon.png share/help/C/xiphos/figures/xiphos-trail-icon.png share/help/C/xiphos/index.page share/help/C/xiphos/legal.xml share/help/C/xiphos/xiphos-01-introduction.page share/help/C/xiphos/xiphos-02-shortcut-keys.page share/help/C/xiphos/xiphos-10-start.page share/help/C/xiphos/xiphos-11-interface.page share/help/C/xiphos/xiphos-20-modules-introduction.page share/help/C/xiphos/xiphos-21-modules-configuration.page share/help/C/xiphos/xiphos-22-modules-install.page share/help/C/xiphos/xiphos-23-modules-maintenance.page share/help/C/xiphos/xiphos-24-modules-third-party.page share/help/C/xiphos/xiphos-30-search.page share/help/C/xiphos/xiphos-31-advanced-search.page share/help/C/xiphos/xiphos-32-search-syntax.page share/help/C/xiphos/xiphos-33-original-language.page share/help/C/xiphos/xiphos-40-personal-commentary.page share/help/C/xiphos/xiphos-41-studypad.page share/help/C/xiphos/xiphos-42-journals.page share/help/C/xiphos/xiphos-50-preferences-general-settings.page share/help/C/xiphos/xiphos-51-preferences-biblesync.page share/help/C/xiphos/xiphos-52-preferences-fonts-colors.page share/help/C/xiphos/xiphos-53-preferences-modules.page share/help/C/xiphos/xiphos-60-online-help.page share/help/C/xiphos/xiphos-90-credits.page share/help/fa/xiphos/figures/first_start.png share/help/fa/xiphos/figures/interface.png share/help/fa/xiphos/figures/interface_biblepane-options.png share/help/fa/xiphos/figures/interface_biblepane.png share/help/fa/xiphos/figures/interface_commentarypane.png share/help/fa/xiphos/figures/interface_dictionary.png share/help/fa/xiphos/figures/interface_menubar-view.png share/help/fa/xiphos/figures/interface_menubar.png share/help/fa/xiphos/figures/interface_parallel-separate.png share/help/fa/xiphos/figures/interface_parallel.png share/help/fa/xiphos/figures/interface_searchpane.png share/help/fa/xiphos/figures/interface_shortcut.png share/help/fa/xiphos/figures/interface_sidepane.png share/help/fa/xiphos/figures/interface_toolbar.png share/help/fa/xiphos/figures/interface_viewer.png share/help/fa/xiphos/figures/journal.png share/help/fa/xiphos/figures/module.png share/help/fa/xiphos/figures/personal.png share/help/fa/xiphos/figures/preferences_fonts-color.png share/help/fa/xiphos/figures/preferences_fonts-misc.png share/help/fa/xiphos/figures/preferences_general-biblesync.png share/help/fa/xiphos/figures/preferences_general-misc.png share/help/fa/xiphos/figures/preferences_modules-misc.png share/help/fa/xiphos/figures/preferences_modules-parallel.png share/help/fa/xiphos/figures/search_search.png share/help/fa/xiphos/figures/studypad.png share/help/fa/xiphos/figures/sword3.png share/help/fa/xiphos/figures/sword_config.png share/help/fa/xiphos/figures/sword_install.png share/help/fa/xiphos/figures/sword_remove.png share/help/fa/xiphos/figures/sword_sources.png share/help/fa/xiphos/figures/xiphos-icon.png share/help/fa/xiphos/figures/xiphos-trail-icon.png share/help/fa/xiphos/index.page share/help/fa/xiphos/legal.xml share/help/fa/xiphos/xiphos-01-introduction.page share/help/fa/xiphos/xiphos-02-shortcut-keys.page share/help/fa/xiphos/xiphos-10-start.page share/help/fa/xiphos/xiphos-11-interface.page share/help/fa/xiphos/xiphos-20-modules-introduction.page share/help/fa/xiphos/xiphos-21-modules-configuration.page share/help/fa/xiphos/xiphos-22-modules-install.page share/help/fa/xiphos/xiphos-23-modules-maintenance.page share/help/fa/xiphos/xiphos-24-modules-third-party.page share/help/fa/xiphos/xiphos-30-search.page share/help/fa/xiphos/xiphos-31-advanced-search.page share/help/fa/xiphos/xiphos-32-search-syntax.page share/help/fa/xiphos/xiphos-33-original-language.page share/help/fa/xiphos/xiphos-40-personal-commentary.page share/help/fa/xiphos/xiphos-41-studypad.page share/help/fa/xiphos/xiphos-42-journals.page share/help/fa/xiphos/xiphos-50-preferences-general-settings.page share/help/fa/xiphos/xiphos-51-preferences-biblesync.page share/help/fa/xiphos/xiphos-52-preferences-fonts-colors.page share/help/fa/xiphos/xiphos-53-preferences-modules.page share/help/fa/xiphos/xiphos-60-online-help.page share/help/fa/xiphos/xiphos-90-credits.page share/help/fr/xiphos/figures/first_start.png share/help/fr/xiphos/figures/interface.png share/help/fr/xiphos/figures/interface_biblepane-options.png share/help/fr/xiphos/figures/interface_biblepane.png share/help/fr/xiphos/figures/interface_commentarypane.png share/help/fr/xiphos/figures/interface_dictionary.png share/help/fr/xiphos/figures/interface_menubar-view.png share/help/fr/xiphos/figures/interface_menubar.png share/help/fr/xiphos/figures/interface_parallel-separate.png share/help/fr/xiphos/figures/interface_parallel.png share/help/fr/xiphos/figures/interface_searchpane.png share/help/fr/xiphos/figures/interface_shortcut.png share/help/fr/xiphos/figures/interface_sidepane.png share/help/fr/xiphos/figures/interface_toolbar.png share/help/fr/xiphos/figures/interface_viewer.png share/help/fr/xiphos/figures/journal.png share/help/fr/xiphos/figures/module.png share/help/fr/xiphos/figures/personal.png share/help/fr/xiphos/figures/preferences_fonts-color.png share/help/fr/xiphos/figures/preferences_fonts-misc.png share/help/fr/xiphos/figures/preferences_general-biblesync.png share/help/fr/xiphos/figures/preferences_general-misc.png share/help/fr/xiphos/figures/preferences_modules-misc.png share/help/fr/xiphos/figures/preferences_modules-parallel.png share/help/fr/xiphos/figures/search_search.png share/help/fr/xiphos/figures/studypad.png share/help/fr/xiphos/figures/sword3.png share/help/fr/xiphos/figures/sword_config.png share/help/fr/xiphos/figures/sword_install.png share/help/fr/xiphos/figures/sword_remove.png share/help/fr/xiphos/figures/sword_sources.png share/help/fr/xiphos/figures/xiphos-icon.png share/help/fr/xiphos/figures/xiphos-trail-icon.png share/help/fr/xiphos/index.page share/help/fr/xiphos/legal.xml share/help/fr/xiphos/xiphos-01-introduction.page share/help/fr/xiphos/xiphos-02-shortcut-keys.page share/help/fr/xiphos/xiphos-10-start.page share/help/fr/xiphos/xiphos-11-interface.page share/help/fr/xiphos/xiphos-20-modules-introduction.page share/help/fr/xiphos/xiphos-21-modules-configuration.page share/help/fr/xiphos/xiphos-22-modules-install.page share/help/fr/xiphos/xiphos-23-modules-maintenance.page share/help/fr/xiphos/xiphos-24-modules-third-party.page share/help/fr/xiphos/xiphos-30-search.page share/help/fr/xiphos/xiphos-31-advanced-search.page share/help/fr/xiphos/xiphos-32-search-syntax.page share/help/fr/xiphos/xiphos-33-original-language.page share/help/fr/xiphos/xiphos-40-personal-commentary.page share/help/fr/xiphos/xiphos-41-studypad.page share/help/fr/xiphos/xiphos-42-journals.page share/help/fr/xiphos/xiphos-50-preferences-general-settings.page share/help/fr/xiphos/xiphos-51-preferences-biblesync.page share/help/fr/xiphos/xiphos-52-preferences-fonts-colors.page share/help/fr/xiphos/xiphos-53-preferences-modules.page share/help/fr/xiphos/xiphos-60-online-help.page share/help/fr/xiphos/xiphos-90-credits.page share/help/it/xiphos/figures/first_start.png share/help/it/xiphos/figures/interface.png share/help/it/xiphos/figures/interface_biblepane-options.png share/help/it/xiphos/figures/interface_biblepane.png share/help/it/xiphos/figures/interface_commentarypane.png share/help/it/xiphos/figures/interface_dictionary.png share/help/it/xiphos/figures/interface_menubar-view.png share/help/it/xiphos/figures/interface_menubar.png share/help/it/xiphos/figures/interface_parallel-separate.png share/help/it/xiphos/figures/interface_parallel.png share/help/it/xiphos/figures/interface_searchpane.png share/help/it/xiphos/figures/interface_shortcut.png share/help/it/xiphos/figures/interface_sidepane.png share/help/it/xiphos/figures/interface_toolbar.png share/help/it/xiphos/figures/interface_viewer.png share/help/it/xiphos/figures/journal.png share/help/it/xiphos/figures/module.png share/help/it/xiphos/figures/personal.png share/help/it/xiphos/figures/preferences_fonts-color.png share/help/it/xiphos/figures/preferences_fonts-misc.png share/help/it/xiphos/figures/preferences_general-biblesync.png share/help/it/xiphos/figures/preferences_general-misc.png share/help/it/xiphos/figures/preferences_modules-misc.png share/help/it/xiphos/figures/preferences_modules-parallel.png share/help/it/xiphos/figures/search_search.png share/help/it/xiphos/figures/studypad.png share/help/it/xiphos/figures/sword3.png share/help/it/xiphos/figures/sword_config.png share/help/it/xiphos/figures/sword_install.png share/help/it/xiphos/figures/sword_remove.png share/help/it/xiphos/figures/sword_sources.png share/help/it/xiphos/figures/xiphos-icon.png share/help/it/xiphos/figures/xiphos-trail-icon.png share/help/it/xiphos/index.page share/help/it/xiphos/legal.xml share/help/it/xiphos/xiphos-01-introduction.page share/help/it/xiphos/xiphos-02-shortcut-keys.page share/help/it/xiphos/xiphos-10-start.page share/help/it/xiphos/xiphos-11-interface.page share/help/it/xiphos/xiphos-20-modules-introduction.page share/help/it/xiphos/xiphos-21-modules-configuration.page share/help/it/xiphos/xiphos-22-modules-install.page share/help/it/xiphos/xiphos-23-modules-maintenance.page share/help/it/xiphos/xiphos-24-modules-third-party.page share/help/it/xiphos/xiphos-30-search.page share/help/it/xiphos/xiphos-31-advanced-search.page share/help/it/xiphos/xiphos-32-search-syntax.page share/help/it/xiphos/xiphos-33-original-language.page share/help/it/xiphos/xiphos-40-personal-commentary.page share/help/it/xiphos/xiphos-41-studypad.page share/help/it/xiphos/xiphos-42-journals.page share/help/it/xiphos/xiphos-50-preferences-general-settings.page share/help/it/xiphos/xiphos-51-preferences-biblesync.page share/help/it/xiphos/xiphos-52-preferences-fonts-colors.page share/help/it/xiphos/xiphos-53-preferences-modules.page share/help/it/xiphos/xiphos-60-online-help.page share/help/it/xiphos/xiphos-90-credits.page share/icons/hicolor/scalable/apps/xiphos.svg %%NLS%%share/locale/ar/LC_MESSAGES/xiphos.mo +%%NLS%%share/locale/bg/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/cs/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/cy/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/da/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/de/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/es/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/fa/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/fi/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/fr/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/he/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/hu/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/it/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/ja/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/ko_KR/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/lt/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/lv/LC_MESSAGES/xiphos.mo +%%NLS%%share/locale/my/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/nb/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/nl/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/pl/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/pt/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/ro/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/ru/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/sk/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/sl/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/sv/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/tr/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xiphos.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xiphos.mo %%DATADIR%%/about.png %%DATADIR%%/arrow_down.png %%DATADIR%%/arrow_down_box.png %%DATADIR%%/arrow_up.png %%DATADIR%%/arrow_up_box.png %%DATADIR%%/biblesync-v1-30.png %%DATADIR%%/biblesync-v1-50.png %%DATADIR%%/biblesync_icon-16.png %%DATADIR%%/book_closed.png %%DATADIR%%/book_closed_rtol.png %%DATADIR%%/book_open.png %%DATADIR%%/book_open_rtol.png %%DATADIR%%/bookmarks.gtkbuilder %%DATADIR%%/bookmarks_old.gtkbuilder %%DATADIR%%/chat_icon-16.png %%DATADIR%%/dlg-un-16.png %%DATADIR%%/dlg-un.png %%DATADIR%%/editor_link_dialog.gtkbuilder %%DATADIR%%/editor_link_dialog_old.gtkbuilder %%DATADIR%%/editor_note.xml %%DATADIR%%/editor_studypad.xml %%DATADIR%%/epiphany-bookmark-page.png %%DATADIR%%/epiphany-bookmarks.png %%DATADIR%%/epiphany-secure.png %%DATADIR%%/epiphany-unsecure.png %%DATADIR%%/export-dialog.gtkbuilder %%DATADIR%%/export-dialog_old.gtkbuilder %%DATADIR%%/gnome-session.png %%DATADIR%%/gnome-sound-properties.png %%DATADIR%%/gnome-window-manager.png %%DATADIR%%/gnome-windows.png %%DATADIR%%/gs2-48x48.ico %%DATADIR%%/gs2-48x48.png %%DATADIR%%/gs2.xpm %%DATADIR%%/indexed-16.png %%DATADIR%%/indexed.png %%DATADIR%%/init-settings.png %%DATADIR%%/languages %%DATADIR%%/logo.png %%DATADIR%%/mailing_list_icon-16.png %%DATADIR%%/markverse.gtkbuilder %%DATADIR%%/markverse_old.gtkbuilder %%DATADIR%%/module-manager.gtkbuilder %%DATADIR%%/module-manager_old.gtkbuilder %%DATADIR%%/navbar_versekey.gtkbuilder %%DATADIR%%/navbar_versekey_old.gtkbuilder %%DATADIR%%/new_tab_button.png %%DATADIR%%/prefs.gtkbuilder %%DATADIR%%/prefs_old.gtkbuilder %%DATADIR%%/search-dialog.gtkbuilder %%DATADIR%%/search-dialog_old.gtkbuilder %%DATADIR%%/selector-prefs.gtkbuilder %%DATADIR%%/selector-prefs_old.gtkbuilder %%DATADIR%%/silk-edit-bookmarks.png %%DATADIR%%/splash.png %%DATADIR%%/sword-big.png %%DATADIR%%/sword.png %%DATADIR%%/sword3.png %%DATADIR%%/sword_icon-16.png %%DATADIR%%/translation_icon-16.png %%DATADIR%%/tt.png %%DATADIR%%/window-close.png %%DATADIR%%/xi-menus-popup.gtkbuilder %%DATADIR%%/xi-menus-popup_old.gtkbuilder %%DATADIR%%/xi-menus.gtkbuilder %%DATADIR%%/xi-menus_old.gtkbuilder %%DATADIR%%/xi-splash.gtkbuilder %%DATADIR%%/xi-splash_old.gtkbuilder %%DATADIR%%/xiphos-button-125.png %%DATADIR%%/xiphos-x-16.png %%DATADIR%%/xiphos.xpm