Resolve conflicts between texlive-tetex and tex-context-doc.

tex-context{,-doc} were imported during freeze to fix context format
generation in teTeX-bin.

4 files changed, 26 insertions, 23 deletions

diff --git a/print/texlive-tetex/Makefile b/print/texlive-tetex/Makefile
index 480504d80cf..dc942af5a15 100644
--- a/print/texlive-tetex/Makefile
+++ b/print/texlive-tetex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/01/16 03:40:44 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/17 00:21:16 minskim Exp $
 
 DISTNAME=	texlive-20091011-source
 PKGNAME=	texlive-tetex-2009
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/print/texlive-tetex/PLIST b/print/texlive-tetex/PLIST
index 5e4f10fcc3d..58d446d311c 100644
--- a/print/texlive-tetex/PLIST
+++ b/print/texlive-tetex/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/09/19 15:31:03 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/06/17 00:21:16 minskim Exp $
 bin/allcm
 bin/allec
 bin/allneeded
@@ -26,7 +26,6 @@ bin/updmap-sys
 man/man1/allcm.1
 man/man1/allec.1
 man/man1/allneeded.1
-man/man1/ctxtools.1
 man/man1/dvi2fax.1
 man/man1/dvired.1
 man/man1/fmtutil-sys.1
@@ -36,35 +35,25 @@ man/man1/kpsepath.1
 man/man1/kpsetool.1
 man/man1/kpsewhere.1
 man/man1/kpsexpand.1
-man/man1/makempy.1
 man/man1/mkjobtexmf.1
 man/man1/mkocp.1
 man/man1/mkofm.1
 man/man1/mktexfmt.1
-man/man1/mptopdf.1
 man/man1/ofm2opl.1
 man/man1/opl2ofm.1
 man/man1/otp2ocp.1
 man/man1/outocp.1
 man/man1/ovf2ovp.1
 man/man1/ovp2ovf.1
-man/man1/pdftools.1
 man/man1/ps2frag.1
 man/man1/pslatex.1
-man/man1/pstopdf.1
 man/man1/rubibtex.1
 man/man1/rumakeindex.1
 man/man1/texconfig-sys.1
 man/man1/texconfig.1
 man/man1/texdoctk.1
-man/man1/texexec.1
-man/man1/texfind.1
-man/man1/texfont.1
 man/man1/texhash.1
 man/man1/texlinks.1
-man/man1/texmfstart.1
-man/man1/textools.1
-man/man1/texutil.1
 man/man1/thumbpdf.1
 man/man1/ttf2afm.1
 man/man1/updmap-sys.1
diff --git a/print/texlive-tetex/distinfo b/print/texlive-tetex/distinfo
index 2bfb6d9d4fd..d08394fdbb5 100644
--- a/print/texlive-tetex/distinfo
+++ b/print/texlive-tetex/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2010/01/16 03:40:44 minskim Exp $
+$NetBSD: distinfo,v 1.7 2010/06/17 00:21:16 minskim Exp $
 
 SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
 RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
 Size (texlive-20091011-source.tar.xz) = 29683728 bytes
-SHA1 (patch-aa) = 0ecc9a662343bc64a95da24ca010fcbf3aab5582
+SHA1 (patch-aa) = 4caa7aeea5254998165ab929b3f57233db4c0347
 SHA1 (patch-ab) = 7dedf57466ab0256b25a4c6a52e47cfaa0183b0b
 SHA1 (patch-ac) = 00a18f7106ac91c8f6e38b27cd607dce28d00cd6
 SHA1 (patch-ad) = 3fde31afd0d136e8f04a373b2ece3f6d7f587495
diff --git a/print/texlive-tetex/patches/patch-aa b/print/texlive-tetex/patches/patch-aa
index c9050035187..1c19cd1d6f9 100644
--- a/print/texlive-tetex/patches/patch-aa
+++ b/print/texlive-tetex/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2010/01/16 03:40:44 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2010/06/17 00:21:17 minskim Exp $
 
---- Makefile.in.orig	2009-09-28 08:46:20.000000000 -0700
+--- Makefile.in.orig	2009-09-28 15:46:20.000000000 +0000
 +++ Makefile.in
 @@ -197,7 +197,6 @@ dist_bin_SCRIPTS = \
  	kpsetool \
@@ -10,15 +10,28 @@ $NetBSD: patch-aa,v 1.4 2010/01/16 03:40:44 minskim Exp $
  	pslatex \
  	rubibtex \
  	rumakeindex \
-@@ -225,7 +224,6 @@ dist_man1_MANS = \
- 	context/texutil.man \
+@@ -212,20 +211,8 @@ dist_man1_MANS = \
+ 	allcm.man \
+ 	allec.man \
+ 	allneeded.man \
+-	context/ctxtools.man \
+-	context/makempy.man \
+-	context/mptopdf.man \
+-	context/pdftools.man \
+-	context/pstopdf.man \
+-	context/texexec.man \
+-	context/texfind.man \
+-	context/texfont.man \
+-	context/texmfstart.man \
+-	context/textools.man \
+-	context/texutil.man \
  	dvi2fax.man \
  	dvired.man \
 -	e2pall.man \
  	fmtutil.man \
  	fontinst.man \
  	kpsetool.man \
-@@ -254,14 +252,14 @@ dist_man5_MANS = \
+@@ -254,14 +241,14 @@ dist_man5_MANS = \
  	fmtutil.cnf.5 \
  	updmap.cfg.5
  
@@ -35,7 +48,7 @@ $NetBSD: patch-aa,v 1.4 2010/01/16 03:40:44 minskim Exp $
  nobase_dist_texconf_DATA = \
  	texmf/texconfig/README \
  	texmf/texconfig/g/generic \
-@@ -269,7 +267,7 @@ nobase_dist_texconf_DATA = \
+@@ -269,7 +256,7 @@ nobase_dist_texconf_DATA = \
  	texmf/texconfig/v/vt100 \
  	texmf/texconfig/x/xterm
  
@@ -44,7 +57,7 @@ $NetBSD: patch-aa,v 1.4 2010/01/16 03:40:44 minskim Exp $
  dist_texconfig_SCRIPTS = tcfmgr
  dist_texconfig_DATA = tcfmgr.map
  web2cdir = ${prefix}/texmf/web2c
-@@ -753,8 +751,8 @@ info: info-am
+@@ -753,8 +740,8 @@ info: info-am
  
  info-am:
  
@@ -55,7 +68,7 @@ $NetBSD: patch-aa,v 1.4 2010/01/16 03:40:44 minskim Exp $
  	install-man install-nobase_dist_texconfDATA
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -848,22 +846,15 @@ install-exec-hook:
+@@ -848,22 +835,15 @@ install-exec-hook:
  
  install-data-hook:
  	cd $(DESTDIR)$(man1dir) \