5 files changed, 15 insertions, 90 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 987c7afa865..484d4241b4f 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1472,8 +1472,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \
 	euptexdir/EUPTEX.txt eptexdir/eptrip/etrip.log \
 	eptexdir/eptrip/etrip.tex euptexdir/euptrip/euptrip.diffs \
-	euptexdir/euptrip/texmf.cnf $(pdftex_ch_srcs) etexdir/etex.ch \
-	pdftexdir/pdftex.defines pdftexdir/pdftex.h \
+	euptexdir/euptrip/texmf.cnf $(pdftex_ch_srcs) \
+	pdftexdir/pdftex.defines \
 	pdftexdir/ChangeLog pdftexdir/NEWS pdftexdir/README \
 	pdftexdir/change-files.txt $(pdftex_tests) tests/wprob.tex \
 	pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
@@ -2125,7 +2125,8 @@ pdftex_ch_srcs = \
 	tex.ch \
 	enctex.ch \
 	$(pdftex_ch_synctex) \
-	pdftexdir/pdftex.ch
+	pdftexdir/pdftex.ch \
+	tex-binpool.ch
 
 
 # pdfTeX Tests
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 9796ed68ad1..2fe37d2112b 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pdftex.web: Change program name into PDFTEX (not ETEX).
+	* pdftex.ch: Remove the contents of ../tex-binpool.ch.
+	* am/pdftex.am (pdftex_ch_srcs): Add tex-binpool.ch.
+
 2012-10-19  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* pdftoepdf.cc: In MSVC 5.0 getNewObjectNumber() requires an int
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 18b7a371b29..60515b29cda 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -65,10 +65,10 @@ pdftex_ch_srcs = \
 	tex.ch \
 	enctex.ch \
 	$(pdftex_ch_synctex) \
-	pdftexdir/pdftex.ch
+	pdftexdir/pdftex.ch \
+	tex-binpool.ch
 ##
-EXTRA_DIST += $(pdftex_ch_srcs) etexdir/etex.ch \
-	pdftexdir/pdftex.defines pdftexdir/pdftex.h
+EXTRA_DIST += $(pdftex_ch_srcs) pdftexdir/pdftex.defines
 
 DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c \
 	pdftex.p pdftex.pool pdftex-tangle
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.ch b/Build/source/texk/web2c/pdftexdir/pdftex.ch
index b1f3ff613bd..ad598cc73e9 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.ch
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.ch
@@ -1,5 +1,5 @@
 %
-% Copyright 1996-2011 Han The Thanh, <thanh@pdftex.org>
+% Copyright 1996-2012 Han The Thanh, <thanh@pdftex.org>
 %
 % This file is part of pdfTeX.
 %
@@ -39,88 +39,6 @@
 @z
 
 @x
-@!m,@!n:text_char; {characters input from |pool_file|}
-@!g:str_number; {garbage}
-@!a:integer; {accumulator for check sum}
-@!c:boolean; {check sum has been checked}
-@y
-@!g:str_number; {garbage}
-@z
-
-@x
-@ @d bad_pool(#)==begin wake_up_terminal; write_ln(term_out,#);
-  a_close(pool_file); get_strings_started:=false; return;
-  end
-@<Read the other strings...@>=
-name_length := strlen (pool_name);
-name_of_file := xmalloc_array (ASCII_code, name_length + 1);
-strcpy (stringcast(name_of_file+1), pool_name); {copy the string}
-if a_open_in (pool_file, kpse_texpool_format) then
-  begin c:=false;
-  repeat @<Read one string, but return |false| if the
-    string memory space is getting too tight for comfort@>;
-  until c;
-  a_close(pool_file); get_strings_started:=true;
-  end
-else  bad_pool('! I can''t read ', pool_name, '; bad path?')
-@.I can't read TEX.POOL@>
-
-@ @<Read one string...@>=
-begin if eof(pool_file) then bad_pool('! ', pool_name, ' has no check sum.');
-@.TEX.POOL has no check sum@>
-read(pool_file,m); read(pool_file,n); {read two digits of string length}
-if m='*' then @<Check the pool check sum@>
-else  begin if (xord[m]<"0")or(xord[m]>"9")or@|
-      (xord[n]<"0")or(xord[n]>"9") then
-    bad_pool('! ', pool_name, ' line doesn''t begin with two digits.');
-@.TEX.POOL line doesn't...@>
-  l:=xord[m]*10+xord[n]-"0"*11; {compute the length}
-  if pool_ptr+l+string_vacancies>pool_size then
-    bad_pool('! You have to increase POOLSIZE.');
-@.You have to increase POOLSIZE@>
-  for k:=1 to l do
-    begin if eoln(pool_file) then m:=' '@+else read(pool_file,m);
-    append_char(xord[m]);
-    end;
-  read_ln(pool_file); g:=make_string;
-  end;
-end
-
-@ The \.{WEB} operation \.{@@\$} denotes the value that should be at the
-end of this \.{TEX.POOL} file; any other value means that the wrong pool
-file has been loaded.
-@^check sum@>
-
-@<Check the pool check sum@>=
-begin a:=0; k:=1;
-loop@+  begin if (xord[n]<"0")or(xord[n]>"9") then
-  bad_pool('! ', pool_name, ' check sum doesn''t have nine digits.');
-@.TEX.POOL check sum...@>
-  a:=10*a+xord[n]-"0";
-  if k=9 then goto done;
-  incr(k); read(pool_file,n);
-  end;
-done: if a<>@$ then
-  bad_pool('! ', pool_name, ' doesn''t match; tangle me again (or fix the path).');
-@.TEX.POOL doesn't match@>
-c:=true;
-end
-@y
-@ @<Read the other strings...@>=
-  g := loadpoolstrings((pool_size-string_vacancies));
-  if g=0 then begin
-     wake_up_terminal; write_ln(term_out,'! You have to increase POOLSIZE.');
-     get_strings_started:=false;
-     return;
-  end;
-  get_strings_started:=true;
-
-@ Empty module
-
-@ Empty module
-@z
-
-@x
 @d frozen_null_font=frozen_control_sequence+11
   {permanent `\.{\\nullfont}'}
 @y
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 4826b7e79bc..7656d29ca46 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -310,7 +310,7 @@ known as `\eTeX'.
 @#
 @d banner==pdfTeX_banner
 @#
-@d TEX==ETEX {change program name into |ETEX|}
+@d TEX==PDFTEX {change program name into |PDFTEX|}
 @#
 @d TeXXeT_code=0 {the \TeXXeT\ feature is optional}
 @#