From 280a31be4027fcfb8d8ed0327c20504decfe863a Mon Sep 17 00:00:00 2001 From: Thomas Abthorpe Date: Fri, 23 Feb 2018 01:30:03 +0000 Subject: [PATCH] - Update misc/sword to 1.8.0 - Chase shlib bump - Reassign to the heap PR: 225276 Submitted by: bsam --- misc/bibletime/Makefile | 3 +-- misc/sword/Makefile | 10 ++-------- misc/sword/distinfo | 5 +++-- misc/sword/pkg-plist | 20 ++++++++++++++++++++ misc/xiphos/Makefile | 6 ++---- 5 files changed, 28 insertions(+), 16 deletions(-) diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile index 7a93632a9d96..d9d84a8e1816 100644 --- a/misc/bibletime/Makefile +++ b/misc/bibletime/Makefile @@ -2,6 +2,7 @@ PORTNAME= bibletime PORTVERSION= 2.10.1 +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code @@ -10,8 +11,6 @@ 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 diff --git a/misc/sword/Makefile b/misc/sword/Makefile index ea1da73cbb89..20b9ce5c3529 100644 --- a/misc/sword/Makefile +++ b/misc/sword/Makefile @@ -2,24 +2,18 @@ # $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 diff --git a/misc/sword/distinfo b/misc/sword/distinfo index 89f69b11ca38..bfe6ff98266c 100644 --- a/misc/sword/distinfo +++ b/misc/sword/distinfo @@ -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 diff --git a/misc/sword/pkg-plist b/misc/sword/pkg-plist index 11bb91b48459..cfb3fe73fd28 100644 --- a/misc/sword/pkg-plist +++ b/misc/sword/pkg-plist @@ -1,4 +1,5 @@ bin/diatheke +bin/emptyvss bin/imp2gbs bin/imp2ld bin/imp2vs @@ -9,16 +10,20 @@ 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 @@ -29,6 +34,7 @@ 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 @@ -49,6 +55,7 @@ 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 @@ -76,6 +83,7 @@ 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 @@ -107,6 +115,7 @@ 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 @@ -137,6 +146,7 @@ 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 @@ -145,6 +155,7 @@ 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 @@ -172,6 +183,7 @@ 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 @@ -179,12 +191,16 @@ 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 @@ -196,6 +212,7 @@ libdata/pkgconfig/sword.pc %%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 @@ -237,10 +254,12 @@ libdata/pkgconfig/sword.pc %%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 @@ -268,6 +287,7 @@ libdata/pkgconfig/sword.pc %%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 diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile index 829069f24748..953910232c75 100644 --- a/misc/xiphos/Makefile +++ b/misc/xiphos/Makefile @@ -2,17 +2,15 @@ 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 \