Update web2c to 2012.

Changes:
- Add upTeX.
- Documentation and bug fixes.

4 files changed, 16 insertions, 26 deletions

diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index e3c7e668642..443c830afed 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2012/07/04 20:30:22 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2012/07/10 22:34:38 minskim Exp $
 
-DISTNAME=	texlive-20110705-source
-PKGNAME=	web2c-2011
-PKGREVISION=	3
+DISTNAME=	texlive-20120701-source
+PKGNAME=	web2c-2012
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/print/web2c/PLIST b/print/web2c/PLIST
index 396dd36fbd9..ad9a43be587 100644
--- a/print/web2c/PLIST
+++ b/print/web2c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/12/14 19:33:40 minskim Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/07/10 22:34:38 minskim Exp $
 bin/aleph
 bin/bibtex
 bin/ctangle
@@ -8,6 +8,7 @@ bin/dvicopy
 bin/dvitomp
 bin/dvitype
 bin/eptex
+bin/euptex
 bin/gftodvi
 bin/gftopk
 bin/gftype
@@ -48,9 +49,15 @@ bin/tex
 bin/tftopl
 bin/tie
 bin/ttf2afm
+bin/upbibtex
+bin/updvitype
+bin/uppltotf
+bin/uptex
+bin/uptftopl
 bin/vftovp
 bin/vptovf
 bin/weave
+bin/wovp2ovf
 info/web2c.info
 man/man1/aleph.1
 man/man1/bibtex.1
diff --git a/print/web2c/distinfo b/print/web2c/distinfo
index 8c03b3ef9d6..ee96e4882fc 100644
--- a/print/web2c/distinfo
+++ b/print/web2c/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2012/07/05 08:01:03 tron Exp $
+$NetBSD: distinfo,v 1.15 2012/07/10 22:34:38 minskim Exp $
 
-SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4
-RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b
-Size (texlive-20110705-source.tar.xz) = 131207904 bytes
+SHA1 (texlive-20120701-source.tar.xz) = e41ef31eba27891f3434e01638d3559cc6958016
+RMD160 (texlive-20120701-source.tar.xz) = df09b657919a3f203309645028803098f52bbac9
+Size (texlive-20120701-source.tar.xz) = 131904044 bytes
 SHA1 (patch-am) = 989d2f74fc4de89ff22fca80689809b0d60a6d77
-SHA1 (patch-an) = bfb8f4abf680391a09cc3c2813809d1b7a4cf703
diff --git a/print/web2c/patches/patch-an b/print/web2c/patches/patch-an
deleted file mode 100644
index 6bc6697ee2a..00000000000
--- a/print/web2c/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.4 2012/07/05 08:01:03 tron Exp $
-
-Fix build with poppler-0.20.
-
---- pdftexdir/pdftosrc.cc.orig	2012-06-24 13:48:08.000000000 +0000
-+++ pdftexdir/pdftosrc.cc
-@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
-         exit(1);
-     }
-     if (extract_xref_table) {
--        int size = xref->getSize();
-+        int size = xref->getNumObjects();
-         int i;
-         for (i = 0; i < size; i++) {
-             if (xref->getEntry(i)->offset == 0xffffffff)