Update web2c to 2010.

Changes:
- Added ptex.

4 files changed, 38 insertions, 19 deletions

diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index 837272c8cce..398543097dc 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:18 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/09/13 04:09:54 minskim Exp $
 
-DISTNAME=	texlive-20091011-source
-PKGNAME=	web2c-2009
-PKGREVISION=	1
+DISTNAME=	texlive-20100720-source
+PKGNAME=	web2c-2010
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
@@ -11,11 +10,14 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/web2c/
 COMMENT=	TeX implementation translating WEB to C
 
+CONFLICTS+=	ja-ptex-bin-[0-9]*
 CONFLICTS+=	teTeX-bin<=3.0nb28
+CONFLICTS+=	texlive-tetex<2010
 
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 			${DISTNAME}/libs/obsdcompat \
 			${DISTNAME}/libs/xpdf \
+			${DISTNAME}/texk/ptexenc \
 			${DISTNAME}/texk/web2c
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -43,6 +45,7 @@ CONFIGURE_ARGS+=	--with-system-zlib \
 
 CONFIGURE_DIRS=	${WRKDIR}/${DISTNAME}/libs/obsdcompat \
 		${WRKDIR}/${DISTNAME}/libs/xpdf \
+		${WRKDIR}/${DISTNAME}/texk/ptexenc \
 		${WRKDIR}/${DISTNAME}/texk/web2c
 INSTALL_DIRS=	${WRKDIR}/${DISTNAME}/texk/web2c
 
diff --git a/print/web2c/PLIST b/print/web2c/PLIST
index 0a24e0fe560..f29ebfb9443 100644
--- a/print/web2c/PLIST
+++ b/print/web2c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/01/16 03:15:38 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/09/13 04:09:54 minskim Exp $
 bin/aleph
 bin/bibtex
 bin/ctangle
@@ -27,12 +27,17 @@ bin/outocp
 bin/ovf2ovp
 bin/ovp2ovf
 bin/patgen
+bin/pbibtex
 bin/pdftex
 bin/pdftosrc
+bin/pdvitype
 bin/pktogf
 bin/pktype
 bin/pltotf
 bin/pooltype
+bin/ppltotf
+bin/ptex
+bin/ptftopl
 bin/synctex
 bin/tangle
 bin/tex
@@ -55,13 +60,24 @@ man/man1/dvitype.1
 man/man1/gftodvi.1
 man/man1/gftopk.1
 man/man1/gftype.1
+man/man1/lamed.1
 man/man1/mf-nowin.1
 man/man1/mf.1
 man/man1/mft.1
+man/man1/mkocp.1
+man/man1/mkofm.1
 man/man1/mpost.1
 man/man1/odvicopy.1
 man/man1/odvitype.1
+man/man1/ofm2opl.1
+man/man1/opl2ofm.1
+man/man1/otangle.1
+man/man1/otp2ocp.1
+man/man1/outocp.1
+man/man1/ovf2ovp.1
+man/man1/ovp2ovf.1
 man/man1/patgen.1
+man/man1/pdflatex.1
 man/man1/pdftex.1
 man/man1/pdftosrc.1
 man/man1/pktogf.1
@@ -73,6 +89,7 @@ man/man1/tangle.1
 man/man1/tex.1
 man/man1/tftopl.1
 man/man1/tie.1
+man/man1/ttf2afm.1
 man/man1/vftovp.1
 man/man1/vptovf.1
 man/man1/weave.1
diff --git a/print/web2c/distinfo b/print/web2c/distinfo
index d7de39b9601..1b370bbdd0b 100644
--- a/print/web2c/distinfo
+++ b/print/web2c/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2010/01/16 03:15:38 minskim Exp $
+$NetBSD: distinfo,v 1.7 2010/09/13 04:09:54 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-am) = d9068b2a3fc307cddada36c328a34b2d0080c9cf
+SHA1 (texlive-20100720-source.tar.xz) = 713b861123e3d9e073e2c93d7ed3e13262d82c34
+RMD160 (texlive-20100720-source.tar.xz) = b1120f3377ca45b4d86911b99a95c2e6e45927b5
+Size (texlive-20100720-source.tar.xz) = 33484212 bytes
+SHA1 (patch-am) = 05fca26634f16926e52820a6505dc99156dfae11
diff --git a/print/web2c/patches/patch-am b/print/web2c/patches/patch-am
index ce861ea512b..31c18006c7f 100644
--- a/print/web2c/patches/patch-am
+++ b/print/web2c/patches/patch-am
@@ -1,14 +1,13 @@
-$NetBSD: patch-am,v 1.2 2010/01/16 03:15:38 minskim Exp $
+$NetBSD: patch-am,v 1.3 2010/09/13 04:09:54 minskim Exp $
 
---- man/Makefile.in.orig	2009-07-23 11:43:28.000000000 -0700
+--- man/Makefile.in.orig	2010-07-06 09:17:20.000000000 +0000
 +++ man/Makefile.in
-@@ -289,8 +289,7 @@ x_tool_libs = @x_tool_libs@
+@@ -308,7 +308,7 @@ x_tool_libs = @x_tool_libs@
  man_sources = $(bootstrap_man_sources) $(am__append_1) $(am__append_2) \
- 	$(am__append_3) $(am__append_4) $(am__append_5) \
- 	$(am__append_6) $(am__append_7) $(am__append_8) \
--	$(am__append_9) $(am__append_10) $(am__append_11) \
--	$(misc_man_sources)
-+	$(am__append_9) $(am__append_10) $(am__append_11)
+ 	$(am__append_3) $(am__append_5) $(am__append_6) \
+ 	$(am__append_7) $(am__append_9) $(am__append_10) \
+-	$(am__append_11) $(am__append_13) $(misc_man_sources)
++	$(am__append_11) $(am__append_13)
  EXTRA_DIST = $(bootstrap_man_sources) $(web_man_sources) tex.man \
  	mf.man mpost.man etex.man $(pdftex_man_sources) luatex.man \
- 	aleph.man $(misc_man_sources) amslatex.min initex.min \
+ 	$(otangle_man_sources) aleph.man $(misc_man_sources) \