Replace teTeX's texdoc with TeX Live's.

5 files changed, 15 insertions, 18 deletions

diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index aef2129d055..fe49f86a82f 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2011/10/27 19:41:40 minskim Exp $
+# $NetBSD: Makefile,v 1.59 2012/02/09 21:44:15 minskim Exp $
 
 DISTNAME=	teTeX-3.0
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	print meta-pkgs
 MASTER_SITES=	# empty
 
@@ -15,9 +15,10 @@ DEPENDS+=	dvipng-[0-9]*:../../graphics/dvipng
 DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
 DEPENDS+=	gsftopkk-[0-9]*:../../fonts/gsftopkk
 DEPENDS+=	ps2pkm-[0-9]*:../../fonts/ps2pkm
-DEPENDS+=	teTeX-bin>=3.0nb49:../../print/teTeX3-bin
+DEPENDS+=	teTeX-bin>=3.0nb50:../../print/teTeX3-bin
 DEPENDS+=	teTeX-texmf>=3.0nb32:../../print/teTeX3-texmf
 DEPENDS+=	tex-a2ping-[0-9]*:../../graphics/tex-a2ping
+DEPENDS+=	tex-texdoc-[0-9]*:../../print/tex-texdoc
 DEPENDS+=	tex-pdftools-[0-9]*:../../print/tex-pdftools
 DEPENDS+=	texi2html>=1.52:../../textproc/texi2html
 DEPENDS+=	xdvik-[0-9]*:../../print/xdvik
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index 64c60c408fc..44c81a1ec8a 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2011/10/27 19:39:34 minskim Exp $
+# $NetBSD: Makefile,v 1.67 2012/02/09 21:44:15 minskim Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	49
+PKGREVISION=	50
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/}
 
diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST
index f57e4163df4..6bf33c669fe 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.24 2011/10/27 19:39:34 minskim Exp $
+@comment $NetBSD: PLIST,v 1.25 2012/02/09 21:44:15 minskim Exp $
 bin/fdf2tan
 bin/fdf2tex
 bin/lamed
 bin/makempy
-bin/texdoc
-bin/texdoctk
 bin/texexec
 bin/texfind
 bin/texfont
@@ -14,7 +12,6 @@ bin/thumbpdf
 bin/uniqleaf
 info/latex.info
 man/man1/fdf2tex.1
-man/man1/texdoc.1
 man/man1/texshow.1
 share/texmf/release-tetex-src.txt
 share/texmf/web2c/pdfetex-pl.pool
diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo
index 58a1c5f55f6..d76383443f9 100644
--- a/print/teTeX3-bin/distinfo
+++ b/print/teTeX3-bin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2011/10/27 19:39:34 minskim Exp $
+$NetBSD: distinfo,v 1.25 2012/02/09 21:44:15 minskim Exp $
 
 SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
 RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
@@ -17,7 +17,7 @@ SHA1 (patch-am) = 54d86197eee3d4e15a6c9bad6ae16ef1e0299667
 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47
 SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7
 SHA1 (patch-ar) = 92f465143d278d7b081d70c3053194b70585571b
-SHA1 (patch-as) = c641dd437386abdd923ba5baeb3f18e3545a01e6
+SHA1 (patch-as) = 8e0d792ad721ce86b1749a5ce78c5a53b379de15
 SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718
 SHA1 (patch-au) = e8f556ac27ba9a22731b8e7c37356a64eb115860
 SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344
diff --git a/print/teTeX3-bin/patches/patch-as b/print/teTeX3-bin/patches/patch-as
index c6789020596..251ac3f1e7b 100644
--- a/print/teTeX3-bin/patches/patch-as
+++ b/print/teTeX3-bin/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.10 2011/10/27 19:39:34 minskim Exp $
+$NetBSD: patch-as,v 1.11 2012/02/09 21:44:15 minskim Exp $
 
 --- texk/tetex/Makefile.in.orig	2005-02-04 22:20:54.000000000 +0000
 +++ texk/tetex/Makefile.in
-@@ -8,26 +8,21 @@ ac_include ../make/programs.mk
+@@ -8,26 +8,20 @@ ac_include ../make/programs.mk
  man5dir = $(mandir)/man5
  
  SCRIPTS = \
@@ -10,7 +10,7 @@ $NetBSD: patch-as,v 1.10 2011/10/27 19:39:34 minskim Exp $
 -  kpsetool kpsewhere ps2frag pslatex rubibtex rumakeindex \
 -  texconfig texconfig-dialog texdoc texdoctk texexec texlinks updmap \
 -  ps4pdf fmtutil-sys texconfig-sys updmap-sys
-+  texdoc texdoctk texexec
++  texexec
  
 -PDFSCRIPTS = a2ping e2pall epstopdf
 +PDFSCRIPTS = ""
@@ -26,7 +26,6 @@ $NetBSD: patch-as,v 1.10 2011/10/27 19:39:34 minskim Exp $
 -  texdoctk texexec texfind texfont texshow texutil thumbpdf \
 -  ttf2afm updmap
 +  fdf2tex \
-+  texdoc \
 +  texshow
  
  INFOFILES= latex.info
@@ -36,7 +35,7 @@ $NetBSD: patch-as,v 1.10 2011/10/27 19:39:34 minskim Exp $
  default: all
  
  install: install-data install-exec
-@@ -39,30 +34,6 @@ install-data:: $(INFOFILES)
+@@ -39,30 +33,6 @@ install-data:: $(INFOFILES)
  	for p in $(manpgs); do \
  	  $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
  	done
@@ -67,7 +66,7 @@ $NetBSD: patch-as,v 1.10 2011/10/27 19:39:34 minskim Exp $
  	test -r ./latex.info || cd $(srcdir) && for i in latex.info*; do \
  	  $(INSTALL_DATA) $$i $(infodir)/$$i; done
  	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-@@ -71,17 +42,6 @@ install-data:: $(INFOFILES)
+@@ -71,17 +41,6 @@ install-data:: $(INFOFILES)
  	for p in $(POOLFILES); do \
  	  $(INSTALL_DATA) $(srcdir)/$$p $(texpooldir)/$$p; \
  	done
@@ -85,7 +84,7 @@ $NetBSD: patch-as,v 1.10 2011/10/27 19:39:34 minskim Exp $
  
  install-exec:
  	-$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
-@@ -96,16 +56,10 @@ install-exec:
+@@ -96,16 +55,10 @@ install-exec:
  	else \
  	  true; \
  	fi