Update tex-hyphen-base to 2013.

- Files in share/texmf have been moved to share/texmf-dist.

6 files changed, 93 insertions, 51 deletions

diff --git a/print/tex-hyphen-base/Makefile b/print/tex-hyphen-base/Makefile
index e78aef37c24..28f74843b3c 100644
--- a/print/tex-hyphen-base/Makefile
+++ b/print/tex-hyphen-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2012/10/14 21:49:28 minskim Exp $
+# $NetBSD: Makefile,v 1.14 2013/11/17 17:06:23 minskim Exp $
 
 DISTNAME=	hyphen-base
-PKGNAME=	tex-${DISTNAME}-2012
-TEXLIVE_REV=	26846
+PKGNAME=	tex-${DISTNAME}-2013
+TEXLIVE_REV=	31131
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	TeX hyphenation patterns for English
@@ -10,15 +10,14 @@ COMMENT=	TeX hyphenation patterns for English
 PKG_SYSCONFSUBDIR=	texmf
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/tex/generic/config
-CONF_FILES+=	${PREFIX}/share/texmf/tex/generic/config/language.dat \
+CONF_FILES+=	${PREFIX}/share/texmf-dist/tex/generic/config/language.dat \
 		${PKG_SYSCONFDIR}/tex/generic/config/language.dat
-CONF_FILES+=	${PREFIX}/share/texmf/tex/generic/config/language.dat.lua \
+CONF_FILES+=	${PREFIX}/share/texmf-dist/tex/generic/config/language.dat.lua \
 		${PKG_SYSCONFDIR}/tex/generic/config/language.dat.lua
-CONF_FILES+=	${PREFIX}/share/texmf/tex/generic/config/language.def \
+CONF_FILES+=	${PREFIX}/share/texmf-dist/tex/generic/config/language.def \
 		${PKG_SYSCONFDIR}/tex/generic/config/language.def
 
-TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
-TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
+TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR} ${PREFIX}/share/texmf-dist
 
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-hyphen-base/PLIST b/print/tex-hyphen-base/PLIST
index d6fbd4995c2..44a13187eb9 100644
--- a/print/tex-hyphen-base/PLIST
+++ b/print/tex-hyphen-base/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2010/09/14 15:37:16 minskim Exp $
-share/texmf/tex/generic/config/language.dat
-share/texmf/tex/generic/config/language.dat.lua
-share/texmf/tex/generic/config/language.def
-share/texmf/tex/generic/config/language.us
-share/texmf/tex/generic/config/language.us.def
-share/texmf/tex/generic/config/language.us.lua
-share/texmf/tex/generic/hyphen/dumyhyph.tex
-share/texmf/tex/generic/hyphen/hyphen.tex
-share/texmf/tex/generic/hyphen/hypht1.tex
-share/texmf/tex/generic/hyphen/zerohyph.tex
+@comment $NetBSD: PLIST,v 1.3 2013/11/17 17:06:23 minskim Exp $
+share/texmf-dist/tex/generic/config/language.dat
+share/texmf-dist/tex/generic/config/language.dat.lua
+share/texmf-dist/tex/generic/config/language.def
+share/texmf-dist/tex/generic/config/language.us
+share/texmf-dist/tex/generic/config/language.us.def
+share/texmf-dist/tex/generic/config/language.us.lua
+share/texmf-dist/tex/generic/hyphen/dumyhyph.tex
+share/texmf-dist/tex/generic/hyphen/hyphen.tex
+share/texmf-dist/tex/generic/hyphen/hypht1.tex
+share/texmf-dist/tex/generic/hyphen/zerohyph.tex
diff --git a/print/tex-hyphen-base/distinfo b/print/tex-hyphen-base/distinfo
index 8d58b31588c..b222c30ff52 100644
--- a/print/tex-hyphen-base/distinfo
+++ b/print/tex-hyphen-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2012/10/14 21:49:28 minskim Exp $
+$NetBSD: distinfo,v 1.13 2013/11/17 17:06:23 minskim Exp $
 
-SHA1 (tex-hyphen-base-26846/hyphen-base.tar.xz) = 057e33aab9cc325f3554dd8ba70c35c4a0fe1f34
-RMD160 (tex-hyphen-base-26846/hyphen-base.tar.xz) = cc39d955bcf0e35f2c6511cf4d479f586f054a6f
-Size (tex-hyphen-base-26846/hyphen-base.tar.xz) = 21960 bytes
-SHA1 (patch-aa) = 2992c551004039ac670f41278c7dcb858da34570
-SHA1 (patch-ab) = 15d067e161e8392132e748897aa64b98a86a16ee
-SHA1 (patch-ac) = d7e42292f2f84fbf67e5646684dcef6a94642a26
+SHA1 (tex-hyphen-base-31131/hyphen-base.tar.xz) = d1501af79d88c660a84b652bf4872c038c7a496d
+RMD160 (tex-hyphen-base-31131/hyphen-base.tar.xz) = 06a570e7d6e419ababc9b0e3cae03032404a2fac
+Size (tex-hyphen-base-31131/hyphen-base.tar.xz) = 22136 bytes
+SHA1 (patch-aa) = 3176e7ea25c5e06d0f6875ad9fa1c72ef5747245
+SHA1 (patch-ab) = e16aa321144620f8cb9296725c726ad9eb1bb613
+SHA1 (patch-ac) = 75f89b8a1710567e7c96f5f610e0526613660a57
diff --git a/print/tex-hyphen-base/patches/patch-aa b/print/tex-hyphen-base/patches/patch-aa
index dae2a9376ac..e342d7f80fd 100644
--- a/print/tex-hyphen-base/patches/patch-aa
+++ b/print/tex-hyphen-base/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.9 2012/10/14 21:49:29 minskim Exp $
+$NetBSD: patch-aa,v 1.10 2013/11/17 17:06:23 minskim Exp $
 
---- texmf/tex/generic/config/language.dat.orig	2012-06-06 02:36:59.000000000 +0000
-+++ texmf/tex/generic/config/language.dat
-@@ -57,145 +57,3 @@ english		hyphen.tex  % do not change!
+--- tex/generic/config/language.dat.orig	2013-07-08 01:19:20.000000000 +0000
++++ tex/generic/config/language.dat
+@@ -57,153 +57,3 @@ english		hyphen.tex  % do not change!
  % 
  dumylang	dumyhyph.tex    %for testing a new language.
  nohyphenation	zerohyph.tex    %a language with no patterns at all.
 -% from dehyph-exptl:
--german-x-2012-05-30 dehypht-x-2012-05-30.tex
+-german-x-2013-05-26 dehypht-x-2013-05-26.tex
 -=german-x-latest
--ngerman-x-2012-05-30 dehyphn-x-2012-05-30.tex
+-ngerman-x-2013-05-26 dehyphn-x-2013-05-26.tex
 -=ngerman-x-latest
 -% from hyphen-afrikaans:
 -afrikaans loadhyph-af.tex
@@ -64,6 +64,8 @@ $NetBSD: patch-aa,v 1.9 2012/10/14 21:49:29 minskim Exp $
 -friulan loadhyph-fur.tex
 -% from hyphen-galician:
 -galician loadhyph-gl.tex
+-% from hyphen-georgian:
+-georgian loadhyph-ka.tex
 -% from hyphen-german:
 -german loadhyph-de-1901.tex
 -ngerman loadhyph-de-1996.tex
@@ -112,11 +114,15 @@ $NetBSD: patch-aa,v 1.9 2012/10/14 21:49:29 minskim Exp $
 -=norwegian
 -=norsk
 -nynorsk loadhyph-nn.tex
+-% from hyphen-piedmontese:
+-piedmontese loadhyph-pms.tex
 -% from hyphen-polish:
 -polish loadhyph-pl.tex
 -% from hyphen-portuguese:
 -portuguese loadhyph-pt.tex
 -=portuges
+-=brazil
+-=brazilian
 -% from hyphen-romanian:
 -romanian loadhyph-ro.tex
 -% from hyphen-romansh:
@@ -138,6 +144,8 @@ $NetBSD: patch-aa,v 1.9 2012/10/14 21:49:29 minskim Exp $
 -=espanol
 -% from hyphen-swedish:
 -swedish loadhyph-sv.tex
+-% from hyphen-thai:
+-thai loadhyph-th.tex
 -% from hyphen-turkish:
 -turkish loadhyph-tr.tex
 -% from hyphen-turkmen:
diff --git a/print/tex-hyphen-base/patches/patch-ab b/print/tex-hyphen-base/patches/patch-ab
index ff03ba3f735..257de01d67a 100644
--- a/print/tex-hyphen-base/patches/patch-ab
+++ b/print/tex-hyphen-base/patches/patch-ab
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.9 2012/10/14 21:49:29 minskim Exp $
+$NetBSD: patch-ab,v 1.10 2013/11/17 17:06:23 minskim Exp $
 
---- texmf/tex/generic/config/language.def.orig	2012-06-06 02:37:02.000000000 +0000
-+++ texmf/tex/generic/config/language.def
-@@ -28,148 +28,6 @@
+--- tex/generic/config/language.def.orig	2013-07-08 01:19:23.000000000 +0000
++++ tex/generic/config/language.def
+@@ -28,156 +28,6 @@
  \addlanguage {USenglish}{hyphen}{}{2}{3} %%% This MUST be the first non-comment
                                           %%% line of the file
  
 -% from dehyph-exptl:
--\addlanguage{german-x-2012-05-30}{dehypht-x-2012-05-30.tex}{}{2}{2}
--\addlanguage{german-x-latest}{dehypht-x-2012-05-30.tex}{}{2}{2}
--\addlanguage{ngerman-x-2012-05-30}{dehyphn-x-2012-05-30.tex}{}{2}{2}
--\addlanguage{ngerman-x-latest}{dehyphn-x-2012-05-30.tex}{}{2}{2}
+-\addlanguage{german-x-2013-05-26}{dehypht-x-2013-05-26.tex}{}{2}{2}
+-\addlanguage{german-x-latest}{dehypht-x-2013-05-26.tex}{}{2}{2}
+-\addlanguage{ngerman-x-2013-05-26}{dehyphn-x-2013-05-26.tex}{}{2}{2}
+-\addlanguage{ngerman-x-latest}{dehyphn-x-2013-05-26.tex}{}{2}{2}
 -% from hyphen-afrikaans:
 -\addlanguage{afrikaans}{loadhyph-af.tex}{}{1}{2}
 -% from hyphen-ancientgreek:
@@ -64,6 +64,8 @@ $NetBSD: patch-ab,v 1.9 2012/10/14 21:49:29 minskim Exp $
 -\addlanguage{friulan}{loadhyph-fur.tex}{}{2}{2}
 -% from hyphen-galician:
 -\addlanguage{galician}{loadhyph-gl.tex}{}{2}{2}
+-% from hyphen-georgian:
+-\addlanguage{georgian}{loadhyph-ka.tex}{}{2}{3}
 -% from hyphen-german:
 -\addlanguage{german}{loadhyph-de-1901.tex}{}{2}{2}
 -\addlanguage{ngerman}{loadhyph-de-1996.tex}{}{2}{2}
@@ -112,11 +114,15 @@ $NetBSD: patch-ab,v 1.9 2012/10/14 21:49:29 minskim Exp $
 -\addlanguage{norwegian}{loadhyph-nb.tex}{}{2}{2}
 -\addlanguage{norsk}{loadhyph-nb.tex}{}{2}{2}
 -\addlanguage{nynorsk}{loadhyph-nn.tex}{}{2}{2}
+-% from hyphen-piedmontese:
+-\addlanguage{piedmontese}{loadhyph-pms.tex}{}{2}{2}
 -% from hyphen-polish:
 -\addlanguage{polish}{loadhyph-pl.tex}{}{2}{2}
 -% from hyphen-portuguese:
 -\addlanguage{portuguese}{loadhyph-pt.tex}{}{2}{3}
 -\addlanguage{portuges}{loadhyph-pt.tex}{}{2}{3}
+-\addlanguage{brazil}{loadhyph-pt.tex}{}{2}{3}
+-\addlanguage{brazilian}{loadhyph-pt.tex}{}{2}{3}
 -% from hyphen-romanian:
 -\addlanguage{romanian}{loadhyph-ro.tex}{}{2}{2}
 -% from hyphen-romansh:
@@ -124,7 +130,7 @@ $NetBSD: patch-ab,v 1.9 2012/10/14 21:49:29 minskim Exp $
 -% from hyphen-russian:
 -\addlanguage{russian}{loadhyph-ru.tex}{}{2}{2}
 -% from hyphen-sanskrit:
--\addlanguage{sanskrit}{loadhyph-sa.tex}{}{1}{5}
+-\addlanguage{sanskrit}{loadhyph-sa.tex}{}{1}{3}
 -% from hyphen-serbian:
 -\addlanguage{serbian}{loadhyph-sr-latn.tex}{}{2}{2}
 -\addlanguage{serbianc}{loadhyph-sr-cyrl.tex}{}{2}{2}
@@ -138,6 +144,8 @@ $NetBSD: patch-ab,v 1.9 2012/10/14 21:49:29 minskim Exp $
 -\addlanguage{espanol}{loadhyph-es.tex}{}{2}{2}
 -% from hyphen-swedish:
 -\addlanguage{swedish}{loadhyph-sv.tex}{}{2}{2}
+-% from hyphen-thai:
+-\addlanguage{thai}{loadhyph-th.tex}{}{2}{3}
 -% from hyphen-turkish:
 -\addlanguage{turkish}{loadhyph-tr.tex}{}{2}{2}
 -% from hyphen-turkmen:
diff --git a/print/tex-hyphen-base/patches/patch-ac b/print/tex-hyphen-base/patches/patch-ac
index 451f39a3caa..1cba9f58235 100644
--- a/print/tex-hyphen-base/patches/patch-ac
+++ b/print/tex-hyphen-base/patches/patch-ac
@@ -1,22 +1,22 @@
-$NetBSD: patch-ac,v 1.7 2012/10/14 21:49:29 minskim Exp $
+$NetBSD: patch-ac,v 1.8 2013/11/17 17:06:23 minskim Exp $
 
---- texmf/tex/generic/config/language.dat.lua.orig	2012-06-06 02:37:05.000000000 +0000
-+++ texmf/tex/generic/config/language.dat.lua
-@@ -33,638 +33,4 @@ return {
+--- tex/generic/config/language.dat.lua.orig	2013-07-08 01:19:27.000000000 +0000
++++ tex/generic/config/language.dat.lua
+@@ -33,665 +33,4 @@ return {
          -- dumylang and zerohyph are dumped in the format,
          -- since they contain either very few or no patterns at all
  -- END of language.us.lua (missing '}' appended after all entries)
 --- from dehyph-exptl:
--	['german-x-2012-05-30'] = {
--		loader = 'dehypht-x-2012-05-30.tex',
+-	['german-x-2013-05-26'] = {
+-		loader = 'dehypht-x-2013-05-26.tex',
 -		lefthyphenmin = 2,
 -		righthyphenmin = 2,
 -		synonyms = { 'german-x-latest' },
 -		patterns = 'hyph-de-1901.pat.txt',
 -		hyphenation = 'hyph-de-1901.hyp.txt',
 -	},
--	['ngerman-x-2012-05-30'] = {
--		loader = 'dehyphn-x-2012-05-30.tex',
+-	['ngerman-x-2013-05-26'] = {
+-		loader = 'dehyphn-x-2013-05-26.tex',
 -		lefthyphenmin = 2,
 -		righthyphenmin = 2,
 -		synonyms = { 'ngerman-x-latest' },
@@ -234,6 +234,15 @@ $NetBSD: patch-ac,v 1.7 2012/10/14 21:49:29 minskim Exp $
 -		patterns = 'hyph-gl.pat.txt',
 -		hyphenation = '',
 -	},
+--- from hyphen-georgian:
+-	['georgian'] = {
+-		loader = 'loadhyph-ka.tex',
+-		lefthyphenmin = 2,
+-		righthyphenmin = 3,
+-		synonyms = {  },
+-		patterns = 'hyph-ka.pat.txt',
+-		hyphenation = '',
+-	},
 --- from hyphen-german:
 -	['german'] = {
 -		loader = 'loadhyph-de-1901.tex',
@@ -488,6 +497,15 @@ $NetBSD: patch-ac,v 1.7 2012/10/14 21:49:29 minskim Exp $
 -		patterns = 'hyph-nn.pat.txt',
 -		hyphenation = 'hyph-nn.hyp.txt',
 -	},
+--- from hyphen-piedmontese:
+-	['piedmontese'] = {
+-		loader = 'loadhyph-pms.tex',
+-		lefthyphenmin = 2,
+-		righthyphenmin = 2,
+-		synonyms = {  },
+-		patterns = 'hyph-pms.pat.txt',
+-		hyphenation = '',
+-	},
 --- from hyphen-polish:
 -	['polish'] = {
 -		loader = 'loadhyph-pl.tex',
@@ -502,7 +520,7 @@ $NetBSD: patch-ac,v 1.7 2012/10/14 21:49:29 minskim Exp $
 -		loader = 'loadhyph-pt.tex',
 -		lefthyphenmin = 2,
 -		righthyphenmin = 3,
--		synonyms = { 'portuges' },
+-		synonyms = { 'portuges', 'brazil', 'brazilian' },
 -		patterns = 'hyph-pt.pat.txt',
 -		hyphenation = 'hyph-pt.hyp.txt',
 -	},
@@ -537,7 +555,7 @@ $NetBSD: patch-ac,v 1.7 2012/10/14 21:49:29 minskim Exp $
 -	['sanskrit'] = {
 -		loader = 'loadhyph-sa.tex',
 -		lefthyphenmin = 1,
--		righthyphenmin = 5,
+-		righthyphenmin = 3,
 -		synonyms = {  },
 -		patterns = 'hyph-sa.pat.txt',
 -		hyphenation = '',
@@ -595,6 +613,15 @@ $NetBSD: patch-ac,v 1.7 2012/10/14 21:49:29 minskim Exp $
 -		patterns = 'hyph-sv.pat.txt',
 -		hyphenation = '',
 -	},
+--- from hyphen-thai:
+-	['thai'] = {
+-		loader = 'loadhyph-th.tex',
+-		lefthyphenmin = 2,
+-		righthyphenmin = 3,
+-		synonyms = {  },
+-		patterns = 'hyph-th.pat.txt',
+-		hyphenation = '',
+-	},
 --- from hyphen-turkish:
 -	['turkish'] = {
 -		loader = 'loadhyph-tr.tex',