Update web2c to 2011.

Changes:
* Doc changes and bug fixes.
* New commands: eptex, inimf, initex, and mfplain.

6 files changed, 23 insertions, 167 deletions

diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index dd4e3018c4a..7b42593130d 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2011/03/09 12:16:35 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2011/07/28 04:34:06 minskim Exp $
 
-DISTNAME=	texlive-20100720-source
-PKGNAME=	web2c-2010
-PKGREVISION=	7
+DISTNAME=	texlive-20110705-source
+PKGNAME=	web2c-2011
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
@@ -14,6 +13,8 @@ COMMENT=	TeX implementation translating WEB to C
 CONFLICTS+=	ja-ptex-bin-[0-9]*
 CONFLICTS+=	teTeX-bin<=3.0nb28
 CONFLICTS+=	texlive-tetex<2010
+DEPENDS+=	kpathsea>=6.0.1:../../print/kpathsea
+DEPENDS+=	ptexenc>=1.2.0:../../print/ptexenc
 
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 			${DISTNAME}/libs/obsdcompat \
@@ -57,11 +58,6 @@ INSTALL_DIRS=	${WRKDIR}/${DISTNAME}/texk/web2c
 .include "../../print/ptexenc/buildlink3.mk"
 
 post-install:
-	${LN} -sf cweb.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ctangle.1
-	${LN} -sf cweb.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/cweave.1
-	${LN} -sf mf.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/mf-nowin.1
-	${LN} -sf dvicopy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/odvicopy.1
-	${LN} -sf dvitype.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/odvitype.1
 	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pdftex.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/web2c/PLIST b/print/web2c/PLIST
index 64425b6ada1..64f34c4e8df 100644
--- a/print/web2c/PLIST
+++ b/print/web2c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/10/09 07:33:43 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/07/28 04:34:06 minskim Exp $
 bin/aleph
 bin/bibtex
 bin/ctangle
@@ -7,11 +7,15 @@ bin/cweave
 bin/dvicopy
 bin/dvitomp
 bin/dvitype
+bin/eptex
 bin/gftodvi
 bin/gftopk
 bin/gftype
+bin/inimf
+bin/initex
 bin/mf
 bin/mf-nowin
+bin/mfplain
 bin/mft
 bin/mkocp
 bin/mkofm
diff --git a/print/web2c/distinfo b/print/web2c/distinfo
index 05c25814b1e..db2a547e363 100644
--- a/print/web2c/distinfo
+++ b/print/web2c/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.10 2011/01/17 10:36:54 wiz Exp $
+$NetBSD: distinfo,v 1.11 2011/07/28 04:34:06 minskim Exp $
 
-SHA1 (texlive-20100720-source.tar.xz) = 713b861123e3d9e073e2c93d7ed3e13262d82c34
-RMD160 (texlive-20100720-source.tar.xz) = b1120f3377ca45b4d86911b99a95c2e6e45927b5
-Size (texlive-20100720-source.tar.xz) = 33484212 bytes
-SHA1 (patch-aa) = f28a82082bbec5385480fc4b7b6a61904536b287
-SHA1 (patch-ab) = f83f9de856e4b8a79b54b5c871c0966ced9b3b18
-SHA1 (patch-am) = c6c08e8c1bace8e93eb737f64f2d2f5128db0bfd
+SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4
+RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b
+Size (texlive-20110705-source.tar.xz) = 131207904 bytes
+SHA1 (patch-am) = 5df4e31280e04efd934d897d52093e63f8de97a9
diff --git a/print/web2c/patches/patch-aa b/print/web2c/patches/patch-aa
deleted file mode 100644
index 35386f38ed5..00000000000
--- a/print/web2c/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2011/01/16 15:07:16 wiz Exp $
-
-Fix to build with png-1.5.
-
---- pdftexdir/writeimg.c.orig	2010-05-02 13:21:48.000000000 +0000
-+++ pdftexdir/writeimg.c
-@@ -137,7 +137,7 @@ integer imagecolordepth(integer img)
- {
-     switch (img_type(img)) {
-     case IMAGE_TYPE_PNG:
--        return png_info(img)->bit_depth;
-+        return png_get_bit_depth(png_ptr(img), png_info(img));
-     case IMAGE_TYPE_JPG:
-         return jpg_ptr(img)->bits_per_component;
-     case IMAGE_TYPE_JBIG2:
-@@ -389,7 +389,7 @@ void deleteimage(integer img)
-         epdf_delete();
-         break;
-     case IMAGE_TYPE_PNG:
--        xfclose((FILE *) png_ptr(img)->io_ptr, cur_file_name);
-+        xfclose((FILE *) png_get_io_ptr(png_ptr(img)), cur_file_name);
-         png_destroy_read_struct(&(png_ptr(img)), &(png_info(img)), NULL);
-         break;
-     case IMAGE_TYPE_JPG:
diff --git a/print/web2c/patches/patch-ab b/print/web2c/patches/patch-ab
deleted file mode 100644
index 2ae4eb9f78c..00000000000
--- a/print/web2c/patches/patch-ab
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2011/01/17 10:36:54 wiz Exp $
-
-Fix to build with png-1.5.
-->transformations part removed on recommendation by John Bowler.
-
---- pdftexdir/writepng.c.orig	2010-06-22 15:35:42.000000000 +0000
-+++ pdftexdir/writepng.c
-@@ -33,7 +33,6 @@ Franklin Street, Fifth Floor, Boston, MA
- #define png_height(N)		png_get_image_height(png_ptr(N), png_info(N))
- #define png_interlace_type(N)	png_get_interlace_type(png_ptr(N), png_info(N))
- #define png_io_ptr(N)		png_get_io_ptr(png_ptr(N))
--#define png_num_palette(N)	png_info(N)->num_palette
- #define png_palette(N)		png_info(N)->palette
- #define png_rowbytes(N)		png_get_rowbytes(png_ptr(N), png_info(N))
- #define png_transformations(N)	png_ptr(N)->transformations
-@@ -50,7 +49,6 @@ Franklin Street, Fifth Floor, Boston, MA
- #define png_height(N)		png_info(N)->height
- #define png_interlace_type(N)	png_info(N)->interlace_type
- #define png_io_ptr(N)		png_ptr(N)->io_ptr
--#define png_num_palette(N)	png_info(N)->num_palette
- #define png_palette(N)		png_info(N)->palette
- #define png_rowbytes(N)		png_info(N)->rowbytes
- #define png_transformations(N)	png_ptr(N)->transformations
-@@ -201,14 +199,18 @@ static void write_png_palette(integer im
-     int i, j, k, l;
-     png_bytep row, r, *rows;
-     integer palette_objnum = 0;
-+    png_colorp palette;
-+    int num_palette;
-+
-+    png_get_PLTE(png_ptr(img), png_info(img), &palette, &num_palette);
-+
-     pdfcreateobj(0, 0);
-     palette_objnum = objptr;
-     if (img_colorspace_ref(img) != 0) {
-         pdf_printf("%i 0 R\n", (int) img_colorspace_ref(img));
-     } else {
-         pdf_printf("[/Indexed /DeviceRGB %i %i 0 R]\n",
--                   (int) (png_num_palette(img) - 1),
--                   (int) palette_objnum);
-+                   num_palette -1, (int) palette_objnum);
-     }
-     pdfbeginstream();
-     if (png_interlace_type(img) == PNG_INTERLACE_NONE) {
-@@ -230,11 +232,11 @@ static void write_png_palette(integer im
-     if (palette_objnum > 0) {
-         pdfbegindict(palette_objnum, 0);
-         pdfbeginstream();
--        for (i = 0; (unsigned) i < png_num_palette(img); i++) {
-+        for (i = 0; (unsigned) i < num_palette; i++) {
-             pdfroom(3);
--            pdfbuf[pdfptr++] = png_palette(img)[i].red;
--            pdfbuf[pdfptr++] = png_palette(img)[i].green;
--            pdfbuf[pdfptr++] = png_palette(img)[i].blue;
-+            pdfbuf[pdfptr++] = palette[i].red;
-+            pdfbuf[pdfptr++] = palette[i].green;
-+            pdfbuf[pdfptr++] = palette[i].blue;
-         }
-         pdfendstream();
-     }
-@@ -553,7 +555,12 @@ void write_png(integer img)
-     double gamma, checked_gamma;
-     int i;
-     integer palette_objnum = 0;
-+    png_colorp palette;
-+    int num_palette;
-     last_png_needs_page_group = false;
-+
-+    png_get_PLTE(png_ptr(img), png_info(img), &palette, &num_palette);
-+
-     if (fixedpdfminorversion < 5)
-         fixedimagehicolor = 0;
- 
-@@ -574,8 +581,6 @@ void write_png(integer img)
-      */
-     if (fixedpdfminorversion > 1
-         && png_interlace_type(img) == PNG_INTERLACE_NONE
--        && (png_transformations(img) == PNG_TRANSFORM_IDENTITY
--            || png_transformations(img) == 0x2000)
-         /* gamma */
-         && !(png_ptr_color_type(img) == PNG_COLOR_TYPE_GRAY_ALPHA ||
-              png_ptr_color_type(img) == PNG_COLOR_TYPE_RGB_ALPHA)
-@@ -590,8 +595,7 @@ void write_png(integer img)
-                 pdfcreateobj(0, 0);
-                 palette_objnum = objptr;
-                 pdf_printf("[/Indexed /DeviceRGB %i %i 0 R]\n",
--                           (int) (png_num_palette(img) - 1),
--                           (int) palette_objnum);
-+                           num_palette - 1, (int) palette_objnum);
-                 break;
-             case PNG_COLOR_TYPE_GRAY:
-                 pdf_puts("/DeviceGray\n");
-@@ -605,11 +609,11 @@ void write_png(integer img)
-         if (palette_objnum > 0) {
-             pdfbegindict(palette_objnum, 0);
-             pdfbeginstream();
--            for (i = 0; i < png_num_palette(img); i++) {
-+            for (i = 0; i < num_palette; i++) {
-                 pdfroom(3);
--                pdfbuf[pdfptr++] = png_palette(img)[i].red;
--                pdfbuf[pdfptr++] = png_palette(img)[i].green;
--                pdfbuf[pdfptr++] = png_palette(img)[i].blue;
-+                pdfbuf[pdfptr++] = palette[i].red;
-+                pdfbuf[pdfptr++] = palette[i].green;
-+                pdfbuf[pdfptr++] = palette[i].blue;
-             }
-             pdfendstream();
-         }
-@@ -619,9 +623,6 @@ void write_png(integer img)
-             if (fixedimageapplygamma &&
-                 (checked_gamma > 1.01 || checked_gamma < 0.99))
-                 tex_printf("gamma delta=%lf ", checked_gamma);
--            if (png_transformations(img) != PNG_TRANSFORM_IDENTITY)
--                tex_printf("transform=%lu",
--                           (long) png_transformations(img));
-             if ((png_color_type(img) != PNG_COLOR_TYPE_GRAY)
-                 && (png_color_type(img) != PNG_COLOR_TYPE_RGB)
-                 && (png_color_type(img) != PNG_COLOR_TYPE_PALETTE))
diff --git a/print/web2c/patches/patch-am b/print/web2c/patches/patch-am
index 41031530eaf..5071f5ca02f 100644
--- a/print/web2c/patches/patch-am
+++ b/print/web2c/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.4 2010/09/24 21:54:57 minskim Exp $
+$NetBSD: patch-am,v 1.5 2011/07/28 04:34:06 minskim Exp $
 
---- man/Makefile.in.orig	2010-07-06 09:17:20.000000000 +0000
+--- man/Makefile.in.orig	2011-05-11 07:06:49.000000000 +0000
 +++ man/Makefile.in
 @@ -40,7 +40,7 @@ host_triplet = @host@
  @MP_TRUE@am__append_5 = mpost.man
@@ -9,14 +9,14 @@ $NetBSD: patch-am,v 1.4 2010/09/24 21:54:57 minskim Exp $
 -@PDFTEX_TRUE@am__append_8 = pdftex:pdflatex
 +@PDFTEX_TRUE@am__append_8 = pdftex
  @LUATEX_TRUE@am__append_9 = luatex.man
- @XETEX_TRUE@am__append_10 = # xetex.man
- @OTANGLE_TRUE@am__append_11 = $(otangle_man_sources)
-@@ -308,7 +308,7 @@ x_tool_libs = @x_tool_libs@
+ @LUATEX_TRUE@am__append_10 = luatex:texlua luatex:texluac
+ @XETEX_TRUE@am__append_11 = # xetex.man
+@@ -315,7 +315,7 @@ x_tool_libs = @x_tool_libs@
  man_sources = $(bootstrap_man_sources) $(am__append_1) $(am__append_2) \
  	$(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)
+ 	$(am__append_7) $(am__append_9) $(am__append_11) \
+-	$(am__append_12) $(am__append_14) $(misc_man_sources)
++	$(am__append_12) $(am__append_14)
  EXTRA_DIST = $(bootstrap_man_sources) $(web_man_sources) tex.man \
  	mf.man mpost.man etex.man $(pdftex_man_sources) luatex.man \
  	$(otangle_man_sources) aleph.man $(misc_man_sources) \