- Update to 1.6.2

3 files changed, 17 insertions, 8 deletions

diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 6b70a5e9cc3a..f625dbc09fb9 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sword
-PORTVERSION=	1.6.1
-PORTREVISION=	3
+PORTVERSION=	1.6.2
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.6/ \
 		http://crosswire.org/ftpmirror/pub/sword/source/v1.6/ \
@@ -17,6 +16,8 @@ MASTER_SITE_SUBDIR=	tabthorpe
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A project framework for manipulating Bible texts
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
 
 MAKE_JOBS_SAFE=	yes
@@ -30,6 +31,8 @@ USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 .if defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=	--without-curl
 .else
@@ -43,7 +46,6 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|2.63|2.68|g' ${WRKSRC}/aclocal.m4
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|:=|=|' ${WRKSRC}/Makefile.am \
diff --git a/misc/sword/distinfo b/misc/sword/distinfo
index 8c9fb2f9d04b..2a6b0131745a 100644
--- a/misc/sword/distinfo
+++ b/misc/sword/distinfo
@@ -1,3 +1,2 @@
-MD5 (sword-1.6.1.tar.gz) = 347e72f73313ff3ba700368db76a5d50
-SHA256 (sword-1.6.1.tar.gz) = 8b9c5e5cae97dbcb3d980d23c29a27c28c7281f6c9ad422eb6c9c1550b827bd8
-SIZE (sword-1.6.1.tar.gz) = 1893837
+SHA256 (sword-1.6.2.tar.gz) = af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9
+SIZE (sword-1.6.2.tar.gz) = 1965427
diff --git a/misc/sword/pkg-plist b/misc/sword/pkg-plist
index a1c80443599e..c520debfd6e3 100644
--- a/misc/sword/pkg-plist
+++ b/misc/sword/pkg-plist
@@ -20,6 +20,8 @@ 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
@@ -29,6 +31,7 @@ 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
@@ -175,17 +178,18 @@ include/sword/zld.h
 include/sword/zstr.h
 include/sword/ztext.h
 include/sword/zverse.h
-lib/libsword-1.6.1.so
+lib/libsword-%%PORTVERSION%%.so
 lib/libsword.a
 lib/libsword.la
 lib/libsword.so
-share/sword/locales.d/locales.conf
 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
 %%DATADIR%%/locales.d/ar_EG-cp1256.conf
 %%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
@@ -213,6 +217,7 @@ libdata/pkgconfig/sword.pc
 %%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
@@ -256,6 +261,9 @@ libdata/pkgconfig/sword.pc
 %%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
 @dirrm %%DATADIR%%/mods.d