Date: Wed, 11 Dec 2013 04:14:51 +0000 (UTC) From: Thomas Abthorpe <tabthorpe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336141 - in head/misc: . sword17 sword17/files Message-ID: <201312110414.rBB4EpFa078307@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tabthorpe Date: Wed Dec 11 04:14:50 2013 New Revision: 336141 URL: http://svnweb.freebsd.org/changeset/ports/336141 Log: - Add sword 1.7.0 Added: head/misc/sword17/ - copied from r336137, head/misc/sword/ Deleted: head/misc/sword17/files/patch-configure head/misc/sword17/files/patch-include::ftpparse.h head/misc/sword17/files/patch-src::utilfuns::ftpparse.c head/misc/sword17/files/patch-src__mgr__curlftpt.cpp head/misc/sword17/files/patch-src__modules__swmodule.cpp Modified: head/misc/Makefile head/misc/sword17/Makefile head/misc/sword17/distinfo (contents, props changed) head/misc/sword17/pkg-plist (contents, props changed) Modified: head/misc/Makefile ============================================================================== --- head/misc/Makefile Wed Dec 11 03:56:09 2013 (r336140) +++ head/misc/Makefile Wed Dec 11 04:14:50 2013 (r336141) @@ -423,6 +423,7 @@ SUBDIR += susv2 SUBDIR += susv3 SUBDIR += sword + SUBDIR += sword17 SUBDIR += table.el SUBDIR += talkfilters SUBDIR += tcb Modified: head/misc/sword17/Makefile ============================================================================== --- head/misc/sword/Makefile Wed Dec 11 01:53:16 2013 (r336137) +++ head/misc/sword17/Makefile Wed Dec 11 04:14:50 2013 (r336141) @@ -2,23 +2,23 @@ # $FreeBSD$ PORTNAME= sword -PORTVERSION= 1.6.2 -PORTREVISION= 4 +PORTVERSION= 1.7.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}/ \ - LOCAL/tabthorpe + http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/ MAINTAINER= tabthorpe@FreeBSD.org COMMENT= Framework for manipulating Bible texts LICENSE= GPLv2 +CONFLICTS= sword-1.6.* + BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit USES= gmake pkgconfig USE_AUTOTOOLS= automake autoconf -CONFIGURE_ARGS= --without-conf --with-zlib +CONFIGURE_ARGS= --with-conf --with-zlib USE_LDCONFIG= yes SUB_FILES= pkg-message @@ -50,16 +50,12 @@ PLIST_SUB+= ICU="@comment " run-autotools:: run-autotools-aclocal + @${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/configure + post-patch: @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ + -e's|-O3||g' \ ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|:=|=|' ${WRKSRC}/Makefile.am \ - ${WRKSRC}/Makefile.in ${WRKSRC}/lib/Makefile.am \ - ${WRKSRC}/lib/Makefile.in - @${REINPLACE_CMD} -e '/<curl\/types.h>/d' \ - ${WRKSRC}/src/mgr/curlhttpt.cpp ${WRKSRC}/src/mgr/curlftpt.cpp - @${REINPLACE_CMD} -e 's/find(k)/this->&/ ; s/insert(/this->&/ ; \ - s/[a-z]*_bound(k)/this->&/' ${WRKSRC}/include/multimapwdef.h post-install: @${MKDIR} ${PREFIX}/share/sword/mods.d Modified: head/misc/sword17/distinfo ============================================================================== --- head/misc/sword/distinfo Wed Dec 11 01:53:16 2013 (r336137) +++ head/misc/sword17/distinfo Wed Dec 11 04:14:50 2013 (r336141) @@ -1,2 +1,2 @@ -SHA256 (sword-1.6.2.tar.gz) = af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 -SIZE (sword-1.6.2.tar.gz) = 1965427 +SHA256 (sword-1.7.0.tar.gz) = 819bb4178e871ac2cbcf2a7765f94314c0051b79f522d02c24f8d9ddddac3501 +SIZE (sword-1.7.0.tar.gz) = 2115304 Modified: head/misc/sword17/pkg-plist ============================================================================== --- head/misc/sword/pkg-plist Wed Dec 11 01:53:16 2013 (r336137) +++ head/misc/sword17/pkg-plist Wed Dec 11 04:14:50 2013 (r336141) @@ -1,38 +1,22 @@ -bin/addld bin/diatheke -bin/imp2gbs -bin/imp2ld -bin/imp2vs -bin/installmgr -bin/mkfastmod bin/mod2imp bin/mod2osis -bin/mod2vpl -bin/mod2zmod bin/osis2mod bin/tei2mod -bin/vpl2mod bin/vs2osisref bin/vs2osisreftxt +bin/mod2vpl +bin/mkfastmod +bin/vpl2mod +bin/imp2vs +bin/installmgr bin/xml2gbs +bin/imp2gbs +bin/imp2ld +bin/mod2zmod %%ETCDIR%%.conf -include/sword/Greek2Greek.h -include/sword/GreekChars.h include/sword/canon.h include/sword/canon_abbrevs.h -include/sword/canon_catholic.h -include/sword/canon_catholic2.h -include/sword/canon_german.h -include/sword/canon_kjva.h -include/sword/canon_leningrad.h -include/sword/canon_luther.h -include/sword/canon_mt.h -include/sword/canon_nrsv.h -include/sword/canon_nrsva.h -include/sword/canon_null.h -include/sword/canon_synodal.h -include/sword/canon_synodalp.h -include/sword/canon_vulg.h include/sword/cipherfil.h include/sword/curlftpt.h include/sword/curlhttpt.h @@ -42,24 +26,27 @@ include/sword/encfiltmgr.h include/sword/entriesblk.h include/sword/femain.h include/sword/filemgr.h +include/sword/versificationmgr.h include/sword/flatapi.h -include/sword/ftplib.h -include/sword/ftplibftpt.h include/sword/ftpparse.h -include/sword/ftptrans.h +include/sword/remotetrans.h +include/sword/ftplibftpt.h +include/sword/ftplib.h include/sword/gbffootnotes.h include/sword/gbfheadings.h include/sword/gbfhtml.h +include/sword/gbfxhtml.h include/sword/gbfhtmlhref.h +include/sword/rawld.h +include/sword/gbfwebif.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/gbfthml.h include/sword/greeklexattribs.h include/sword/hebrewmcim.h include/sword/hrefcom.h @@ -72,37 +59,41 @@ include/sword/lzsscomprs.h include/sword/markupfiltmgr.h include/sword/multimapwdef.h include/sword/nullim.h -include/sword/osisfootnotes.h +include/sword/osisglosses.h +include/sword/osisenum.h include/sword/osisheadings.h include/sword/osishtmlhref.h -include/sword/osislemma.h +include/sword/osisxhtml.h +include/sword/osiswebif.h include/sword/osismorph.h include/sword/osismorphsegmentation.h -include/sword/osisosis.h include/sword/osisplain.h -include/sword/osisredletterwords.h include/sword/osisrtf.h -include/sword/osisscripref.h +include/sword/osisosis.h include/sword/osisstrongs.h -include/sword/osisvariants.h -include/sword/osiswebif.h +include/sword/osisfootnotes.h +include/sword/osislemma.h +include/sword/osisredletterwords.h +include/sword/osisscripref.h include/sword/osiswordjs.h +include/sword/osisvariants.h +include/sword/osisxlit.h include/sword/papyriplain.h -include/sword/plainfootnotes.h -include/sword/plainhtml.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/roman.h include/sword/rtfhtml.h include/sword/sapphire.h -include/sword/stringmgr.h +include/sword/scsuutf8.h include/sword/strkey.h include/sword/swbasicfilter.h include/sword/swbuf.h @@ -122,22 +113,22 @@ include/sword/swlocale.h include/sword/swlog.h include/sword/swmacs.h include/sword/swmgr.h +include/sword/stringmgr.h include/sword/swmodule.h -include/sword/swobject.h include/sword/swoptfilter.h +include/sword/swobject.h include/sword/swsearchable.h include/sword/swtext.h include/sword/swunicod.h include/sword/swversion.h include/sword/sysdata.h -include/sword/teihtmlhref.h -include/sword/teiplain.h -include/sword/teirtf.h include/sword/thmlfootnotes.h include/sword/thmlgbf.h include/sword/thmlheadings.h include/sword/thmlhtml.h +include/sword/thmlxhtml.h include/sword/thmlhtmlhref.h +include/sword/thmlwebif.h include/sword/thmllemma.h include/sword/thmlmorph.h include/sword/thmlosis.h @@ -146,20 +137,23 @@ 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/teiplain.h +include/sword/teirtf.h +include/sword/teixhtml.h +include/sword/teihtmlhref.h include/sword/treekey.h include/sword/treekeyidx.h include/sword/unicodertf.h -include/sword/untgz.h include/sword/url.h +include/sword/untgz.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/utf8arabicpoints.h include/sword/utf8html.h include/sword/utf8latin1.h include/sword/utf8nfc.h @@ -169,31 +163,33 @@ include/sword/utf8utf16.h include/sword/utilstr.h include/sword/utilxml.h include/sword/versekey.h -include/sword/versemgr.h include/sword/versetreekey.h include/sword/zcom.h -include/sword/zconf.h include/sword/zipcomprs.h include/sword/zld.h include/sword/zstr.h include/sword/ztext.h include/sword/zverse.h +include/sword/canon_kjva.h +include/sword/canon_leningrad.h +include/sword/canon_mt.h +include/sword/canon_nrsv.h +include/sword/canon_nrsva.h +include/sword/canon_synodal.h +include/sword/canon_synodalprot.h +include/sword/canon_vulg.h +include/sword/canon_german.h +include/sword/canon_luther.h +include/sword/canon_catholic.h +include/sword/canon_catholic2.h +include/sword/canon_lxx.h +include/sword/canon_null.h +include/sword/canon_orthodox.h lib/libsword-%%PORTVERSION%%.so lib/libsword.a lib/libsword.la lib/libsword.so -%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_Any_Latex.res -%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_Any_Latin1.res -%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_BETA_Greek.res -%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_BGreek_Greek.res -%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_CCAT_Hebrew.res -%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_CCAT_Syriac.res -%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_Latin_Coptic.res -%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_Latin_Gothic.res -%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_Latin_Ugaritic.res -%%ICU%%lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%/translit_swordindex.res libdata/pkgconfig/sword.pc -%%DATADIR%%/locales.d/locales.conf %%DATADIR%%/locales.d/abbr.conf %%DATADIR%%/locales.d/af-utf8.conf %%DATADIR%%/locales.d/af.conf @@ -221,6 +217,7 @@ libdata/pkgconfig/sword.pc %%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 @@ -234,6 +231,7 @@ libdata/pkgconfig/sword.pc %%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 @@ -241,6 +239,7 @@ libdata/pkgconfig/sword.pc %%DATADIR%%/locales.d/ko_abbrev.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/mt-utf8.conf %%DATADIR%%/locales.d/nb-utf8.conf @@ -251,6 +250,7 @@ libdata/pkgconfig/sword.pc %%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 @@ -276,9 +276,8 @@ libdata/pkgconfig/sword.pc %%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 @dirrm %%DATADIR%%/mods.d @dirrm %%DATADIR%%/locales.d @dirrm %%DATADIR%% -%%ICU%%@dirrm lib/sword/%%PORTVERSION%%_icu_%%ICUVER%% -@dirrm lib/sword @dirrm include/sword
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312110414.rBB4EpFa078307>