- Update to 2.6.4

4 files changed, 78 insertions, 66 deletions

diff --git a/devel/liblouis/Makefile b/devel/liblouis/Makefile
index ed0a9d43ffa2..8bb2d78c2cee 100644
--- a/devel/liblouis/Makefile
+++ b/devel/liblouis/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	liblouis
-PORTVERSION=	2.5.4
-PORTREVISION=	1
+PORTVERSION=	2.6.4
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
-MASTER_SITES=	http://www.liblouis.org/downloads/
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Open-source Braille Translator And Back-translator
@@ -14,27 +13,15 @@ LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		gmake libtool
+USES=		gmake libtool autoreconf
+USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-INFO=		liblouis
 
-post-extract:
-	@${REINPLACE_CMD} -e \
-		's#@libdir@#${PREFIX}/libdata#g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's#tables doc tests python#tests python#g' ${WRKSRC}/Makefile.in
+pre-configure:
+	cd ${WRKSRC} && ./autogen.sh
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/tables
-	${INSTALL_DATA} ${WRKSRC}/tables/*.dic ${STAGEDIR}${DATADIR}/tables/
-	${INSTALL_DATA} ${WRKSRC}/tables/*.ctb ${STAGEDIR}${DATADIR}/tables/
-	${INSTALL_DATA} ${WRKSRC}/tables/*.utb ${STAGEDIR}${DATADIR}/tables/
-	${INSTALL_DATA} ${WRKSRC}/tables/*.cti ${STAGEDIR}${DATADIR}/tables/
-	${INSTALL_DATA} ${WRKSRC}/tables/*.dis ${STAGEDIR}${DATADIR}/tables/
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in liblouis.html liblouis.txt
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblouis.so
 
 .include <bsd.port.mk>
diff --git a/devel/liblouis/distinfo b/devel/liblouis/distinfo
index 663d4467c5e6..f6c3db6b384d 100644
--- a/devel/liblouis/distinfo
+++ b/devel/liblouis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liblouis-2.5.4.tar.gz) = eb45a443bbf382c7d8f2c781eb172834ddde88a2524d2dc0e5b9e4885fada91d
-SIZE (liblouis-2.5.4.tar.gz) = 3887619
+SHA256 (liblouis-liblouis-v2.6.4_GH0.tar.gz) = 0056b12d9cfbd63d6d7c6b5c19e217b842f749da0771f82b5a631f3aa3c64ac3
+SIZE (liblouis-liblouis-v2.6.4_GH0.tar.gz) = 22569444
diff --git a/devel/liblouis/files/patch-autogen.sh b/devel/liblouis/files/patch-autogen.sh
new file mode 100644
index 000000000000..a308693ea5f4
--- /dev/null
+++ b/devel/liblouis/files/patch-autogen.sh
@@ -0,0 +1,13 @@
+--- autogen.sh.orig	2015-09-10 16:17:51.726491000 +0800
++++ autogen.sh	2015-09-10 16:18:08.800813000 +0800
+@@ -28,8 +28,8 @@
+ 
+ # Refresh GNU autotools toolchain.
+ echo Cleaning autotools files...
+-find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
+-find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
++find . -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
++find . -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
+ 	-o -name depcomp -o -name ltmain.sh -o -name configure \
+ 	-o -name config.sub -o -name config.guess -o -name config.h.in \
+         -o -name mdate-sh -o -name texinfo.tex \
diff --git a/devel/liblouis/pkg-plist b/devel/liblouis/pkg-plist
index f4769e764e79..30a467efb799 100644
--- a/devel/liblouis/pkg-plist
+++ b/devel/liblouis/pkg-plist
@@ -1,29 +1,44 @@
+bin/lou_allround
+bin/lou_checkhyphens
+bin/lou_checktable
+bin/lou_debug
+bin/lou_harnessGenerator
+bin/lou_trace
+bin/lou_translate
+include/liblouis/liblouis.h
+include/liblouis/louis.h
+lib/liblouis.a
+lib/liblouis.so
+lib/liblouis.so.9
+lib/liblouis.so.9.0.0
+lib/pkgconfig/liblouis.pc
 %%DATADIR%%/tables/Cz-Cz-g1.utb
 %%DATADIR%%/tables/Es-Es-G0.utb
 %%DATADIR%%/tables/Es-Es-g1.utb
 %%DATADIR%%/tables/Fr-Ca-g2.ctb
 %%DATADIR%%/tables/Fr-Fr-g2.ctb
 %%DATADIR%%/tables/Lv-Lv-g1.utb
-%%DATADIR%%/tables/Nl-Nl-g1.utb
 %%DATADIR%%/tables/Pl-Pl-g1.utb
 %%DATADIR%%/tables/Se-Se-g1.utb
 %%DATADIR%%/tables/UEBC-g1.utb
 %%DATADIR%%/tables/UEBC-g2.ctb
+%%DATADIR%%/tables/afr-za-g1.ctb
 %%DATADIR%%/tables/ar-ar-g1.utb
 %%DATADIR%%/tables/ar-fa.utb
-%%DATADIR%%/tables/as.ctb
-%%DATADIR%%/tables/awa.ctb
+%%DATADIR%%/tables/as-in-g1.utb
+%%DATADIR%%/tables/aw-in-g1.utb
+%%DATADIR%%/tables/be-in-g1.utb
 %%DATADIR%%/tables/bengali.cti
 %%DATADIR%%/tables/bg.ctb
 %%DATADIR%%/tables/bh.ctb
-%%DATADIR%%/tables/bn.ctb
 %%DATADIR%%/tables/bo.ctb
 %%DATADIR%%/tables/boxes.ctb
-%%DATADIR%%/tables/bra.ctb
+%%DATADIR%%/tables/br-in-g1.utb
 %%DATADIR%%/tables/braille-patterns.cti
 %%DATADIR%%/tables/ca-chardefs.cti
 %%DATADIR%%/tables/ca-g1.ctb
 %%DATADIR%%/tables/chardefs.cti
+%%DATADIR%%/tables/chr-us-g1.ctb
 %%DATADIR%%/tables/ckb-chardefs.cti
 %%DATADIR%%/tables/ckb-g1.ctb
 %%DATADIR%%/tables/ckb-translation.cti
@@ -36,20 +51,21 @@
 %%DATADIR%%/tables/cs-translation.cti
 %%DATADIR%%/tables/cy-cy-g1.utb
 %%DATADIR%%/tables/cy-cy-g2.ctb
-%%DATADIR%%/tables/da-ansi6.dis
 %%DATADIR%%/tables/da-ansi8.dis
 %%DATADIR%%/tables/da-chardefs6.cti
 %%DATADIR%%/tables/da-chardefs8.cti
+%%DATADIR%%/tables/da-dk-common6.uti
 %%DATADIR%%/tables/da-dk-g16.utb
 %%DATADIR%%/tables/da-dk-g18.utb
+%%DATADIR%%/tables/da-dk-g26-patches.cti
 %%DATADIR%%/tables/da-dk-g26.ctb
+%%DATADIR%%/tables/da-dk-g28-patches.cti
 %%DATADIR%%/tables/da-dk-g28.ctb
 %%DATADIR%%/tables/da-dk-g28caps.cti
 %%DATADIR%%/tables/da-dk-g2core.cti
+%%DATADIR%%/tables/da-dk-nocaps.uti
 %%DATADIR%%/tables/da-dk.dis
 %%DATADIR%%/tables/da-lt.ctb
-%%DATADIR%%/tables/da-unicode6.dis
-%%DATADIR%%/tables/da-unicode8.dis
 %%DATADIR%%/tables/de-ch-accents.cti
 %%DATADIR%%/tables/de-ch-g0.utb
 %%DATADIR%%/tables/de-ch-g1.ctb
@@ -77,6 +93,7 @@
 %%DATADIR%%/tables/en-chess.ctb
 %%DATADIR%%/tables/en-gb-comp8.ctb
 %%DATADIR%%/tables/en-gb-g1.utb
+%%DATADIR%%/tables/en-in-g1.ctb
 %%DATADIR%%/tables/en-ueb-chardefs.uti
 %%DATADIR%%/tables/en-ueb-g1.ctb
 %%DATADIR%%/tables/en-ueb-g2.ctb
@@ -102,6 +119,7 @@
 %%DATADIR%%/tables/eurodefs.cti
 %%DATADIR%%/tables/fi-fi-8dot.ctb
 %%DATADIR%%/tables/fi-fi.ctb
+%%DATADIR%%/tables/fi.utb
 %%DATADIR%%/tables/fi1.ctb
 %%DATADIR%%/tables/fi2.ctb
 %%DATADIR%%/tables/fr-2007.ctb
@@ -110,17 +128,18 @@
 %%DATADIR%%/tables/fr-bfu-g2.ctb
 %%DATADIR%%/tables/fr-ca-g1.utb
 %%DATADIR%%/tables/fr-fr-g1.utb
-%%DATADIR%%/tables/ga.ctb
+%%DATADIR%%/tables/ga-g1.utb
+%%DATADIR%%/tables/ga-g2.ctb
 %%DATADIR%%/tables/gd.ctb
 %%DATADIR%%/tables/gon.ctb
 %%DATADIR%%/tables/gr-bb.ctb
 %%DATADIR%%/tables/gr-gr-g1.utb
-%%DATADIR%%/tables/gu.ctb
+%%DATADIR%%/tables/gu-in-g1.utb
 %%DATADIR%%/tables/gujarati.cti
-%%DATADIR%%/tables/gurmukhi.cti
+%%DATADIR%%/tables/gurumuki.cti
+%%DATADIR%%/tables/haw-us-g1.ctb
 %%DATADIR%%/tables/he.ctb
 %%DATADIR%%/tables/hi-in-g1.utb
-%%DATADIR%%/tables/hi.ctb
 %%DATADIR%%/tables/hr.ctb
 %%DATADIR%%/tables/hu-backtranslate-correction.dis
 %%DATADIR%%/tables/hu-chardefs.cti
@@ -150,14 +169,21 @@
 %%DATADIR%%/tables/it-it-comp6.utb
 %%DATADIR%%/tables/it-it-comp8.utb
 %%DATADIR%%/tables/iu-ca-g1.ctb
+%%DATADIR%%/tables/ka-in-g1.utb
 %%DATADIR%%/tables/kannada.cti
-%%DATADIR%%/tables/kha.ctb
-%%DATADIR%%/tables/kn.ctb
+%%DATADIR%%/tables/kh-in-g1.utb
+%%DATADIR%%/tables/ko-2006-g1.ctb
+%%DATADIR%%/tables/ko-2006-g2.ctb
+%%DATADIR%%/tables/ko-2006.cti
+%%DATADIR%%/tables/ko-chars.cti
+%%DATADIR%%/tables/ko-g1-rules.cti
 %%DATADIR%%/tables/ko-g1.ctb
+%%DATADIR%%/tables/ko-g2-rules.cti
 %%DATADIR%%/tables/ko-g2.ctb
 %%DATADIR%%/tables/ko.cti
 %%DATADIR%%/tables/kok.ctb
 %%DATADIR%%/tables/kru.ctb
+%%DATADIR%%/tables/ks-in-g1.utb
 %%DATADIR%%/tables/latinLetterDef6Dots.uti
 %%DATADIR%%/tables/latinLetterDef8Dots.uti
 %%DATADIR%%/tables/litdigits6Dots.uti
@@ -165,27 +191,26 @@
 %%DATADIR%%/tables/loweredDigits8Dots.uti
 %%DATADIR%%/tables/lt.ctb
 %%DATADIR%%/tables/malayalam.cti
+%%DATADIR%%/tables/mao-nz-g1.ctb
 %%DATADIR%%/tables/marburg.ctb
 %%DATADIR%%/tables/marburg_edit.ctb
 %%DATADIR%%/tables/marburg_single_cell_defs.cti
 %%DATADIR%%/tables/marburg_unicode_defs.cti
-%%DATADIR%%/tables/ml.ctb
-%%DATADIR%%/tables/mni.ctb
-%%DATADIR%%/tables/mr.ctb
+%%DATADIR%%/tables/ml-in-g1.utb
+%%DATADIR%%/tables/mn-in-g1.utb
+%%DATADIR%%/tables/mr-in-g1.utb
 %%DATADIR%%/tables/mt.ctb
 %%DATADIR%%/tables/mun.ctb
 %%DATADIR%%/tables/mwr.ctb
 %%DATADIR%%/tables/ne.ctb
-%%DATADIR%%/tables/ne.utb
 %%DATADIR%%/tables/nemeth.ctb
 %%DATADIR%%/tables/nemeth_edit.ctb
 %%DATADIR%%/tables/nemethdefs.cti
-%%DATADIR%%/tables/new.ctb
 %%DATADIR%%/tables/nl-BE-chardefs.cti
 %%DATADIR%%/tables/nl-BE-g1.ctb
-%%DATADIR%%/tables/nl-BE-translation.cti
 %%DATADIR%%/tables/nl-BE.dis
-%%DATADIR%%/tables/nl-be-g1.utb
+%%DATADIR%%/tables/nl-NL-chardefs.cti
+%%DATADIR%%/tables/nl-NL-g1.ctb
 %%DATADIR%%/tables/no-no-g0.utb
 %%DATADIR%%/tables/no-no-g1.ctb
 %%DATADIR%%/tables/no-no-g2.ctb
@@ -194,14 +219,16 @@
 %%DATADIR%%/tables/no-no-generic.dis
 %%DATADIR%%/tables/no-no.ctb
 %%DATADIR%%/tables/no-no.dis
-%%DATADIR%%/tables/or.ctb
+%%DATADIR%%/tables/np-in-g1.utb
+%%DATADIR%%/tables/or-in-g1.utb
 %%DATADIR%%/tables/oriya.cti
-%%DATADIR%%/tables/pa.ctb
 %%DATADIR%%/tables/pi.ctb
+%%DATADIR%%/tables/pl-pl-comp8.ctb
 %%DATADIR%%/tables/printables.cti
 %%DATADIR%%/tables/pt-pt-comp8.ctb
 %%DATADIR%%/tables/pt-pt-g1.utb
 %%DATADIR%%/tables/pt-pt-g2.ctb
+%%DATADIR%%/tables/pu-in-g1.utb
 %%DATADIR%%/tables/ro.ctb
 %%DATADIR%%/tables/ru-chardefs.cti
 %%DATADIR%%/tables/ru-compbrl.ctb
@@ -210,28 +237,28 @@
 %%DATADIR%%/tables/ru-ru-g1.utb
 %%DATADIR%%/tables/ru-ru.dis
 %%DATADIR%%/tables/ru.ctb
-%%DATADIR%%/tables/sa.ctb
-%%DATADIR%%/tables/sat.ctb
-%%DATADIR%%/tables/sd.ctb
+%%DATADIR%%/tables/sa-in-g1.utb
 %%DATADIR%%/tables/se-se.ctb
 %%DATADIR%%/tables/se-se.dis
+%%DATADIR%%/tables/si-in-g1.utb
 %%DATADIR%%/tables/sk-sk-g1.utb
 %%DATADIR%%/tables/sk-sk.utb
 %%DATADIR%%/tables/sl-si-comp8.ctb
 %%DATADIR%%/tables/sl-si-g1.utb
+%%DATADIR%%/tables/sot-za-g1.ctb
 %%DATADIR%%/tables/spaces.ctb
 %%DATADIR%%/tables/sr-chardefs.cti
 %%DATADIR%%/tables/sr-g1.ctb
-%%DATADIR%%/tables/sr-translation.cti
 %%DATADIR%%/tables/sv-1989.ctb
 %%DATADIR%%/tables/sv-1996.ctb
 %%DATADIR%%/tables/ta-ta-g1.ctb
 %%DATADIR%%/tables/ta.ctb
 %%DATADIR%%/tables/tamil.cti
-%%DATADIR%%/tables/te.ctb
+%%DATADIR%%/tables/te-in-g1.utb
 %%DATADIR%%/tables/telugu.cti
 %%DATADIR%%/tables/text_nabcc.dis
 %%DATADIR%%/tables/tr.ctb
+%%DATADIR%%/tables/tsn-za-g1.ctb
 %%DATADIR%%/tables/ukchardefs.cti
 %%DATADIR%%/tables/ukmaths.ctb
 %%DATADIR%%/tables/ukmaths_edit.ctb
@@ -241,25 +268,10 @@
 %%DATADIR%%/tables/unicode.dis
 %%DATADIR%%/tables/unicodedefs.cti
 %%DATADIR%%/tables/us-table.dis
+%%DATADIR%%/tables/vi-g1.ctb
 %%DATADIR%%/tables/vi.ctb
 %%DATADIR%%/tables/wiskunde-chardefs.cti
 %%DATADIR%%/tables/wiskunde-translation.cti
 %%DATADIR%%/tables/wiskunde.ctb
 %%DATADIR%%/tables/zh-hk.ctb
 %%DATADIR%%/tables/zh-tw.ctb
-%%PORTDOCS%%%%DOCSDIR%%/liblouis.html
-%%PORTDOCS%%%%DOCSDIR%%/liblouis.txt
-bin/lou_allround
-bin/lou_checkhyphens
-bin/lou_checktable
-bin/lou_debug
-bin/lou_harnessGenerator
-bin/lou_trace
-bin/lou_translate
-include/liblouis/liblouis.h
-include/liblouis/louis.h
-lib/liblouis.a
-lib/liblouis.so
-lib/liblouis.so.2
-lib/liblouis.so.2.4.0
-libdata/pkgconfig/liblouis.pc