Depend on more stuff, install less.

2 files changed, 84 insertions, 182 deletions

diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 561f0ec2754..e99efe9a229 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2015/05/08 13:22:52 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2015/05/16 13:02:11 markd Exp $
 
 DISTNAME=	tetex-texmf-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=	54
+PKGREVISION=	55
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/}
 
@@ -20,10 +20,11 @@ DEPENDS+=	tex-acronym-[0-9]*:../../print/tex-acronym
 DEPENDS+=	tex-adrconv-[0-9]*:../../print/tex-adrconv
 DEPENDS+=	tex-advdate-[0-9]*:../../print/tex-advdate
 DEPENDS+=	tex-aeguill-[0-9]*:../../print/tex-aeguill
+DEPENDS+=	tex-algorithms-[0-9]*:../../print/tex-algorithms
+DEPENDS+=	tex-amstex-[0-9]*:../../print/tex-amstex
 DEPENDS+=	tex-anonchap-[0-9]*:../../print/tex-anonchap
 DEPENDS+=	tex-antt-[0-9]*:../../fonts/tex-antt
 DEPENDS+=	tex-anysize-[0-9]*:../../print/tex-anysize
-DEPENDS+=	tex-algorithms-[0-9]*:../../print/tex-algorithms
 DEPENDS+=	tex-appendix-[0-9]*:../../print/tex-appendix
 DEPENDS+=	tex-bbm-[0-9]*:../../fonts/tex-bbm
 DEPENDS+=	tex-bbm-macros-[0-9]*:../../print/tex-bbm-macros
@@ -41,6 +42,7 @@ DEPENDS+=	tex-boxedminipage-[0-9]*:../../print/tex-boxedminipage
 DEPENDS+=	tex-braket-[0-9]*:../../print/tex-braket
 DEPENDS+=	tex-breakcites-[0-9]*:../../print/tex-breakcites
 DEPENDS+=	tex-breqn-[0-9]*:../../print/tex-breqn
+DEPENDS+=	tex-calrsfs-[0-9]*:../../print/tex-calrsfs
 DEPENDS+=	tex-cancel-[0-9]*:../../print/tex-cancel
 DEPENDS+=	tex-capt-of-[0-9]*:../../print/tex-capt-of
 DEPENDS+=	tex-captdef-[0-9]*:../../print/tex-captdef
@@ -48,19 +50,18 @@ DEPENDS+=	tex-caption-[0-9]*:../../print/tex-caption
 DEPENDS+=	tex-cases-[0-9]*:../../print/tex-cases
 DEPENDS+=	tex-cbfonts-[0-9]*:../../fonts/tex-cbfonts
 DEPENDS+=	tex-cbfonts-fd-[0-9]*:../../fonts/tex-cbfonts-fd
+DEPENDS+=	tex-ccaption-[0-9]*:../../print/tex-ccaption
 DEPENDS+=	tex-ccfonts-[0-9]*:../../fonts/tex-ccfonts
 DEPENDS+=	tex-changebar-[0-9]*:../../print/tex-changebar
+DEPENDS+=	tex-changepage-[0-9]*:../../print/tex-changepage
+DEPENDS+=	tex-chappg-[0-9]*:../../print/tex-chappg
 DEPENDS+=	tex-chbibref-[0-9]*:../../print/tex-chbibref
 DEPENDS+=	tex-chngcntr-[0-9]*:../../print/tex-chngcntr
-DEPENDS+=	tex-changepage-[0-9]*:../../print/tex-changepage
 DEPENDS+=	tex-circle-[0-9]*:../../print/tex-circle
 DEPENDS+=	tex-cite-[0-9]*:../../print/tex-cite
 DEPENDS+=	tex-cmap-[0-9]*:../../print/tex-cmap
 DEPENDS+=	tex-cmbright-[0-9]*:../../fonts/tex-cmbright
 DEPENDS+=	tex-cmcyr>=2009:../../fonts/tex-cmcyr
-DEPENDS+=	texlive-collection-fontsrecommended>=2010:../../meta-pkgs/texlive-collection-fontsrecommended
-DEPENDS+=	texlive-collection-genericrecommended>=2010:../../meta-pkgs/texlive-collection-genericrecommended
-DEPENDS+=	texlive-collection-latex>=2010:../../meta-pkgs/texlive-collection-latex
 DEPENDS+=	tex-colortbl-[0-9]*:../../print/tex-colortbl
 DEPENDS+=	tex-comment-[0-9]*:../../print/tex-comment
 DEPENDS+=	tex-concmath-[0-9]*:../../fonts/tex-concmath
@@ -69,11 +70,15 @@ DEPENDS+=	tex-concrete-[0-9]*:../../fonts/tex-concrete
 DEPENDS+=	tex-context>=2009:../../print/tex-context
 DEPENDS+=	tex-crop-[0-9]*:../../print/tex-crop
 DEPENDS+=	tex-cs-[0-9]*:../../fonts/tex-cs
+DEPENDS+=	tex-curves-[0-9]*:../../print/tex-curves
+DEPENDS+=	tex-custom-bib-[0-9]*:../../print/tex-custom-bib
 DEPENDS+=	tex-cweb-[0-9]*:../../print/tex-cweb
 DEPENDS+=	tex-cyrillic>=2009:../../print/tex-cyrillic
 DEPENDS+=	tex-dblfloatfix-[0-9]*:../../print/tex-dblfloatfix
+DEPENDS+=	tex-dinbrief-[0-9]*:../../print/tex-dinbrief
 DEPENDS+=	tex-dk-bib-[0-9]*:../../print/tex-dk-bib
 DEPENDS+=	tex-doublestroke>=1.0:../../fonts/tex-doublestroke
+DEPENDS+=	tex-draftcopy-[0-9]*:../../print/tex-draftcopy
 DEPENDS+=	tex-ec>=1.0:../../fonts/tex-ec
 DEPENDS+=	tex-ecc>=1.0:../../fonts/tex-ecc
 DEPENDS+=	tex-eepic>=1.1e:../../graphics/tex-eepic
@@ -83,22 +88,27 @@ DEPENDS+=	tex-enumitem-[0-9]*:../../print/tex-enumitem
 DEPENDS+=	tex-esint-[0-9]*:../../fonts/tex-esint
 DEPENDS+=	tex-eso-pic-[0-9]*:../../print/tex-eso-pic
 DEPENDS+=	tex-ethiop-[0-9]*:../../print/tex-ethiop
-DEPENDS+=	tex-euxm-[0-9]*:../../fonts/tex-euxm
 DEPENDS+=	tex-eulervm-[0-9]*:../../fonts/tex-eulervm
+DEPENDS+=	tex-euxm-[0-9]*:../../fonts/tex-euxm
 DEPENDS+=	tex-exam-[0-9]*:../../print/tex-exam
 DEPENDS+=	tex-excludeonly-[0-9]*:../../print/tex-excludeonly
 DEPENDS+=	tex-extsizes-[0-9]*:../../print/tex-extsizes
 DEPENDS+=	tex-fancybox-[0-9]*:../../print/tex-fancybox
 DEPENDS+=	tex-fancyvrb-[0-9]*:../../print/tex-fancyvrb
+DEPENDS+=	tex-filecontents-[0-9]*:../../print/tex-filecontents
 DEPENDS+=	tex-float-[0-9]*:../../print/tex-float
+DEPENDS+=	tex-floatflt-[0-9]*:../../print/tex-floatflt
 DEPENDS+=	tex-fncylab-[0-9]*:../../print/tex-fncylab
 DEPENDS+=	tex-fnpara-[0-9]*:../../print/tex-fnpara
-DEPENDS+=	tex-footmisc-[0-9]*:../../print/tex-footmisc
 DEPENDS+=	tex-fontinst-[0-9]*:../../fonts/tex-fontinst
+DEPENDS+=	tex-footbib-[0-9]*:../../print/tex-footbib
+DEPENDS+=	tex-footmisc-[0-9]*:../../print/tex-footmisc
+DEPENDS+=	tex-footnpag-[0-9]*:../../print/tex-footnpag
 DEPENDS+=	tex-fp-[0-9]*:../../math/tex-fp
 DEPENDS+=	tex-framed-[0-9]*:../../print/tex-framed
 DEPENDS+=	tex-ftcap-[0-9]*:../../print/tex-ftcap
 DEPENDS+=	tex-fwlw-[0-9]*:../../print/tex-fwlw
+DEPENDS+=	tex-g-brief-[0-9]*:../../print/tex-g-brief
 DEPENDS+=	tex-germbib-[0-9]*:../../print/tex-germbib
 DEPENDS+=	tex-gothic-[0-9]*:../../fonts/tex-gothic
 DEPENDS+=	tex-graphics-pln-[0-9]*:../../graphics/tex-graphics-pln
@@ -137,21 +147,28 @@ DEPENDS+=	tex-hyphen-turkish-[0-9]*:../../print/tex-hyphen-turkish
 DEPENDS+=	tex-hyphen-ukrainian-[0-9]*:../../print/tex-hyphen-ukrainian
 DEPENDS+=	tex-hyphenat-[0-9]*:../../print/tex-hyphenat
 DEPENDS+=	tex-ifmtarg-[0-9]*:../../print/tex-ifmtarg
+DEPENDS+=	tex-import-[0-9]*:../../print/tex-import
 DEPENDS+=	tex-index-[0-9]*:../../print/tex-index
 DEPENDS+=	tex-jknapltx-[0-9]*:../../print/tex-jknapltx
 DEPENDS+=	tex-jurabib-[0-9]*:../../print/tex-jurabib
 DEPENDS+=	tex-kix-[0-9]*:../../print/tex-kix
 DEPENDS+=	tex-knuth-doc-[0-9]*:../../print/tex-knuth-doc
 DEPENDS+=	tex-koma-script-[0-9]*:../../print/tex-koma-script
+DEPENDS+=	tex-labels-[0-9]*:../../print/tex-labels
 DEPENDS+=	tex-lambda-[0-9]*:../../print/tex-lambda
 DEPENDS+=	tex-lastpage-[0-9]*:../../print/tex-lastpage
+DEPENDS+=	tex-layouts-[0-9]*:../../print/tex-layouts
+DEPENDS+=	tex-leftidx-[0-9]*:../../print/tex-leftidx
+DEPENDS+=	tex-lettrine-[0-9]*:../../print/tex-lettrine
+DEPENDS+=	tex-lh>=3.5g:../../fonts/tex-lh
 DEPENDS+=	tex-lineno-[0-9]*:../../print/tex-lineno
 DEPENDS+=	tex-listing-[0-9]*:../../print/tex-listing
 DEPENDS+=	tex-listings-[0-9]*:../../print/tex-listings
-DEPENDS+=	tex-lh>=3.5g:../../fonts/tex-lh
+DEPENDS+=	tex-ltabptch-[0-9]*:../../print/tex-ltabptch
 DEPENDS+=	tex-ly1-[0-9]*:../../fonts/tex-ly1
 DEPENDS+=	tex-magaz-[0-9]*:../../print/tex-magaz
 DEPENDS+=	tex-manfnt-[0-9]*:../../fonts/tex-manfnt
+DEPENDS+=	tex-mathcomp-[0-9]*:../../print/tex-mathcomp
 DEPENDS+=	tex-mathtools-[0-9]*:../../print/tex-mathtools
 DEPENDS+=	tex-mdwtools-[0-9]*:../../print/tex-mdwtools
 DEPENDS+=	tex-memoir-[0-9]*:../../print/tex-memoir
@@ -162,7 +179,9 @@ DEPENDS+=	tex-midpage-[0-9]*:../../print/tex-midpage
 DEPENDS+=	tex-misc209-[0-9]*:../../print/tex-misc209
 DEPENDS+=	tex-mltex-[0-9]*:../../print/tex-mltex
 DEPENDS+=	tex-moreverb-[0-9]*:../../print/tex-moreverb
+DEPENDS+=	tex-mparhack-[0-9]*:../../print/tex-mparhack
 DEPENDS+=	tex-ms-[0-9]*:../../print/tex-ms
+DEPENDS+=	tex-multibib-[0-9]*:../../print/tex-multibib
 DEPENDS+=	tex-multirow-[0-9]*:../../print/tex-multirow
 DEPENDS+=	tex-needspace-[0-9]*:../../print/tex-needspace
 DEPENDS+=	tex-nextpage-[0-9]*:../../print/tex-nextpage
@@ -172,12 +191,15 @@ DEPENDS+=	tex-ntheorem-[0-9]*:../../print/tex-ntheorem
 DEPENDS+=	tex-ocherokee-[0-9]*:../../fonts/tex-ocherokee
 DEPENDS+=	tex-oinuit-[0-9]*:../../print/tex-oinuit
 DEPENDS+=	tex-omega-[0-9]*:../../print/tex-omega
+DEPENDS+=	tex-onlyamsmath-[0-9]*:../../print/tex-onlyamsmath
 DEPENDS+=	tex-otibet-[0-9]*:../../print/tex-otibet
 DEPENDS+=	tex-oubraces-[0-9]*:../../print/tex-oubraces
 DEPENDS+=	tex-overpic-[0-9]*:../../print/tex-overpic
 DEPENDS+=	tex-paralist-[0-9]*:../../print/tex-paralist
+DEPENDS+=	tex-pb-diagram-[0-9]*:../../print/tex-pb-diagram
 DEPENDS+=	tex-pdfpages-[0-9]*:../../print/tex-pdfpages
 DEPENDS+=	tex-picinpar-[0-9]*:../../print/tex-picinpar
+DEPENDS+=	tex-pict2e-[0-9]*:../../print/tex-pict2e
 DEPENDS+=	tex-pictex-[0-9]*:../../graphics/tex-pictex
 DEPENDS+=	tex-pl-[0-9]*:../../fonts/tex-pl
 DEPENDS+=	tex-placeins-[0-9]*:../../print/tex-placeins
@@ -186,6 +208,7 @@ DEPENDS+=	tex-poltawski-[0-9]*:../../print/tex-poltawski
 DEPENDS+=	tex-preprint-[0-9]*:../../print/tex-preprint
 DEPENDS+=	tex-preview-[0-9]*:../../print/tex-preview
 DEPENDS+=	tex-printlen-[0-9]*:../../print/tex-printlen
+DEPENDS+=	tex-program-[0-9]*:../../print/tex-program
 DEPENDS+=	tex-psfrag-[0-9]*:../../print/tex-psfrag
 DEPENDS+=	tex-psgo-[0-9]*:../../graphics/tex-psgo
 DEPENDS+=	tex-pst-3d-[0-9]*:../../graphics/tex-pst-3d
@@ -195,10 +218,10 @@ DEPENDS+=	tex-pst-circ-[0-9]*:../../graphics/tex-pst-circ
 DEPENDS+=	tex-pst-coil-[0-9]*:../../graphics/tex-pst-coil
 DEPENDS+=	tex-pst-eps-[0-9]*:../../graphics/tex-pst-eps
 DEPENDS+=	tex-pst-fill-[0-9]*:../../graphics/tex-pst-fill
+DEPENDS+=	tex-pst-geo-[0-9]*:../../geography/tex-pst-geo
 DEPENDS+=	tex-pst-ghsb-[0-9]*:../../graphics/tex-pst-ghsb
 DEPENDS+=	tex-pst-gr3d-[0-9]*:../../graphics/tex-pst-gr3d
 DEPENDS+=	tex-pst-grad-[0-9]*:../../graphics/tex-pst-grad
-DEPENDS+=	tex-pst-geo-[0-9]*:../../geography/tex-pst-geo
 DEPENDS+=	tex-pst-lens-[0-9]*:../../graphics/tex-pst-lens
 DEPENDS+=	tex-pst-math-[0-9]*:../../graphics/tex-pst-math
 DEPENDS+=	tex-pst-node-[0-9]*:../../graphics/tex-pst-node
@@ -215,27 +238,38 @@ DEPENDS+=	tex-pstricks-add-[0-9]*:../../graphics/tex-pstricks-add
 DEPENDS+=	tex-relsize-[0-9]*:../../print/tex-relsize
 DEPENDS+=	tex-revtex4-[0-9]*:../../print/tex-revtex4
 DEPENDS+=	tex-rotating-[0-9]*:../../print/tex-rotating
+DEPENDS+=	tex-rotfloat-[0-9]*:../../print/tex-rotfloat
 DEPENDS+=	tex-sansmath-[0-9]*:../../print/tex-sansmath
 DEPENDS+=	tex-sauter-[0-9]*:../../fonts/tex-sauter
+DEPENDS+=	tex-scale-[0-9]*:../../print/tex-scale
 DEPENDS+=	tex-sectsty-[0-9]*:../../print/tex-sectsty
 DEPENDS+=	tex-selectp-[0-9]*:../../print/tex-selectp
 DEPENDS+=	tex-seminar-[0-9]*:../../print/tex-seminar
 DEPENDS+=	tex-setspace-[0-9]*:../../print/tex-setspace
+DEPENDS+=	tex-shapepar-[0-9]*:../../print/tex-shapepar
+DEPENDS+=	tex-showdim-[0-9]*:../../print/tex-showdim
+DEPENDS+=	tex-showlabels-[0-9]*:../../print/tex-showlabels
+DEPENDS+=	tex-sidecap-[0-9]*:../../print/tex-sidecap
 DEPENDS+=	tex-soul-[0-9]*:../../print/tex-soul
+DEPENDS+=	tex-stdclsdv-[0-9]*:../../print/tex-stdclsdv
 DEPENDS+=	tex-stmaryrd-[0-9]*:../../fonts/tex-stmaryrd
-DEPENDS+=	tex-subfigure-[0-9]*:../../print/tex-subfigure
 DEPENDS+=	tex-subfig-[0-9]*:../../print/tex-subfig
+DEPENDS+=	tex-subfigure-[0-9]*:../../print/tex-subfigure
 DEPENDS+=	tex-supertabular-[0-9]*:../../print/tex-supertabular
-DEPENDS+=	tex-tabls-[0-9]*:../../print/tex-tabls
 DEPENDS+=	tex-t2-[0-9]*:../../print/tex-t2
+DEPENDS+=	tex-tabls-[0-9]*:../../print/tex-tabls
 DEPENDS+=	tex-tex-gyre-[0-9]*:../../fonts/tex-tex-gyre
 DEPENDS+=	tex-tex-gyre-math-[0-9]*:../../fonts/tex-tex-gyre-math
 DEPENDS+=	tex-texinfo-[0-9]*:../../print/tex-texinfo
+DEPENDS+=	tex-textfit-[0-9]*:../../print/tex-textfit
+DEPENDS+=	tex-textmerg-[0-9]*:../../print/tex-textmerg
+DEPENDS+=	tex-textpos-[0-9]*:../../print/tex-textpos
 DEPENDS+=	tex-threeparttable-[0-9]*:../../print/tex-threeparttable
 DEPENDS+=	tex-thumbpdf-[0-9]*:../../print/tex-thumbpdf
 DEPENDS+=	tex-titlesec-[0-9]*:../../print/tex-titlesec
 DEPENDS+=	tex-tocbibind-[0-9]*:../../print/tex-tocbibind
 DEPENDS+=	tex-tocloft-[0-9]*:../../print/tex-tocloft
+DEPENDS+=	tex-totpages-[0-9]*:../../print/tex-totpages
 DEPENDS+=	tex-twoinone-[0-9]*:../../print/tex-twoinone
 DEPENDS+=	tex-type1cm-[0-9]*:../../print/tex-type1cm
 DEPENDS+=	tex-umlaute-[0-9]*:../../print/tex-umlaute
@@ -245,18 +279,23 @@ DEPENDS+=	tex-url-[0-9]*:../../print/tex-url
 DEPENDS+=	tex-verbdef-[0-9]*:../../print/tex-verbdef
 DEPENDS+=	tex-version-[0-9]*:../../print/tex-version
 DEPENDS+=	tex-vertbars-[0-9]*:../../print/tex-vertbars
+DEPENDS+=	tex-vmargin-[0-9]*:../../print/tex-vmargin
 DEPENDS+=	tex-vntex-[0-9]*:../../print/tex-vntex
 DEPENDS+=	tex-vruler-[0-9]*:../../print/tex-vruler
+DEPENDS+=	tex-was-[0-9]*:../../print/tex-was
 DEPENDS+=	tex-wrapfig-[0-9]*:../../print/tex-wrapfig
 DEPENDS+=	tex-xcolor-[0-9]*:../../print/tex-xcolor
 DEPENDS+=	tex-xkeyval-[0-9]*:../../print/tex-xkeyval
 DEPENDS+=	tex-xtab-[0-9]*:../../print/tex-xtab
 DEPENDS+=	tex-xypic-[0-9]*:../../graphics/tex-xypic
 DEPENDS+=	tex-yfonts-[0-9]*:../../print/tex-yfonts
+DEPENDS+=	texlive-collection-fontsrecommended>=2010:../../meta-pkgs/texlive-collection-fontsrecommended
+DEPENDS+=	texlive-collection-genericrecommended>=2010:../../meta-pkgs/texlive-collection-genericrecommended
+DEPENDS+=	texlive-collection-latex>=2010:../../meta-pkgs/texlive-collection-latex
 
 EXTRACT_ELEMENTS+=	bibtex
 EXTRACT_ELEMENTS+=	fonts
-EXTRACT_ELEMENTS+=	scripts
+#EXTRACT_ELEMENTS+=	scripts
 EXTRACT_ELEMENTS+=	tex
 
 WRKSRC=		${WRKDIR}/tetex
@@ -351,8 +390,7 @@ post-extract:
 	rm -rf ${WRKSRC}/fonts/vf/cg/[h-k]*
 	rm -rf ${WRKSRC}/fonts/vf/cg/times
 	rm -rf ${WRKSRC}/fonts/vf/yandy/times
-	rm -rf ${WRKSRC}/scripts/context
-	rm -rf ${WRKSRC}/scripts/thumbpdf
+	rm -rf ${WRKSRC}/tex/amstex
 	rm -rf ${WRKSRC}/tex/context
 	rm -rf ${WRKSRC}/tex/fontinst
 	rm -rf ${WRKSRC}/tex/generic/[abdf-km-pu-z]*
@@ -366,107 +404,64 @@ post-extract:
 	rm -rf ${WRKSRC}/tex/generic/thumbpdf
 	rm -rf ${WRKSRC}/tex/lambda
 	rm -rf ${WRKSRC}/tex/latex/SIunits
-	rm -rf ${WRKSRC}/tex/latex/a4wide
-	rm -rf ${WRKSRC}/tex/latex/a[b-m]*
-	rm -rf ${WRKSRC}/tex/latex/anysize
-	rm -rf ${WRKSRC}/tex/latex/antp
-	rm -rf ${WRKSRC}/tex/latex/antt
-	rm -rf ${WRKSRC}/tex/latex/appendix
+	rm -rf ${WRKSRC}/tex/latex/a*
 	rm -rf ${WRKSRC}/tex/latex/base
-	rm -rf ${WRKSRC}/tex/latex/bbm
-	rm -rf ${WRKSRC}/tex/latex/bbold
-	rm -rf ${WRKSRC}/tex/latex/be*
-	rm -rf ${WRKSRC}/tex/latex/bib*
-	rm -rf ${WRKSRC}/tex/latex/bo*
-	rm -rf ${WRKSRC}/tex/latex/ca[m-z]*
-	rm -rf ${WRKSRC}/tex/latex/carlisle
-	rm -rf ${WRKSRC}/tex/latex/ccfonts
-	rm -rf ${WRKSRC}/tex/latex/cmbright
-	rm -rf ${WRKSRC}/tex/latex/changebar
-	rm -rf ${WRKSRC}/tex/latex/chngpage
+	rm -rf ${WRKSRC}/tex/latex/b[b-z]*
+	rm -rf ${WRKSRC}/tex/latex/c[a-h]*
 	rm -rf ${WRKSRC}/tex/latex/cite
-	rm -rf ${WRKSRC}/tex/latex/cmap
-	rm -rf ${WRKSRC}/tex/latex/comment
-	rm -rf ${WRKSRC}/tex/latex/concmath
-	rm -rf ${WRKSRC}/tex/latex/concrete
-	rm -rf ${WRKSRC}/tex/latex/con[f-z]*
-	rm -rf ${WRKSRC}/tex/latex/crop
+	rm -rf ${WRKSRC}/tex/latex/c[m-r]*
+	rm -rf ${WRKSRC}/tex/latex/curves
+	rm -rf ${WRKSRC}/tex/latex/custom-bib
 	rm -rf ${WRKSRC}/tex/latex/c[v-z]*
-	rm -rf ${WRKSRC}/tex/latex/dk-bib
-	rm -rf ${WRKSRC}/tex/latex/dstroke
+	rm -rf ${WRKSRC}/tex/latex/d[a-u]*
 	rm -rf ${WRKSRC}/tex/latex/dvipdfm
 	rm -rf ${WRKSRC}/tex/latex/e[d-n]*
-	rm -rf ${WRKSRC}/tex/latex/e[st]*
-	rm -rf ${WRKSRC}/tex/latex/euler
-	rm -rf ${WRKSRC}/tex/latex/eulervm
-	rm -rf ${WRKSRC}/tex/latex/eurosym
-	rm -rf ${WRKSRC}/tex/latex/ex*
-	rm -rf ${WRKSRC}/tex/latex/fa*
-	rm -rf ${WRKSRC}/tex/latex/float
-	rm -rf ${WRKSRC}/tex/latex/fnpara
-	rm -rf ${WRKSRC}/tex/latex/footmisc
-	rm -rf ${WRKSRC}/tex/latex/fontinst
-	rm -rf ${WRKSRC}/tex/latex/fp
-	rm -rf ${WRKSRC}/tex/latex/framed
+	rm -rf ${WRKSRC}/tex/latex/e[s-x]*
+	rm -rf ${WRKSRC}/tex/latex/f[a-f]*
+	rm -rf ${WRKSRC}/tex/latex/f[h-z]*
+	rm -rf ${WRKSRC}/tex/latex/g-brief
 	rm -rf ${WRKSRC}/tex/latex/germbib
 	rm -rf ${WRKSRC}/tex/latex/geo*
-	rm -f ${WRKSRC}/tex/latex/graphics/[a-l]*
-	rm -f ${WRKSRC}/tex/latex/graphics/p*
-	rm -f ${WRKSRC}/tex/latex/graphics/t[cr]*
+	rm -rf ${WRKSRC}/tex/latex/graphics
 	rm -rf ${WRKSRC}/tex/latex/h*
-	rm -rf ${WRKSRC}/tex/latex/index
-	rm -rf ${WRKSRC}/tex/latex/jknappen
-	rm -rf ${WRKSRC}/tex/latex/jurabib
+	rm -rf ${WRKSRC}/tex/latex/i*
+	rm -rf ${WRKSRC}/tex/latex/j*
 	rm -rf ${WRKSRC}/tex/latex/k*
-	rm -rf ${WRKSRC}/tex/latex/lastpage
-	rm -rf ${WRKSRC}/tex/latex/lineno
-	rm -rf ${WRKSRC}/tex/latex/lis*
-	rm -rf ${WRKSRC}/tex/latex/lm
+	rm -rf ${WRKSRC}/tex/latex/l[a-t]*
 	rm -rf ${WRKSRC}/tex/latex/marvosym
-	rm -rf ${WRKSRC}/tex/latex/m[b-o]*
+	rm -rf ${WRKSRC}/tex/latex/mathcomp
+	rm -rf ${WRKSRC}/tex/latex/m[b-p]*
 	rm -rf ${WRKSRC}/tex/latex/ms
+	rm -rf ${WRKSRC}/tex/latex/multibib
 	rm -rf ${WRKSRC}/tex/latex/multind
 	rm -rf ${WRKSRC}/tex/latex/multirow
 	rm -rf ${WRKSRC}/tex/latex/n[a-s]*
 	rm -rf ${WRKSRC}/tex/latex/ntgclass
 	rm -rf ${WRKSRC}/tex/latex/ntheorem
-	rm -f ${WRKSRC}/tex/latex/oberdiek/[a-u]*
-	rm -rf ${WRKSRC}/tex/latex/optional
-	rm -rf ${WRKSRC}/tex/latex/overpic
+	rm -rf ${WRKSRC}/tex/latex/o*
 	rm -rf ${WRKSRC}/tex/latex/par*
-	rm -rf ${WRKSRC}/tex/latex/p[c-g]*
+	rm -rf ${WRKSRC}/tex/latex/p[b-g]*
 	rm -rf ${WRKSRC}/tex/latex/picinpar
+	rm -rf ${WRKSRC}/tex/latex/pict2e
 	rm -rf ${WRKSRC}/tex/latex/placeins
 	rm -rf ${WRKSRC}/tex/latex/portland
-	rm -rf ${WRKSRC}/tex/latex/pre*
+	rm -rf ${WRKSRC}/tex/latex/pr*
 	rm -rf ${WRKSRC}/tex/latex/ps[b-z]*
 	rm -rf ${WRKSRC}/tex/latex/pxfonts
 	rm -rf ${WRKSRC}/tex/latex/qfonts
-	rm -rf ${WRKSRC}/tex/latex/relsize
-	rm -rf ${WRKSRC}/tex/latex/revtex4
-	rm -rf ${WRKSRC}/tex/latex/rotating
-	rm -rf ${WRKSRC}/tex/latex/selectp
-	rm -rf ${WRKSRC}/tex/latex/sec*
-	rm -rf ${WRKSRC}/tex/latex/seminar
-	rm -rf ${WRKSRC}/tex/latex/set*
-	rm -rf ${WRKSRC}/tex/latex/shadow
-	rm -rf ${WRKSRC}/tex/latex/showtags
-	rm -rf ${WRKSRC}/tex/latex/soul
-	rm -rf ${WRKSRC}/tex/latex/stmaryrd
-	rm -rf ${WRKSRC}/tex/latex/su*
+	rm -rf ${WRKSRC}/tex/latex/r*
+	rm -rf ${WRKSRC}/tex/latex/s[a-k]*
+	rm -rf ${WRKSRC}/tex/latex/s[m-z]*
 	rm -rf ${WRKSRC}/tex/latex/t2
 	rm -rf ${WRKSRC}/tex/latex/tabls
-	rm -rf ${WRKSRC}/tex/latex/threeparttable
-	rm -rf ${WRKSRC}/tex/latex/ti*
-	rm -rf ${WRKSRC}/tex/latex/toc*
-	rm -rf ${WRKSRC}/tex/latex/tools
+	rm -rf ${WRKSRC}/tex/latex/text*
+	rm -rf ${WRKSRC}/tex/latex/t[f-q]*
 	rm -rf ${WRKSRC}/tex/latex/t[s-z]*
 	rm -rf ${WRKSRC}/tex/latex/u[l-p]*
 	rm -rf ${WRKSRC}/tex/latex/url
 	rm -rf ${WRKSRC}/tex/latex/version
-	rm -rf ${WRKSRC}/tex/latex/wasysym
-	rm -rf ${WRKSRC}/tex/latex/wrapfig
-	rm -rf ${WRKSRC}/tex/latex/xcolor
+	rm -rf ${WRKSRC}/tex/latex/vmargin
+	rm -rf ${WRKSRC}/tex/latex/w*
 	rm -rf ${WRKSRC}/tex/latex/x*
 	rm -rf ${WRKSRC}/tex/latex/y*
 	rm -rf ${WRKSRC}/tex/plain/amsfonts
diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST
index 527b6dd523b..47a4efa1025 100644
--- a/print/teTeX3-texmf/PLIST
+++ b/print/teTeX3-texmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2015/05/08 13:22:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.51 2015/05/16 13:02:11 markd Exp $
 share/texmf-dist/bibtex/bst/norbib/norabbrv.bst
 share/texmf-dist/bibtex/bst/norbib/noralpha.bst
 share/texmf-dist/bibtex/bst/norbib/norplain.bst
@@ -1047,16 +1047,6 @@ share/texmf-dist/fonts/vf/yandy/mathplus/mtmu.vf
 share/texmf-dist/fonts/vf/yandy/mathplus/mtmub.vf
 share/texmf-dist/fonts/vf/yandy/mathplus/mtmuh.vf
 share/texmf-dist/fonts/vf/yandy/mathtime/mtmi.vf
-share/texmf-dist/scripts/pdfcrop/pdfcrop.pl
-share/texmf-dist/scripts/uniqleaf/uniqleaf.pl
-share/texmf-dist/tex/amstex/base/amsppt.sty
-share/texmf-dist/tex/amstex/base/amsppt1.tex
-share/texmf-dist/tex/amstex/base/amstex.tex
-share/texmf-dist/tex/amstex/config/amsppt.sti
-share/texmf-dist/tex/amstex/config/amstex.ini
-share/texmf-dist/tex/amstex/config/bamstex.ini
-share/texmf-dist/tex/amstex/config/pdfamstex.ini
-share/texmf-dist/tex/amstex/config/pdfbamstex.ini
 share/texmf-dist/tex/cslatex/cslatex.ini
 share/texmf-dist/tex/cslatex/cspsfont.il2
 share/texmf-dist/tex/cslatex/cspsfont.tex
@@ -1154,9 +1144,6 @@ share/texmf-dist/tex/generic/texdraw/texdraw.tex
 share/texmf-dist/tex/generic/texdraw/txdps.tex
 share/texmf-dist/tex/generic/texdraw/txdtools.tex
 share/texmf-dist/tex/latex/bar/bar.sty
-share/texmf-dist/tex/latex/calrsfs/calrsfs.sty
-share/texmf-dist/tex/latex/ccaption/ccaption.sty
-share/texmf-dist/tex/latex/chappg/chappg.sty
 share/texmf-dist/tex/latex/citesort/citesort.sty
 share/texmf-dist/tex/latex/cslatex/il2cmdh.fd
 share/texmf-dist/tex/latex/cslatex/il2cmfib.fd
@@ -1169,32 +1156,6 @@ share/texmf-dist/tex/latex/cslatex/il2enc.def
 share/texmf-dist/tex/latex/cslatex/il2lcmss.fd
 share/texmf-dist/tex/latex/cslatex/il2lcmtt.fd
 share/texmf-dist/tex/latex/currvita/currvita.sty
-share/texmf-dist/tex/latex/curves/curves.sty
-share/texmf-dist/tex/latex/curves/curvesls.sty
-share/texmf-dist/tex/latex/custom-bib/catalan.mbs
-share/texmf-dist/tex/latex/custom-bib/dansk.mbs
-share/texmf-dist/tex/latex/custom-bib/dutch.mbs
-share/texmf-dist/tex/latex/custom-bib/english.mbs
-share/texmf-dist/tex/latex/custom-bib/esperant.mbs
-share/texmf-dist/tex/latex/custom-bib/finnish.mbs
-share/texmf-dist/tex/latex/custom-bib/french.mbs
-share/texmf-dist/tex/latex/custom-bib/geojour.mbs
-share/texmf-dist/tex/latex/custom-bib/german.mbs
-share/texmf-dist/tex/latex/custom-bib/italian.mbs
-share/texmf-dist/tex/latex/custom-bib/makebst.tex
-share/texmf-dist/tex/latex/custom-bib/merlin.mbs
-share/texmf-dist/tex/latex/custom-bib/norsk.mbs
-share/texmf-dist/tex/latex/custom-bib/photjour.mbs
-share/texmf-dist/tex/latex/custom-bib/physjour.mbs
-share/texmf-dist/tex/latex/custom-bib/polski.mbs
-share/texmf-dist/tex/latex/custom-bib/portuges.mbs
-share/texmf-dist/tex/latex/custom-bib/slovene.mbs
-share/texmf-dist/tex/latex/custom-bib/spanish.mbs
-share/texmf-dist/tex/latex/custom-bib/suppjour.mbs
-share/texmf-dist/tex/latex/dinbrief/dinbrief.cls
-share/texmf-dist/tex/latex/dinbrief/dinbrief.sty
-share/texmf-dist/tex/latex/draftcopy/draftcopy.cfg
-share/texmf-dist/tex/latex/draftcopy/draftcopy.sty
 share/texmf-dist/tex/latex/dvilj/cgalbertus.sty
 share/texmf-dist/tex/latex/dvilj/cgantiqueolive.sty
 share/texmf-dist/tex/latex/dvilj/cgcourier.sty
@@ -1209,26 +1170,8 @@ share/texmf-dist/tex/latex/eo/eo.ldf
 share/texmf-dist/tex/latex/eo/eo.sty
 share/texmf-dist/tex/latex/eo/latin3eo.def
 share/texmf-dist/tex/latex/fguill/fguill.sty
-share/texmf-dist/tex/latex/filecontents/filecontents.sty
-share/texmf-dist/tex/latex/floatflt/floatflt.sty
-share/texmf-dist/tex/latex/footbib/footbib.sty
-share/texmf-dist/tex/latex/footnpag/footnpag.sty
-share/texmf-dist/tex/latex/g-brief/g-brief.cls
-share/texmf-dist/tex/latex/g-brief/g-brief.sty
-share/texmf-dist/tex/latex/g-brief/g-brief2.cls
-share/texmf-dist/tex/latex/g-brief/g-brief2.sty
 share/texmf-dist/tex/latex/gletter/gletter.sty
-share/texmf-dist/tex/latex/graphics/textures.def
-share/texmf-dist/tex/latex/graphics/vtex.def
 share/texmf-dist/tex/latex/greek/iso-8859-7.def
-share/texmf-dist/tex/latex/import/import.sty
-share/texmf-dist/tex/latex/labels/labels.sty
-share/texmf-dist/tex/latex/labels/olabels.sty
-share/texmf-dist/tex/latex/layouts/layouts.sty
-share/texmf-dist/tex/latex/leftidx/leftidx.sty
-share/texmf-dist/tex/latex/lettrine/lettrine.cfg
-share/texmf-dist/tex/latex/lettrine/lettrine.sty
-share/texmf-dist/tex/latex/ltabptch/ltabptch.sty
 share/texmf-dist/tex/latex/lucida/ly1hlce.fd
 share/texmf-dist/tex/latex/lucida/ly1hlcf.fd
 share/texmf-dist/tex/latex/lucida/ly1hlcn.fd
@@ -1270,7 +1213,6 @@ share/texmf-dist/tex/latex/lucidabr/omlhlh.fd
 share/texmf-dist/tex/latex/lucidabr/omshlcy.fd
 share/texmf-dist/tex/latex/lucidabr/omshlh.fd
 share/texmf-dist/tex/latex/lucidabr/omxhlcv.fd
-share/texmf-dist/tex/latex/mathcomp/mathcomp.sty
 share/texmf-dist/tex/latex/mathpple/ot1phvv.fd
 share/texmf-dist/tex/latex/mathpple/t1phvv.fd
 share/texmf-dist/tex/latex/mathpple/ts1phvv.fd
@@ -1284,9 +1226,7 @@ share/texmf-dist/tex/latex/mathtime/umh2.fd
 share/texmf-dist/tex/latex/mathtime/umh2scr.fd
 share/texmf-dist/tex/latex/mathtime/umh6.fd
 share/texmf-dist/tex/latex/mathtime/umtms.fd
-share/texmf-dist/tex/latex/mparhack/mparhack.sty
 share/texmf-dist/tex/latex/mt11p/mt11p.sty
-share/texmf-dist/tex/latex/multibib/multibib.sty
 share/texmf-dist/tex/latex/multibox/multibox.sty
 share/texmf-dist/tex/latex/mwcls/mw10.clo
 share/texmf-dist/tex/latex/mwcls/mw11.clo
@@ -1297,27 +1237,12 @@ share/texmf-dist/tex/latex/mwcls/mwbk10.clo
 share/texmf-dist/tex/latex/mwcls/mwbk11.clo
 share/texmf-dist/tex/latex/mwcls/mwbk12.clo
 share/texmf-dist/tex/latex/mwcls/mwrep.cls
-share/texmf-dist/tex/latex/oberdiek/vpe.sty
-share/texmf-dist/tex/latex/onlyamsmath/onlyamsmath.sty
 share/texmf-dist/tex/latex/palatcm/omlpplcm.fd
 share/texmf-dist/tex/latex/palatcm/omspplcm.fd
 share/texmf-dist/tex/latex/palatcm/omxpplcm.fd
 share/texmf-dist/tex/latex/palatcm/ot1pplcm.fd
 share/texmf-dist/tex/latex/palatcm/palatcm.sty
-share/texmf-dist/tex/latex/pb-diagram/lamsarrow.sty
-share/texmf-dist/tex/latex/pb-diagram/pb-diagram.sty
-share/texmf-dist/tex/latex/pb-diagram/pb-lams.sty
-share/texmf-dist/tex/latex/pb-diagram/pb-xy.sty
 share/texmf-dist/tex/latex/picins/picins.sty
-share/texmf-dist/tex/latex/pict2e/p2e-dvipdfm.def
-share/texmf-dist/tex/latex/pict2e/p2e-dvips.def
-share/texmf-dist/tex/latex/pict2e/p2e-pctex32.def
-share/texmf-dist/tex/latex/pict2e/p2e-pctexps.def
-share/texmf-dist/tex/latex/pict2e/p2e-pdftex.def
-share/texmf-dist/tex/latex/pict2e/p2e-textures.def
-share/texmf-dist/tex/latex/pict2e/p2e-vtex.def
-share/texmf-dist/tex/latex/pict2e/pict2e.cfg
-share/texmf-dist/tex/latex/pict2e/pict2e.sty
 share/texmf-dist/tex/latex/platex/amigapl.def
 share/texmf-dist/tex/latex/platex/mazovia.def
 share/texmf-dist/tex/latex/platex/omlplcm.fd
@@ -1335,22 +1260,9 @@ share/texmf-dist/tex/latex/platex/ot4cmtt.fd
 share/texmf-dist/tex/latex/platex/plprefix.sty
 share/texmf-dist/tex/latex/platex/polski.sty
 share/texmf-dist/tex/latex/platex/qxenc.def
-share/texmf-dist/tex/latex/program/program.sty
 share/texmf-dist/tex/latex/ps4pdf/ps4pdf.sty
-share/texmf-dist/tex/latex/rotfloat/rotfloat.sty
-share/texmf-dist/tex/latex/scale/scale.sty
-share/texmf-dist/tex/latex/shapepar/shapepar.sty
-share/texmf-dist/tex/latex/showdim/showdim.sty
-share/texmf-dist/tex/latex/showlabels/showlabels.sty
-share/texmf-dist/tex/latex/sidecap/sidecap.sty
 share/texmf-dist/tex/latex/slashbox/slashbox.sty
-share/texmf-dist/tex/latex/stdclsdv/stdclsdv.sty
 share/texmf-dist/tex/latex/texmacs/TeXmacs.sty
-share/texmf-dist/tex/latex/textfit/textfit.sty
-share/texmf-dist/tex/latex/textmerg/textmerg.sty
-share/texmf-dist/tex/latex/textmerg/textmerg.tex
-share/texmf-dist/tex/latex/textpos/textpos.sty
-share/texmf-dist/tex/latex/totpages/totpages.sty
 share/texmf-dist/tex/latex/treesvr/trees.sty
 share/texmf-dist/tex/latex/urwvn/t5pag.fd
 share/texmf-dist/tex/latex/urwvn/t5pbk.fd
@@ -1384,12 +1296,7 @@ share/texmf-dist/tex/latex/vietnam/vietnam.sty
 share/texmf-dist/tex/latex/vietnam/viscii.def
 share/texmf-dist/tex/latex/vietnam/vncaps.tex
 share/texmf-dist/tex/latex/vietnam/vps.def
-share/texmf-dist/tex/latex/vmargin/vmargin.sty
 share/texmf-dist/tex/latex/vpage/vpage.sty
-share/texmf-dist/tex/latex/was/fixmath.sty
-share/texmf-dist/tex/latex/was/gensymb.sty
-share/texmf-dist/tex/latex/was/icomma.sty
-share/texmf-dist/tex/latex/was/upgreek.sty
 share/texmf-dist/tex/mex/base/mex.tex
 share/texmf-dist/tex/mex/base/mex1.tex
 share/texmf-dist/tex/mex/base/mex2.tex