Resolve conflicts between teTeX-texmf and the following packages:

  - tex-cite
  - tex-fancyvrb
  - tex-listings
  - tex-nomencl

2 files changed, 14 insertions, 31 deletions

diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 194b72f3a21..3394a076788 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2009/09/02 08:34:15 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2009/09/19 15:45:43 minskim Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -23,6 +23,7 @@ DEPENDS+=	tex-babel-[0-9]*:../../print/tex-babel
 DEPENDS+=	tex-bibtex-[0-9]*:../../print/tex-bibtex
 DEPENDS+=	tex-caption-[0-9]*:../../print/tex-caption
 DEPENDS+=	tex-carlisle-[0-9]*:../../print/tex-carlisle
+DEPENDS+=	tex-cite-[0-9]*:../../print/tex-cite
 DEPENDS+=	tex-colortbl-[0-9]*:../../print/tex-colortbl
 DEPENDS+=	tex-courier-[0-9]*:../../fonts/tex-courier
 DEPENDS+=	tex-dvips-[0-9]*:../../print/tex-dvips
@@ -30,6 +31,7 @@ DEPENDS+=	tex-enctex-[0-9]*:../../print/tex-enctex
 DEPENDS+=	tex-enumitem-[0-9]*:../../print/tex-enumitem
 DEPENDS+=	tex-exam-[0-9]*:../../print/tex-exam
 DEPENDS+=	tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr
+DEPENDS+=	tex-fancyvrb-[0-9]*:../../print/tex-fancyvrb
 DEPENDS+=	tex-float-[0-9]*:../../print/tex-float
 DEPENDS+=	tex-footmisc-[0-9]*:../../print/tex-footmisc
 DEPENDS+=	tex-geometry-[0-9]*:../../print/tex-geometry
@@ -69,6 +71,7 @@ DEPENDS+=	tex-hyphen-ukrainian-[0-9]*:../../print/tex-hyphen-ukrainian
 DEPENDS+=	tex-koma-script-[0-9]*:../../print/tex-koma-script
 DEPENDS+=	tex-lambda-[0-9]*:../../print/tex-lambda
 DEPENDS+=	tex-latex-[0-9]*:../../print/tex-latex
+DEPENDS+=	tex-listings-[0-9]*:../../print/tex-listings
 DEPENDS+=	tex-lm-[0-9]*:../../fonts/tex-lm
 DEPENDS+=	tex-ltxmisc-[0-9]*:../../print/tex-ltxmisc
 DEPENDS+=	tex-marvosym-[0-9]*:../../fonts/tex-marvosym
@@ -81,6 +84,7 @@ DEPENDS+=	tex-moreverb-[0-9]*:../../print/tex-moreverb
 DEPENDS+=	tex-ms-[0-9]*:../../print/tex-ms
 DEPENDS+=	tex-multirow-[0-9]*:../../print/tex-multirow
 DEPENDS+=	tex-natbib-[0-9]*:../../print/tex-natbib
+DEPENDS+=	tex-nomencl-[0-9]*:../../print/tex-nomencl
 DEPENDS+=	tex-oberdiek-[0-9]*:../../print/tex-oberdiek
 DEPENDS+=	tex-paralist-[0-9]*:../../print/tex-paralist
 DEPENDS+=	tex-placeins-[0-9]*:../../print/tex-placeins
@@ -185,18 +189,19 @@ post-extract:
 	rm -rf ${WRKSRC}/doc/latex/ca*
 	rm -rf ${WRKSRC}/doc/latex/enumitem
 	rm -rf ${WRKSRC}/doc/latex/exam
-	rm -rf ${WRKSRC}/doc/latex/fancyh*
+	rm -rf ${WRKSRC}/doc/latex/fancy[c-z]*
 	rm -rf ${WRKSRC}/doc/latex/float
 	rm -rf ${WRKSRC}/doc/latex/footmisc
 	rm -rf ${WRKSRC}/doc/latex/geo*
 	rm -rf ${WRKSRC}/doc/latex/hyperref
 	rm -rf ${WRKSRC}/doc/latex/k*
+	rm -rf ${WRKSRC}/doc/latex/lis*
 	rm -rf ${WRKSRC}/doc/latex/memoir
 	rm -rf ${WRKSRC}/doc/latex/mflogo
 	rm -rf ${WRKSRC}/doc/latex/microtype
 	rm -rf ${WRKSRC}/doc/latex/moreverb
 	rm -rf ${WRKSRC}/doc/latex/ms
-	rm -rf ${WRKSRC}/doc/latex/natbib
+	rm -rf ${WRKSRC}/doc/latex/n[a-s]*
 	rm -rf ${WRKSRC}/doc/latex/oberdiek
 	rm -rf ${WRKSRC}/doc/latex/paralist
 	rm -rf ${WRKSRC}/doc/latex/placeins
@@ -311,6 +316,7 @@ post-extract:
 	rm -rf ${WRKSRC}/tex/latex/ca[m-z]*
 	rm -rf ${WRKSRC}/tex/latex/carlisle
 	rm -rf ${WRKSRC}/tex/latex/chngpage
+	rm -rf ${WRKSRC}/tex/latex/cite
 	rm -rf ${WRKSRC}/tex/latex/concrete
 	rm -rf ${WRKSRC}/tex/latex/config
 	rm -f ${WRKSRC}/tex/latex/dvipdfm/dvipdfm.def
@@ -318,7 +324,7 @@ post-extract:
 	rm -rf ${WRKSRC}/tex/latex/enumitem
 	rm -rf ${WRKSRC}/tex/latex/etex
 	rm -rf ${WRKSRC}/tex/latex/exam
-	rm -rf ${WRKSRC}/tex/latex/fancyh*
+	rm -rf ${WRKSRC}/tex/latex/fancy[c-z]*
 	rm -rf ${WRKSRC}/tex/latex/float
 	rm -rf ${WRKSRC}/tex/latex/fnpara
 	rm -rf ${WRKSRC}/tex/latex/footmisc
@@ -329,6 +335,7 @@ post-extract:
 	rm -f ${WRKSRC}/tex/latex/graphics/t[cr]*
 	rm -rf ${WRKSRC}/tex/latex/hyperref
 	rm -rf ${WRKSRC}/tex/latex/k*
+	rm -rf ${WRKSRC}/tex/latex/lis*
 	rm -rf ${WRKSRC}/tex/latex/lm
 	rm -rf ${WRKSRC}/tex/latex/marvosym
 	rm -rf ${WRKSRC}/tex/latex/memoir
@@ -337,7 +344,7 @@ post-extract:
 	rm -rf ${WRKSRC}/tex/latex/moreverb
 	rm -rf ${WRKSRC}/tex/latex/ms
 	rm -rf ${WRKSRC}/tex/latex/multirow
-	rm -rf ${WRKSRC}/tex/latex/n[a-n]*
+	rm -rf ${WRKSRC}/tex/latex/n[a-s]*
 	rm -f ${WRKSRC}/tex/latex/oberdiek/[a-u]*
 	rm -rf ${WRKSRC}/tex/latex/optional
 	rm -rf ${WRKSRC}/tex/latex/par*
diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST
index 60d025f5bcb..e0bff32d54e 100644
--- a/print/teTeX3-texmf/PLIST
+++ b/print/teTeX3-texmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2009/07/16 23:57:57 minskim Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/09/19 15:45:43 minskim Exp $
 share/texmf-dist/aliases
 share/texmf-dist/bibtex/bib/plbib/plbib.bib
 share/texmf-dist/bibtex/bst/adrconv/adrconv.bst
@@ -3123,8 +3123,6 @@ share/texmf-dist/doc/latex/eulervm/eulervm.pdf
 share/texmf-dist/doc/latex/eulervm/manifest.txt
 share/texmf-dist/doc/latex/extsizes/readme.extsizes
 share/texmf-dist/doc/latex/fancybox/fancybox.dvi
-share/texmf-dist/doc/latex/fancyvrb/fancyvrb.ps
-share/texmf-dist/doc/latex/fancyvrb/fvrb-ex.dvi
 share/texmf-dist/doc/latex/filecontents/filecontents.dvi
 share/texmf-dist/doc/latex/floatflt/floatexm.dvi
 share/texmf-dist/doc/latex/floatflt/floatexm.tex
@@ -3179,8 +3177,6 @@ share/texmf-dist/doc/latex/lineno/COPYING.txt
 share/texmf-dist/doc/latex/lineno/README.txt
 share/texmf-dist/doc/latex/lineno/lineno.dvi
 share/texmf-dist/doc/latex/lineno/ulineno.dvi
-share/texmf-dist/doc/latex/listings/README
-share/texmf-dist/doc/latex/listings/listings.dvi
 share/texmf-dist/doc/latex/ltabptch/README
 share/texmf-dist/doc/latex/mathcomp/mathcomp.dvi
 share/texmf-dist/doc/latex/mathtime/0readme
@@ -3225,9 +3221,6 @@ share/texmf-dist/doc/latex/mwcls/CZYTAJ
 share/texmf-dist/doc/latex/mwcls/ChangeLog
 share/texmf-dist/doc/latex/mwcls/README
 share/texmf-dist/doc/latex/mwcls/mwclsdoc.pdf
-share/texmf-dist/doc/latex/nomencl/README
-share/texmf-dist/doc/latex/nomencl/license.txt
-share/texmf-dist/doc/latex/nomencl/nomencl.dvi
 share/texmf-dist/doc/latex/ntgclass/a4.dvi
 share/texmf-dist/doc/latex/ntgclass/artdoc.dvi
 share/texmf-dist/doc/latex/ntgclass/brief.tex
@@ -9666,10 +9659,6 @@ share/texmf-dist/tex/latex/ccfonts/t1ccr.fd
 share/texmf-dist/tex/latex/ccfonts/ts1ccr.fd
 share/texmf-dist/tex/latex/changebar/changebar.sty
 share/texmf-dist/tex/latex/chappg/chappg.sty
-share/texmf-dist/tex/latex/cite/chapterbib.sty
-share/texmf-dist/tex/latex/cite/cite.sty
-share/texmf-dist/tex/latex/cite/drftcite.sty
-share/texmf-dist/tex/latex/cite/overcite.sty
 share/texmf-dist/tex/latex/citesort/citesort.sty
 share/texmf-dist/tex/latex/cmap/cmap.sty
 share/texmf-dist/tex/latex/cmap/t1.cmap
@@ -9893,10 +9882,6 @@ share/texmf-dist/tex/latex/extsizes/size20.clo
 share/texmf-dist/tex/latex/extsizes/size8.clo
 share/texmf-dist/tex/latex/extsizes/size9.clo
 share/texmf-dist/tex/latex/fancybox/fancybox.sty
-share/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
-share/texmf-dist/tex/latex/fancyvrb/fvrb-ex.sty
-share/texmf-dist/tex/latex/fancyvrb/hbaw.sty
-share/texmf-dist/tex/latex/fancyvrb/hcolor.sty
 share/texmf-dist/tex/latex/fguill/fguill.sty
 share/texmf-dist/tex/latex/filecontents/filecontents.sty
 share/texmf-dist/tex/latex/floatflt/floatflt.sty
@@ -9964,14 +9949,6 @@ share/texmf-dist/tex/latex/lettrine/lettrine.sty
 share/texmf-dist/tex/latex/lineno/ednmath0.sty
 share/texmf-dist/tex/latex/lineno/edtable.sty
 share/texmf-dist/tex/latex/lineno/lineno.sty
-share/texmf-dist/tex/latex/listings/listings.cfg
-share/texmf-dist/tex/latex/listings/listings.sty
-share/texmf-dist/tex/latex/listings/lstdoc.sty
-share/texmf-dist/tex/latex/listings/lstlang1.sty
-share/texmf-dist/tex/latex/listings/lstlang2.sty
-share/texmf-dist/tex/latex/listings/lstlang3.sty
-share/texmf-dist/tex/latex/listings/lstmisc.sty
-share/texmf-dist/tex/latex/listings/lstpatch.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
@@ -10149,7 +10126,6 @@ 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/nomencl/nomencl.sty
 share/texmf-dist/tex/latex/ntgclass/a4.sty
 share/texmf-dist/tex/latex/ntgclass/artikel1.cls
 share/texmf-dist/tex/latex/ntgclass/artikel2.cls