svn commit: r339984 - in head/misc/sword: . files

Thomas Abthorpe tabthorpe at FreeBSD.org
Thu Jan 16 20:44:22 UTC 2014 

Author: tabthorpe
Date: Thu Jan 16 20:44:20 2014
New Revision: 339984
URL: http://svnweb.freebsd.org/changeset/ports/339984
QAT: https://qat.redports.org/buildarchive/r339984/

Log:
  - Update to 1.7.2
  - Support STAGEDIR

Deleted:
  head/misc/sword/files/patch-configure
  head/misc/sword/files/patch-include::ftpparse.h
  head/misc/sword/files/patch-src::utilfuns::ftpparse.c
  head/misc/sword/files/patch-src__mgr__curlftpt.cpp
  head/misc/sword/files/patch-src__modules__swmodule.cpp
Modified:
  head/misc/sword/Makefile
  head/misc/sword/distinfo   (contents, props changed)
  head/misc/sword/pkg-plist   (contents, props changed)

Modified: head/misc/sword/Makefile
==============================================================================
--- head/misc/sword/Makefile	Thu Jan 16 20:42:37 2014	(r339983)
+++ head/misc/sword/Makefile	Thu Jan 16 20:44:20 2014	(r339984)
@@ -2,25 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	sword
-PORTVERSION=	1.6.2
-PORTREVISION=	4
+PORTVERSION=	1.7.2
 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 at FreeBSD.org
 COMMENT=	Framework for manipulating Bible texts
 
 LICENSE=	GPLv2
 
-CONFLICTS=	sword-1.7.*
-
 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
 
@@ -30,7 +26,6 @@ OPTIONS_DEFINE=	CURL CLUCENE
 CLUCENE_DESC=	Include indexing capability
 OPTIONS_DEFAULT=CURL CLUCENE
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCURL}
@@ -44,24 +39,19 @@ CONFIGURE_ARGS+=	--without-curl
 LIB_DEPENDS+=	libclucene-core.so:${PORTSDIR}/textproc/clucene \
 		libicudata.so:${PORTSDIR}/devel/icu
 CONFIGURE_ARGS+=	--with-clucene=${LOCALBASE} --with-icu
-PLIST_SUB+=		ICU="" ICUVER="`${LOCALBASE}/bin/icu-config --version`"
 .else
 CONFIGURE_ARGS+=	--without-clucene --without-icu
-PLIST_SUB+=		ICU="@comment "
 .endif
 
 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' \
+		-e 's|%%DESTDIR%%|${STAGEDIR}|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
@@ -75,7 +65,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-register:
-	${MAKE_CMD} register -C ${WRKSRC}
-
 .include <bsd.port.mk>

Modified: head/misc/sword/distinfo
==============================================================================
--- head/misc/sword/distinfo	Thu Jan 16 20:42:37 2014	(r339983)
+++ head/misc/sword/distinfo	Thu Jan 16 20:44:20 2014	(r339984)
@@ -1,2 +1,2 @@
-SHA256 (sword-1.6.2.tar.gz) = af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9
-SIZE (sword-1.6.2.tar.gz) = 1965427
+SHA256 (sword-1.7.2.tar.gz) = ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871
+SIZE (sword-1.7.2.tar.gz) = 2127944

Modified: head/misc/sword/pkg-plist
==============================================================================
--- head/misc/sword/pkg-plist	Thu Jan 16 20:42:37 2014	(r339983)
+++ head/misc/sword/pkg-plist	Thu Jan 16 20:44:20 2014	(r339984)
@@ -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,21 @@ 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 +136,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 +162,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
@@ -201,7 +196,6 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/ar_EG-utf8.conf
 %%DATADIR%%/locales.d/az-utf8.conf
 %%DATADIR%%/locales.d/bg_BG-cp1251.conf
-%%DATADIR%%/locales.d/bg_BG-utf8.conf
 %%DATADIR%%/locales.d/cs-utf8.conf
 %%DATADIR%%/locales.d/cs.conf
 %%DATADIR%%/locales.d/cy-utf8.conf
@@ -221,6 +215,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 +229,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 +237,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 +248,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
@@ -269,16 +267,14 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/th-utf8.conf
 %%DATADIR%%/locales.d/uk_UA-cp1251.conf
 %%DATADIR%%/locales.d/uk_UA-koi8-u.conf
-%%DATADIR%%/locales.d/uk_UA-utf8.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
 @dirrm %%DATADIR%%/mods.d
 @dirrm %%DATADIR%%/locales.d
 @dirrm %%DATADIR%%
-%%ICU%%@dirrm lib/sword/%%PORTVERSION%%_icu_%%ICUVER%%
- at dirrm lib/sword
 @dirrm include/sword

More information about the svn-ports-all mailing list