Index: head/misc/bibletime/Makefile =================================================================== --- head/misc/bibletime/Makefile (revision 462656) +++ head/misc/bibletime/Makefile (revision 462657) @@ -1,23 +1,22 @@ # $FreeBSD$ PORTNAME= bibletime PORTVERSION= 2.10.1 +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code MAINTAINER= tabthorpe@FreeBSD.org COMMENT= Open source Bible study tool LICENSE= GPLv2 - -BROKEN_FreeBSD_12= does not build on 12.X LIB_DEPENDS= libclucene-core.so:textproc/clucene \ libsword.so:misc/sword USES= cmake:outsource tar:xz ssl USE_QT4= corelib dbus gui iconengines network phonon qtestlib script \ svg webkit xml linguist_build moc_build qmake_build \ rcc_build uic_build .include Index: head/misc/sword/Makefile =================================================================== --- head/misc/sword/Makefile (revision 462656) +++ head/misc/sword/Makefile (revision 462657) @@ -1,63 +1,57 @@ # Created by: Willem van Engen # $FreeBSD$ PORTNAME= sword -PORTVERSION= 1.7.4 -PORTREVISION= 10 +PORTVERSION= 1.8.0 CATEGORIES= misc MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \ http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/ -MAINTAINER= tabthorpe@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Framework for manipulating Bible texts LICENSE= GPLv2 BUILD_DEPENDS= cppunit-config:devel/cppunit - -# Workaround for for FreeBSD_11+. -BUILD_DEPENDS+= clang38:lang/clang38 -CC= clang38 -CXX= clang++38 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-conf --with-zlib INSTALL_TARGET= install-strip USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes SUB_FILES= pkg-message PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= CURL CLUCENE CLUCENE_DESC= Include indexing capability OPTIONS_DEFAULT=CURL CLUCENE .include .if ${PORT_OPTIONS:MCURL} LIB_DEPENDS= libcurl.so:ftp/curl CONFIGURE_ARGS+= --with-curl .else CONFIGURE_ARGS+= --without-curl .endif .if ${PORT_OPTIONS:MCLUCENE} USES+= compiler:c++11-lib USE_CXXSTD= gnu++11 LIB_DEPENDS+= libclucene-core.so:textproc/clucene \ libicudata.so:devel/icu CONFIGURE_ARGS+= --with-clucene=${LOCALBASE} --with-icu .else CONFIGURE_ARGS+= --without-clucene --without-icu .endif post-patch: @${REINPLACE_CMD} 's|-O3||' ${WRKSRC}/configure post-install: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install_config) ${MV} ${STAGEDIR}${PREFIX}/etc/sword.conf \ ${STAGEDIR}${PREFIX}/etc/sword.conf.sample .include Index: head/misc/sword/distinfo =================================================================== --- head/misc/sword/distinfo (revision 462656) +++ head/misc/sword/distinfo (revision 462657) @@ -1,2 +1,3 @@ -SHA256 (sword-1.7.4.tar.gz) = 995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9d6666c9b313edd9d213d -SIZE (sword-1.7.4.tar.gz) = 2157882 +TIMESTAMP = 1516212969 +SHA256 (sword-1.8.0.tar.gz) = b5eba722c6c0b55c7931a48344ed1e12d8f5f6974e6b21686018250975f0f956 +SIZE (sword-1.8.0.tar.gz) = 2444386 Index: head/misc/sword/pkg-plist =================================================================== --- head/misc/sword/pkg-plist (revision 462656) +++ head/misc/sword/pkg-plist (revision 462657) @@ -1,280 +1,300 @@ bin/diatheke +bin/emptyvss bin/imp2gbs bin/imp2ld bin/imp2vs bin/installmgr bin/mkfastmod bin/mod2imp bin/mod2osis bin/mod2vpl bin/mod2zmod bin/osis2mod +bin/stripaccents bin/tei2mod bin/vpl2mod bin/vs2osisref bin/vs2osisreftxt bin/xml2gbs @sample etc/sword.conf.sample +include/sword/bz2comprs.h include/sword/canon.h include/sword/canon_abbrevs.h +include/sword/canon_calvin.h include/sword/canon_catholic.h include/sword/canon_catholic2.h +include/sword/canon_darbyfr.h include/sword/canon_german.h include/sword/canon_kjva.h include/sword/canon_leningrad.h include/sword/canon_luther.h include/sword/canon_lxx.h include/sword/canon_mt.h include/sword/canon_nrsv.h include/sword/canon_nrsva.h include/sword/canon_null.h include/sword/canon_orthodox.h +include/sword/canon_segond.h include/sword/canon_synodal.h include/sword/canon_synodalprot.h include/sword/canon_vulg.h include/sword/cipherfil.h include/sword/curlftpt.h include/sword/curlhttpt.h include/sword/defs.h include/sword/echomod.h include/sword/encfiltmgr.h include/sword/entriesblk.h include/sword/femain.h include/sword/filemgr.h include/sword/flatapi.h include/sword/ftplib.h include/sword/ftplibftpt.h include/sword/ftpparse.h include/sword/gbffootnotes.h include/sword/gbfheadings.h include/sword/gbfhtml.h include/sword/gbfhtmlhref.h +include/sword/gbflatex.h include/sword/gbfmorph.h include/sword/gbfosis.h include/sword/gbfplain.h include/sword/gbfredletterwords.h include/sword/gbfrtf.h include/sword/gbfstrongs.h include/sword/gbfthml.h include/sword/gbfwebif.h include/sword/gbfwordjs.h include/sword/gbfxhtml.h include/sword/greeklexattribs.h include/sword/hebrewmcim.h include/sword/hrefcom.h include/sword/installmgr.h include/sword/latin1utf16.h include/sword/latin1utf8.h include/sword/listkey.h include/sword/localemgr.h include/sword/lzsscomprs.h include/sword/markupfiltmgr.h include/sword/multimapwdef.h include/sword/nullim.h include/sword/osisenum.h include/sword/osisfootnotes.h include/sword/osisglosses.h include/sword/osisheadings.h include/sword/osishtmlhref.h +include/sword/osislatex.h include/sword/osislemma.h include/sword/osismorph.h include/sword/osismorphsegmentation.h include/sword/osisosis.h include/sword/osisplain.h include/sword/osisredletterwords.h include/sword/osisreferencelinks.h include/sword/osisrtf.h include/sword/osisscripref.h include/sword/osisstrongs.h include/sword/osisvariants.h include/sword/osiswebif.h include/sword/osiswordjs.h include/sword/osisxhtml.h include/sword/osisxlit.h include/sword/papyriplain.h include/sword/rawcom.h include/sword/rawcom4.h include/sword/rawfiles.h include/sword/rawgenbook.h include/sword/rawld.h include/sword/rawld4.h include/sword/rawstr.h include/sword/rawstr4.h include/sword/rawtext.h include/sword/rawtext4.h include/sword/rawverse.h include/sword/rawverse4.h include/sword/remotetrans.h include/sword/roman.h include/sword/rtfhtml.h +include/sword/rtranspgdrive.h include/sword/sapphire.h include/sword/scsuutf8.h include/sword/stringmgr.h include/sword/strkey.h include/sword/swbasicfilter.h include/sword/swbuf.h include/sword/swcacher.h include/sword/swcipher.h include/sword/swcom.h include/sword/swcomprs.h include/sword/swconfig.h include/sword/swdisp.h include/sword/swfilter.h include/sword/swfiltermgr.h include/sword/swgenbook.h include/sword/swinputmeth.h include/sword/swkey.h include/sword/swld.h include/sword/swlocale.h include/sword/swlog.h include/sword/swmacs.h include/sword/swmgr.h include/sword/swmodule.h include/sword/swobject.h include/sword/swoptfilter.h include/sword/swsearchable.h include/sword/swtext.h include/sword/swversion.h include/sword/sysdata.h include/sword/teihtmlhref.h +include/sword/teilatex.h include/sword/teiplain.h include/sword/teirtf.h include/sword/teixhtml.h include/sword/thmlfootnotes.h include/sword/thmlgbf.h include/sword/thmlheadings.h include/sword/thmlhtml.h include/sword/thmlhtmlhref.h +include/sword/thmllatex.h include/sword/thmllemma.h include/sword/thmlmorph.h include/sword/thmlosis.h include/sword/thmlplain.h include/sword/thmlrtf.h include/sword/thmlscripref.h include/sword/thmlstrongs.h include/sword/thmlvariants.h include/sword/thmlwebif.h include/sword/thmlwordjs.h include/sword/thmlxhtml.h include/sword/treekey.h include/sword/treekeyidx.h include/sword/unicodertf.h include/sword/untgz.h include/sword/url.h include/sword/utf16utf8.h include/sword/utf8arabicpoints.h include/sword/utf8arshaping.h include/sword/utf8bidireorder.h include/sword/utf8cantillation.h include/sword/utf8greekaccents.h include/sword/utf8hebrewpoints.h include/sword/utf8html.h include/sword/utf8latin1.h include/sword/utf8nfc.h include/sword/utf8nfkd.h +include/sword/utf8scsu.h include/sword/utf8transliterator.h include/sword/utf8utf16.h include/sword/utilstr.h include/sword/utilxml.h include/sword/versekey.h include/sword/versetreekey.h include/sword/versificationmgr.h +include/sword/xzcomprs.h include/sword/zcom.h +include/sword/zcom4.h include/sword/zipcomprs.h include/sword/zld.h include/sword/zstr.h include/sword/ztext.h +include/sword/ztext4.h include/sword/zverse.h +include/sword/zverse4.h lib/libsword-%%PORTVERSION%%.so lib/libsword.a lib/libsword.so libdata/pkgconfig/sword.pc %%DATADIR%%/locales.d/abbr.conf %%DATADIR%%/locales.d/af-utf8.conf %%DATADIR%%/locales.d/af.conf %%DATADIR%%/locales.d/ar-utf8.conf %%DATADIR%%/locales.d/ar_EG-cp1256.conf %%DATADIR%%/locales.d/ar_EG-utf8.conf %%DATADIR%%/locales.d/az-utf8.conf +%%DATADIR%%/locales.d/be-utf8.conf %%DATADIR%%/locales.d/bg-utf8.conf %%DATADIR%%/locales.d/bg_BG-cp1251.conf %%DATADIR%%/locales.d/cs-utf8.conf %%DATADIR%%/locales.d/cs.conf %%DATADIR%%/locales.d/cy-utf8.conf %%DATADIR%%/locales.d/cy.conf %%DATADIR%%/locales.d/da-utf8.conf %%DATADIR%%/locales.d/da.conf %%DATADIR%%/locales.d/de-utf8.conf %%DATADIR%%/locales.d/de.conf %%DATADIR%%/locales.d/de_abbrev-utf8.conf %%DATADIR%%/locales.d/de_abbrev.conf %%DATADIR%%/locales.d/es-utf8.conf %%DATADIR%%/locales.d/es.conf %%DATADIR%%/locales.d/et-utf8.conf %%DATADIR%%/locales.d/et.conf %%DATADIR%%/locales.d/et_abbr-utf8.conf %%DATADIR%%/locales.d/et_abbr.conf %%DATADIR%%/locales.d/fa-utf8.conf %%DATADIR%%/locales.d/fi-utf8.conf %%DATADIR%%/locales.d/fi.conf %%DATADIR%%/locales.d/fo-utf8.conf %%DATADIR%%/locales.d/fr-utf8.conf %%DATADIR%%/locales.d/fr.conf %%DATADIR%%/locales.d/fr_abbrev-utf8.conf %%DATADIR%%/locales.d/fr_abbrev.conf %%DATADIR%%/locales.d/ga-utf8.conf %%DATADIR%%/locales.d/he-utf8.conf %%DATADIR%%/locales.d/hr-utf8.conf %%DATADIR%%/locales.d/hu-utf8.conf %%DATADIR%%/locales.d/hu.conf %%DATADIR%%/locales.d/id-utf8.conf %%DATADIR%%/locales.d/id.conf %%DATADIR%%/locales.d/it-utf8.conf %%DATADIR%%/locales.d/it.conf %%DATADIR%%/locales.d/iu-utf8.conf %%DATADIR%%/locales.d/ja-utf8.conf %%DATADIR%%/locales.d/ko-utf8.conf %%DATADIR%%/locales.d/ko.conf %%DATADIR%%/locales.d/ko_abbrev-utf8.conf %%DATADIR%%/locales.d/ko_abbrev.conf +%%DATADIR%%/locales.d/kpg-utf8.conf %%DATADIR%%/locales.d/la-utf8.conf %%DATADIR%%/locales.d/la.conf %%DATADIR%%/locales.d/locales.conf %%DATADIR%%/locales.d/lt-utf8.conf +%%DATADIR%%/locales.d/lv-utf8.conf %%DATADIR%%/locales.d/mt-utf8.conf %%DATADIR%%/locales.d/nb-utf8.conf %%DATADIR%%/locales.d/nb.conf %%DATADIR%%/locales.d/nl-utf8.conf %%DATADIR%%/locales.d/nl.conf %%DATADIR%%/locales.d/no-utf8.conf %%DATADIR%%/locales.d/no.conf %%DATADIR%%/locales.d/pl-utf8.conf %%DATADIR%%/locales.d/pl.conf %%DATADIR%%/locales.d/pon_utf8.conf %%DATADIR%%/locales.d/pt-utf8.conf %%DATADIR%%/locales.d/pt.conf %%DATADIR%%/locales.d/pt_BR-utf8.conf %%DATADIR%%/locales.d/pt_BR.conf %%DATADIR%%/locales.d/ro-utf8.conf %%DATADIR%%/locales.d/ro.conf %%DATADIR%%/locales.d/ru-utf8.conf %%DATADIR%%/locales.d/ru_RU-cp1251.conf %%DATADIR%%/locales.d/ru_RU-koi8-r.conf %%DATADIR%%/locales.d/ru_RU-utf8.conf %%DATADIR%%/locales.d/sk-utf8.conf %%DATADIR%%/locales.d/sk.conf %%DATADIR%%/locales.d/sl-utf8.conf %%DATADIR%%/locales.d/sl.conf %%DATADIR%%/locales.d/sv-utf8.conf %%DATADIR%%/locales.d/sv.conf %%DATADIR%%/locales.d/th-utf8.conf +%%DATADIR%%/locales.d/tr-utf8.conf %%DATADIR%%/locales.d/uk-utf8.conf %%DATADIR%%/locales.d/uk_UA-cp1251.conf %%DATADIR%%/locales.d/uk_UA-koi8-u.conf %%DATADIR%%/locales.d/vi-utf8.conf %%DATADIR%%/locales.d/zh_CN-utf8.conf %%DATADIR%%/locales.d/zh_Hans-utf8.conf %%DATADIR%%/locales.d/zh_Hant-utf8.conf %%DATADIR%%/locales.d/zh_TW-utf8.conf %%DATADIR%%/locales.d/zh_english-utf8.conf %%DATADIR%%/mods.d/globals.conf Index: head/misc/xiphos/Makefile =================================================================== --- head/misc/xiphos/Makefile (revision 462656) +++ head/misc/xiphos/Makefile (revision 462657) @@ -1,36 +1,34 @@ # $FreeBSD$ PORTNAME= xiphos PORTVERSION= 3.1.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc gnome MASTER_SITES= SF/gnomesword/Xiphos/${PORTVERSION} -MAINTAINER= tabthorpe@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Bible interface utilizing the sword framework LICENSE= GPLv2 - -BROKEN_FreeBSD_12= does not build on 12.X RUN_DEPENDS= yelp:x11/yelp BUILD_DEPENDS:= ${RUN_DEPENDS} \ docbook2html:textproc/docbook-utils \ gnome-doc-tool:textproc/gnome-doc-utils \ nspr>=4.8:devel/nspr LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 \ libdbus-glib-1.so:devel/dbus-glib \ libsword.so:misc/sword USES= gettext pkgconfig waf INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GNOME= gtkhtml4 intlhack gtk30 gconf2 libgsf \ gtk-update-icon-cache OPTIONS_DEFINE= DOCS post-install: @${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/icon-theme.cache .include