Update tex-hyphen-base to 2011. No functional change.

5 files changed, 47 insertions, 38 deletions

diff --git a/print/tex-hyphen-base/Makefile b/print/tex-hyphen-base/Makefile
index f33b9396eda..35a72fb2bb8 100644
--- a/print/tex-hyphen-base/Makefile
+++ b/print/tex-hyphen-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2011/01/22 21:18:16 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2011/12/11 20:30:24 minskim Exp $
 
 DISTNAME=	hyphen-base
-PKGNAME=	tex-${DISTNAME}-2010
-PKGREVISION=	1
-TEXLIVE_REV=	21066
+PKGNAME=	tex-${DISTNAME}-2011
+TEXLIVE_REV=	23418
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	TeX hyphenation patterns for English
diff --git a/print/tex-hyphen-base/distinfo b/print/tex-hyphen-base/distinfo
index 691b1521e0f..83c8dca4878 100644
--- a/print/tex-hyphen-base/distinfo
+++ b/print/tex-hyphen-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2011/01/22 21:18:16 minskim Exp $
+$NetBSD: distinfo,v 1.11 2011/12/11 20:30:24 minskim Exp $
 
-SHA1 (tex-hyphen-base-21066/hyphen-base.tar.xz) = 1364ba44d20a9278885159d8e634865ca4b5f7ce
-RMD160 (tex-hyphen-base-21066/hyphen-base.tar.xz) = f4bb4998da150de3591039b9089cadc7a9bb714e
-Size (tex-hyphen-base-21066/hyphen-base.tar.xz) = 21888 bytes
-SHA1 (patch-aa) = a50794d49e6ef8fb70e30eeebbceac42525a76dc
-SHA1 (patch-ab) = 8c3d20c1d37ad4113f1c281c80601af98237a529
-SHA1 (patch-ac) = 4746fa094f27035214143b2150037f4fe0e4365a
+SHA1 (tex-hyphen-base-23418/hyphen-base.tar.xz) = a4842c79e746ac6ec67b1256bdb9c4a859727df2
+RMD160 (tex-hyphen-base-23418/hyphen-base.tar.xz) = 7ea94cd5110829ef46be3ca9225463b7b1817a63
+Size (tex-hyphen-base-23418/hyphen-base.tar.xz) = 21928 bytes
+SHA1 (patch-aa) = 7309a9e81a561d673fcff9d0217bbca8008be536
+SHA1 (patch-ab) = e3b3a391bb75395d241882215b1f3728de66ccfd
+SHA1 (patch-ac) = 72c5fb5ef654063706f68589b1d8af384950f1fb
diff --git a/print/tex-hyphen-base/patches/patch-aa b/print/tex-hyphen-base/patches/patch-aa
index e7fc39474bf..f3fe0fe4f5d 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.7 2011/01/22 21:18:16 minskim Exp $
+$NetBSD: patch-aa,v 1.8 2011/12/11 20:30:24 minskim Exp $
 
---- texmf/tex/generic/config/language.dat.orig	2011-01-14 03:13:12.000000000 +0000
+--- texmf/tex/generic/config/language.dat.orig	2011-08-05 02:26:40.000000000 +0000
 +++ texmf/tex/generic/config/language.dat
-@@ -57,142 +57,3 @@ english		hyphen.tex  % do not change!
+@@ -57,143 +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-2009-06-19 dehypht-x-2009-06-19.tex
+-german-x-2011-07-01 dehypht-x-2011-07-01.tex
 -=german-x-latest
--ngerman-x-2009-06-19 dehyphn-x-2009-06-19.tex
+-ngerman-x-2011-07-01 dehyphn-x-2011-07-01.tex
 -=ngerman-x-latest
 -% from hyphen-afrikaans:
 -afrikaans loadhyph-af.tex
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.7 2011/01/22 21:18:16 minskim Exp $
 -% from hyphen-catalan:
 -catalan loadhyph-ca.tex
 -% from hyphen-chinese:
--pinyin loadhyph-zh-latn.tex
+-pinyin loadhyph-zh-latn-pinyin.tex
 -% from hyphen-coptic:
 -coptic loadhyph-cop.tex
 -% from hyphen-croatian:
@@ -125,6 +125,7 @@ $NetBSD: patch-aa,v 1.7 2011/01/22 21:18:16 minskim Exp $
 -sanskrit loadhyph-sa.tex
 -% from hyphen-serbian:
 -serbian loadhyph-sr-latn.tex
+-serbianc loadhyph-sr-cyrl.tex
 -% from hyphen-slovak:
 -slovak loadhyph-sk.tex
 -% from hyphen-slovenian:
diff --git a/print/tex-hyphen-base/patches/patch-ab b/print/tex-hyphen-base/patches/patch-ab
index f7c82800c9c..8bd1abc51b6 100644
--- a/print/tex-hyphen-base/patches/patch-ab
+++ b/print/tex-hyphen-base/patches/patch-ab
@@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.7 2011/01/22 21:18:16 minskim Exp $
+$NetBSD: patch-ab,v 1.8 2011/12/11 20:30:24 minskim Exp $
 
---- texmf/tex/generic/config/language.def.orig	2011-01-14 03:13:16.000000000 +0000
+--- texmf/tex/generic/config/language.def.orig	2011-08-05 02:26:43.000000000 +0000
 +++ texmf/tex/generic/config/language.def
-@@ -28,145 +28,6 @@
+@@ -28,146 +28,6 @@
  \addlanguage {USenglish}{hyphen}{}{2}{3} %%% This MUST be the first non-comment
                                           %%% line of the file
  
 -% from dehyph-exptl:
--\addlanguage{german-x-2009-06-19}{dehypht-x-2009-06-19.tex}{}{2}{2}
--\addlanguage{german-x-latest}{dehypht-x-2009-06-19.tex}{}{2}{2}
--\addlanguage{ngerman-x-2009-06-19}{dehyphn-x-2009-06-19.tex}{}{2}{2}
--\addlanguage{ngerman-x-latest}{dehyphn-x-2009-06-19.tex}{}{2}{2}
+-\addlanguage{german-x-2011-07-01}{dehypht-x-2011-07-01.tex}{}{2}{2}
+-\addlanguage{german-x-latest}{dehypht-x-2011-07-01.tex}{}{2}{2}
+-\addlanguage{ngerman-x-2011-07-01}{dehyphn-x-2011-07-01.tex}{}{2}{2}
+-\addlanguage{ngerman-x-latest}{dehyphn-x-2011-07-01.tex}{}{2}{2}
 -% from hyphen-afrikaans:
--\addlanguage{afrikaans}{loadhyph-af.tex}{}{2}{2}
+-\addlanguage{afrikaans}{loadhyph-af.tex}{}{1}{2}
 -% from hyphen-ancientgreek:
 -\addlanguage{ancientgreek}{loadhyph-grc.tex}{}{1}{1}
 -\addlanguage{ibycus}{ibyhyph.tex}{}{2}{2}
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.7 2011/01/22 21:18:16 minskim Exp $
 -% from hyphen-catalan:
 -\addlanguage{catalan}{loadhyph-ca.tex}{}{2}{2}
 -% from hyphen-chinese:
--\addlanguage{pinyin}{loadhyph-zh-latn.tex}{}{1}{1}
+-\addlanguage{pinyin}{loadhyph-zh-latn-pinyin.tex}{}{1}{1}
 -% from hyphen-coptic:
 -\addlanguage{coptic}{loadhyph-cop.tex}{}{1}{1}
 -% from hyphen-croatian:
@@ -125,6 +125,7 @@ $NetBSD: patch-ab,v 1.7 2011/01/22 21:18:16 minskim Exp $
 -\addlanguage{sanskrit}{loadhyph-sa.tex}{}{1}{5}
 -% from hyphen-serbian:
 -\addlanguage{serbian}{loadhyph-sr-latn.tex}{}{2}{2}
+-\addlanguage{serbianc}{loadhyph-sr-cyrl.tex}{}{2}{2}
 -% from hyphen-slovak:
 -\addlanguage{slovak}{loadhyph-sk.tex}{}{2}{3}
 -% from hyphen-slovenian:
diff --git a/print/tex-hyphen-base/patches/patch-ac b/print/tex-hyphen-base/patches/patch-ac
index 96d18a5ac65..a5dabc73d9c 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.5 2011/01/22 21:18:17 minskim Exp $
+$NetBSD: patch-ac,v 1.6 2011/12/11 20:30:25 minskim Exp $
 
---- texmf/tex/generic/config/language.dat.lua.orig	2011-01-14 03:13:20.000000000 +0000
+--- texmf/tex/generic/config/language.dat.lua.orig	2011-08-05 02:26:45.000000000 +0000
 +++ texmf/tex/generic/config/language.dat.lua
-@@ -33,621 +33,4 @@ return {
+@@ -33,629 +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-2009-06-19'] = {
--		loader = 'dehypht-x-2009-06-19.tex',
+-	['german-x-2011-07-01'] = {
+-		loader = 'dehypht-x-2011-07-01.tex',
 -		lefthyphenmin = 2,
 -		righthyphenmin = 2,
 -		synonyms = { 'german-x-latest' },
 -		patterns = 'hyph-de-1901.pat.txt',
 -		hyphenation = 'hyph-de-1901.hyp.txt',
 -	},
--	['ngerman-x-2009-06-19'] = {
--		loader = 'dehyphn-x-2009-06-19.tex',
+-	['ngerman-x-2011-07-01'] = {
+-		loader = 'dehyphn-x-2011-07-01.tex',
 -		lefthyphenmin = 2,
 -		righthyphenmin = 2,
 -		synonyms = { 'ngerman-x-latest' },
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.5 2011/01/22 21:18:17 minskim Exp $
 --- from hyphen-afrikaans:
 -	['afrikaans'] = {
 -		loader = 'loadhyph-af.tex',
--		lefthyphenmin = 2,
+-		lefthyphenmin = 1,
 -		righthyphenmin = 2,
 -		synonyms = {  },
 -		patterns = 'hyph-af.pat.txt',
@@ -94,11 +94,11 @@ $NetBSD: patch-ac,v 1.5 2011/01/22 21:18:17 minskim Exp $
 -	},
 --- from hyphen-chinese:
 -	['pinyin'] = {
--		loader = 'loadhyph-zh-latn.tex',
+-		loader = 'loadhyph-zh-latn-pinyin.tex',
 -		lefthyphenmin = 1,
 -		righthyphenmin = 1,
 -		synonyms = {  },
--		patterns = 'hyph-zh-latn.pat.txt',
+-		patterns = 'hyph-zh-latn-pinyin.pat.txt',
 -		hyphenation = '',
 -	},
 --- from hyphen-coptic:
@@ -539,8 +539,16 @@ $NetBSD: patch-ac,v 1.5 2011/01/22 21:18:17 minskim Exp $
 -		lefthyphenmin = 2,
 -		righthyphenmin = 2,
 -		synonyms = {  },
--		patterns = 'hyph-sr-latn.pat.txt',
--		hyphenation = 'hyph-sr-latn.hyp.txt',
+-		patterns = 'hyph-sh-latn.pat.txt,hyph-sh-cyrl.pat.txt',
+-		hyphenation = 'hyph-sh-latn.hyp.txt,hyph-sh-cyrl.hyp.txt',
+-	},
+-	['serbianc'] = {
+-		loader = 'loadhyph-sr-cyrl.tex',
+-		lefthyphenmin = 2,
+-		righthyphenmin = 2,
+-		synonyms = {  },
+-		patterns = 'hyph-sh-latn.pat.txt,hyph-sh-cyrl.pat.txt',
+-		hyphenation = 'hyph-sh-latn.hyp.txt,hyph-sh-cyrl.hyp.txt',
 -	},
 --- from hyphen-slovak:
 -	['slovak'] = {