Update to 2.99.13.20040204, a teTeX-3.0 release candidate.

A lot of tools and macros has been updated and the share/texmf* directory
structure has been changed as well.  The portupgrade utility should work,
but please read http://people.freebsd.org/~hrs/tetex-upgrade.txt before
upgrading.

8 files changed, 61 insertions, 177 deletions

diff --git a/print/teTeX-base/files/patch-CAN-2004-0888 b/print/teTeX-base/files/patch-CAN-2004-0888
index 63d9260..d7cf6cd 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 9f7d944..0000000
--- 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 493d22e..0000000
--- 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 3752145..ae62314 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 9357caa..0000000
--- 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 109f67a..0000000
--- 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 3f2acac..0000000
--- 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 555be4f..cfe2a4f 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/.