Update web2c to 2009.

Changes:
    - --shell-restricted aka shell_escape=p for restricted shell access.
    - --enable-write18 and --disable-write18 accepted as synonyms for
      --shell-escape and --no-shell-escape, for compatibility with MiKTeX.
    - Omega removed; use Aleph.
    - Build system now automake-based.

25 files changed, 40 insertions, 620 deletions

diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index 5eed7e317ef..0ed9fab9667 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2009/07/26 10:10:18 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2010/01/16 03:15:38 minskim Exp $
 
-DISTNAME=	texlive-20080816-source
-PKGNAME=	web2c-7.5.7
-PKGREVISION=	5
+DISTNAME=	texlive-20091011-source
+PKGNAME=	web2c-2009
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
-EXTRACT_SUFX=	.tar.lzma
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/web2c/
@@ -13,22 +12,9 @@ COMMENT=	TeX implementation translating WEB to C
 
 CONFLICTS+=	teTeX-bin<=3.0nb28
 
-EXTRACT_ELEMENTS=	${DISTNAME}/config \
-			${DISTNAME}/libs/lua51 \
-			${DISTNAME}/libs/luafilesystem \
-			${DISTNAME}/libs/luafontforge \
-			${DISTNAME}/libs/luamd5 \
-			${DISTNAME}/libs/luapeg \
-			${DISTNAME}/libs/luazip \
-			${DISTNAME}/libs/luazlib \
-			${DISTNAME}/libs/md5 \
-			${DISTNAME}/libs/slnunicode \
-			${DISTNAME}/libs/xpdf ${DISTNAME}/libs/obsdcompat \
-			${DISTNAME}/texk/make \
-			${DISTNAME}/texk/config.guess \
-			${DISTNAME}/texk/config.sub \
-			${DISTNAME}/texk/install.sh \
-			${DISTNAME}/texk/mkinstalldirs \
+EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
+			${DISTNAME}/libs/obsdcompat \
+			${DISTNAME}/libs/xpdf \
 			${DISTNAME}/texk/web2c
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -37,28 +23,28 @@ GNU_CONFIGURE=	yes
 INFO_FILES=	yes
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake lex perl yacc
+USE_TOOLS+=	gmake lex yacc pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 
-CONFIGURE_ARGS+=	--without-luatex
-CONFIGURE_ARGS+=	--without-xetex
-CONFIGURE_ARGS+=	--with-mf-nowin
-CONFIGURE_ARGS+=	--with-system-pnglib \
-			--with-pnglib-include=${BUILDLINK_PREFIX.png}/include \
-			--with-pnglib-libdir=${BUILDLINK_PREFIX.png}/lib
+CONFIGURE_ARGS+=	--disable-luatex
+CONFIGURE_ARGS+=	--disable-xetex
+CONFIGURE_ARGS+=	--with-x=no
+CONFIGURE_ARGS+=	--without-mf-x-toolkit
+CONFIGURE_ARGS+=	--with-system-kpathsea \
+		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
+		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
+CONFIGURE_ARGS+=	--with-system-libpng \
+			--with-libpng-includes=${BUILDLINK_PREFIX.png}/include \
+			--with-libpng-libdir=${BUILDLINK_PREFIX.png}/lib
 CONFIGURE_ARGS+=	--with-system-zlib \
-			--with-zlib-include=${BUILDLINK_PREFIX.zlib}/include \
+			--with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
 			--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
-CONFIGURE_ARGS+=	--enable-static
 
-CONFIGURE_DIRS=	${WRKDIR}/${DISTNAME}/libs/xpdf \
-		${WRKDIR}/${DISTNAME}/libs/obsdcompat \
+CONFIGURE_DIRS=	${WRKDIR}/${DISTNAME}/libs/obsdcompat \
+		${WRKDIR}/${DISTNAME}/libs/xpdf \
 		${WRKDIR}/${DISTNAME}/texk/web2c
 INSTALL_DIRS=	${WRKDIR}/${DISTNAME}/texk/web2c
 
-MAKE_ENV+=	KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
-MAKE_FLAGS+=	LIBTOOL=${LIBTOOL:Q}
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../print/kpathsea/buildlink3.mk"
diff --git a/print/web2c/PLIST b/print/web2c/PLIST
index 88907a342a7..0a24e0fe560 100644
--- a/print/web2c/PLIST
+++ b/print/web2c/PLIST
@@ -1,29 +1,24 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/09 22:31:14 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/01/16 03:15:38 minskim Exp $
 bin/aleph
 bin/bibtex
 bin/ctangle
 bin/ctie
 bin/cweave
-bin/dmp
 bin/dvicopy
 bin/dvitomp
 bin/dvitype
 bin/gftodvi
 bin/gftopk
 bin/gftype
-bin/makempx
 bin/mf
 bin/mf-nowin
 bin/mft
 bin/mkocp
 bin/mkofm
 bin/mpost
-bin/mpto
-bin/newer
 bin/odvicopy
 bin/odvitype
 bin/ofm2opl
-bin/omega
 bin/omfonts
 bin/opl2ofm
 bin/otangle
@@ -48,28 +43,24 @@ bin/vftovp
 bin/vptovf
 bin/weave
 info/web2c.info
+man/man1/aleph.1
 man/man1/bibtex.1
 man/man1/ctangle.1
 man/man1/ctie.1
 man/man1/cweave.1
 man/man1/cweb.1
-man/man1/dmp.1
 man/man1/dvicopy.1
 man/man1/dvitomp.1
 man/man1/dvitype.1
 man/man1/gftodvi.1
 man/man1/gftopk.1
 man/man1/gftype.1
-man/man1/makempx.1
 man/man1/mf-nowin.1
 man/man1/mf.1
 man/man1/mft.1
 man/man1/mpost.1
-man/man1/mpto.1
-man/man1/newer.1
 man/man1/odvicopy.1
 man/man1/odvitype.1
-man/man1/omega.1
 man/man1/patgen.1
 man/man1/pdftex.1
 man/man1/pdftosrc.1
diff --git a/print/web2c/distinfo b/print/web2c/distinfo
index ae0d777ab64..d7de39b9601 100644
--- a/print/web2c/distinfo
+++ b/print/web2c/distinfo
@@ -1,27 +1,6 @@
-$NetBSD: distinfo,v 1.5 2009/07/17 06:58:51 minskim Exp $
+$NetBSD: distinfo,v 1.6 2010/01/16 03:15:38 minskim Exp $
 
-SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
-RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
-Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
-SHA1 (patch-aa) = d3a3c38638a699b5cb9b4e6da7b53f3ab57ba3f8
-SHA1 (patch-ab) = 06a46cdac3ce4731dda8940848a2c4493f703502
-SHA1 (patch-ac) = 7e604596d3c9c5095937b2bdd094371127f6f05f
-SHA1 (patch-ad) = b61ea68a06def0d23b3b79fb98edb68875181885
-SHA1 (patch-ae) = f700b735a9b0fdd5ae25a556798334f3d05739e1
-SHA1 (patch-af) = af78a42510c7b060340ab770e9065a90c7d06e5f
-SHA1 (patch-ag) = d04526f55500e13757acd9e2a320b2c6737edd3b
-SHA1 (patch-ah) = b518352ae6b2839b2790550b422f1c2860821350
-SHA1 (patch-ai) = 85d011bd5023ea6ef984836d49d7b8d439ce725a
-SHA1 (patch-aj) = 986cae97bbe29164ab0e5ab2b0f9dc9d7c6f8e10
-SHA1 (patch-ak) = 6315532bc4929dcec2d06d1112e424f74a2ae7a9
-SHA1 (patch-al) = b8fc7bad60bffac60a48dccc63af2b9b736b84f0
-SHA1 (patch-am) = fbca2d97fe693b6d964f596e79908680a6e03965
-SHA1 (patch-an) = e2cb5013c035fd9d3ec288af37b7c4f40c6648eb
-SHA1 (patch-ao) = 714bb6752f9f6d7647ecfa53f78305603fb0f9e9
-SHA1 (patch-ap) = afea107d16a936a834b10c526dc5cadd5a5d97bb
-SHA1 (patch-aq) = 6be32b638b283924b5ff70ebd9e653f821bea3a0
-SHA1 (patch-ar) = 58dcc0263b7347d7dfbf10370bcad3ed46849414
-SHA1 (patch-as) = b676605ce6f599d75ef9076316f60a5679656a16
-SHA1 (patch-at) = 590c83e0decf5603a75970e33d8028d794d920d2
-SHA1 (patch-au) = acc255d4e4eacd960d4b9a9807ca4b0cff37d000
-SHA1 (patch-av) = 9b7272f47229daf1daccafdafbf201c34f8ef6d8
+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
diff --git a/print/web2c/patches/patch-aa b/print/web2c/patches/patch-aa
deleted file mode 100644
index 7dfbbfa32e8..00000000000
--- a/print/web2c/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- ../make/tkpathsea.mk.orig	2008-05-29 13:59:08.000000000 -0700
-+++ ../make/tkpathsea.mk
-@@ -4,10 +4,9 @@ makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='
- 
- # This is wrong: the library doesn't depend on kpsewhich.c or
- # acconfig.h.  But what to do?
--$(kpathsea): $(kpathsea_srcdir)/*.c $(kpathsea_srcdir)/*.h \
--	     $(top_srcdir)/../make/paths.mk
--	cd $(kpathsea_dir) && $(MAKE) $(makeargs)
-+$(kpathsea):
-+	true
- 
--$(kpathsea_dir)/paths.h: $(kpathsea_srcdir)/texmf.cnf
--	cd $(kpathsea_dir) && $(MAKE) $(makeargs)
-+$(kpathsea_dir)/paths.h:
-+	true
- # End of tkpathsea.mk.
diff --git a/print/web2c/patches/patch-ab b/print/web2c/patches/patch-ab
deleted file mode 100644
index 69b0f297db7..00000000000
--- a/print/web2c/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- ../make/common.mk.orig	2007-01-20 03:03:18.000000000 -0800
-+++ ../make/common.mk
-@@ -17,7 +17,7 @@ LIBTOOL = $(SHELL) $(kpathsea_parent)/li
- # You can change [X]CPPFLAGS, [X]CFLAGS, or [X]DEFS, but
- # please don't change ALL_CPPFLAGS or ALL_CFLAGS.
- # prog_cflags is set by subdirectories of web2c.
--ALL_CPPFLAGS = $(DEFS) -I. -I$(srcdir) -I$(kpathsea_parent) \
-+ALL_CPPFLAGS = $(DEFS) -I. -I$(srcdir) -I$(KPATHSEA_PREFIX)/include \
-   -I$(kpathsea_srcdir_parent) $(prog_cflags) $(CPPFLAGS)
- ALL_CFLAGS = $(ALL_CPPFLAGS) $(CFLAGS)
- ALL_CXXFLAGS = $(ALL_CPPFLAGS) $(CXXFLAGS)
-@@ -51,11 +51,11 @@ UNINSTALL_LIBTOOL_LIBS = $(LIBTOOL) --mo
- UNINSTALL_LIBTOOL_PROG = $(LIBTOOL) --mode=uninstall $(RM)
- 
- # We use these for many things.
--kpathsea_parent = ..
-+kpathsea_parent = $(KPATHSEA_PREFIX)/include
- kpathsea_dir = $(kpathsea_parent)/kpathsea
- kpathsea_srcdir_parent = $(top_srcdir)/..
--kpathsea_srcdir = $(kpathsea_srcdir_parent)/kpathsea
--kpathsea = $(kpathsea_dir)/libkpathsea.la
-+kpathsea_srcdir = $(KPATHSEA_PREFIX)/include/kpathsea
-+kpathsea = $(KPATHSEA_PREFIX)/lib/libkpathsea.la
- 
- @MAINT@ifeq ($(CC), gcc)
- @MAINT@XDEFS = -Wpointer-arith $(warn_more)
diff --git a/print/web2c/patches/patch-ac b/print/web2c/patches/patch-ac
deleted file mode 100644
index 4d36a32ddd2..00000000000
--- a/print/web2c/patches/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- lib/Makefile.in.orig	2008-01-30 06:56:21.000000000 -0800
-+++ lib/Makefile.in
-@@ -30,4 +30,3 @@ Makefile: Makefile.in ../config.status
- 
- kpse_include ../make/clean.mk
- kpse_include ../make/rdepend.mk
--kpse_include lib/depend.mk
diff --git a/print/web2c/patches/patch-ad b/print/web2c/patches/patch-ad
deleted file mode 100644
index 5f1e90f832c..00000000000
--- a/print/web2c/patches/patch-ad
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- web2c/Makefile.in.orig	2008-04-15 16:20:46.000000000 -0700
-+++ web2c/Makefile.in
-@@ -71,4 +71,3 @@ clean::
- 	rm -f y_tab.c y_tab.h y.out* yacc.* $(LEX_OUTPUT_ROOT).c
- 
- kpse_include ../make/rdepend.mk
--kpse_include web2c/depend.mk
diff --git a/print/web2c/patches/patch-ae b/print/web2c/patches/patch-ae
deleted file mode 100644
index 12275fbfc9e..00000000000
--- a/print/web2c/patches/patch-ae
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- window/Makefile.in.orig	2008-01-30 06:56:21.000000000 -0800
-+++ window/Makefile.in
-@@ -35,4 +35,3 @@ distclean::
- 	rm -f x11.c
- 
- kpse_include ../make/rdepend.mk
--kpse_include window/depend.mk
diff --git a/print/web2c/patches/patch-af b/print/web2c/patches/patch-af
deleted file mode 100644
index 91934b335a6..00000000000
--- a/print/web2c/patches/patch-af
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- mpware/Makefile.in.orig	2008-01-30 06:56:21.000000000 -0800
-+++ mpware/Makefile.in
-@@ -46,11 +46,11 @@ Makefile: Makefile.in ../config.status
- 
- install: install-exec install-data
- install-exec: $(programs)
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir)
--	$(INSTALL_PROGRAM) newer $(bindir)/newer
--	$(INSTALL_LIBTOOL_PROG) dmp $(bindir)
--	$(INSTALL_LIBTOOL_PROG) mpto $(bindir)
--	$(INSTALL_LIBTOOL_PROG) makempx $(bindir)
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(scriptdir)
-+	$(INSTALL_PROGRAM) newer $(DESTDIR)$(bindir)/newer
-+	$(INSTALL_LIBTOOL_PROG) dmp $(DESTDIR)$(bindir)
-+	$(INSTALL_LIBTOOL_PROG) mpto $(DESTDIR)$(bindir)
-+	$(INSTALL_LIBTOOL_PROG) makempx $(DESTDIR)$(bindir)
- install-data:
- 
- kpse_include ../make/tkpathsea.mk
-@@ -60,4 +60,3 @@ mostlyclean::
- 	rm -f testex1 testex2
- 
- kpse_include ../make/rdepend.mk
--kpse_include mpware/depend.mk
diff --git a/print/web2c/patches/patch-ag b/print/web2c/patches/patch-ag
deleted file mode 100644
index 85106a99416..00000000000
--- a/print/web2c/patches/patch-ag
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- ../make/man.mk.orig	2006-01-17 13:41:51.000000000 -0800
-+++ ../make/man.mk
-@@ -29,7 +29,7 @@ txt: $(manfiles:.1=.txt)
- # At present, all but VERSION should be unused.
- sedscript:
- 	cp /dev/null sedscript
--	for f in $(kpathsea_dir)/paths.h; do \
-+	for f in $(KPATHSEA_PREFIX)/include/kpathsea/paths.h; do \
- 	  sed -n -e '/^#define/s/#define[ 	][ 	]*\([A-Z_a-z][A-Z_a-z]*\)[ 	][ 	]*\(.*\)/s%@\1@%\2%/p' \
- 		$$f \
- 	  | sed -e 's/"//g' -e 's/[ 	]*\/\*[^*]*\*\///g' >>sedscript;\
-@@ -51,16 +51,16 @@ sedscript:
- 	echo 's%@LOCALMODES@%$(localmodes)%'	>>sedscript
- 
- install-man: manfiles
--	$(top_srcdir)/../mkinstalldirs $(man1dir)
-+	$(top_srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir)
- 	for nameone in $(manfiles); do					\
-           name=`basename $${nameone} .1`;				\
--          $(INSTALL_DATA) $${name}.1 $(man1dir)/$${name}.$(manext);	\
-+          $(INSTALL_DATA) $${name}.1 $(DESTDIR)$(man1dir)/$${name}.$(manext);	\
-         done
- 
- uninstall-man:
- 	for nameone in $(manfiles); do					\
- 	  name=`basename $${nameone} .1`;				\
--	  rm -f $(man1dir)/$${name}.$(manext);				\
-+	  rm -f $(DESTDIR)$(man1dir)/$${name}.$(manext);				\
- 	done
- 
- install-data: install-man
diff --git a/print/web2c/patches/patch-ah b/print/web2c/patches/patch-ah
deleted file mode 100644
index 07fda24af60..00000000000
--- a/print/web2c/patches/patch-ah
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- pdftexdir/Makefile.in.orig	2008-07-17 10:58:14.000000000 -0700
-+++ pdftexdir/Makefile.in
-@@ -67,5 +67,3 @@ depend:
- 	XXCFLAGS=-MM XCFLAGS=-MM $(MAKE) -k $(OBJS) ttf2afm.o pdftosrc.o | \
- 	    grep -v "^$(CC)\|$(CXX)\|$(AR)\|make\" | \
- 	    sed 's: [^ ]*/\.\./libs/[^ ]*::g' > $(srcdir)/depend.mk
--
--kpse_include pdftexdir/depend.mk
diff --git a/print/web2c/patches/patch-ai b/print/web2c/patches/patch-ai
deleted file mode 100644
index 42266bba43b..00000000000
--- a/print/web2c/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- omegafonts/Makefile.in.orig	2008-03-01 15:49:05.000000000 -0800
-+++ omegafonts/Makefile.in
-@@ -53,12 +53,12 @@ install: install-exec 
- install-exec:: install-links
- 
- install-programs: $(programs)
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) 
--	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) 
-+	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(DESTDIR)$(bindir); done
- 
- install-links: install-programs
- 	for f in ""$(linked_programs); do \
--	cd $(bindir) && (rm -f $$f; $(LN) omfonts $$f); done
-+	cd $(DESTDIR)$(bindir) && (rm -f $$f; $(LN) omfonts $$f); done
- 
- Makefile: Makefile.in ../config.status
- 	cd .. && $(SHELL) config.status
diff --git a/print/web2c/patches/patch-aj b/print/web2c/patches/patch-aj
deleted file mode 100644
index 4211c3a9afb..00000000000
--- a/print/web2c/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- otps/Makefile.in.orig	2008-01-30 06:56:21.000000000 -0800
-+++ otps/Makefile.in
-@@ -36,9 +36,9 @@ outocp: outocp.o
- $(programs): $(proglib) $(kpathsea)
- 
- install-programs: $(programs)
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) 
--	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
--	for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(scriptdir); done
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) 
-+	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(DESTDIR)$(bindir); done
-+	for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(scriptdir); done
- 
- Makefile: Makefile.in ../config.status
- 	cd .. && $(SHELL) config.status
-@@ -50,4 +50,3 @@ clean::
- 	rm -f y_tab.c y_tab.h y.out* yacc.* $(LEX_OUTPUT_ROOT).c
- 
- kpse_include ../make/rdepend.mk
--kpse_include otps/depend.mk
diff --git a/print/web2c/patches/patch-ak b/print/web2c/patches/patch-ak
deleted file mode 100644
index 91ff2585096..00000000000
--- a/print/web2c/patches/patch-ak
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2009/06/09 21:32:03 minskim Exp $
-
-Avoid using program_invocation_name (r12635).
-
---- web2c/splitup.c.orig	2008-03-24 08:47:15.000000000 -0700
-+++ web2c/splitup.c
-@@ -9,11 +9,30 @@
- #include "config.h"
- #include <kpathsea/getopt.h>
- 
-+#if defined (FATAL)
-+#undef FATAL
-+#endif
-+
-+#define FATAL(str) do {                                                 \
-+        fprintf (stderr, "%s: fatal: ", argv[0]);                       \
-+        fputs (str, stderr);                                            \
-+        fputs (".\n", stderr); exit (1); } while (0)
-+
-+
-+#if defined (FATAL1)
-+#undef FATAL1
-+#endif
-+
-+#define FATAL1(str, e1) do {                                            \
-+        fprintf (stderr, "%s: fatal: ", argv[0]);                       \
-+        fprintf (stderr, str, e1);                                      \
-+        fputs (".\n", stderr); exit (1); } while (0)
-+
-+
- #ifdef VMS
- #define unlink delete
- #endif
- 
--char *program_invocation_name;
- int filenumber = 0, ifdef_nesting = 0, lines_in_file = 0;
- char *output_name = NULL;
- boolean has_ini;
-@@ -63,8 +82,6 @@ main P2C(int, argc, string *, argv)
-   unsigned coerce_len;
-   int option;
- 
--  program_invocation_name = argv[0];
--  
-   while ((option = getopt(argc, argv, "il:")) != -1) {
-     switch (option) {
-     case 'i':
diff --git a/print/web2c/patches/patch-al b/print/web2c/patches/patch-al
deleted file mode 100644
index c8c9d104c47..00000000000
--- a/print/web2c/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- luatexdir/image/image.h.orig	2008-04-28 01:45:24.000000000 -0700
-+++ luatexdir/image/image.h
-@@ -22,7 +22,7 @@ $Id: image.h 1125 2008-03-25 19:36:52Z h
- #ifndef IMAGE_H
- #  define IMAGE_H
- 
--#  include <../libpng/png.h>
-+#  include <png.h>
- 
- #  define JPG_UINT16      unsigned int
- #  define JPG_UINT32      unsigned long
diff --git a/print/web2c/patches/patch-am b/print/web2c/patches/patch-am
index 184f6485404..ce861ea512b 100644
--- a/print/web2c/patches/patch-am
+++ b/print/web2c/patches/patch-am
@@ -1,32 +1,14 @@
-$NetBSD: patch-am,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
+$NetBSD: patch-am,v 1.2 2010/01/16 03:15:38 minskim Exp $
 
---- man/Makefile.in.orig	2008-01-30 06:56:21.000000000 -0800
+--- man/Makefile.in.orig	2009-07-23 11:43:28.000000000 -0700
 +++ man/Makefile.in
-@@ -32,19 +32,15 @@ localmodes = modes
- # The programs are listed in alphabetical order.
- # 
- manfiles=		\
--	amstex.1	\
- 	bibtex.1	\
- 	cweb.1		\
- 	dmp.1		\
- 	dvicopy.1	\
- 	dvitomp.1	\
- 	dvitype.1	\
--	eplain.1	\
--	etex.1		\
- 	gftodvi.1	\
- 	gftopk.1	\
- 	gftype.1	\
--	latex.1		\
- 	makempx.1	\
- 	mf.1		\
- 	mft.1		\
-@@ -53,7 +49,6 @@ manfiles=		\
- 	newer.1		\
- 	omega.1		\
- 	patgen.1	\
--	pdfetex.1	\
- 	pdftex.1	\
- 	pdftosrc.1	\
- 	pktogf.1	\
+@@ -289,8 +289,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)
+ 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 \
diff --git a/print/web2c/patches/patch-an b/print/web2c/patches/patch-an
deleted file mode 100644
index e668020f9bc..00000000000
--- a/print/web2c/patches/patch-an
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- doc/Makefile.in.orig	2008-04-29 15:40:29.000000000 -0700
-+++ doc/Makefile.in
-@@ -49,12 +49,12 @@ Makefile: Makefile.in ../config.status
- install: install-exec install-data
- install-exec:
- install-data: web2c.info
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(infodir)
--	$(INSTALL_DATA) $(srcdir)/web2c.i* $(infodir)/
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(infodir)
-+	$(INSTALL_DATA) $(srcdir)/web2c.i* $(DESTDIR)$(infodir)/
- #
- 	$(POST_INSTALL)
- 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
--	  install-info --info-dir=$(infodir) $(infodir)/web2c.info; \
-+	  install-info --info-dir=$(infodir) $(DESTDIR)$(infodir)/web2c.info; \
- 	else true; fi
- 
- check: all
diff --git a/print/web2c/patches/patch-ao b/print/web2c/patches/patch-ao
deleted file mode 100644
index 3cf95b6966f..00000000000
--- a/print/web2c/patches/patch-ao
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- Makefile.in.orig	2008-08-12 16:46:59.000000000 -0700
-+++ Makefile.in
-@@ -816,29 +816,29 @@ install: install-exec install-data
- install-exec:: install-programs
- 
- # Installation directories.
--$(bindir)::
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
--$(texpooldir)::
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texpooldir)
--$(mfpooldir)::
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mfpooldir)
--$(mppooldir)::
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mppooldir)
--$(fmtdir)::
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(fmtdir)
--$(basedir)::
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(basedir)
--$(memdir)::
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(memdir)
--$(web2cdir)::
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(web2cdir)
-+$(DESTDIR)$(bindir)::
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
-+$(DESTDIR)$(texpooldir)::
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(texpooldir)
-+$(DESTDIR)$(mfpooldir)::
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(mfpooldir)
-+$(DESTDIR)$(mppooldir)::
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(mppooldir)
-+$(DESTDIR)$(fmtdir)::
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(fmtdir)
-+$(DESTDIR)$(basedir)::
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(basedir)
-+$(DESTDIR)$(memdir)::
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(memdir)
-+$(DESTDIR)$(web2cdir)::
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(web2cdir)
- 
- # Installing the binaries.  Each of the *dir/*.mk files (except etex)
- # add to this target via a dependency-only rule, to install their
- # respective engines.
--install-programs: $(programs) $(basic_engines) $(bindir)
-+install-programs: $(programs) $(basic_engines) $(DESTDIR)$(bindir)
- 	for p in $(programs) $(basic_engines); do \
--	  $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+	  $(INSTALL_LIBTOOL_PROG) $$p $(DESTDIR)$(bindir); done
- 
- # We do not attempt to install any of the per-format symlinks, leaving
- # that to a separate run of texlinks.
-@@ -874,13 +874,14 @@ install-mpost-mems: mems $(memdir)
-             (cd $(bindir) && (rm -f $$base; $(LN) mpost $$base)); done
- 
- # Auxiliary files.
--install-data:: $(web2cdir)
-+install-data:: $(DESTDIR)$(web2cdir)
- 	cd doc && $(MAKE) $(install_makeargs) install-data
- 	cd man && $(MAKE) $(install_makeargs) install-data
--	$(INSTALL_DATA) $(srcdir)/tiedir/tie.1 $(man1dir)/tie.$(manext)
--	$(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 $(man1dir)/ctie.$(manext)
--	$(INSTALL_DATA) $(srcdir)/synctexdir/man1/synctex.1 $(man1dir)/synctex.$(manext)
--	$(INSTALL_DATA) $(srcdir)/synctexdir/man5/synctex.5 $(man5dir)/synctex.5
-+	$(INSTALL_DATA) $(srcdir)/tiedir/tie.1 $(DESTDIR)$(man1dir)/tie.$(manext)
-+	$(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 $(DESTDIR)$(man1dir)/ctie.$(manext)
-+	$(INSTALL_DATA) $(srcdir)/synctexdir/man1/synctex.1 $(DESTDIR)$(man1dir)/synctex.$(manext)
-+	$(top_srcdir)/../mkinstalldirs $(DESTDIR)$(man5dir)
-+	$(INSTALL_DATA) $(srcdir)/synctexdir/man5/synctex.5 $(DESTDIR)$(man5dir)/synctex.5
- 
- # Dummy target.
- uninstall uninstall-exec uninstall-data:
diff --git a/print/web2c/patches/patch-ap b/print/web2c/patches/patch-ap
deleted file mode 100644
index 9dde469b256..00000000000
--- a/print/web2c/patches/patch-ap
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2009/02/01 06:05:59 minskim Exp $
-
---- luatexdir/luatexlib.mk.orig	2008-05-31 16:09:36.000000000 -0700
-+++ luatexdir/luatexlib.mk
-@@ -42,14 +42,14 @@ endif
- 
- 
- $(LIBLUADEP):
--	mkdir -p $(LIBLUADIR) && cd $(LIBLUADIR) && cp -f $(LIBLUASRCDIR)/* . && $(MAKE) $(luatarget)
-+	cd $(LIBLUADIR) && $(MAKE) $(luatarget)
- 
- # slnunicode
- SLNUNICODEDIR=../../libs/slnunicode
- SLNUNICODESRCDIR=$(srcdir)/$(SLNUNICODEDIR)
- SLNUNICODEDEP=$(SLNUNICODEDIR)/slnunico.o
- $(SLNUNICODEDEP): $(SLNUNICODEDIR)/slnunico.c $(SLNUNICODEDIR)/slnudata.c
--	mkdir -p $(SLNUNICODEDIR) && cd $(SLNUNICODEDIR) && cp -f $(SLNUNICODESRCDIR)/* . && $(CC) $(CFLAGS) -I$(LIBLUADIR) -o slnunico.o -c slnunico.c
-+	mkdir -p $(SLNUNICODEDIR) && cd $(SLNUNICODEDIR) && $(CC) $(CFLAGS) -I$(LIBLUADIR) -o slnunico.o -c slnunico.c
- 
- # zziplib
- 
-@@ -88,7 +88,7 @@ LUAZIPDEP=$(LUAZIPDIR)/src/luazip.o
- LUAZIPINC=-I../../lua51 -I../$(ZZIPLIBSRCDIR) -I../$(ZZIPLIBDIR)
- 
- $(LUAZIPDEP): $(LUAZIPDIR)/src/luazip.c
--	mkdir -p $(LUAZIPDIR) && cd $(LUAZIPDIR) && cp -R $(LUAZIPSRCDIR)/* . && \
-+	mkdir -p $(LUAZIPDIR) && cd $(LUAZIPDIR) && \
-     cd src && $(CC) $(CFLAGS) $(LUAZIPINC) -g -o luazip.o -c luazip.c
- 
- # luafilesystem
-@@ -99,15 +99,14 @@ LUAFSDEP=$(LUAFSDIR)/src/lfs.o
- LUAFSINC=-I../../lua51
- 
- $(LUAFSDEP): $(LUAFSDIR)/src/lfs.c $(LUAFSDIR)/src/lfs.h
--	mkdir -p $(LUAFSDIR) && cd $(LUAFSDIR) && cp -R $(LUAFSSRCDIR)/* . && \
--    cd src && $(CC) $(CFLAGS) $(LUAFSINC) -g -o lfs.o -c lfs.c
-+	cd $(LUAFSDIR)/src && $(CC) $(CFLAGS) $(LUAFSINC) -g -o lfs.o -c lfs.c
- 
- # luapeg
- LUAPEGDIR=../../libs/luapeg
- LUAPEGSRCDIR=$(srcdir)/$(LUAPEGDIR)
- LUAPEGDEP=$(LUAPEGDIR)/lpeg.o
- $(LUAPEGDEP): $(LUAPEGDIR)/lpeg.c
--	mkdir -p $(LUAPEGDIR) && cd $(LUAPEGDIR) && cp -f $(LUAPEGSRCDIR)/* . && $(CC) $(CFLAGS) -I$(LIBLUADIR) -g -o lpeg.o -c lpeg.c
-+	mkdir -p $(LUAPEGDIR) && cd $(LUAPEGDIR) && $(CC) $(CFLAGS) -I$(LIBLUADIR) -g -o lpeg.o -c lpeg.c
- 
- 
- # luamd5
-@@ -115,13 +114,13 @@ LUAMDVDIR=../../libs/luamd5
- LUAMDVSRCDIR=$(srcdir)/$(LUAMDVDIR)
- LUAMDVDEP=$(LUAMDVDIR)/md5lib.o $(LUAMDVDIR)/md5.o
- $(LUAMDVDEP): $(LUAMDVDIR)/md5lib.c $(LUAMDVDIR)/md5.h $(LUAMDVDIR)/md5.c
--	mkdir -p $(LUAMDVDIR) && cd $(LUAMDVDIR) && cp -f $(LUAMDVSRCDIR)/* . && $(CC) $(CFLAGS) -I$(LIBLUADIR) -g -o md5.o -c md5.c && $(CC) $(CFLAGS) -I$(LIBLUADIR) -g -o md5lib.o -c md5lib.c
-+	cd $(LUAMDVDIR) && $(CC) $(CFLAGS) -I$(LIBLUADIR) -g -o md5.o -c md5.c && $(CC) $(CFLAGS) -I$(LIBLUADIR) -g -o md5lib.o -c md5lib.c
- 
- .PHONY: always
- 
- # luaff
--LUAFFDIR=../../libs/luafontforge
--LUAFFSRCDIR=$(srcdir)/$(LUAFFDIR)
-+LUAFFDIR=../../libs/luafontforge/src
-+LUAFFSRCDIR=$(srcdir)/../../libs/luafontforge
- LUAFFDEP=$(LUAFFDIR)/libff.a
- $(LUAFFDEP): always
- 	mkdir -p $(LUAFFDIR) && cp -f $(LUAFFSRCDIR)/Makefile $(LUAFFDIR)
-@@ -136,7 +135,7 @@ LUAZLIBSRCDIR=$(srcdir)/$(LUAZLIBDIR)
- LUAZLIBDEP=$(LUAZLIBDIR)/lgzip.o $(LUAZLIBDIR)/lzlib.o
- LUAZLIBINC=-I$(ZLIBSRCDIR) -I$(LIBLUASRCDIR)
- $(LUAZLIBDEP): $(LUAZLIBDIR)/lgzip.c $(LUAZLIBDIR)/lzlib.c
--	mkdir -p $(LUAZLIBDIR) && cd $(LUAZLIBDIR) && cp -f $(LUAZLIBSRCDIR)/* . && $(CC) $(CFLAGS) $(LUAZLIBINC) -g -o lgzip.o -c lgzip.c && $(CC) $(CFLAGS) $(LUAZLIBINC) -g -o lzlib.o -c lzlib.c
-+	mkdir -p $(LUAZLIBDIR) && cd $(LUAZLIBDIR) && $(CC) $(CFLAGS) $(LUAZLIBINC) -g -o lgzip.o -c lgzip.c && $(CC) $(CFLAGS) $(LUAZLIBINC) -g -o lzlib.o -c lzlib.c
- 
- 
- # Convenience variables.
diff --git a/print/web2c/patches/patch-aq b/print/web2c/patches/patch-aq
deleted file mode 100644
index 00317bf3f2b..00000000000
--- a/print/web2c/patches/patch-aq
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aq,v 1.1.1.1 2009/02/01 06:05:59 minskim Exp $
-
---- omegadir/omega.mk.orig	2008-07-03 15:16:18.000000000 -0700
-+++ omegadir/omega.mk
-@@ -212,8 +212,8 @@ omegafonts/omfonts:
- # Installation.
- install-omega: install-omega-exec
- install-programs: @OMEGA@ install-omega-exec
--install-omega-exec: $(omega_programs) $(bindir) install-omega-links
--	for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+install-omega-exec: $(omega_programs) $(DESTDIR)$(bindir) install-omega-links
-+	for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p $(DESTDIR)$(bindir); done
- 	cd otps && $(MAKE) $(install_makeargs) install-programs
- 	cd omegafonts && $(MAKE) $(install_makeargs) install-programs
- 
diff --git a/print/web2c/patches/patch-ar b/print/web2c/patches/patch-ar
deleted file mode 100644
index 4c6017762a7..00000000000
--- a/print/web2c/patches/patch-ar
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2009/02/01 06:05:59 minskim Exp $
-
---- luatexdir/luatex.mk.orig	2008-06-02 07:54:32.000000000 -0700
-+++ luatexdir/luatex.mk
-@@ -121,8 +121,8 @@ luatex.fmt: luatex
- install-luatex: install-luatex-exec
- 
- install-programs: @LTEX@ install-luatex-exec
--install-luatex-exec: $(luatex) $(bindir)
--	for p in luatex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+install-luatex-exec: $(luatex) $(DESTDIR)$(bindir)
-+	for p in luatex; do $(INSTALL_LIBTOOL_PROG) $$p $(DESTDIR)$(bindir); done
- 	cd $(DESTDIR)$(bindir) && rm -f texlua && $(LN) luatex texlua
- 	cd $(DESTDIR)$(bindir) && rm -f texluac && $(LN) luatex texluac
- 
diff --git a/print/web2c/patches/patch-as b/print/web2c/patches/patch-as
deleted file mode 100644
index 8362be51c84..00000000000
--- a/print/web2c/patches/patch-as
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2009/02/01 06:05:59 minskim Exp $
-
---- alephdir/aleph.mk.orig	2008-05-28 11:29:28.000000000 -0700
-+++ alephdir/aleph.mk
-@@ -159,7 +159,7 @@ lamed.fmt: aleph
- # Installation.
- install-aleph: install-aleph-exec
- install-programs: @ALEPH@ install-aleph-exec
--install-aleph-exec: aleph $(bindir)
--	for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+install-aleph-exec: aleph $(DESTDIR)$(bindir)
-+	for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p $(DESTDIR)$(bindir); done
- 
- # end of aleph.mk
diff --git a/print/web2c/patches/patch-at b/print/web2c/patches/patch-at
deleted file mode 100644
index ccc58abd534..00000000000
--- a/print/web2c/patches/patch-at
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-at,v 1.1.1.1 2009/02/01 06:05:59 minskim Exp $
-
---- pdftexdir/pdftex.mk.orig	2008-07-10 23:51:52.000000000 -0700
-+++ pdftexdir/pdftex.mk
-@@ -111,8 +111,8 @@ pdflatex.fmt: pdftex
- # Installation.
- install-pdftex: install-pdftex-exec
- install-programs: @PETEX@ install-pdftex-exec
--install-pdftex-exec: $(pdftex) $(bindir)
--	for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+install-pdftex-exec: $(pdftex) $(DESTDIR)$(bindir)
-+	for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p $(DESTDIR)$(bindir); done
- 
- # 
- # ttf2afm
diff --git a/print/web2c/patches/patch-au b/print/web2c/patches/patch-au
deleted file mode 100644
index 8d783bc52fc..00000000000
--- a/print/web2c/patches/patch-au
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-au,v 1.1 2009/07/17 06:55:14 minskim Exp $
-
---- cpascal.h.orig	2008-05-24 16:56:44.000000000 -0700
-+++ cpascal.h
-@@ -272,6 +272,12 @@ typedef struct option getoptstruct;
- #undef getname
- #define getname vms_getname
- #endif
-+
-+#ifdef getline
-+#undef getline
-+#endif
-+#define getline web2c_getline
-+
- 
- /* Declarations for the routines we provide ourselves in lib/.  */
- 
diff --git a/print/web2c/patches/patch-av b/print/web2c/patches/patch-av
deleted file mode 100644
index 43567ffc46b..00000000000
--- a/print/web2c/patches/patch-av
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-av,v 1.1 2009/07/17 06:58:52 minskim Exp $
-
---- mpware/mpto.c.orig	2008-04-11 09:33:03.000000000 -0700
-+++ mpware/mpto.c
-@@ -97,7 +97,7 @@ usage(char *progn)
- }
- 
- char *
--getline(void)
-+mp_getline(void)
- {				/* returns NULL on EOF or error, otherwise buf */
-     int c;
-     unsigned loc = 0;
-@@ -302,7 +302,7 @@ copytex(void)
-     char *res = NULL;
-     do {
- 	if (*aa == 0)
--	  if ((aa = getline()) == NULL)
-+	  if ((aa = mp_getline()) == NULL)
- 	    err("btex section does not end");
- 
- 	if (getbta(aa) && *tt == 'e') {
-@@ -483,7 +483,7 @@ Current maintainer: Taco Hoekwater.\n");
- 	postverb = troff_postverb;
-     }
-     printf("%s", predoc);
--    while (getline() != NULL)
-+    while (mp_getline() != NULL)
- 	do_line();
-     printf("%s", postdoc);
-     exit(0);