Let teTeX-texmf register its map files and hyphenation patterns using

map.mk and hyphen.mk.  With this change, language.dat and language.def
are handled propertly through CONF_FILES.

Bump PKGREVISION for teTeX-texmf and teTeX-bin.

2 files changed, 113 insertions, 33 deletions

diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index d255cbbdd11..b5fb7105430 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2009/02/17 21:09:54 minskim Exp $
+# $NetBSD: Makefile,v 1.24 2009/03/06 20:41:02 minskim Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -15,6 +15,26 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 NOT_FOR_BULK_PLATFORM=	HPUX-*-*
 
 CONFLICTS+=	teTeX-share-[0-9]*
+DEPENDS+=	tex-bin-kpathsea-[0-9]*:../../print/tex-bin-kpathsea
+
+EXTRACT_ELEMENTS+=	ChangeLog
+EXTRACT_ELEMENTS+=	LICENSE.texmf
+EXTRACT_ELEMENTS+=	aliases
+EXTRACT_ELEMENTS+=	bibtex
+EXTRACT_ELEMENTS+=	context
+EXTRACT_ELEMENTS+=	doc
+EXTRACT_ELEMENTS+=	dvipdfm
+EXTRACT_ELEMENTS+=	dvips
+EXTRACT_ELEMENTS+=	fonts
+EXTRACT_ELEMENTS+=	makeindex
+EXTRACT_ELEMENTS+=	metafont
+EXTRACT_ELEMENTS+=	metapost
+EXTRACT_ELEMENTS+=	mft
+EXTRACT_ELEMENTS+=	omega
+EXTRACT_ELEMENTS+=	release-tetex-texmf.txt
+EXTRACT_ELEMENTS+=	scripts
+EXTRACT_ELEMENTS+=	tex
+EXTRACT_ELEMENTS+=	texdoctk
 
 WRKSRC=		${WRKDIR}/tetex
 EXTRACT_DIR=	${WRKSRC}
@@ -27,12 +47,96 @@ CHECK_INTERPRETER_SKIP+=share/texmf-dist/doc/generic/ruhyphen/reduce-patt \
 REPLACE_SH+=	doc/latex/bibunits/bibtexall doc/latex/multibib/bibtexall
 USE_TOOLS+=	sh:run pax
 
+TEX_HYPHEN_DAT+=	french frhyph.tex
+TEX_HYPHEN_DAT+=	= patois
+TEX_HYPHEN_DAT+=	german dehypht.tex
+TEX_HYPHEN_DAT+=	= austrian
+TEX_HYPHEN_DAT+=	ngerman dehyphn.tex
+TEX_HYPHEN_DAT+=	= naustrian
+TEX_HYPHEN_DAT+=	bahasa inhyph.tex
+TEX_HYPHEN_DAT+=	basque	bahyph.tex
+TEX_HYPHEN_DAT+=	bulgarian bghyphen.tex
+TEX_HYPHEN_DAT+=	catalan cahyph.tex
+TEX_HYPHEN_DAT+=	croatian hrhyph.tex
+TEX_HYPHEN_DAT+=	czech czhyph.tex
+TEX_HYPHEN_DAT+=	danish dkhyphen.tex
+TEX_HYPHEN_DAT+=	dutch nehyph.tex
+TEX_HYPHEN_DAT+=	esperanto eohyph.tex
+TEX_HYPHEN_DAT+=	estonian eehyph.tex
+TEX_HYPHEN_DAT+=	finnish fi8hyph.tex
+TEX_HYPHEN_DAT+=	greek grhyph.tex
+TEX_HYPHEN_DAT+=	icelandic icehyph.tex
+TEX_HYPHEN_DAT+=	irish gahyph.tex
+TEX_HYPHEN_DAT+=	italian ithyph.tex
+TEX_HYPHEN_DAT+=	latin lahyph.tex
+TEX_HYPHEN_DAT+=	magyar huhyphn.tex
+TEX_HYPHEN_DAT+=	norsk nohyphbx.tex
+TEX_HYPHEN_DAT+=	polish plhyph.tex
+TEX_HYPHEN_DAT+=	portuges pt8hyph.tex
+TEX_HYPHEN_DAT+=	romanian rohyphen.tex
+TEX_HYPHEN_DAT+=	russian ruhyphen.tex
+TEX_HYPHEN_DAT+=	serbian srhyphc.tex
+TEX_HYPHEN_DAT+=	slovak skhyph.tex
+TEX_HYPHEN_DAT+=	slovene sihyph23.tex
+TEX_HYPHEN_DAT+=	spanish eshyph.tex
+TEX_HYPHEN_DAT+=	swedish sehyph.tex
+TEX_HYPHEN_DAT+=	turkish trhyph.tex
+TEX_HYPHEN_DAT+=	ukrainian ukrhyph.tex
+TEX_MAP_FILES+=		antp.map
+TEX_MAP_FILES+=		cork-antt.map
+TEX_MAP_FILES+=		cs-antt.map
+TEX_MAP_FILES+=		exp-antt.map
+TEX_MAP_FILES+=		greek-antt.map
+TEX_MAP_FILES+=		qx-antt.map
+TEX_MAP_FILES+=		t2a-antt.map
+TEX_MAP_FILES+=		t2b-antt.map
+TEX_MAP_FILES+=		t2c-antt.map
+TEX_MAP_FILES+=		t5-antt.map
+TEX_MAP_FILES+=		texnansi-antt.map
+TEX_MAP_FILES+=		wncy-antt.map
+TEX_MAP_FILES+=		qbk.map
+TEX_MAP_FILES+=		qcr.map
+TEX_MAP_FILES+=		qhv.map
+TEX_MAP_FILES+=		qpl.map
+TEX_MAP_FILES+=		qtm.map
+TEX_MAP_FILES+=		qzc.map
+TEX_MAP_FILES+=		charter.map
+TEX_MAP_FILES+=		cmcyr.map
+TEX_MAP_FILES+=		contnav.map
+TEX_MAP_FILES+=		cork-lm.map
+TEX_MAP_FILES+=		qx-lm.map
+TEX_MAP_FILES+=		texnansi-lm.map
+TEX_MAP_FILES+=		ts1-lm.map
+TEX_MAP_FILES+=		marvosym.map
+TEX_MAP_FILES+=		mathpple.map
+TEX_MAP_FILES+=		omega.map
+TEX_MAP_FILES+=		pazo.map
+TEX_MAP_FILES+=		pxfonts.map
+TEX_MAP_FILES+=		txfonts.map
+TEX_MAP_FILES+=		xypic.map
+TEX_MAP_FILES+=		mt-belleek.map
+TEX_MAP_FILES+=		urwvn.map
+TEX_MAP_FILES+=		dstroke.map
+TEX_MAP_FILES+=		fpls.map
+TEX_MIXEDMAP_FILES+=	ttcmex.map
+TEX_MIXEDMAP_FILES+=	bsr.map
+TEX_MIXEDMAP_FILES+=	bsr-interpolated.map
+TEX_MIXEDMAP_FILES+=	cs.map
+TEX_MIXEDMAP_FILES+=	hoekwater.map
+TEX_MIXEDMAP_FILES+=	pl.map
+TEX_MIXEDMAP_FILES+=	ccpl.map
+TEX_MIXEDMAP_FILES+=	eurosym.map
+TEX_MIXEDMAP_FILES+=	vnr.map
+
 .include "../../print/kpathsea/texmf.mk"
+.include "../../print/texlive-tetex/hyphen.mk"
+.include "../../print/texlive-tetex/map.mk"
 
 post-extract:
 	rm -f ${WRKSRC}/ls-R
 	rmdir ${WRKSRC}/doc/generic/pdfcrop
 	rm -rf ${WRKSRC}/dvips/config
+	rm -rf ${WRKSRC}/dvips/tetex
 	rmdir ${WRKSRC}/fonts/cmap
 	rmdir ${WRKSRC}/fonts/lig
 	rmdir ${WRKSRC}/fonts/map/dvipdfm/updmap
@@ -45,7 +149,6 @@ post-extract:
 	rmdir ${WRKSRC}/fonts/truetype
 	rmdir ${WRKSRC}/fonts/type3
 	rmdir ${WRKSRC}/fonts/type42
-	rm -rf ${WRKSRC}/dvips/tetex
 	rm -rf ${WRKSRC}/fonts/enc/dvipdfm/tetex
 	rm -rf ${WRKSRC}/fonts/enc/dvips/tetex
 	rm -f ${WRKSRC}/fonts/map/dvipdfm/tetex/cm-dvipdfm-fix.map
@@ -57,6 +160,12 @@ post-extract:
 	rm -f ${WRKSRC}/fonts/map/dvips/tetex/mt-yy.map
 	rm -f ${WRKSRC}/fonts/map/dvips/tetex/pdftex35.map
 	rm -f ${WRKSRC}/fonts/map/dvips/tetex/ps2pk35.map
+	rm -f ${WRKSRC}/tex/generic/config/language.dat
+	rm -f ${WRKSRC}/tex/generic/hyphen/dumyhyph.tex
+	rm -f ${WRKSRC}/tex/generic/hyphen/hyphen.tex
+	rm -f ${WRKSRC}/tex/generic/hyphen/hypht1.tex
+	rm -f ${WRKSRC}/tex/generic/hyphen/zerohyph.tex
+	rm -f ${WRKSRC}/tex/plain/config/language.def
 
 do-install:
 	cd ${WRKSRC} && pax -wr -s ',.*\.orig$$,,' * ${DESTDIR}${PREFIX}/share/texmf-dist
diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST
index dc11b2e5676..1afda96ea39 100644
--- a/print/teTeX3-texmf/PLIST
+++ b/print/teTeX3-texmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/02/17 21:09:54 minskim Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/03/06 20:41:02 minskim Exp $
 share/texmf-dist/ChangeLog
 share/texmf-dist/LICENSE.texmf
 share/texmf-dist/aliases
@@ -11737,7 +11737,6 @@ share/texmf-dist/tex/generic/bghyph/catmik.tex
 share/texmf-dist/tex/generic/bghyph/mik2t2.tex
 share/texmf-dist/tex/generic/config/fontmath.cfg
 share/texmf-dist/tex/generic/config/fonttext.cfg
-share/texmf-dist/tex/generic/config/language.dat
 share/texmf-dist/tex/generic/config/pdftexconfig.tex
 share/texmf-dist/tex/generic/config/preload.cfg
 share/texmf-dist/tex/generic/context/m-ch-de.tex
@@ -11812,7 +11811,6 @@ share/texmf-dist/tex/generic/hyphen/dehypht.tex
 share/texmf-dist/tex/generic/hyphen/dkcommon.tex
 share/texmf-dist/tex/generic/hyphen/dkhyphen.tex
 share/texmf-dist/tex/generic/hyphen/dkspecial.tex
-share/texmf-dist/tex/generic/hyphen/dumyhyph.tex
 share/texmf-dist/tex/generic/hyphen/eehyph.tex
 share/texmf-dist/tex/generic/hyphen/eohyph.tex
 share/texmf-dist/tex/generic/hyphen/eshyph.tex
@@ -11824,8 +11822,6 @@ share/texmf-dist/tex/generic/hyphen/grhyph.tex
 share/texmf-dist/tex/generic/hyphen/hrhyph.tex
 share/texmf-dist/tex/generic/hyphen/huhyph.tex
 share/texmf-dist/tex/generic/hyphen/huhyphn.tex
-share/texmf-dist/tex/generic/hyphen/hyphen.tex
-share/texmf-dist/tex/generic/hyphen/hypht1.tex
 share/texmf-dist/tex/generic/hyphen/icehyph.tex
 share/texmf-dist/tex/generic/hyphen/inhyph.tex
 share/texmf-dist/tex/generic/hyphen/ithyph.tex
@@ -11845,7 +11841,6 @@ share/texmf-dist/tex/generic/hyphen/skhyph.tex
 share/texmf-dist/tex/generic/hyphen/skhyph2e.tex
 share/texmf-dist/tex/generic/hyphen/srhyphc.tex
 share/texmf-dist/tex/generic/hyphen/trhyph.tex
-share/texmf-dist/tex/generic/hyphen/zerohyph.tex
 share/texmf-dist/tex/generic/localloc/localloc.sty
 share/texmf-dist/tex/generic/mfpic/dvipsnam.mp
 share/texmf-dist/tex/generic/mfpic/grafbase.mp
@@ -13640,7 +13635,6 @@ share/texmf-dist/tex/plain/btxmac/btxmac.tex
 share/texmf-dist/tex/plain/config/aleph.ini
 share/texmf-dist/tex/plain/config/bplain.ini
 share/texmf-dist/tex/plain/config/etex.ini
-share/texmf-dist/tex/plain/config/language.def
 share/texmf-dist/tex/plain/config/omega.ini
 share/texmf-dist/tex/plain/config/pdfbplain.ini
 share/texmf-dist/tex/plain/config/pdfetex.ini
@@ -13720,26 +13714,3 @@ share/texmf-dist/tex/texinfo/txi-tr.tex
 share/texmf-dist/tex/texinfo/vntexinfo.tex
 share/texmf-dist/texdoctk/texdocrc.defaults
 share/texmf-dist/texdoctk/texdoctk.dat
-share/texmf-dist/web2c/amiga-pl.tcx
-share/texmf-dist/web2c/cp1250cs.tcx
-share/texmf-dist/web2c/cp1250pl.tcx
-share/texmf-dist/web2c/cp1250t1.tcx
-share/texmf-dist/web2c/cp227.tcx
-share/texmf-dist/web2c/cp852-cs.tcx
-share/texmf-dist/web2c/cp852-pl.tcx
-share/texmf-dist/web2c/cp8bit.tcx
-share/texmf-dist/web2c/il1-t1.tcx
-share/texmf-dist/web2c/il2-cs.tcx
-share/texmf-dist/web2c/il2-pl.tcx
-share/texmf-dist/web2c/il2-t1.tcx
-share/texmf-dist/web2c/kam-cs.tcx
-share/texmf-dist/web2c/kam-t1.tcx
-share/texmf-dist/web2c/macce-cs.tcx
-share/texmf-dist/web2c/macce-pl.tcx
-share/texmf-dist/web2c/macce-t1.tcx
-share/texmf-dist/web2c/maz-pl.tcx
-share/texmf-dist/web2c/mktex.cnf
-share/texmf-dist/web2c/natural.tcx
-share/texmf-dist/web2c/tcvn-t5.tcx
-share/texmf-dist/web2c/updmap.cfg
-share/texmf-dist/web2c/viscii-t5.tcx