11 files changed, 314 insertions, 462 deletions

diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index de463a5fc7c4..6936220d55dc 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -6,39 +6,47 @@
 #
 
 PORTNAME=	teTeX-base
-PORTVERSION=	2.0.2
-PORTREVISION=	9
+PORTVERSION=	2.99.13.20050204
+PORTREVISION=	0
 CATEGORIES=	print
-MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
+MASTER_SITES=	ftp://ftp.dante.de/tex-archive/systems/unix/teTeX-beta/ \
 		${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	systems/unix/teTeX/2.0/distrib/
+MASTER_SITE_SUBDIR=	systems/unix/teTeX-beta
 DISTNAME=	${TETEX_SRC}
 DIST_SUBDIR=	teTeX
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Thomas Esser's distribution of TeX & friends (binaries)
 
-BUILD_DEPENDS=	${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
-		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-RUN_DEPENDS=	${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
+BUILD_DEPENDS=	${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
+		texi2html:${PORTSDIR}/textproc/texi2html
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
-		t1.5:${PORTSDIR}/devel/t1lib
+		t1.5:${PORTSDIR}/devel/t1lib \
+		gd.4:${PORTSDIR}/graphics/gd
 
-WRKSRC=		${WRKDIR}/tetex-src-${PORTVERSION}
-USE_PERL5_RUN=	yes
+WRKSRC=		${WRKDIR}/tetex-src-${PORTVERSION}-beta
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-multiplatform \
-		--without-texinfo --without-dialog \
+		--without-texinfo \
+		--without-texi2html \
+		--without-dialog \
 		--with-system-ncurses --with-system-zlib \
 		--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
 		--with-libwww-include=${LIBWWW_PREFIX}/include/w3c-libwww \
 		--with-system-pnglib --with-pnglib-libdir=${LIBPNG_PREFIX}/lib \
 		--with-pnglib-include=${LIBPNG_PREFIX}/include \
 		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
-		--with-t1lib-include=${LIBT1_PREFIX}/include
+		--with-t1lib-include=${LIBT1_PREFIX}/include \
+		--with-system-gd --with-gd-libdir=${LIBGD_PREFIX}/lib \
+		--with-gd-include=${LIBGD_PREFIX}/include \
+		--without-dvipsk --without-odvipsk \
+		--without-xdvik --without-oxdvik
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
@@ -48,99 +56,92 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 CONFLICTS=	ja-ptex-base-[0-9]* latex2e-[0-9]* \
 		tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
 
-MAN1=		MakeTeXPK.1 access.1 allcm.1 allneeded.1 \
-		amstex.1 bibtex.1 cont-de.1 cont-en.1 cont-nl.1 dmp.1 \
-		dvicopy.1 dvilj.1 dvired.1 dvitype.1 dvipdfm.1 einitex.1 \
-		elatex.1 eplain.1 etex.1 fontexport.1 fontimport.1 \
-		gftodvi.1 gftopk.1 gftype.1 gsftopk.1 inimf.1 inimpost.1 \
-		iniomega.1 initex.1 kpsepath.1 kpsestat.1 kpsewhich.1 \
-		kpsexpand.1 lambda.1 latex.1 \
-		mag.1 makeindex.1 makempx.1 mf.1 mft.1 mktexlsr.1 mktexmf.1 \
-		mktexpk.1 mktextfm.1 mpost.1 mpto.1 newer.1 omega.1 patgen.1 \
-		pdfinitex.1 pdflatex.1 pdftex.1 pfb2pfa.1 pk2bm.1 \
-		pktogf.1 pktype.1 pltotf.1 pooltype.1 ps2frag.1 ps2pk.1 \
-		readlink.1 tangle.1 tex.1 texconfig.1 texi2html.1 \
-		tftopl.1 tie.1 vftovp.1 vptovf.1 weave.1 pdfetex.1 fontinst.1 \
-		cweb.1 dvihp.1 mkindex.1 dvi2fax.1 e2pall.1 \
-		epstopdf.1 kpsetool.1 pslatex.1 \
-		rubibtex.1 rumakeindex.1 texdoc.1 texexec.1 texi2pdf.1 \
-		texshow.1 texutil.1 thumbpdf.1 texdoctk.1 updmap.1 dvitomp.1
-MAN5=		fmtutil.cnf.5
-MAN8=		fmtutil.8 texlinks.8 mkfontdesc.8
-MLINKS=		allcm.1 allec.1 mktexlsr.1 texhash.1 tex.1 virtex.1 \
-		etex.1 evirtex.1 mf.1 virmf.1 mpost.1 virmpost.1 \
-		omega.1 viromega.1 pdftex.1 pdfvirtex.1
-INFO=		kpathsea latex web2c
-
-#OPTIONS=	DVIPSK "Build and install dvipsk" off \
-#		XDVIK "Build and install xdvik" off \
-#		X11 "Build with X Window System support" on
+MAN1=	tie.1 kpseaccess.1 kpsereadlink.1 mpost.1 \
+	dmp.1 dvicopy.1 dvilj.1 dvipdfm.1 \
+	fmtutil.1 gftodvi.1 gftopk.1 gftype.1 \
+	gsftopk.1 kpsewhich.1 makeindex.1 \
+	mf.1 mft.1 mktexmf.1 mktexpk.1 \
+	mktextfm.1 dvihp.1 patgen.1 \
+	pfb2pfa.1 pdfxtex.1 pktype.1 pltotf.1 \
+	pooltype.1 ps2pk.1 tex.1 vftovp.1 \
+	vptovf.1 weave.1 pdfetex.1 fontinst.1 \
+	cweb.1 ctie.1 etex.1 dvired.1 \
+	mpto.1 newer.1 dvipdft.1 ebb.1 \
+	dvipng.1 e2pall.1 makempx.1 \
+	pk2bm.1 pktogf.1 tangle.1 amstex.1 \
+	eplain.1 epstopdf.1 kpsetool.1 fdf2tex.1 \
+	mkindex.1 pslatex.1 texhash.1 kpsewhere.1 \
+	makempy.1 mkocp.1 mkofm.1 ofm2opl.1 \
+	opl2ofm.1 otp2ocp.1 bibtex.1 outocp.1 \
+	ovf2ovp.1 ovp2ovf.1 rumakeindex.1 texdoc.1 \
+	tftopl.1 texexec.1 updmap.1 texshow.1 \
+	texfind.1 texfont.1 texlinks.1 texutil.1 \
+	thumbpdf.1 ttf2afm.1 dvitomp.1 latex.1 \
+	pdftex.1 mag.1 kpsestat.1 texconfig.1 \
+	odvitype.1 allcm.1 allneeded.1 \
+	dvitype.1 mktexlsr.1 omega.1 \
+	ps2frag.1 dvi2fax.1 rubibtex.1 texdoctk.1
+MAN5=	fmtutil.cnf.5
+
+MLINKS=	dvilj.1 dvilj2p.1 \
+	dvilj.1 dvilj4.1 \
+	dvilj.1 dvilj4l.1 \
+	dvilj.1 dvilj6.1 \
+	allcm.1 allec.1 \
+	omega.1 lambda.1 \
+	pdfetex.1 pdflatex.1 \
+	kpsetool.1 kpsepath.1 \
+	kpsetool.1 kpsexpand.1 \
+	mf.1 mf-nowin.1 \
+	cweb.1 ctangle.1 \
+	cweb.1 cweave.1 \
+	dvicopy.1 odvicopy.1 \
+	dvips.1 odvips.1 \
+	fmtutil.1 mktexfmt.1 \
+	fmtutil.1 fmtutil-sys.1 \
+	texconfig.1 texconfig-sys.1 \
+	updmap.1 updmap-sys.1
+
+INFO=	kpathsea latex web2c
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DVIPSK)
-FLAVOR+=	dvipsk
-PLIST_SUB+=	DVIPSK=""
-MAN1+=		afm2tfm.1 dvips.1
-INFO+=		dvips
-CONFLICTS+=	dvips* ja-dvips*
-.else
-CONFIGURE_ARGS+=--without-dvipsk \
-		--without-odvipsk
-PLIST_SUB+=	DVIPSK="@comment "
-.endif
-
-.if defined(WITH_XDVIK) && !defined(WITHOUT_X11)
-FLAVOR+=	xdvik
-PLIST_SUB+=	XDVIK=""
-MAN1+=		xdvi.1 t1mapper.1 xdvizilla.1
-CONFLICTS+=	xdvi* ja-xdvi*
-USE_XLIB=	yes
-.else
-CONFIGURE_ARGS+=--without-xdvik \
-		--without-oxdvik
-PLIST_SUB+=	XDVIK="@comment "
-.endif
-
 .if !defined(WITHOUT_X11)
 PLIST_SUB+=	X11BITS=""
 USE_XLIB=	yes
 .else
 FLAVOR+=	nox11
-CONFIGURE_ARGS+=--without-x11 \
-		--without-oxdvik \
-		--without-xdvik \
-		--with-mfw=no
+CONFIGURE_ARGS+=--without-x11
 PLIST_SUB+=	X11BITS="@comment "
 .endif
 
-# XXX: this does not work
-#.if defined(FLAVOR)
-#PKGNAMESUFFIX=	${FLAVOR:S,^,-,:Q:S,\\ ,,g:S,\\-,-,g}
-#.endif
-
-TETEX_SRC=	tetex-src-${PORTVERSION}
+TETEX_SRC=	tetex-src-${PORTVERSION}-beta
+LIBGD_PREFIX?=	${LOCALBASE}
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 
-TEXMF=		share/texmf
-TEXMFLOCAL=	share/texmf-local
-TEXMFLOCAL_LSR=	${PREFIX}/${TEXMFLOCAL}/ls-R
-TEXMFVAR=	share/texmf-var
+TEXMFDIR=	share/texmf
+TEXMFDISTDIR=	share/texmf-dist
+TEXMFLOCALDIR=	share/texmf-local
+TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCALDIR}/ls-R
+TEXMFVARDIR=	share/texmf-var
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 
-PLIST_SUB+=	TEXMF=${TEXMF} \
-		TEXMFVAR=${TEXMFVAR}
-PKGMESSAGE_SUB=	TEXMF=${TEXMF} \
+PLIST_SUB+=	TEXMFDIR=${TEXMFDIR} \
+		TEXMFDISTDIR=${TEXMFDISTDIR} \
+		TEXMFVARDIR=${TEXMFVARDIR}
+PKGMESSAGE_SUB=	TEXMFDIR=${TEXMFDIR} \
+		TEXMFDISTDIR=${TEXMFDISTDIR} \
 		PREFIX=${PREFIX}
 
-post-configure:
+pre-install:
 	${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/texinfo/util/texi2dvi ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/texinfo/util/texi2pdf ${PREFIX}/bin
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/print/teTeX-base/distinfo b/print/teTeX-base/distinfo
index d9c8f76d7927..ede58e742504 100644
--- a/print/teTeX-base/distinfo
+++ b/print/teTeX-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (teTeX/tetex-src-2.0.2.tar.gz) = a16f6bba227d55e79aeee46fbbd82d28
-SIZE (teTeX/tetex-src-2.0.2.tar.gz) = 11745933
+MD5 (teTeX/tetex-src-2.99.13.20050204-beta.tar.gz) = f0578ba57b930a78c8ba80f85c247a69
+SIZE (teTeX/tetex-src-2.99.13.20050204-beta.tar.gz) = 12768217
diff --git a/print/teTeX-base/files/patch-CAN-2004-0888 b/print/teTeX-base/files/patch-CAN-2004-0888
index 63d9260a9fa3..d7cf6cdc2d5a 100644
--- a/print/teTeX-base/files/patch-CAN-2004-0888
+++ b/print/teTeX-base/files/patch-CAN-2004-0888
@@ -1,40 +1,5 @@
---- libs/xpdf/xpdf/Catalog.cc.orig	Mon Nov  4 07:15:36 2002
-+++ libs/xpdf/xpdf/Catalog.cc	Fri Oct 29 09:18:17 2004
-@@ -22,6 +22,7 @@
- #include "Error.h"
- #include "Link.h"
- #include "Catalog.h"
-+#include <limits.h>
- 
- //------------------------------------------------------------------------
- // Catalog
-@@ -63,6 +64,12 @@
-   }
-   pagesSize = numPages0 = obj.getInt();
-   obj.free();
-+  if ((pagesSize >= INT_MAX / sizeof(Page *)) ||
-+      (pagesSize >= INT_MAX / sizeof(Ref))) {
-+    error(-1, "Invalid 'pagesSize'");
-+    ok = gFalse;
-+    return;
-+  }
-   pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
-   pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
-   for (i = 0; i < pagesSize; ++i) {
-@@ -190,6 +197,11 @@
-       }
-       if (start >= pagesSize) {
- 	pagesSize += 32;
-+	if ((pagesSize >= INT_MAX/sizeof(Page *)) ||
-+	    (pagesSize >= INT_MAX/sizeof(Ref))) {
-+	  error(-1, "Invalid 'pagesSize' parameter.");
-+	  goto err3;
-+	}
- 	pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
- 	pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
- 	for (j = pagesSize - 32; j < pagesSize; ++j) {
---- libs/xpdf/xpdf/XRef.cc.orig	Mon Nov  4 07:15:37 2002
-+++ libs/xpdf/xpdf/XRef.cc	Fri Oct 29 09:18:17 2004
+--- libs/xpdf/xpdf/XRef.cc.orig	Thu Jan  6 10:31:51 2005
++++ libs/xpdf/xpdf/XRef.cc	Thu Jan  6 10:30:39 2005
 @@ -28,6 +28,7 @@
  #include "Error.h"
  #include "ErrorCodes.h"
@@ -43,48 +8,47 @@
  
  //------------------------------------------------------------------------
  
-@@ -76,6 +77,11 @@
- 
-   // trailer is ok - read the xref table
-   } else {
-+    if ( size >= INT_MAX/sizeof(XRefEntry)) {
-+      error(-1, "Invalid 'size' inside xref table.");
-+      ok = gFalse;
-+      return;
-+    }
-     entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry));
-     for (i = 0; i < size; ++i) {
-       entries[i].offset = 0xffffffff;
-@@ -267,6 +273,10 @@
-     // table size
-     if (first + n > size) {
-       newSize = size + 256;
-+      if (newSize >= INT_MAX/sizeof(XRefEntry)) {
-+	error(-1, "Invalid 'newSize'");
-+	goto err2;
+@@ -388,6 +389,10 @@
+       if (newSize < 0) {
+ 	goto err1;
+       }
++      if ( newSize >= INT_MAX/sizeof(XRefEntry)) {
++        error(-1, "Invalid 'newSize' inside xref table.");
++	goto err1;
 +      }
        entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
        for (i = size; i < newSize; ++i) {
  	entries[i].offset = 0xffffffff;
-@@ -410,6 +420,10 @@
- 	    if (!strncmp(p, "obj", 3)) {
- 	      if (num >= size) {
- 		newSize = (num + 1 + 255) & ~255;
-+		if (newSize >= INT_MAX / sizeof(XRefEntry)) {
-+		  error(-1, "Invalid 'obj' parameters.");
-+		  return gFalse;
-+		}
- 		entries = (XRefEntry *)
- 		            grealloc(entries, newSize * sizeof(XRefEntry));
- 		for (i = size; i < newSize; ++i) {
-@@ -431,6 +445,10 @@
+@@ -492,6 +497,10 @@
+   if (newSize < 0) {
+     goto err1;
+   }
++  if (newSize >= INT_MAX/sizeof(XRefEntry)) {
++    error(-1, "Invalid 'newSize'");
++    goto err1;
++  }
+   if (newSize > size) {
+     entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
+     for (i = size; i < newSize; ++i) {
+@@ -583,6 +592,10 @@
+     if (newSize < 0) {
+       return gFalse;
+     }
++    if (newSize >= INT_MAX/sizeof(XRefEntry)) {
++      error(-1, "Invalid 'newSize'");
++      return gFalse;
++    }
+     entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
+     for (i = size; i < newSize; ++i) {
+       entries[i].offset = 0xffffffff;
+@@ -741,6 +754,10 @@
      } else if (!strncmp(p, "endstream", 9)) {
        if (streamEndsLen == streamEndsSize) {
  	streamEndsSize += 64;
 +  	if (streamEndsSize >= INT_MAX/sizeof(int)) {
 +  	  error(-1, "Invalid 'endstream' parameter.");
 +  	  return gFalse;
-+  	}
++	}
  	streamEnds = (Guint *)grealloc(streamEnds,
  				       streamEndsSize * sizeof(int));
        }
diff --git a/print/teTeX-base/files/patch-CAN-2004-1125 b/print/teTeX-base/files/patch-CAN-2004-1125
deleted file mode 100644
index 9f7d9445b2f6..000000000000
--- a/print/teTeX-base/files/patch-CAN-2004-1125
+++ /dev/null
@@ -1,27 +0,0 @@
---- libs/xpdf/xpdf/Gfx.cc	Mon May 17 21:37:57 2004
-+++ libs/xpdf/xpdf/Gfx.cc	Fri Dec 24 17:01:42 2004
-@@ -2654,7 +2654,9 @@
-     haveMask = gFalse;
-     dict->lookup("Mask", &maskObj);
-     if (maskObj.isArray()) {
--      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-+      for (i = 0;
-+	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-+	   ++i) {
- 	maskObj.arrayGet(i, &obj1);
- 	maskColors[i] = obj1.getInt();
- 	obj1.free();
---- libs/xpdf/xpdf/GfxState.cc	Mon May 17 21:37:57 2004
-+++ libs/xpdf/xpdf/GfxState.cc	Fri Dec 24 17:01:42 2004
-@@ -714,6 +714,11 @@
-   }
-   nCompsA = obj2.getInt();
-   obj2.free();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "ICCBased color space with too many (%d > %d) components",
-+	  nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   if (dict->lookup("Alternate", &obj2)->isNull() ||
-       !(altA = GfxColorSpace::parse(&obj2))) {
-     switch (nCompsA) {
diff --git a/print/teTeX-base/files/patch-CAN-2005-0064 b/print/teTeX-base/files/patch-CAN-2005-0064
deleted file mode 100644
index 493d22e6659c..000000000000
--- a/print/teTeX-base/files/patch-CAN-2005-0064
+++ /dev/null
@@ -1,14 +0,0 @@
-*** libs/xpdf/xpdf/XRef.cc.orig	Wed Jan 12 17:10:53 2005
---- libs/xpdf/xpdf/XRef.cc	Wed Jan 12 17:11:22 2005
-***************
-*** 793,798 ****
---- 793,801 ----
-  	} else {
-  	  keyLength = 5;
-  	}
-+ 	if (keyLength > 16) {
-+ 	  keyLength = 16;
-+ 	}
-  	permFlags = permissions.getInt();
-  	if (encVersion >= 1 && encVersion <= 2 &&
-  	    encRevision >= 2 && encRevision <= 3) {
diff --git a/print/teTeX-base/files/patch-texk::kpathsea::Makefile.in b/print/teTeX-base/files/patch-texk::kpathsea::Makefile.in
index 3752145f8923..ae62314b6419 100644
--- a/print/teTeX-base/files/patch-texk::kpathsea::Makefile.in
+++ b/print/teTeX-base/files/patch-texk::kpathsea::Makefile.in
@@ -1,11 +1,27 @@
---- texk/kpathsea/Makefile.in.orig	Sun Feb 16 02:21:42 2003
-+++ texk/kpathsea/Makefile.in	Fri Jun 11 20:49:40 2004
-@@ -126,7 +126,7 @@
- 	| sed 's/^\([^ 	=]*\)[ 	]*=*[ 	]*\(.*\)/#ifndef DEFAULT_\1%#define DEFAULT_\1 "\2"%#endif/' \
- 	| tr '%' '\012' \
- 	| sed -e 's%\$$TEXMFMAIN%$(texmf)%g' \
--	      -e 's%\$$TEXMF%$(texmf)%g' \
-+	      -e 's%\$$TEXMF\([,}/]\)%$(texmf)\1%g' \
- 	      -e 's%\$$VARTEXFONTS%$(vartexfonts)%g' \
- 	      -e 's%\$$web2cdir%$(web2cdir)%g' \
- 	      -e 's%\$$prefix%$(prefix)%g' \
+--- texk/kpathsea/Makefile.in.orig	Mon Jan 31 01:56:30 2005
++++ texk/kpathsea/Makefile.in	Sun Feb  6 08:09:44 2005
+@@ -182,13 +182,13 @@
+ 	$(INSTALL_SCRIPT) $(srcdir)/mktexnam $(web2cdir)/mktexnam
+ 	$(INSTALL_DATA) $(srcdir)/mktexnam.opt $(web2cdir)/mktexnam.opt
+ 	$(INSTALL_SCRIPT) $(srcdir)/mktexupd $(web2cdir)/mktexupd
+-	$(INSTALL_LIBTOOL_LIBS) lib$(library).la $(libdir)
++	$(INSTALL_LIBTOOL_LIBS) .libs/lib$(library).a $(libdir)
+ 	$(INSTALL_LIBTOOL_PROG) kpsewhich $(bindir)
+ 	$(INSTALL_PROGRAM) kpsestat $(bindir)
+ 	$(INSTALL_PROGRAM) kpseaccess $(bindir)
+ 	$(INSTALL_PROGRAM) kpsereadlink $(bindir)
+ uninstall-exec:
+-	$(UNINSTALL_LIBTOOL_LIBS) $(libdir)/lib$(library).la
++	$(UNINSTALL_LIBTOOL_LIBS) $(libdir)/lib$(library).a
+ 	$(UNINSTALL_LIBTOOL_PROG) $(bindir)/kpsewhich
+ 	$(UNINSTALL_PROGRAM) $(bindir)/kpsestat
+ 	$(UNINSTALL_PROGRAM) $(bindir)/kpseaccess
+@@ -271,7 +271,7 @@
+ 
+ mostlyclean::
+ 	rm -f kpsewhich kpsestat kpseaccess kpsereadlink *.lo
+-	$(LIBTOOL) --mode=clean $(RM) lib$(library).la
++	$(LIBTOOL) --mode=clean $(RM) lib$(library).a
+ distclean::
+ 	rm -f paths.h texmf.cnf texmf.sed stamp-paths
+ 
diff --git a/print/teTeX-base/files/patch-texk::kpathsea::texmf.in b/print/teTeX-base/files/patch-texk::kpathsea::texmf.in
deleted file mode 100644
index 9357caaeef90..000000000000
--- a/print/teTeX-base/files/patch-texk::kpathsea::texmf.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- texk/kpathsea/texmf.in.orig	Sat Jun  5 18:49:55 2004
-+++ texk/kpathsea/texmf.in	Sat Jun  5 18:50:02 2004
-@@ -62,7 +62,7 @@
- 
- % If defined, teTeX's texconfig stores modifications here (instead of the
- % TEXMFMAIN tree).
--%   VARTEXMF = @texmf@-var
-+VARTEXMF = @texmf@-var
- 
- % User texmf trees can be catered for like this...
- HOMETEXMF = $HOME/texmf
-@@ -74,7 +74,7 @@
- %   - list $VARTEXMF in the TEXMF definition;
- %   - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition.
- % TEXMF = $TEXMFMAIN
--TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
-+TEXMF = {$HOMETEXMF,!!$VARTEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
- 
- % The system trees.  These are the trees that are shared by all the users.
- SYSTEXMF = $TEXMF
diff --git a/print/teTeX-base/files/patch-texk::tetex::updmap b/print/teTeX-base/files/patch-texk::tetex::updmap
deleted file mode 100644
index 109f67a1a5be..000000000000
--- a/print/teTeX-base/files/patch-texk::tetex::updmap
+++ /dev/null
@@ -1,12 +0,0 @@
---- texk/tetex/updmap.orig	Sat Dec  4 03:21:09 2004
-+++ texk/tetex/updmap	Sat Dec  4 03:22:03 2004
-@@ -743,7 +743,8 @@
-       -e 's@.*%@@' |
-   awk '$1 == $3 && $2 == "default" {$2=""; $3=""} {print}' > $tmp8
-  
--  egrep '^(cm|eu|la|lc|line|msam|xy)' $tmp8 | sed 's@$@ -r@'
-+  egrep '^(cm|eu|la|lc|line|msam|xy)' $tmp8 \
-+	| sed 's@$@ -r@; s@\(fmex[789]\) -r$@\1@'
-   egrep -v '^(cm|eu|la|lc|line|msam|xy)' $tmp8
- }
- 
diff --git a/print/teTeX-base/files/patch-texk::web2c::etexdir::etex.fix b/print/teTeX-base/files/patch-texk::web2c::etexdir::etex.fix
deleted file mode 100644
index 3f2acac04a9a..000000000000
--- a/print/teTeX-base/files/patch-texk::web2c::etexdir::etex.fix
+++ /dev/null
@@ -1,23 +0,0 @@
---- texk/web2c/etexdir/etex.fix.orig	Thu Jul 22 12:56:18 2004
-+++ texk/web2c/etexdir/etex.fix	Thu Jul 22 12:56:53 2004
-@@ -1,7 +1,19 @@
- % Bugfixes for etex.ch version 2.1
- % Public Domain.
- 
--@x l.5503
-+@x l.1163 - |int_val| is a level, not a value.
-+    begin cur_val:=int_val;
-+@y
-+    begin cur_val_level:=int_val;
-+@z
-+
-+@x l.2737 - typo
-+    else q:=sa_ptr(cur_ptr)
-+@y
-+    else q:=sa_ptr(cur_chr)
-+@z
-+
-+@x l.5503 - comparison with 0 instead of |null|.
-   if cur_ptr<>0 then
- @y
-   if cur_ptr<>null then
diff --git a/print/teTeX-base/files/pkg-message.in b/print/teTeX-base/files/pkg-message.in
index 555be4fab3dd..cfe2a4f29d5e 100644
--- a/print/teTeX-base/files/pkg-message.in
+++ b/print/teTeX-base/files/pkg-message.in
@@ -1,3 +1,3 @@
 You may want to run texconfig to configure teTeX for your
 local environment. You will find teTeX's local documentation
-in %%PREFIX%%/%%TEXMF%%/doc/.
+in %%PREFIX%%/%%TEXMFDISTDIR%%/doc/.
diff --git a/print/teTeX-base/pkg-plist b/print/teTeX-base/pkg-plist
index 3e5de7215343..bde3e760c040 100644
--- a/print/teTeX-base/pkg-plist
+++ b/print/teTeX-base/pkg-plist
@@ -1,143 +1,127 @@
 @comment $FreeBSD$
-bin/MakeTeXPK
-bin/access
-%%DVIPSK%%bin/afm2tfm
-bin/allcm
-bin/allec
-bin/allneeded
+bin/mktexpk
+bin/mktexmf
+bin/mktextfm
+bin/mktexlsr
+bin/kpsewhich
+bin/kpsestat
+bin/kpseaccess
+bin/kpsereadlink
+bin/omega
+bin/otp2ocp
+bin/outocp
+bin/mkocp
+bin/mkofm
+bin/omfonts
+bin/aleph
+bin/pdfetex
+bin/pdfxtex
+bin/tex
+bin/mf
+bin/mf-nowin
+bin/mpost
+bin/newer
+bin/dmp
+bin/mpto
+bin/makempx
 bin/bibtex
 bin/ctangle
+bin/ctie
 bin/cweave
-bin/dmp
-bin/dvi2fax
 bin/dvicopy
-bin/dvihp
-bin/dvilj
-bin/dvilj2p
-bin/dvilj4
-bin/dvilj4l
-bin/dvilj6
-bin/dvipdfm
-bin/dvipdft
-%%DVIPSK%%bin/dvips
-bin/dvired
 bin/dvitomp
 bin/dvitype
-bin/e2pall
-bin/ebb
-bin/einitex
-bin/elatex
-bin/epstopdf
-bin/etex
-bin/evirtex
-bin/fdf2tan
-bin/fmtutil
-bin/fontexport
-bin/fontimport
-bin/fontinst
 bin/gftodvi
 bin/gftopk
 bin/gftype
-bin/gsftopk
-bin/inimf
-bin/inimpost
-bin/iniomega
-bin/initex
-bin/kpsepath
-bin/kpsestat
-bin/kpsetool
-bin/kpsewhich
-bin/kpsexpand
-bin/lambda
-bin/latex
-bin/mag
-bin/makeindex
-bin/makempx
-bin/makempy
-bin/mf
-%%X11BITS%%bin/mf-nowin
 bin/mft
-%%X11BITS%%bin/mfw
-bin/mkfontdesc
-bin/mkindex
-bin/mkocp
-bin/mkofm
-bin/mktexfmt
-bin/mktexlsr
-bin/mktexmf
-bin/mktexpk
-bin/mktextfm
-bin/mpost
-bin/mpto
-bin/mptopdf
-bin/newer
 bin/odvicopy
-%%DVIPSK%%bin/odvips
 bin/odvitype
-bin/ofm2opl
-bin/omega
-bin/omfonts
-bin/opl2ofm
 bin/otangle
-bin/otp2ocp
-bin/outocp
-bin/ovf2ovp
-bin/ovp2ovf
-%%X11BITS%%%%XDVIK%%bin/oxdvi
-%%X11BITS%%%%XDVIK%%bin/oxdvi.bin
 bin/patgen
-bin/pdfeinitex
-bin/pdfelatex
-bin/pdfetex
-bin/pdfevirtex
-bin/pdfinitex
-bin/pdflatex
-bin/pdftex
-bin/pdftosrc
-bin/pdfvirtex
-bin/pfb2pfa
-bin/pk2bm
 bin/pktogf
 bin/pktype
 bin/pltotf
 bin/pooltype
-bin/ps2frag
+bin/tangle
+bin/tftopl
+bin/tie
+bin/ttf2afm
+bin/vftovp
+bin/vptovf
+bin/weave
+bin/dvilj
+bin/dvilj2p
+bin/dvilj4
+bin/dvilj4l
+bin/dvihp
+bin/dvilj6
+bin/ebb
+bin/dvipdfm
+bin/dvipdft
+bin/dvipng
+bin/dvigif
+bin/gsftopk
+bin/makeindex
+bin/mkindex
+bin/pfb2pfa
+bin/mag
+bin/pk2bm
 bin/ps2pk
+bin/allcm
+bin/allneeded
+bin/dvi2fax
+bin/dvired
+bin/fmtutil
+bin/fmtutil-sys
+bin/fontinst
+bin/kpsetool
+bin/kpsewhere
+bin/ps2frag
 bin/pslatex
-bin/readlink
 bin/rubibtex
 bin/rumakeindex
-%%XDVIK%%bin/t1mapper
-bin/tangle
-bin/tex
 bin/texconfig
+bin/texconfig-dialog
+bin/texconfig-sys
 bin/texdoc
 bin/texdoctk
 bin/texexec
+bin/texlinks
+bin/updmap
+bin/updmap-sys
+bin/ps4pdf
+bin/a2ping
+bin/e2pall
+bin/epstopdf
+bin/mptopdf
+bin/allec
+bin/kpsepath
+bin/kpsexpand
+bin/texhash
+bin/fdf2tan
+bin/fdf2tex
+bin/makempy
 bin/texfind
 bin/texfont
-bin/texhash
-bin/texi2dvi
-bin/texi2html
-bin/texi2pdf
-bin/texlinks
 bin/texshow
 bin/texutil
-bin/tftopl
 bin/thumbpdf
-bin/tie
-bin/ttf2afm
-bin/updmap
-bin/vftovp
-bin/virmf
-bin/virmpost
-bin/viromega
-bin/virtex
-bin/vptovf
-%%XDVIK%%bin/xdvi
-%%XDVIK%%bin/xdvi.bin
-%%XDVIK%%bin/xdvizilla
-bin/weave
+bin/pdfcrop
+bin/uniqleaf
+bin/mktexfmt
+bin/ofm2opl
+bin/opl2ofm
+bin/ovf2ovp
+bin/ovp2ovf
+bin/latex
+bin/etex
+bin/pdftex
+bin/pdflatex
+bin/lambda
+bin/lamed
+bin/texi2dvi
+bin/texi2pdf
 include/kpathsea/absolute.h
 include/kpathsea/c-auto.h
 include/kpathsea/c-ctype.h
@@ -189,99 +173,82 @@ include/kpathsea/variable.h
 include/kpathsea/xopendir.h
 include/kpathsea/xstat.h
 lib/libkpathsea.a
-%%TEXMF%%/doc/tetex/TETEXDOC.dvi
-%%TEXMF%%/doc/tetex/TETEXDOC.pdf
-%%TEXMF%%/doc/tetex/TETEXDOC.ps
-%%TEXMF%%/doc/tetex/teTeX-FAQ
-%%TEXMF%%/dvips/gsftopk/render.ps
-%%TEXMF%%/texconfig/README
-%%TEXMF%%/texconfig/g/generic
-%%TEXMF%%/texconfig/generic
-%%TEXMF%%/texconfig/v/vt100
-%%TEXMF%%/texconfig/x/xterm
-%%TEXMF%%/web2c/etex-pl.pool
-%%TEXMF%%/web2c/etex.pool
-%%TEXMF%%/web2c/fmtutil.cnf
-%%TEXMF%%/web2c/mf.pool
-%%TEXMF%%/web2c/mktex.opt
-%%TEXMF%%/web2c/mktexdir
-%%TEXMF%%/web2c/mktexdir.opt
-%%TEXMF%%/web2c/mktexnam
-%%TEXMF%%/web2c/mktexnam.opt
-%%TEXMF%%/web2c/mktexupd
-%%TEXMF%%/web2c/mp.pool
-%%TEXMF%%/web2c/omega.pool
-%%TEXMF%%/web2c/pdfetex-pl.pool
-%%TEXMF%%/web2c/pdfetex.pool
-%%TEXMF%%/web2c/pdftex-pl.pool
-%%TEXMF%%/web2c/pdftex.pool
-%%TEXMF%%/web2c/tex-pl.pool
-%%TEXMF%%/web2c/tex.pool
-%%TEXMF%%/web2c/texmf.cnf
-%%TEXMFVAR%%/web2c/cont-en.log
-%%TEXMFVAR%%/web2c/cont-en.efmt
-%%TEXMFVAR%%/web2c/elatex.efmt
-%%TEXMFVAR%%/web2c/elatex.log
-%%TEXMFVAR%%/web2c/etex.efmt
-%%TEXMFVAR%%/web2c/etex.log
-%%TEXMFVAR%%/web2c/lambda.log
-%%TEXMFVAR%%/web2c/lambda.oft
-%%TEXMFVAR%%/web2c/latex.fmt
-%%TEXMFVAR%%/web2c/latex.log
-%%TEXMFVAR%%/web2c/metafun.log
-%%TEXMFVAR%%/web2c/metafun.mem
-%%TEXMFVAR%%/web2c/mf-nowin.base
-%%TEXMFVAR%%/web2c/mf.base
-%%TEXMFVAR%%/web2c/mf.log
-%%TEXMFVAR%%/web2c/mfw.base
-%%TEXMFVAR%%/web2c/mpost.log
-%%TEXMFVAR%%/web2c/mpost.mem
-%%TEXMFVAR%%/web2c/mptopdf.efmt
-%%TEXMFVAR%%/web2c/mptopdf.log
-%%TEXMFVAR%%/web2c/omega.log
-%%TEXMFVAR%%/web2c/omega.oft
-%%TEXMFVAR%%/web2c/pdfelatex.efmt
-%%TEXMFVAR%%/web2c/pdfelatex.log
-%%TEXMFVAR%%/web2c/pdfetex.efmt
-%%TEXMFVAR%%/web2c/pdfetex.log
-%%TEXMFVAR%%/web2c/pdflatex.fmt
-%%TEXMFVAR%%/web2c/pdflatex.log
-%%TEXMFVAR%%/web2c/pdftex.fmt
-%%TEXMFVAR%%/web2c/pdftex.log
-%%TEXMFVAR%%/web2c/plain.base
-%%TEXMFVAR%%/web2c/plain.fmt
-%%TEXMFVAR%%/web2c/plain.mem
-%%TEXMFVAR%%/web2c/tex.fmt
-%%TEXMFVAR%%/web2c/tex.log
-%%XDVIK%%%%TEXMF%%/xdvi/xdvi.cfg
-@exec mkdir -p %D/%%TEXMF%%/fonts/afm/hoekwater
-@exec mkdir -p %D/%%TEXMF%%/fonts/bh
-@exec mkdir -p %D/%%TEXMF%%/fonts/bh/lucidabr
-@exec mkdir -p %D/%%TEXMF%%/fonts/bh/lumath
-@exec mkdir -p %D/%%TEXMF%%/fonts/ofm/public/ommincho
-@exec mkdir -p %D/%%TEXMF%%/fonts/ofm/uhc
-@exec mkdir -p %D/%%TEXMF%%/fonts/ofm/uhc/gothic
-@exec mkdir -p %D/%%TEXMF%%/fonts/ofm/uhc/myoungjo
-@exec mkdir -p %D/%%TEXMF%%/fonts/ofm/uhc/taza
-@exec mkdir -p %D/%%TEXMF%%/fonts/ovf/public/ommincho
-@exec mkdir -p %D/%%TEXMF%%/fonts/ovf/uhc
-@exec mkdir -p %D/%%TEXMF%%/fonts/ovf/uhc/gothic
-@exec mkdir -p %D/%%TEXMF%%/fonts/ovf/uhc/myoungjo
-@exec mkdir -p %D/%%TEXMF%%/fonts/ovf/uhc/taza
-@exec mkdir -p %D/%%TEXMF%%/fonts/ovp/public/ommincho
-@exec mkdir -p %D/%%TEXMF%%/fonts/pk
-@exec mkdir -p %D/%%TEXMF%%/fonts/tfm/monotype
-@exec mkdir -p %D/%%TEXMF%%/fonts/vf/monotype
-@exec mkdir -p %D/%%TEXMF%%/omega/generic
-@exec mkdir -p %D/%%TEXMF%%/omega/generic/config
-@exec mkdir -p %D/%%TEXMF%%/omega/ocp/omegajapanese
-@exec mkdir -p %D/%%TEXMF%%/omega/otp/omega-j
-@exec mkdir -p %D/%%TEXMF%%/omega/otp/omegajapanese
-@exec mkdir -p %D/%%TEXMF%%/xdvi
+%%TEXMFDIR%%/web2c/mktex.opt
+%%TEXMFDIR%%/web2c/mktexdir
+%%TEXMFDIR%%/web2c/mktexdir.opt
+%%TEXMFDIR%%/web2c/mktexnam
+%%TEXMFDIR%%/web2c/mktexnam.opt
+%%TEXMFDIR%%/web2c/mktexupd
+%%TEXMFDIR%%/web2c/texmf.cnf
+%%TEXMFDIR%%/web2c/omega.pool
+%%TEXMFDIR%%/web2c/aleph.pool
+%%TEXMFDIR%%/web2c/pdfetex.pool
+%%TEXMFDIR%%/web2c/pdfxtex.pool
+%%TEXMFDIR%%/web2c/tex.pool
+%%TEXMFDIR%%/web2c/mf.pool
+%%TEXMFDIR%%/web2c/mp.pool
+%%TEXMFDIR%%/web2c/fmtutil.cnf
+%%TEXMFDIR%%/web2c/pdfetex-pl.pool
+%%TEXMFDIR%%/dvips/gsftopk/render.ps
+%%TEXMFDIR%%/doc/tetex/TETEXDOC.pdf
+%%TEXMFDIR%%/doc/tetex/TETEXDOC.ps
+%%TEXMFDIR%%/doc/tetex/TETEXDOC.dvi
+%%TEXMFDIR%%/doc/tetex/teTeX-FAQ
+%%TEXMFDIR%%/texconfig/g/generic
+%%TEXMFDIR%%/texconfig/v/vt100
+%%TEXMFDIR%%/texconfig/x/xterm
+%%TEXMFDIR%%/texconfig/README
+%%TEXMFDIR%%/texconfig/generic
+%%TEXMFDIR%%/texconfig/tcfmgr
+%%TEXMFDIR%%/texconfig/tcfmgr.map
+%%TEXMFDIR%%/release-tetex-src.txt
+%%TEXMFVARDIR%%/fonts/map/dvips/updmap/download35.map
+%%TEXMFVARDIR%%/fonts/map/dvips/updmap/builtin35.map
+%%TEXMFVARDIR%%/fonts/map/dvips/updmap/psfonts_t1.map
+%%TEXMFVARDIR%%/fonts/map/dvips/updmap/psfonts_pk.map
+%%TEXMFVARDIR%%/fonts/map/dvips/updmap/ps2pk.map
+%%TEXMFVARDIR%%/fonts/map/dvips/updmap/psfonts.map
+%%TEXMFVARDIR%%/fonts/map/pdftex/updmap/pdftex_dl14.map
+%%TEXMFVARDIR%%/fonts/map/pdftex/updmap/pdftex_ndl14.map
+%%TEXMFVARDIR%%/fonts/map/pdftex/updmap/pdftex.map
+%%TEXMFVARDIR%%/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
+%%TEXMFVARDIR%%/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
+%%TEXMFVARDIR%%/fonts/map/dvipdfm/updmap/dvipdfm.map
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/aleph.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/cont-en.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/etex.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/lambda.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/lamed.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/latex.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/metafun.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/mf.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/mpost.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/mptopdf.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/omega.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/pdfetex.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/pdflatex.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/pdftex.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/tex.log
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/aleph.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/cont-en.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/etex.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/lambda.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/lamed.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/latex.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/mptopdf.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/omega.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/pdfetex.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/pdflatex.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/pdftex.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/tex.fmt
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/metafun.mem
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/mpost.mem
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/mf.base
+@unexec rm -f %D/%%TEXMFVARDIR%%/web2c/updmap.log
 @dirrm include/kpathsea
-@dirrm %%TEXMF%%/texconfig/x
-@dirrm %%TEXMF%%/texconfig/v
-@dirrm %%TEXMF%%/texconfig/g
-@dirrm %%TEXMF%%/texconfig
-@dirrm %%TEXMF%%/dvips/gsftopk
+@dirrm %%TEXMFDIR%%/texconfig/x
+@dirrm %%TEXMFDIR%%/texconfig/v
+@dirrm %%TEXMFDIR%%/texconfig/g
+@dirrm %%TEXMFDIR%%/texconfig
+@dirrm %%TEXMFDIR%%/dvips/gsftopk
 @exec %%MKTEXLSR%%