Remove old texinfo bits. This should solve conflicts with print/texinfo.

Suggested by:	johans

4 files changed, 14 insertions, 28 deletions

diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index cbc139f7ed39..f7286f281567 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	teTeX-base
 PORTVERSION=	3.0
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -177,8 +177,6 @@ post-install:
 	${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/texconfig
 	${INSTALL_DATA} ${PREFIX}/${TEXMFDIR}/texconfig/tcfmgr.map \
 		${PREFIX}/${TEXMFCONFIGDIR}/texconfig/tcfmgr.map
-	${INSTALL_SCRIPT} ${WRKSRC}/utils/texinfo/util/texi2dvi ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/utils/texinfo/util/texi2pdf ${PREFIX}/bin
 	${MV} -f ${PREFIX}/bin/texdoctk ${PREFIX}/bin/texdoctk.real
 	${INSTALL_SCRIPT} ${WRKDIR}/texdoctk.wrapper ${PREFIX}/bin/texdoctk
 	${MKDIR} ${PREFIX}/${UPDMAPDIR}
diff --git a/print/teTeX-base/pkg-plist b/print/teTeX-base/pkg-plist
index 36da42dd1721..685b8e6e9cc6 100644
--- a/print/teTeX-base/pkg-plist
+++ b/print/teTeX-base/pkg-plist
@@ -121,8 +121,6 @@ bin/pdftex
 bin/pdflatex
 bin/lambda
 bin/lamed
-bin/texi2dvi
-bin/texi2pdf
 include/kpathsea/absolute.h
 include/kpathsea/c-auto.h
 include/kpathsea/c-ctype.h
diff --git a/print/teTeX-texmf/Makefile b/print/teTeX-texmf/Makefile
index 4e92d0cfac00..28bf85287416 100644
--- a/print/teTeX-texmf/Makefile
+++ b/print/teTeX-texmf/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	teTeX-texmf
 PORTVERSION=	3.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -56,19 +56,23 @@ EXCLUDE_LIST=	fonts/type1/bluesky/cm/\* \
 		fonts/type1/bluesky/euler/\* \
 		fonts/type1/bluesky/latex/\* \
 		fonts/type1/bluesky/symbols/\* \
-		fonts/type1/bluesky/cyrillic/\*
+		fonts/type1/bluesky/cyrillic/\* \
+		tex/texinfo/\*
 
 do-install:
 	${MKDIR} ${PREFIX}/${TEXMFDISTDIR}
 	cd ${PREFIX}/${TEXMFDISTDIR} && \
-		${TAR} -x -z -U -f ${DISTDIR}/${DIST_SUBDIR}/${TETEX_TEXMF_SRC} \
-			${EXCLUDE_LIST:S,^,--exclude ,g}
+	    ${TAR} -x -z -U -f ${DISTDIR}/${DIST_SUBDIR}/${TETEX_TEXMF_SRC} \
+	    ${EXCLUDE_LIST:S,^,--exclude ,g}
 	cd ${PREFIX}/${TEXMFDISTDIR} && \
-		${PATCH} < ${FILESDIR}/extra-patch-latex.ltx && \
-		${RM} -f tex/latex/base/latex.ltx.orig
-	${INSTALL_DATA} ${FILESDIR}/cslatex.ini ${PREFIX}/${TEXMFDISTDIR}/tex/cslatex/cslatex.ini
-	${INSTALL_DATA} ${FILESDIR}/csplain.ini ${PREFIX}/${TEXMFDISTDIR}/tex/csplain/csplain.ini
-	${INSTALL_DATA} ${FILESDIR}/t1code.tex ${PREFIX}/${TEXMFDISTDIR}/tex/csplain/t1code.tex
+	    ${PATCH} < ${FILESDIR}/extra-patch-latex.ltx && \
+	    ${RM} -f tex/latex/base/latex.ltx.orig
+	${INSTALL_DATA} ${FILESDIR}/cslatex.ini \
+	    ${PREFIX}/${TEXMFDISTDIR}/tex/cslatex/cslatex.ini
+	${INSTALL_DATA} ${FILESDIR}/csplain.ini \
+	    ${PREFIX}/${TEXMFDISTDIR}/tex/csplain/csplain.ini
+	${INSTALL_DATA} ${FILESDIR}/t1code.tex \
+	    ${PREFIX}/${TEXMFDISTDIR}/tex/csplain/t1code.tex
 .for T in afm type1
 	${MKDIR} ${PREFIX}/${TEXMFDISTDIR}/fonts/${T}/bluesky
 	cd ${PREFIX}/${TEXMFDISTDIR}/fonts/${T}/bluesky && \
diff --git a/print/teTeX-texmf/pkg-plist b/print/teTeX-texmf/pkg-plist
index 07cd674957c3..66cc1230be47 100644
--- a/print/teTeX-texmf/pkg-plist
+++ b/print/teTeX-texmf/pkg-plist
@@ -13617,19 +13617,6 @@
 %%TEXMFDISTDIR%%/tex/platex/config/language.dat
 %%TEXMFDISTDIR%%/tex/platex/config/pdfplatex.ini
 %%TEXMFDISTDIR%%/tex/platex/config/platex.ini
-%%TEXMFDISTDIR%%/tex/texinfo/texinfo.ini
-%%TEXMFDISTDIR%%/tex/texinfo/texinfo.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-cs.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-de.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-en.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-es.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-fr.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-it.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-nl.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-no.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-pl.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-pt.tex
-%%TEXMFDISTDIR%%/tex/texinfo/txi-tr.tex
 %%TEXMFDISTDIR%%/tex/texinfo/vntexinfo.tex
 %%TEXMFDISTDIR%%/texdoctk/texdocrc.defaults
 %%TEXMFDISTDIR%%/texdoctk/texdoctk.dat
@@ -13673,7 +13660,6 @@
 @dirrm %%TEXMFDISTDIR%%/xdvi
 @dirrm %%TEXMFDISTDIR%%/web2c
 @dirrm %%TEXMFDISTDIR%%/texdoctk
-@dirrm %%TEXMFDISTDIR%%/tex/texinfo
 @dirrm %%TEXMFDISTDIR%%/tex/platex/config
 @dirrm %%TEXMFDISTDIR%%/tex/platex
 @dirrm %%TEXMFDISTDIR%%/tex/plain/xepsf