diff --git a/dvipsk-jpatch-pdvips.patch b/dvipsk-jpatch-pdvips.patch
index 42c0e77..0ef0021 100644
--- a/dvipsk-jpatch-pdvips.patch
+++ b/dvipsk-jpatch-pdvips.patch
@@ -1,7 +1,42 @@
---- tetex-src-3.0/texk/pdvipsk/Makefile.in.pdvips	2005-04-13 19:35:07.000000000 +0900
-+++ tetex-src-3.0/texk/pdvipsk/Makefile.in	2005-04-13 19:53:44.000000000 +0900
-@@ -20,6 +20,8 @@
- ac_include ../make/texi.mk
+diff -up texlive-2007/texk/configure.in.pdvips texlive-2007/texk/configure.in
+--- texlive-2007/texk/configure.in.pdvips	2007-01-10 17:36:20.000000000 +0100
++++ texlive-2007/texk/configure.in	2008-08-27 15:26:38.000000000 +0200
+@@ -62,6 +62,7 @@ PKGS='
+  dvipng
+  dvipos
+  dvipsk
++ pdvipsk
+  gsftopk
+  lacheck
+  makeindexk
+diff -up texlive-2007/texk/configure.pdvips texlive-2007/texk/configure
+--- texlive-2007/texk/configure.pdvips	2007-01-10 17:36:44.000000000 +0100
++++ texlive-2007/texk/configure	2008-08-27 15:26:38.000000000 +0200
+@@ -6604,6 +6604,7 @@ PKGS='
+  dvipng
+  dvipos
+  dvipsk
++ pdvipsk
+  gsftopk
+  lacheck
+  makeindexk
+diff -up texlive-2007/texk/pdvipsk/dvips.c.pdvips texlive-2007/texk/pdvipsk/dvips.c
+--- texlive-2007/texk/pdvipsk/dvips.c.pdvips	2008-08-27 15:26:38.000000000 +0200
++++ texlive-2007/texk/pdvipsk/dvips.c	2008-08-27 15:26:38.000000000 +0200
+@@ -597,7 +597,7 @@ main P2C(int, argc, char **, argv)
+ #endif
+ 
+ #ifdef KPATHSEA
+-   kpse_set_program_name (argv[0], "dvips");
++   kpse_set_program_name (argv[0], "pdvips");
+    kpse_set_program_enabled (kpse_pk_format, MAKE_TEX_PK_BY_DEFAULT, kpse_src_compile);
+ #endif
+    
+diff -up texlive-2007/texk/pdvipsk/Makefile.in.pdvips texlive-2007/texk/pdvipsk/Makefile.in
+--- texlive-2007/texk/pdvipsk/Makefile.in.pdvips	2008-08-27 15:26:38.000000000 +0200
++++ texlive-2007/texk/pdvipsk/Makefile.in	2008-08-27 15:26:38.000000000 +0200
+@@ -20,6 +20,8 @@ kpse_include ../make/cross.mk
+ kpse_include ../make/texi.mk
  prog_cflags = -DUNIX -DKPATHSEA -DNeedFunctionPrototypes -DSHIFTLOWCHARS
  
 +ppsheaderdir = $(texmf)/pdvips
@@ -9,7 +44,7 @@
  # The `t[mp]-' business is so that we don't create an empty .pro file,
  # if running squeeze fails for some reason.  A dependency on squeeze
  # fails here, so we include it below.
-@@ -36,11 +38,11 @@
+@@ -36,11 +38,11 @@ scalewidth.o dosection.o dopage.o reside
  header.o repack.o virtualfont.o dpicheck.o finclude.o writet1.o		\
  pprescan.o papersiz.o color.o bbox.o hps.o t1part.o
  
@@ -23,7 +58,7 @@
  
  $(program): $(kpathsea) $(objects)
  	$(kpathsea_link) $(objects) $(LOADLIBES) 
-@@ -93,16 +95,16 @@
+@@ -93,16 +95,16 @@ uninstall-exec:
  	for p in $(programs); do rm -f $(bindir)/$$p; done
  	rm -f $(bindir)/o$(program)
  
@@ -45,7 +80,7 @@
  # psfonts.map.
  #	if test ! -r $(psheaderdir)/base/psfonts.map 			\
  #	   || grep 'original psfonts.map --' $(psheaderdir)/base/psfonts.map \
-@@ -110,11 +112,8 @@
+@@ -110,11 +112,8 @@ install-data: $(program).info
  #	  $(INSTALL_DATA) $(srcdir)/psfonts.map $(psheaderdir)/base/psfonts.map; \
  #        else true; fi
  # psfonts_jp.map.
@@ -59,7 +94,7 @@
  # Man pages.
  	$(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
  	rm -f $(man1dir)/o$(program).$(manext)
-@@ -124,9 +123,6 @@
+@@ -124,9 +123,6 @@ install-data: $(program).info
  #	cd $(srcdir)/tex && for m in *.tex; do \
  #	  $(INSTALL_DATA) $$m $(dvips_plain_macrodir)/$$m; done
  	$(POST_INSTALL)
@@ -69,7 +104,7 @@
  
  uninstall-data:
  	$(PRE_UNINSTALL)
-@@ -149,11 +145,11 @@
+@@ -149,11 +145,11 @@ uninstall-data:
  	rm -f $(man1dir)/dvips.$(manext) $(man1dir)/afm2tfm.$(manext)
  
  distname = dvipsk
@@ -83,64 +118,3 @@
  post-dist-$(distname):
  	ln -s `pwd`/contrib `pwd`/tex $(distdir)
  	mkdir $(distdir)/reencode; ln -s $(fontname)/*.enc $(distdir)/reencode
---- tetex-src-2.99.6.20041211-beta/texk/pdvipsk/dvips.c.pdvips	2004-12-14 21:13:36.005636838 +0900
-+++ tetex-src-2.99.6.20041211-beta/texk/pdvipsk/dvips.c	2004-12-14 21:13:36.076623936 +0900
-@@ -588,17 +588,17 @@ main P2C(int, argc, char **, argv)
- #ifdef __APPLE__ /* for Mac OS X, T. Uchiyama */
-    struct rlimit rl;
-    getrlimit(RLIMIT_STACK, &rl);
-    rl.rlim_cur = 2048 * 1024;
-    setrlimit(RLIMIT_STACK, &rl);
- #endif
- 
- #ifdef KPATHSEA
--   kpse_set_program_name (argv[0], "dvips");
-+   kpse_set_program_name (argv[0], "pdvips");
-    kpse_set_program_enabled (kpse_pk_format, MAKE_TEX_PK_BY_DEFAULT, kpse_src_compile);
- #endif
-    
- #ifdef __THINK__
-    argc = dcommand(&argv) ; /* do I/O stream redirection */
- #endif
- #ifdef VMS		/* Grab the command-line buffer */
-    short len_arg;
---- texlive-2007/texk/configure.in.pdvips	2007-01-11 01:36:20.000000000 +0900
-+++ texlive-2007/texk/configure.in	2007-02-22 10:45:22.000000000 +0900
-@@ -57,16 +57,17 @@ PKGS='
-  dvi2tty
-  dvidvi
-  dviljk
-  dvipdfm
-  dvipdfmx
-  dvipng
-  dvipos
-  dvipsk
-+ pdvipsk
-  gsftopk
-  lacheck
-  makeindexk
-  musixflx
-  ps2pkm
-  seetexk
-  tetex
-  tex4htk
---- texlive-2007/texk/configure.pdvips	2007-01-11 01:36:44.000000000 +0900
-+++ texlive-2007/texk/configure	2007-02-22 10:46:14.000000000 +0900
-@@ -6599,16 +6599,17 @@ PKGS='
-  dvi2tty
-  dvidvi
-  dviljk
-  dvipdfm
-  dvipdfmx
-  dvipng
-  dvipos
-  dvipsk
-+ pdvipsk
-  gsftopk
-  lacheck
-  makeindexk
-  musixflx
-  ps2pkm
-  seetexk
-  tetex
-  tex4htk
diff --git a/texlive-2007-badscript.patch b/texlive-2007-badscript.patch
index 1c0b9ba..b64924c 100644
--- a/texlive-2007-badscript.patch
+++ b/texlive-2007-badscript.patch
@@ -1,6 +1,33 @@
---- TeX/texk/tetex/allcm.badscript	2006-05-24 16:15:36.000000000 -0700
-+++ TeX/texk/tetex/allcm	2006-05-24 16:18:47.000000000 -0700
-@@ -14,7 +14,7 @@
+diff -up texlive-2007/texk/dviljk/dvihp.badscript texlive-2007/texk/dviljk/dvihp
+--- texlive-2007/texk/dviljk/dvihp.badscript	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/dviljk/dvihp	2008-08-27 13:30:02.000000000 +0200
+@@ -7,9 +7,7 @@
+ : ${SPOOL=lpr}          # used to print an LJ file
+ : ${TMPDIR=${TEMP-${TMP-/tmp}}} # for the dvicopy output
+ 
+-tmpdir="${TMPDIR}"/dvihp$$
+-(umask 077; mkdir "$tmpdir") \
+-  || { echo "cannot create directory \`$tmpdir'."; exit 1; }
++tmpdir=`mktemp -d ${TMPDIR}/dvihp.XXXXXX` || { echo "cannot create secure temporary directory."; exit 1; }
+ 
+ trap '
+   cd "${TMPDIR}"
+diff -up texlive-2007/texk/dvipdfm/dvipdft.badscript texlive-2007/texk/dvipdfm/dvipdft
+--- texlive-2007/texk/dvipdfm/dvipdft.badscript	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/dvipdfm/dvipdft	2008-08-27 13:30:02.000000000 +0200
+@@ -31,7 +31,7 @@ help="Usage: $progname [options] dvifile
+        $progname --help
+        $progname --version"
+ 
+-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
++tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX`
+ 
+ quoteit()
+ {
+diff -up texlive-2007/texk/tetex/allcm.badscript texlive-2007/texk/tetex/allcm
+--- texlive-2007/texk/tetex/allcm.badscript	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/allcm	2008-08-27 13:30:02.000000000 +0200
+@@ -14,7 +14,7 @@ unset RUNNING_BSH
  test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
  
  progname=`basename $0`
@@ -9,7 +36,7 @@
  
  case "$progname" in
    allec)
-@@ -81,11 +81,6 @@
+@@ -81,11 +81,6 @@ trap '
    exit 1
  ' 1 2 3 7 13 15
  
@@ -21,9 +48,10 @@
  cd $tmpdir || exit 1
  echo >&2
  echo "---------------------------------------------------------------------" >&2
---- TeX/texk/tetex/fmtutil.badscript	2006-05-24 16:19:21.000000000 -0700
-+++ TeX/texk/tetex/fmtutil	2006-05-24 16:22:26.000000000 -0700
-@@ -108,8 +108,6 @@
+diff -up texlive-2007/texk/tetex/fmtutil.badscript texlive-2007/texk/tetex/fmtutil
+--- texlive-2007/texk/tetex/fmtutil.badscript	2007-01-14 18:46:37.000000000 +0100
++++ texlive-2007/texk/tetex/fmtutil	2008-08-27 13:30:02.000000000 +0200
+@@ -112,8 +112,6 @@ setupTmpDir()
  
    trap 'cleanup 1' 1 2 3 7 13 15
    needsCleanup=true
@@ -32,7 +60,7 @@
  }
  
  ###############################################################################
-@@ -355,7 +353,7 @@
+@@ -360,7 +358,7 @@ main()
    need_find_hyphenfile=false
    cfgparam=
    cfgmaint=
@@ -40,10 +68,11 @@
 +  tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX`
    verboseFlag=true
  
-   # mktexfmtMode: if called as mktexfmt, set to true. Will echo the generated
---- TeX/texk/tetex/texconfig.badscript	2006-05-24 16:22:54.000000000 -0700
-+++ TeX/texk/tetex/texconfig	2006-05-24 16:24:18.000000000 -0700
-@@ -37,7 +37,7 @@
+   # mktexfmtMode: if called as mktexfmt, set to true. Will echo the
+diff -up texlive-2007/texk/tetex/texconfig.badscript texlive-2007/texk/tetex/texconfig
+--- texlive-2007/texk/tetex/texconfig.badscript	2007-01-16 01:33:36.000000000 +0100
++++ texlive-2007/texk/tetex/texconfig	2008-08-27 13:30:02.000000000 +0200
+@@ -37,7 +37,7 @@ envVars="
    TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
    TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
  "
@@ -52,7 +81,7 @@
  needsCleanup=false
  lastUpdatedFile=
  
-@@ -216,8 +216,6 @@
+@@ -216,8 +216,6 @@ setupTmpDir()
  
    trap 'cleanup 1' 1 2 3 7 13 15
    needsCleanup=true
@@ -61,9 +90,10 @@
  }
  
  ###############################################################################
---- TeX/texk/tetex/texlinks.badscript	2005-08-28 12:45:59.000000000 -0700
-+++ TeX/texk/tetex/texlinks	2006-05-24 16:31:25.000000000 -0700
-@@ -100,8 +100,6 @@
+diff -up texlive-2007/texk/tetex/texlinks.badscript texlive-2007/texk/tetex/texlinks
+--- texlive-2007/texk/tetex/texlinks.badscript	2007-01-17 17:31:31.000000000 +0100
++++ texlive-2007/texk/tetex/texlinks	2008-08-27 13:30:02.000000000 +0200
+@@ -100,8 +100,6 @@ setupTmpDir()
  
    trap 'cleanup 1' 1 2 3 7 13 15
    needsCleanup=true
@@ -72,7 +102,7 @@
  }
  
  
-@@ -192,7 +190,7 @@
+@@ -199,7 +197,7 @@ search_symlinkdir()
  upd_symlinkdir()
  {
    search_symlinkdir || return 0
@@ -81,7 +111,7 @@
      install_link "$selfautoloc/$i" "$symlinkdir/$i"
    done
  }
-@@ -236,12 +234,12 @@
+@@ -243,12 +241,12 @@ main()
    test -f "$cnf_file" || abort "config file \`$cnf' not found"
  
  
@@ -96,7 +126,7 @@
  
    if test -z "$dirs"; then
      if test $multiplatform = true; then
-@@ -259,8 +257,8 @@
+@@ -266,8 +264,8 @@ main()
    for d in $dirs; do
      kpseaccess -w $d \
        || { errmsg "$d: no write permissions. Skipping..."; continue; }
@@ -107,9 +137,10 @@
      while test $# != 0; do
        fmt=$1; engine=$2; shift; shift
  
---- TeX/texk/tetex/updmap.badscript	2006-05-24 16:32:13.000000000 -0700
-+++ TeX/texk/tetex/updmap	2006-05-24 16:33:51.000000000 -0700
-@@ -769,7 +769,6 @@
+diff -up texlive-2007/texk/tetex/updmap.badscript texlive-2007/texk/tetex/updmap
+--- texlive-2007/texk/tetex/updmap.badscript	2006-12-25 19:43:31.000000000 +0100
++++ texlive-2007/texk/tetex/updmap	2008-08-27 13:30:02.000000000 +0200
+@@ -769,7 +769,6 @@ setupTmpDir()
  
    trap 'cleanup 1' 1 2 3 7 13 15
    needsCleanup=true
@@ -117,7 +148,7 @@
  }
  
  ###############################################################################
-@@ -1296,7 +1295,8 @@
+@@ -1299,7 +1298,8 @@ main()
    dvipsoutputdir=; pdftexoutputdir=; dvipdfmoutputdir=
    : ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`}
  
@@ -127,27 +158,3 @@
    tmp1=$tmpdir/a
    tmp2=$tmpdir/b
    tmp3=$tmpdir/c
---- TeX/texk/dviljk/dvihp.badscript	2006-05-24 16:43:13.000000000 -0700
-+++ TeX/texk/dviljk/dvihp	2006-05-24 16:47:10.000000000 -0700
-@@ -7,9 +7,7 @@
- : ${SPOOL=lpr}          # used to print an LJ file
- : ${TMPDIR=${TEMP-${TMP-/tmp}}} # for the dvicopy output
- 
--tmpdir="${TMPDIR}"/dvihp$$
--(umask 077; mkdir "$tmpdir") \
--  || { echo "cannot create directory \`$tmpdir'."; exit 1; }
-+tmpdir=`mktemp -d ${TMPDIR}/dvihp.XXXXXX` || { echo "cannot create secure temporary directory."; exit 1; }
- 
- trap '
-   cd "${TMPDIR}"
---- TeX/texk/dvipdfm/dvipdft.badscript	2006-05-24 16:48:16.000000000 -0700
-+++ TeX/texk/dvipdfm/dvipdft	2006-05-24 16:51:53.000000000 -0700
-@@ -31,7 +31,7 @@
-        $progname --help
-        $progname --version"
- 
--tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-+tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX`
- 
- quoteit()
- {
diff --git a/texlive-2007-makej.patch b/texlive-2007-makej.patch
index 44b4435..16efdf3 100644
--- a/texlive-2007-makej.patch
+++ b/texlive-2007-makej.patch
@@ -1,25 +1,26 @@
---- tetex-src-2.0.2/texk/web2c/web2c/Makefile.in.makej	2002-10-12 13:37:39.000000000 +0200
-+++ tetex-src-2.0.2/texk/web2c/web2c/Makefile.in	2005-01-07 10:48:22.931698496 +0100
-@@ -25,13 +25,14 @@
+diff -up texlive-2007/texk/web2c/omegafonts/Makefile.in.makej texlive-2007/texk/web2c/omegafonts/Makefile.in
+--- texlive-2007/texk/web2c/omegafonts/Makefile.in.makej	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/web2c/omegafonts/Makefile.in	2008-08-27 13:28:57.000000000 +0200
+@@ -34,12 +34,13 @@ omfonts: $(omfonts_objects)
+ 	$(kpathsea_link) $(omfonts_objects) $(LEXLIB) $(LOADLIBES) 
  
- # We use y_tab.* for the sake of MS-DOS.
- main.o: main.c y_tab.h
--y_tab.c y_tab.h: web2c.y
+ omfonts.o: omfonts.c y_tab.h
+-y_tab.c y_tab.h: pl.y
 +y_tab.c: y_tab.h
-+y_tab.h: web2c.y
- 	@echo Expect one shift/reduce conflict.
- 	$(YACC) -d -v $(srcdir)/web2c.y
++y_tab.h: pl.y
+ 	$(YACC) -d -v $(srcdir)/pl.y
  	-test -f y.tab.c && mv -f y.tab.c y_tab.c
  	-test -f y.tab.h && mv -f y.tab.h y_tab.h
- $(LEX_OUTPUT_ROOT).o: y_tab.h
--$(LEX_OUTPUT_ROOT).c: web2c.l
-+$(LEX_OUTPUT_ROOT).c: y_tab.h web2c.l
- 	$(LEX) $(srcdir)/web2c.l
+ $(LEX_OUTPUT_ROOT).o: parser.h
+-$(LEX_OUTPUT_ROOT).c: pl.l
++$(LEX_OUTPUT_ROOT).c: y_tab.h pl.l
+ 	$(LEX) $(srcdir)/pl.l
+ 
  
- fixwrites: fixwrites.o
---- tetex-src-2.0.2/texk/web2c/otps/Makefile.in.makej	2000-06-21 00:27:56.000000000 +0200
-+++ tetex-src-2.0.2/texk/web2c/otps/Makefile.in	2005-01-07 10:49:37.588348960 +0100
-@@ -21,12 +21,13 @@
+diff -up texlive-2007/texk/web2c/otps/Makefile.in.makej texlive-2007/texk/web2c/otps/Makefile.in
+--- texlive-2007/texk/web2c/otps/Makefile.in.makej	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/web2c/otps/Makefile.in	2008-08-27 13:28:57.000000000 +0200
+@@ -21,12 +21,13 @@ otp2ocp: $(otp2ocp_objects)
  	$(kpathsea_link) $(otp2ocp_objects) $(LEXLIB) $(LOADLIBES) 
  
  otp2ocp.o: otp2ocp.c y_tab.h
@@ -35,21 +36,23 @@
  	$(LEX) $(srcdir)/otp.l
  
  outocp: outocp.o
---- tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in.makej	2001-11-10 14:42:37.000000000 +0100
-+++ tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in	2005-01-07 10:44:36.556112816 +0100
-@@ -34,12 +34,13 @@
- 	$(kpathsea_link) $(omfonts_objects) $(LEXLIB) $(LOADLIBES) 
+diff -up texlive-2007/texk/web2c/web2c/Makefile.in.makej texlive-2007/texk/web2c/web2c/Makefile.in
+--- texlive-2007/texk/web2c/web2c/Makefile.in.makej	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/web2c/web2c/Makefile.in	2008-08-27 13:28:57.000000000 +0200
+@@ -25,13 +25,14 @@ web2c: $(web2c_objects)
  
- omfonts.o: omfonts.c y_tab.h
--y_tab.c y_tab.h: pl.y
+ # We use y_tab.* for the sake of MS-DOS.
+ main.o: main.c y_tab.h
+-y_tab.c y_tab.h: web2c.y
 +y_tab.c: y_tab.h
-+y_tab.h: pl.y
- 	$(YACC) -d -v $(srcdir)/pl.y
++y_tab.h: web2c.y
+ 	@echo Expect one shift/reduce conflict.
+ 	$(YACC) -d -v $(srcdir)/web2c.y
  	-test -f y.tab.c && mv -f y.tab.c y_tab.c
  	-test -f y.tab.h && mv -f y.tab.h y_tab.h
- $(LEX_OUTPUT_ROOT).o: parser.h
--$(LEX_OUTPUT_ROOT).c: pl.l
-+$(LEX_OUTPUT_ROOT).c: y_tab.h pl.l
- 	$(LEX) $(srcdir)/pl.l
- 
+ $(LEX_OUTPUT_ROOT).o: y_tab.h
+-$(LEX_OUTPUT_ROOT).c: web2c.l
++$(LEX_OUTPUT_ROOT).c: y_tab.h web2c.l
+ 	$(LEX) $(srcdir)/web2c.l
  
+ fixwrites: fixwrites.o kps.o
diff --git a/texlive-2007-tmpcleanup.patch b/texlive-2007-tmpcleanup.patch
index e9f9978..138d1de 100644
--- a/texlive-2007-tmpcleanup.patch
+++ b/texlive-2007-tmpcleanup.patch
@@ -1,6 +1,26 @@
---- TeX/texk/tetex/texconfig.tmpcleanup	2006-05-24 17:21:48.000000000 -0700
-+++ TeX/texk/tetex/texconfig	2006-05-24 17:23:55.000000000 -0700
-@@ -38,7 +38,8 @@
+diff -up texlive-2007/texk/tetex/fmtutil.tmpcleanup texlive-2007/texk/tetex/fmtutil
+--- texlive-2007/texk/tetex/fmtutil.tmpcleanup	2008-08-27 13:31:03.000000000 +0200
++++ texlive-2007/texk/tetex/fmtutil	2008-08-27 13:31:03.000000000 +0200
+@@ -354,11 +354,13 @@ main()
+   destdir=     # global variable: where do we put the format files?
+   cnf_file=    # global variable: full name of the config file
+   cmd=         # desired action from command line
+-  needsCleanup=false
++  needsCleanup=true
+   need_find_hyphenfile=false
+   cfgparam=
+   cfgmaint=
+-  tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX`
++  tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX` || \
++      abort "could not create temporary directory"
++  trap -- "cleanup;" EXIT 1 2 3 7 13 15
+   verboseFlag=true
+ 
+   # mktexfmtMode: if called as mktexfmt, set to true. Will echo the
+diff -up texlive-2007/texk/tetex/texconfig.tmpcleanup texlive-2007/texk/tetex/texconfig
+--- texlive-2007/texk/tetex/texconfig.tmpcleanup	2008-08-27 13:31:03.000000000 +0200
++++ texlive-2007/texk/tetex/texconfig	2008-08-27 13:31:03.000000000 +0200
+@@ -38,7 +38,8 @@ envVars="
    TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
  "
  tmpdir=`mktemp -d "${TMP-/tmp}/$progname.XXXXXX"` || exit 1
@@ -10,9 +30,10 @@
  lastUpdatedFile=
  
  ###############################################################################
---- TeX/texk/tetex/updmap.tmpcleanup	2006-05-24 17:24:18.000000000 -0700
-+++ TeX/texk/tetex/updmap	2006-05-24 17:26:39.000000000 -0700
-@@ -1288,7 +1288,7 @@
+diff -up texlive-2007/texk/tetex/updmap.tmpcleanup texlive-2007/texk/tetex/updmap
+--- texlive-2007/texk/tetex/updmap.tmpcleanup	2008-08-27 13:31:03.000000000 +0200
++++ texlive-2007/texk/tetex/updmap	2008-08-27 13:31:03.000000000 +0200
+@@ -1291,7 +1291,7 @@ main()
    texhashEnabled=true
    mkmapEnabled=true
    verbose=true
@@ -21,7 +42,7 @@
  
    cnfFileShort=updmap.cfg
    cnfFile=
-@@ -1296,7 +1296,8 @@
+@@ -1299,7 +1299,8 @@ main()
    : ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`}
  
    tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX` || \
@@ -31,21 +52,3 @@
    tmp1=$tmpdir/a
    tmp2=$tmpdir/b
    tmp3=$tmpdir/c
---- TeX/texk/tetex/fmtutil.tmpcleanup	2006-05-24 17:27:13.000000000 -0700
-+++ TeX/texk/tetex/fmtutil	2006-05-24 17:30:36.000000000 -0700
-@@ -349,11 +349,13 @@
-   destdir=     # global variable: where do we put the format files?
-   cnf_file=    # global variable: full name of the config file
-   cmd=         # desired action from command line
--  needsCleanup=false
-+  needsCleanup=true
-   need_find_hyphenfile=false
-   cfgparam=
-   cfgmaint=
--  tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX`
-+  tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX` || \
-+      abort "could not create temporary directory"
-+  trap -- "cleanup;" EXIT 1 2 3 7 13 15
-   verboseFlag=true
- 
-   # mktexfmtMode: if called as mktexfmt, set to true. Will echo the generated
diff --git a/texlive-dviljktemp.patch b/texlive-dviljktemp.patch
index 3996642..bfcb795 100644
--- a/texlive-dviljktemp.patch
+++ b/texlive-dviljktemp.patch
@@ -1,6 +1,135 @@
-diff -up tetex-src-3.0/texk/dviljk/dvi2xx.c.dviljktemp tetex-src-3.0/texk/dviljk/dvi2xx.c
---- tetex-src-3.0/texk/dviljk/dvi2xx.c.dviljktemp	1999-02-06 22:46:34.000000000 +0100
-+++ tetex-src-3.0/texk/dviljk/dvi2xx.c	2007-11-13 14:53:45.000000000 +0100
+diff -up texlive-2007/texk/dviljk/c-auto.in.dviljktemp texlive-2007/texk/dviljk/c-auto.in
+--- texlive-2007/texk/dviljk/c-auto.in.dviljktemp	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/dviljk/c-auto.in	2008-08-27 13:32:10.000000000 +0200
+@@ -1,9 +1,23 @@
+-/* c-auto.in.  Generated automatically from configure.in by autoheader.  */
++/* c-auto.in.  Generated from configure.in by autoheader.  */
++/* acconfig.h -- used by autoheader when generating c-auto.in.
+ 
+-/* Define if type char is unsigned and you are not using gcc.  */
+-#ifndef __CHAR_UNSIGNED__
+-#undef __CHAR_UNSIGNED__
+-#endif
++   If you're thinking of editing acconfig.h to fix a configuration
++   problem, don't. Edit the c-auto.h file created by configure,
++   instead.  Even better, fix configure to give the right answer.  */
++
++/* Define to 1 if you have the `mkdtemp' function. */
++#undef HAVE_MKDTEMP
++
++/* Define to 1 if you have the `rmdir' function. */
++#undef HAVE_RMDIR
+ 
+-/* The number of bytes in a long.  */
++/* Define to 1 if you have the `unlink' function. */
++#undef HAVE_UNLINK
++
++/* The size of a `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
++
++/* Define to 1 if type `char' is unsigned and you are not using gcc.  */
++#ifndef __CHAR_UNSIGNED__
++# undef __CHAR_UNSIGNED__
++#endif
+diff -U0 texlive-2007/texk/dviljk/ChangeLog.dviljktemp texlive-2007/texk/dviljk/ChangeLog
+--- texlive-2007/texk/dviljk/ChangeLog.dviljktemp	2006-05-29 22:09:20.000000000 +0200
++++ texlive-2007/texk/dviljk/ChangeLog	2008-08-27 13:32:10.000000000 +0200
+@@ -0,0 +1,39 @@
++2007-07-02  Joachim Schrod  <jschrod@acm.org>
++
++	* dvi2xx.c (DoSpecial): Security issue: usage of tmpnam() caused
++	tempfile race condition. I use mkdtemp() if it's available and
++	fall back to tmpnam.
++
++	Special parsing of include files was inconsistent, unify it. The
++	current parsing code still allows lots of non-sensical special
++	commands, but at least it doesn't access unrelated variables any
++	more.
++
++2007-06-28  Joachim Schrod  <jschrod@acm.org>
++
++	* dvi2xx.c: Fixed a whole bunch of buffer overflows: The program
++	did not check memory bounds for any string operation. All places
++	where strings are copied with strcpy are replaced by dynamically
++	allocated strings (with xstrdup from kpathsea) or bounded string
++	operations. Fixed also manual string copy operations on special
++	strings. Fixed array buffer overflow in defpoint and fill special
++	operations.
++	(DoSpecial): Call of ghostscript for psfile special had also a
++	potential buffer overflow caused by unchecked usage of sprintf.
++	Fix core dump: Check if all required parameters of psfile special
++	are passed.
++
++	Bumped version number up to 2.6p3.
++
++	* dvi2xx.h: Some fixed sized string arrays are pointers now, they
++	get dynamically allocated.
++	(GetBytes): Another buffer overflow: Check that the buffer size is
++	sufficient to store the read bytes. That relies on the invariant
++	that the GetBytes macro is always called with an array as argument
++	and not with a pointer.
++
++	* config.h: Throw an error if kpathsea is not used. dvi2xx.c
++	had previously already kpathsea dependencies without protecting
++	them with #if KPATHSEA. We go that road further since upstream
++	does not exist any more.
++
+diff -up texlive-2007/texk/dviljk/config.h.dviljktemp texlive-2007/texk/dviljk/config.h
+--- texlive-2007/texk/dviljk/config.h.dviljktemp	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/dviljk/config.h	2008-08-27 13:32:10.000000000 +0200
+@@ -216,12 +216,7 @@ typedef SCHAR_TYPE signed_char;
+ #endif
+ 
+ #ifndef KPATHSEA
+-extern bool findfile(
+-#if NeedFunctionPrototypes
+-char path[], char n[], long4 fontmag, char name[], 
+-	      bool tfm, int level
+-#endif
+-    );
++#error "Would need changed findfile, dviljk has changed allocation semantic of name member in tfontptr"
+ #endif
+ 
+ 
+@@ -444,3 +439,24 @@ typedef  FILE *FILEPTR;
+ /* If we have neither, should fall back to fprintf with fixed args.  */
+ #endif
+ #endif
++
++/* If unlink and rmdir are not there, we don't delete the temporary files. */
++#ifndef HAVE_RMDIR
++#define rmdir(dir)
++#endif
++#ifndef HAVE_UNLINK
++#define unlink(file)
++#endif
++
++/* If mkdtemp() does not exist, we have to use tmpnam(). */
++#ifndef HAVE_MKDTEMP
++#define mkdtemp(dir) (tmpnam(dir) ? \
++		      ( mkdir(dir, 0700) == -1 ? NULL : dir ) :	\
++		      ( errno = EINVAL, NULL ) )
++#endif
++
++#ifndef KPATHSEA
++/* FIXME: Should provide a strdup function. But currently this tree is
++   only used in connection with kpathsea anyhow. */
++#error "Need xstrdup and xmalloc function, e.g. from kpathsea"
++#endif
+diff -up texlive-2007/texk/dviljk/configure.in.dviljktemp texlive-2007/texk/dviljk/configure.in
+--- texlive-2007/texk/dviljk/configure.in.dviljktemp	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/dviljk/configure.in	2008-08-27 13:32:10.000000000 +0200
+@@ -13,6 +13,7 @@ sinclude(../kpathsea/withenable.ac)
+ dnl These tests prevent reliable cross-compilation.  Sigh.
+ AC_C_CHAR_UNSIGNED
+ AC_CHECK_SIZEOF(long)
++AC_CHECK_FUNCS(rmdir unlink mkdtemp)
+ 
+ KPSE_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+diff -up texlive-2007/texk/dviljk/dvi2xx.c.dviljktemp texlive-2007/texk/dviljk/dvi2xx.c
+--- texlive-2007/texk/dviljk/dvi2xx.c.dviljktemp	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/dviljk/dvi2xx.c	2008-08-27 13:32:10.000000000 +0200
 @@ -1,5 +1,5 @@
  /* $Id: dvi2xx.c,v 2.5 1997/12/08 20:52:20 neumann Exp $ */
 -#define VERSION "2.6p2 (dviljk)"
@@ -711,64 +840,9 @@ diff -up tetex-src-3.0/texk/dviljk/dvi2xx.c.dviljktemp tetex-src-3.0/texk/dviljk
  
    tfontptr->plusid = plusid;
    plusid++;
-diff -U0 tetex-src-3.0/texk/dviljk/ChangeLog.dviljktemp tetex-src-3.0/texk/dviljk/ChangeLog
---- tetex-src-3.0/texk/dviljk/ChangeLog.dviljktemp	1998-03-03 11:17:39.000000000 +0100
-+++ tetex-src-3.0/texk/dviljk/ChangeLog	2007-11-13 14:59:19.000000000 +0100
-@@ -0,0 +1,39 @@
-+2007-07-02  Joachim Schrod  <jschrod@acm.org>
-+
-+	* dvi2xx.c (DoSpecial): Security issue: usage of tmpnam() caused
-+	tempfile race condition. I use mkdtemp() if it's available and
-+	fall back to tmpnam.
-+
-+	Special parsing of include files was inconsistent, unify it. The
-+	current parsing code still allows lots of non-sensical special
-+	commands, but at least it doesn't access unrelated variables any
-+	more.
-+
-+2007-06-28  Joachim Schrod  <jschrod@acm.org>
-+
-+	* dvi2xx.c: Fixed a whole bunch of buffer overflows: The program
-+	did not check memory bounds for any string operation. All places
-+	where strings are copied with strcpy are replaced by dynamically
-+	allocated strings (with xstrdup from kpathsea) or bounded string
-+	operations. Fixed also manual string copy operations on special
-+	strings. Fixed array buffer overflow in defpoint and fill special
-+	operations.
-+	(DoSpecial): Call of ghostscript for psfile special had also a
-+	potential buffer overflow caused by unchecked usage of sprintf.
-+	Fix core dump: Check if all required parameters of psfile special
-+	are passed.
-+
-+	Bumped version number up to 2.6p3.
-+
-+	* dvi2xx.h: Some fixed sized string arrays are pointers now, they
-+	get dynamically allocated.
-+	(GetBytes): Another buffer overflow: Check that the buffer size is
-+	sufficient to store the read bytes. That relies on the invariant
-+	that the GetBytes macro is always called with an array as argument
-+	and not with a pointer.
-+
-+	* config.h: Throw an error if kpathsea is not used. dvi2xx.c
-+	had previously already kpathsea dependencies without protecting
-+	them with #if KPATHSEA. We go that road further since upstream
-+	does not exist any more.
-+
-diff -up tetex-src-3.0/texk/dviljk/configure.dviljktemp tetex-src-3.0/texk/dviljk/configure
-diff -up tetex-src-3.0/texk/dviljk/configure.in.dviljktemp tetex-src-3.0/texk/dviljk/configure.in
---- tetex-src-3.0/texk/dviljk/configure.in.dviljktemp	1999-02-08 22:42:01.000000000 +0100
-+++ tetex-src-3.0/texk/dviljk/configure.in	2007-11-13 14:55:04.000000000 +0100
-@@ -13,6 +13,7 @@ sinclude(../kpathsea/withenable.ac)
- dnl These tests prevent reliable cross-compilation.  Sigh.
- AC_C_CHAR_UNSIGNED
- AC_CHECK_SIZEOF(long)
-+AC_CHECK_FUNCS(rmdir unlink mkdtemp)
- 
- AC_OUTPUT(Makefile)
- dnl Update stamp-auto, since we just remade `c-auto.h'.
-diff -up tetex-src-3.0/texk/dviljk/dvi2xx.h.dviljktemp tetex-src-3.0/texk/dviljk/dvi2xx.h
---- tetex-src-3.0/texk/dviljk/dvi2xx.h.dviljktemp	1999-03-16 08:03:33.000000000 +0100
-+++ tetex-src-3.0/texk/dviljk/dvi2xx.h	2007-11-13 14:53:45.000000000 +0100
+diff -up texlive-2007/texk/dviljk/dvi2xx.h.dviljktemp texlive-2007/texk/dviljk/dvi2xx.h
+--- texlive-2007/texk/dviljk/dvi2xx.h.dviljktemp	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/dviljk/dvi2xx.h	2008-08-27 13:32:10.000000000 +0200
 @@ -10,8 +10,8 @@
  
  #ifdef KPATHSEA
@@ -865,78 +939,3 @@ diff -up tetex-src-3.0/texk/dviljk/dvi2xx.h.dviljktemp tetex-src-3.0/texk/dviljk
  #ifdef IBM3812
  bool    FirstAlternate = _FALSE; /* first page from alternate casette ?   */
  #endif
-diff -up tetex-src-3.0/texk/dviljk/c-auto.in.dviljktemp tetex-src-3.0/texk/dviljk/c-auto.in
---- tetex-src-3.0/texk/dviljk/c-auto.in.dviljktemp	1999-03-23 23:40:08.000000000 +0100
-+++ tetex-src-3.0/texk/dviljk/c-auto.in	2007-11-13 14:53:45.000000000 +0100
-@@ -1,9 +1,23 @@
--/* c-auto.in.  Generated automatically from configure.in by autoheader.  */
-+/* c-auto.in.  Generated from configure.in by autoheader.  */
-+/* acconfig.h -- used by autoheader when generating c-auto.in.
- 
--/* Define if type char is unsigned and you are not using gcc.  */
--#ifndef __CHAR_UNSIGNED__
--#undef __CHAR_UNSIGNED__
--#endif
-+   If you're thinking of editing acconfig.h to fix a configuration
-+   problem, don't. Edit the c-auto.h file created by configure,
-+   instead.  Even better, fix configure to give the right answer.  */
-+
-+/* Define to 1 if you have the `mkdtemp' function. */
-+#undef HAVE_MKDTEMP
-+
-+/* Define to 1 if you have the `rmdir' function. */
-+#undef HAVE_RMDIR
- 
--/* The number of bytes in a long.  */
-+/* Define to 1 if you have the `unlink' function. */
-+#undef HAVE_UNLINK
-+
-+/* The size of a `long', as computed by sizeof. */
- #undef SIZEOF_LONG
-+
-+/* Define to 1 if type `char' is unsigned and you are not using gcc.  */
-+#ifndef __CHAR_UNSIGNED__
-+# undef __CHAR_UNSIGNED__
-+#endif
-diff -up tetex-src-3.0/texk/dviljk/config.h.dviljktemp tetex-src-3.0/texk/dviljk/config.h
---- tetex-src-3.0/texk/dviljk/config.h.dviljktemp	2002-01-03 17:40:25.000000000 +0100
-+++ tetex-src-3.0/texk/dviljk/config.h	2007-11-13 14:53:45.000000000 +0100
-@@ -216,12 +216,7 @@ typedef SCHAR_TYPE signed_char;
- #endif
- 
- #ifndef KPATHSEA
--extern bool findfile(
--#if NeedFunctionPrototypes
--char path[], char n[], long4 fontmag, char name[], 
--	      bool tfm, int level
--#endif
--    );
-+#error "Would need changed findfile, dviljk has changed allocation semantic of name member in tfontptr"
- #endif
- 
- 
-@@ -444,3 +439,24 @@ typedef  FILE *FILEPTR;
- /* If we have neither, should fall back to fprintf with fixed args.  */
- #endif
- #endif
-+
-+/* If unlink and rmdir are not there, we don't delete the temporary files. */
-+#ifndef HAVE_RMDIR
-+#define rmdir(dir)
-+#endif
-+#ifndef HAVE_UNLINK
-+#define unlink(file)
-+#endif
-+
-+/* If mkdtemp() does not exist, we have to use tmpnam(). */
-+#ifndef HAVE_MKDTEMP
-+#define mkdtemp(dir) (tmpnam(dir) ? \
-+		      ( mkdir(dir, 0700) == -1 ? NULL : dir ) :	\
-+		      ( errno = EINVAL, NULL ) )
-+#endif
-+
-+#ifndef KPATHSEA
-+/* FIXME: Should provide a strdup function. But currently this tree is
-+   only used in connection with kpathsea anyhow. */
-+#error "Need xstrdup and xmalloc function, e.g. from kpathsea"
-+#endif
diff --git a/texlive-lacheck.patch b/texlive-lacheck.patch
new file mode 100644
index 0000000..4838f9d
--- /dev/null
+++ b/texlive-lacheck.patch
@@ -0,0 +1,17 @@
+diff -up texlive-2007/texk/lacheck/lacheck.lex.lacheck texlive-2007/texk/lacheck/lacheck.lex
+--- texlive-2007/texk/lacheck/lacheck.lex.lacheck	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/lacheck/lacheck.lex	2008-08-27 13:20:52.000000000 +0200
+@@ -1042,11 +1042,12 @@ char *name;
+ void g_checkend(n)
+ int n;
+ {
+-    if ( check_top_level_end(yytext,n) == 1 ) 
++    if ( check_top_level_end(yytext,n) == 1 ) {
+        if (  CG_TYPE != n  )
+ 	 print_bad_match(yytext,n);
+        else
+ 	pop();
++    }
+ }
+ 
+ void e_checkend(n, name)
diff --git a/texlive-man-notetex.patch b/texlive-man-notetex.patch
index 9574eba..e607b22 100644
--- a/texlive-man-notetex.patch
+++ b/texlive-man-notetex.patch
@@ -1,6 +1,24 @@
+diff -up texlive-2007/texk/dvipdfm/dvipdft.1.notetex texlive-2007/texk/dvipdfm/dvipdft.1
+--- texlive-2007/texk/dvipdfm/dvipdft.1.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/dvipdfm/dvipdft.1	2008-08-27 13:33:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH "dvipdft" "1" "May 2004" "teTeX" "teTeX" 
++.TH "dvipdft" "1" "May 2004" "TeXLive" "TeXLive" 
+ .PP 
+ .SH "NAME" 
+ dvipdft \- create thumbnail images for use with dvipdfm
+diff -up texlive-2007/texk/dvipdfm/ebb.1.notetex texlive-2007/texk/dvipdfm/ebb.1
+--- texlive-2007/texk/dvipdfm/ebb.1.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/dvipdfm/ebb.1	2008-08-27 13:33:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH "ebb" "1" "May 2004" "teTeX" "teTeX" 
++.TH "ebb" "1" "May 2004" "TeXLive" "TeXLive" 
+ .PP 
+ .SH "NAME" 
+ ebb \- extract a bounding box from JPEG, PNG, and PDF files
 diff -up texlive-2007/texk/makeindexk/mkindex.1.notetex texlive-2007/texk/makeindexk/mkindex.1
 --- texlive-2007/texk/makeindexk/mkindex.1.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/makeindexk/mkindex.1	2008-01-17 13:17:46.000000000 +0100
++++ texlive-2007/texk/makeindexk/mkindex.1	2008-08-27 13:33:41.000000000 +0200
 @@ -1,4 +1,4 @@
 -.TH "mkindex" "1" "September 2000" "teTeX" "teTeX" 
 +.TH "mkindex" "1" "September 2000" "TeXLive" "TeXLive" 
@@ -16,48 +34,63 @@ diff -up texlive-2007/texk/makeindexk/mkindex.1.notetex texlive-2007/texk/makein
  .PP 
  .SH "AUTHOR" 
  .PP 
-diff -up texlive-2007/texk/dvipdfm/dvipdft.1.notetex texlive-2007/texk/dvipdfm/dvipdft.1
---- texlive-2007/texk/dvipdfm/dvipdft.1.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/dvipdfm/dvipdft.1	2008-01-17 13:17:46.000000000 +0100
+diff -up texlive-2007/texk/tetex/allcm.man.notetex texlive-2007/texk/tetex/allcm.man
+--- texlive-2007/texk/tetex/allcm.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/allcm.man	2008-08-27 13:33:41.000000000 +0200
 @@ -1,4 +1,4 @@
--.TH "dvipdft" "1" "May 2004" "teTeX" "teTeX" 
-+.TH "dvipdft" "1" "May 2004" "TeXLive" "TeXLive" 
- .PP 
- .SH "NAME" 
- dvipdft \- create thumbnail images for use with dvipdfm
-diff -up texlive-2007/texk/dvipdfm/ebb.1.notetex texlive-2007/texk/dvipdfm/ebb.1
---- texlive-2007/texk/dvipdfm/ebb.1.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/dvipdfm/ebb.1	2008-01-17 13:17:46.000000000 +0100
+-.TH allcm 1 "11/94" "teTeX" "teTeX"
++.TH allcm 1 "11/94" "TeXLive" "TeXLive"
+ .SH NAME
+ allcm \- force the most important Computer\-Modern\-fonts to be calculated
+ .SH SYNOPSIS
+diff -up texlive-2007/texk/tetex/allec.man.notetex texlive-2007/texk/tetex/allec.man
+--- texlive-2007/texk/tetex/allec.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/allec.man	2008-08-27 13:33:41.000000000 +0200
 @@ -1,4 +1,4 @@
--.TH "ebb" "1" "May 2004" "teTeX" "teTeX" 
-+.TH "ebb" "1" "May 2004" "TeXLive" "TeXLive" 
+-.TH alldc 1 "11/94" "teTeX" "teTeX"
++.TH alldc 1 "11/94" "TeXLive" "TeXLive"
+ .SH NAME
+ allec \- force the most important ec\-fonts to be calculated
+ .SH SYNOPSIS
+diff -up texlive-2007/texk/tetex/allneeded.man.notetex texlive-2007/texk/tetex/allneeded.man
+--- texlive-2007/texk/tetex/allneeded.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/allneeded.man	2008-08-27 13:33:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH allneeded 1 "11/94" "teTeX" "teTeX"
++.TH allneeded 1 "11/94" "TeXLive" "TeXLive"
+ .SH NAME
+ allneeded \- force the calculation of all fonts now needed
+ .SH SYNOPSIS
+diff -up texlive-2007/texk/tetex/dvired.man.notetex texlive-2007/texk/tetex/dvired.man
+--- texlive-2007/texk/tetex/dvired.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/dvired.man	2008-08-27 13:33:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH dvired 1 "09/94" "teTeX" "teTeX"
++.TH dvired 1 "09/94" "TeXLive" "TeXLive"
+ .SH NAME
+ dvired \- print dvi-files
+ .SH SYNOPSIS
+diff -up texlive-2007/texk/tetex/e2pall.man.notetex texlive-2007/texk/tetex/e2pall.man
+--- texlive-2007/texk/tetex/e2pall.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/e2pall.man	2008-08-27 13:33:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH "e2pall" "1" "August 2000" "teTeX" "teTeX" 
++.TH "e2pall" "1" "August 2000" "TeXLive" "TeXLive" 
  .PP 
  .SH "NAME" 
- ebb \- extract a bounding box from JPEG, PNG, and PDF files
-diff -up texlive-2007/texk/tetex/texdoc.man.notetex texlive-2007/texk/tetex/texdoc.man
---- texlive-2007/texk/tetex/texdoc.man.notetex	2008-01-17 13:17:46.000000000 +0100
-+++ texlive-2007/texk/tetex/texdoc.man	2008-01-17 17:55:26.000000000 +0100
-@@ -9,7 +9,7 @@
- .ft R
- .fi
- ..
--.TH "texdoc" "1" "September 2000" "teTeX" "teTeX" 
-+.TH "texdoc" "1" "September 2000" "TeXLive" "TeXLive" 
+ e2pall \- convert all EPS files in a LaTeX document to PDF
+diff -up texlive-2007/texk/tetex/fmtutil.cnf.5.notetex texlive-2007/texk/tetex/fmtutil.cnf.5
+--- texlive-2007/texk/tetex/fmtutil.cnf.5.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/fmtutil.cnf.5	2008-08-27 13:33:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH "fmtutil\&.cnf" "5" "October 2000" "teTeX" "teTeX" 
++.TH "fmtutil\&.cnf" "5" "October 2000" "TeXLive" "TeXLive" 
  .PP 
  .SH "NAME" 
- texdoc \- Utility to look up TeX documentation
-@@ -23,7 +23,7 @@ texdoc \- Utility to look up TeX documen
- \fBtexdoc\fP seaches for \fINAME\fP in the TeX documentation and
- starts an appropriate viewer\&.
- .PP 
--\fINAME\fP should be the name of a command or package in the teTeX
-+\fINAME\fP should be the name of a command or package in the TeX
- distribution\&.
- .PP 
- .SH "OPTIONS" 
-@@ -87,11 +87,11 @@ search order can be configured in \fItex
- .PP 
- \fBxdg-open\fP(1), \fBxdvi\fP(1)
+ fmtutil\&.cnf \- configuration file for fmtutil
+@@ -55,11 +55,11 @@ hyphenation pattern file
+ \fBamstex\fP(1), \fBetex\fP(1), \fBfmtutil\fP(8),
+ \fBtex\fP(1), \fBtexconfig\fP(8), \fBtexlinks\fP(8)\&.
  .PP 
 -Web page: <http://tug\&.org/teTeX/>
 +Web page: <http://tug\&.org/texlive/>
@@ -71,7 +104,7 @@ diff -up texlive-2007/texk/tetex/texdoc.man.notetex texlive-2007/texk/tetex/texd
  .PP 
 diff -up texlive-2007/texk/tetex/fmtutil.man.notetex texlive-2007/texk/tetex/fmtutil.man
 --- texlive-2007/texk/tetex/fmtutil.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/fmtutil.man	2008-01-17 18:01:11.000000000 +0100
++++ texlive-2007/texk/tetex/fmtutil.man	2008-08-27 13:33:41.000000000 +0200
 @@ -1,4 +1,4 @@
 -.TH "fmtutil" "8" "February 2005" "teTeX" "teTeX" 
 +.TH "fmtutil" "8" "February 2005" "TeXLive" "TeXLive" 
@@ -92,27 +125,58 @@ diff -up texlive-2007/texk/tetex/fmtutil.man.notetex texlive-2007/texk/tetex/fmt
  .PP 
  .SH "AUTHOR" 
  .PP 
-diff -up texlive-2007/texk/tetex/dvired.man.notetex texlive-2007/texk/tetex/dvired.man
---- texlive-2007/texk/tetex/dvired.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/dvired.man	2008-01-17 17:53:33.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH dvired 1 "09/94" "teTeX" "teTeX"
-+.TH dvired 1 "09/94" "TeXLive" "TeXLive"
- .SH NAME
- dvired \- print dvi-files
- .SH SYNOPSIS
 diff -up texlive-2007/texk/tetex/fontinst.man.notetex texlive-2007/texk/tetex/fontinst.man
 --- texlive-2007/texk/tetex/fontinst.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/fontinst.man	2008-01-17 18:08:43.000000000 +0100
++++ texlive-2007/texk/tetex/fontinst.man	2008-08-27 13:33:41.000000000 +0200
 @@ -1,4 +1,4 @@
 -.TH "fontinst" "1" "May 2000" "teTeX" "teTeX" 
 +.TH "fontinst" "1" "May 2000" "TeXLive" "TeXLive" 
  .PP 
  .SH "NAME" 
  fontinst \- utility to run TeX as fontinst 
+diff -up texlive-2007/texk/tetex/kpsetool.man.notetex texlive-2007/texk/tetex/kpsetool.man
+--- texlive-2007/texk/tetex/kpsetool.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/kpsetool.man	2008-08-27 13:33:41.000000000 +0200
+@@ -1,7 +1,7 @@
+-.TH "kpsetool" "1" "September 2000" "teTeX" "teTeX" 
++.TH "kpsetool" "1" "September 2000" "TeXLive" "TeXLive" 
+ .PP 
+ .SH "NAME" 
+-kpsetool \- script to make teTeX-style \fBkpsetool\fP,
++kpsetool \- script to make TeXLive-style \fBkpsetool\fP,
+ \fBkpsexpand\fP, and \fBkpsepath\fP available
+ .PP 
+ .SH "SYNOPSIS" 
+@@ -14,11 +14,8 @@ kpsetool \- script to make teTeX-style \
+ .PP 
+ .SH "DESCRIPTION" 
+ .PP 
+-\fBkpsetool\fP is a Bourne shell script that makes a teTeX-style
++\fBkpsetool\fP is a Bourne shell script that makes a TeXLive-style
+ \fBkpsetool\fP, \fBkpsexpand\fP, and \fBkpsepath\fP available\&.
+-\fBkpsetool\fP uses \fBweb2c\fP\'s (new) \fBkpsexpand\fP binary, so the
+-syntax for \fBkpsexpand\fP is incompatible with teTeX\'s as of version
+-0\&.4\&.
+ .PP 
+ .SH "OPTIONS" 
+ .PP 
+@@ -86,11 +83,11 @@ virtual font
+ .PP 
+ \fIKpathsea: A library for path searching\fP (info or DVI file)
+ .PP 
+-Web page: <http://tug\&.org/teTeX/>
++Web page: <http://tug\&.org/texlive/>
+ .PP 
+ .SH "BUGS" 
+ .PP 
+-None known, but report any bugs found to <tetex@dbs\&.uni-hannover\&.de> (mailing list)\&.
++None known, but report any bugs found to <tex-live@tug\&.org> (mailing list)\&.
+ .PP 
+ .SH "AUTHOR" 
+ .PP 
 diff -up texlive-2007/texk/tetex/kpsewhere.man.notetex texlive-2007/texk/tetex/kpsewhere.man
---- texlive-2007/texk/tetex/kpsewhere.man.notetex	2008-01-17 13:17:46.000000000 +0100
-+++ texlive-2007/texk/tetex/kpsewhere.man	2008-01-17 17:57:17.000000000 +0100
+--- texlive-2007/texk/tetex/kpsewhere.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/kpsewhere.man	2008-08-27 13:33:41.000000000 +0200
 @@ -1,4 +1,4 @@
 -.TH "kpsewhere" "1" "March 2004" "teTeX" "teTeX" 
 +.TH "kpsewhere" "1" "March 2004" "TeXLive" "TeXLive" 
@@ -133,9 +197,45 @@ diff -up texlive-2007/texk/tetex/kpsewhere.man.notetex texlive-2007/texk/tetex/k
  .PP 
  .SH "AUTHOR" 
  .PP 
+diff -up texlive-2007/texk/tetex/mkofm.man.notetex texlive-2007/texk/tetex/mkofm.man
+--- texlive-2007/texk/tetex/mkofm.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/mkofm.man	2008-08-27 13:33:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH "mkofm" "1" "September 2000" "teTeX" "teTeX" 
++.TH "mkofm" "1" "September 2000" "TeXLive" "TeXLive" 
+ .PP 
+ .SH "NAME" 
+ mkofm \- front end to \fBmktextfm\fP(1)
+diff -up texlive-2007/texk/tetex/pslatex.man.notetex texlive-2007/texk/tetex/pslatex.man
+--- texlive-2007/texk/tetex/pslatex.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/pslatex.man	2008-08-27 13:33:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH "pslatex" "1" "September 2000" "teTeX" "teTeX" 
++.TH "pslatex" "1" "September 2000" "TeXLive" "TeXLive" 
+ .PP 
+ .SH "NAME" 
+ pslatex \- utility to typeset LaTeX files using PostScript fonts
+diff -up texlive-2007/texk/tetex/rubibtex.man.notetex texlive-2007/texk/tetex/rubibtex.man
+--- texlive-2007/texk/tetex/rubibtex.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/rubibtex.man	2008-08-27 13:33:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH "rubibtex" "1" "October 2000" "teTeX" "teTeX" 
++.TH "rubibtex" "1" "October 2000" "TeXLive" "TeXLive" 
+ .PP 
+ .SH "NAME" 
+ rubibtex \- make a bibliography for (La)TeX using Russian
+diff -up texlive-2007/texk/tetex/rumakeindex.man.notetex texlive-2007/texk/tetex/rumakeindex.man
+--- texlive-2007/texk/tetex/rumakeindex.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/rumakeindex.man	2008-08-27 13:33:41.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH "rumakeindex" "1" "September 2000" "teTeX" "teTeX" 
++.TH "rumakeindex" "1" "September 2000" "TeXLive" "TeXLive" 
+ .PP 
+ .SH "NAME" 
+ rumakeindex \- process a LaTeX index using Russian Cyrillic
 diff -up texlive-2007/texk/tetex/texconfig.man.notetex texlive-2007/texk/tetex/texconfig.man
 --- texlive-2007/texk/tetex/texconfig.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/texconfig.man	2008-01-17 18:03:13.000000000 +0100
++++ texlive-2007/texk/tetex/texconfig.man	2008-08-27 13:33:41.000000000 +0200
 @@ -1,8 +1,8 @@
 -.TH texconfig 1 "February 2005" "teTeX" "teTeX"
 +.TH texconfig 1 "February 2005" "TeXLive" "TeXLive"
@@ -157,18 +257,30 @@ diff -up texlive-2007/texk/tetex/texconfig.man.notetex texlive-2007/texk/tetex/t
  in an easy and convenient manner. It uses the
  .I dialog
  program to draw nice input boxes. After answering the dialoges, the
-diff -up texlive-2007/texk/tetex/fmtutil.cnf.5.notetex texlive-2007/texk/tetex/fmtutil.cnf.5
---- texlive-2007/texk/tetex/fmtutil.cnf.5.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/fmtutil.cnf.5	2008-01-17 13:17:46.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH "fmtutil\&.cnf" "5" "October 2000" "teTeX" "teTeX" 
-+.TH "fmtutil\&.cnf" "5" "October 2000" "TeXLive" "TeXLive" 
+diff -up texlive-2007/texk/tetex/texdoc.man.notetex texlive-2007/texk/tetex/texdoc.man
+--- texlive-2007/texk/tetex/texdoc.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/texdoc.man	2008-08-27 13:33:41.000000000 +0200
+@@ -9,7 +9,7 @@
+ .ft R
+ .fi
+ ..
+-.TH "texdoc" "1" "September 2000" "teTeX" "teTeX" 
++.TH "texdoc" "1" "September 2000" "TeXLive" "TeXLive" 
  .PP 
  .SH "NAME" 
- fmtutil\&.cnf \- configuration file for fmtutil
-@@ -55,11 +55,11 @@ hyphenation pattern file
- \fBamstex\fP(1), \fBetex\fP(1), \fBfmtutil\fP(8),
- \fBtex\fP(1), \fBtexconfig\fP(8), \fBtexlinks\fP(8)\&.
+ texdoc \- Utility to look up TeX documentation
+@@ -23,7 +23,7 @@ texdoc \- Utility to look up TeX documen
+ \fBtexdoc\fP seaches for \fINAME\fP in the TeX documentation and
+ starts an appropriate viewer\&.
+ .PP 
+-\fINAME\fP should be the name of a command or package in the teTeX
++\fINAME\fP should be the name of a command or package in the TeX
+ distribution\&.
+ .PP 
+ .SH "OPTIONS" 
+@@ -71,11 +71,11 @@ hostname$ export TEXDOCVIEW_html
+ \fBacroread\fP(1), \fBgv\fP(1), \fBkpsewhich\fP(1),
+ \fBless\fP(1), \fBmore\fP(1), \fBxdvi\fP(1)
  .PP 
 -Web page: <http://tug\&.org/teTeX/>
 +Web page: <http://tug\&.org/texlive/>
@@ -180,45 +292,21 @@ diff -up texlive-2007/texk/tetex/fmtutil.cnf.5.notetex texlive-2007/texk/tetex/f
  .PP 
  .SH "AUTHOR" 
  .PP 
-diff -up texlive-2007/texk/tetex/e2pall.man.notetex texlive-2007/texk/tetex/e2pall.man
---- texlive-2007/texk/tetex/e2pall.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/e2pall.man	2008-01-17 18:00:18.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH "e2pall" "1" "August 2000" "teTeX" "teTeX" 
-+.TH "e2pall" "1" "August 2000" "TeXLive" "TeXLive" 
- .PP 
- .SH "NAME" 
- e2pall \- convert all EPS files in a LaTeX document to PDF
-diff -up texlive-2007/texk/tetex/thumbpdf.man.notetex texlive-2007/texk/tetex/thumbpdf.man
---- texlive-2007/texk/tetex/thumbpdf.man.notetex	2008-01-17 13:17:46.000000000 +0100
-+++ texlive-2007/texk/tetex/thumbpdf.man	2008-01-17 17:58:17.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH "thumbpdf" "1" "September 2000" "teTeX" "teTeX" 
-+.TH "thumbpdf" "1" "September 2000" "TeXLive" "TeXLive" 
- .PP 
- .SH "NAME" 
- thumbpdf \- generate thumbnail images for a PDF file
-@@ -75,7 +75,7 @@ for which a user wants to generate thumb
- .PP 
- \fBgs\fP(1), \fBpdftex\fP(1)\&.
- .PP 
--Web page: <http://tug\&.org/teTeX/>
-+Web page: <http://tug\&.org/texlive/>
- .PP 
- .SH "BUGS" 
- .PP 
-diff -up texlive-2007/texk/tetex/allec.man.notetex texlive-2007/texk/tetex/allec.man
---- texlive-2007/texk/tetex/allec.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/allec.man	2008-01-17 18:02:16.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH alldc 1 "11/94" "teTeX" "teTeX"
-+.TH alldc 1 "11/94" "TeXLive" "TeXLive"
- .SH NAME
- allec \- force the most important ec\-fonts to be calculated
- .SH SYNOPSIS
+diff -up texlive-2007/texk/tetex/texdoctk.man.notetex texlive-2007/texk/tetex/texdoctk.man
+--- texlive-2007/texk/tetex/texdoctk.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/texdoctk.man	2008-08-27 13:33:41.000000000 +0200
+@@ -80,7 +80,7 @@ If you want to print the documentations,
+ non-PS files into PostScript. Here are some suggestions:
+ 
+ \& dvi->ps:
+-dvips (is part of teTeX) (http://www.radicaleye.com/dvips.html)
++dvips (is part of TeXLive) (http://www.radicaleye.com/dvips.html)
+ 
+ \& pdf->ps:
+ pdf2ps (http://www.cs.wisc.edu/~ghost) or
 diff -up texlive-2007/texk/tetex/texlinks.man.notetex texlive-2007/texk/tetex/texlinks.man
---- texlive-2007/texk/tetex/texlinks.man.notetex	2008-01-17 13:17:46.000000000 +0100
-+++ texlive-2007/texk/tetex/texlinks.man	2008-01-17 17:59:32.000000000 +0100
+--- texlive-2007/texk/tetex/texlinks.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/texlinks.man	2008-08-27 13:33:41.000000000 +0200
 @@ -1,4 +1,4 @@
 -.TH "texlinks" "8" "September 2000" "teTeX" "teTeX" 
 +.TH "texlinks" "8" "September 2000" "TeXLive" "TeXLive" 
@@ -239,18 +327,39 @@ diff -up texlive-2007/texk/tetex/texlinks.man.notetex texlive-2007/texk/tetex/te
  .PP 
  .SH "AUTHOR" 
  .PP 
-diff -up texlive-2007/texk/tetex/mkofm.man.notetex texlive-2007/texk/tetex/mkofm.man
---- texlive-2007/texk/tetex/mkofm.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/mkofm.man	2008-01-17 18:08:22.000000000 +0100
+diff -up texlive-2007/texk/tetex/thumbpdf.man.notetex texlive-2007/texk/tetex/thumbpdf.man
+--- texlive-2007/texk/tetex/thumbpdf.man.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/thumbpdf.man	2008-08-27 13:33:41.000000000 +0200
 @@ -1,4 +1,4 @@
--.TH "mkofm" "1" "September 2000" "teTeX" "teTeX" 
-+.TH "mkofm" "1" "September 2000" "TeXLive" "TeXLive" 
+-.TH "thumbpdf" "1" "September 2000" "teTeX" "teTeX" 
++.TH "thumbpdf" "1" "September 2000" "TeXLive" "TeXLive" 
  .PP 
  .SH "NAME" 
- mkofm \- front end to \fBmktextfm\fP(1)
+ thumbpdf \- generate thumbnail images for a PDF file
+@@ -75,7 +75,7 @@ for which a user wants to generate thumb
+ .PP 
+ \fBgs\fP(1), \fBpdftex\fP(1)\&.
+ .PP 
+-Web page: <http://tug\&.org/teTeX/>
++Web page: <http://tug\&.org/texlive/>
+ .PP 
+ .SH "BUGS" 
+ .PP 
+diff -up texlive-2007/texk/tetex/updmap.cfg.5.notetex texlive-2007/texk/tetex/updmap.cfg.5
+--- texlive-2007/texk/tetex/updmap.cfg.5.notetex	2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/tetex/updmap.cfg.5	2008-08-27 13:33:41.000000000 +0200
+@@ -23,7 +23,7 @@
+ friends.
+ .SH "DESCRIPTION"
+ The file \fBupdmap.cfg\fR is the central font configuration file of a
+-teTeX system and is read by \fBupdmap\fP(1). It describes if and how
++TeX system and is read by \fBupdmap\fP(1). It describes if and how
+ fonts should be included (or not included) into PS-/PDF-files. This
+ works for Outline (Postscript Type1) and Bitmap Fonts (Postscript
+ Type3) mostly coming from MetaFont.
 diff -up texlive-2007/texk/tetex/updmap.man.notetex texlive-2007/texk/tetex/updmap.man
 --- texlive-2007/texk/tetex/updmap.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/updmap.man	2008-01-17 18:07:21.000000000 +0100
++++ texlive-2007/texk/tetex/updmap.man	2008-08-27 13:33:41.000000000 +0200
 @@ -1,4 +1,4 @@
 -.TH "updmap" "1" "February 2005" "teTeX" "teTeX"
 +.TH "updmap" "1" "February 2005" "TeXLive" "TeXLive"
@@ -289,112 +398,3 @@ diff -up texlive-2007/texk/tetex/updmap.man.notetex texlive-2007/texk/tetex/updm
  .PP
  .SH "AUTHOR"
  .PP
-diff -up texlive-2007/texk/tetex/rumakeindex.man.notetex texlive-2007/texk/tetex/rumakeindex.man
---- texlive-2007/texk/tetex/rumakeindex.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/rumakeindex.man	2008-01-17 17:56:25.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH "rumakeindex" "1" "September 2000" "teTeX" "teTeX" 
-+.TH "rumakeindex" "1" "September 2000" "TeXLive" "TeXLive" 
- .PP 
- .SH "NAME" 
- rumakeindex \- process a LaTeX index using Russian Cyrillic
-diff -up texlive-2007/texk/tetex/kpsetool.man.notetex texlive-2007/texk/tetex/kpsetool.man
---- texlive-2007/texk/tetex/kpsetool.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/kpsetool.man	2008-01-17 17:50:19.000000000 +0100
-@@ -1,7 +1,7 @@
--.TH "kpsetool" "1" "September 2000" "teTeX" "teTeX" 
-+.TH "kpsetool" "1" "September 2000" "TeXLive" "TeXLive" 
- .PP 
- .SH "NAME" 
--kpsetool \- script to make teTeX-style \fBkpsetool\fP,
-+kpsetool \- script to make TeXLive-style \fBkpsetool\fP,
- \fBkpsexpand\fP, and \fBkpsepath\fP available
- .PP 
- .SH "SYNOPSIS" 
-@@ -14,11 +14,8 @@ kpsetool \- script to make teTeX-style \
- .PP 
- .SH "DESCRIPTION" 
- .PP 
--\fBkpsetool\fP is a Bourne shell script that makes a teTeX-style
-+\fBkpsetool\fP is a Bourne shell script that makes a TeXLive-style
- \fBkpsetool\fP, \fBkpsexpand\fP, and \fBkpsepath\fP available\&.
--\fBkpsetool\fP uses \fBweb2c\fP\'s (new) \fBkpsexpand\fP binary, so the
--syntax for \fBkpsexpand\fP is incompatible with teTeX\'s as of version
--0\&.4\&.
- .PP 
- .SH "OPTIONS" 
- .PP 
-@@ -86,11 +83,11 @@ virtual font
- .PP 
- \fIKpathsea: A library for path searching\fP (info or DVI file)
- .PP 
--Web page: <http://tug\&.org/teTeX/>
-+Web page: <http://tug\&.org/texlive/>
- .PP 
- .SH "BUGS" 
- .PP 
--None known, but report any bugs found to <tetex@dbs\&.uni-hannover\&.de> (mailing list)\&.
-+None known, but report any bugs found to <tex-live@tug\&.org> (mailing list)\&.
- .PP 
- .SH "AUTHOR" 
- .PP 
-diff -up texlive-2007/texk/tetex/updmap.cfg.5.notetex texlive-2007/texk/tetex/updmap.cfg.5
---- texlive-2007/texk/tetex/updmap.cfg.5.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/updmap.cfg.5	2008-01-17 13:17:46.000000000 +0100
-@@ -23,7 +23,7 @@
- friends.
- .SH "DESCRIPTION"
- The file \fBupdmap.cfg\fR is the central font configuration file of a
--teTeX system and is read by \fBupdmap\fP(1). It describes if and how
-+TeX system and is read by \fBupdmap\fP(1). It describes if and how
- fonts should be included (or not included) into PS-/PDF-files. This
- works for Outline (Postscript Type1) and Bitmap Fonts (Postscript
- Type3) mostly coming from MetaFont.
-diff -up texlive-2007/texk/tetex/texdoctk.man.notetex texlive-2007/texk/tetex/texdoctk.man
---- texlive-2007/texk/tetex/texdoctk.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/texdoctk.man	2008-01-17 18:06:40.000000000 +0100
-@@ -80,7 +80,7 @@ If you want to print the documentations,
- non-PS files into PostScript. Here are some suggestions:
- 
- \& dvi->ps:
--dvips (is part of teTeX) (http://www.radicaleye.com/dvips.html)
-+dvips (is part of TeXLive) (http://www.radicaleye.com/dvips.html)
- 
- \& pdf->ps:
- pdf2ps (http://www.cs.wisc.edu/~ghost) or
-diff -up texlive-2007/texk/tetex/allneeded.man.notetex texlive-2007/texk/tetex/allneeded.man
---- texlive-2007/texk/tetex/allneeded.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/allneeded.man	2008-01-17 18:09:11.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH allneeded 1 "11/94" "teTeX" "teTeX"
-+.TH allneeded 1 "11/94" "TeXLive" "TeXLive"
- .SH NAME
- allneeded \- force the calculation of all fonts now needed
- .SH SYNOPSIS
-diff -up texlive-2007/texk/tetex/pslatex.man.notetex texlive-2007/texk/tetex/pslatex.man
---- texlive-2007/texk/tetex/pslatex.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/pslatex.man	2008-01-17 18:01:53.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH "pslatex" "1" "September 2000" "teTeX" "teTeX" 
-+.TH "pslatex" "1" "September 2000" "TeXLive" "TeXLive" 
- .PP 
- .SH "NAME" 
- pslatex \- utility to typeset LaTeX files using PostScript fonts
-diff -up texlive-2007/texk/tetex/rubibtex.man.notetex texlive-2007/texk/tetex/rubibtex.man
---- texlive-2007/texk/tetex/rubibtex.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/rubibtex.man	2008-01-17 17:58:46.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH "rubibtex" "1" "October 2000" "teTeX" "teTeX" 
-+.TH "rubibtex" "1" "October 2000" "TeXLive" "TeXLive" 
- .PP 
- .SH "NAME" 
- rubibtex \- make a bibliography for (La)TeX using Russian
-diff -up texlive-2007/texk/tetex/allcm.man.notetex texlive-2007/texk/tetex/allcm.man
---- texlive-2007/texk/tetex/allcm.man.notetex	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/allcm.man	2008-01-17 17:54:07.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH allcm 1 "11/94" "teTeX" "teTeX"
-+.TH allcm 1 "11/94" "TeXLive" "TeXLive"
- .SH NAME
- allcm \- force the most important Computer\-Modern\-fonts to be calculated
- .SH SYNOPSIS
diff --git a/texlive-source-t1lib.patch b/texlive-source-t1lib.patch
index 74aa2c1..49d30ab 100644
--- a/texlive-source-t1lib.patch
+++ b/texlive-source-t1lib.patch
@@ -1,50 +1,55 @@
---- configure
-+++ configure	2006-01-17 17:25:04.000000000 +0100
-@@ -3920,6 +3920,7 @@
+diff -up texlive-2007/configure.t1lib texlive-2007/configure
+--- texlive-2007/configure.t1lib	2008-08-27 13:37:53.000000000 +0200
++++ texlive-2007/configure	2008-08-27 13:37:53.000000000 +0200
+@@ -4097,6 +4097,7 @@ int main() {
      char *p = testbuf;
      int i;
      int version_num;
 +    memset(p, 0, sizeof(testbuf));
      /* T1_GetLibIdent() might return something like '0.8-beta2';
         convert the leading numbers to a single digit: */
-     for (i = 0; i < BUFLEN; i++) {
---- libs/configure
-+++ libs/configure	2006-01-17 17:24:15.000000000 +0100
-@@ -1728,6 +1728,7 @@
+     for (i = 0; i < BUFLEN - 1; i++) {
+diff -up texlive-2007/libs/configure.t1lib texlive-2007/libs/configure
+--- texlive-2007/libs/configure.t1lib	2008-08-27 13:37:53.000000000 +0200
++++ texlive-2007/libs/configure	2008-08-27 13:37:53.000000000 +0200
+@@ -1757,6 +1757,7 @@ int main() {
      char *p = testbuf;
      int i;
      int version_num;
 +    memset(p, 0, sizeof(testbuf));
      /* T1_GetLibIdent() might return something like '0.8-beta2';
         convert the leading numbers to a single digit: */
-     for (i = 0; i < BUFLEN; i++) {
---- libs/t1lib/t1lib.ac
-+++ libs/t1lib/t1lib.ac	2006-01-17 17:26:13.000000000 +0100
-@@ -45,6 +45,7 @@
+     for (i = 0; i < BUFLEN - 1; i++) {
+diff -up texlive-2007/libs/t1lib/t1lib.ac.t1lib texlive-2007/libs/t1lib/t1lib.ac
+--- texlive-2007/libs/t1lib/t1lib.ac.t1lib	2006-01-16 01:09:26.000000000 +0100
++++ texlive-2007/libs/t1lib/t1lib.ac	2008-08-27 13:37:53.000000000 +0200
+@@ -45,6 +45,7 @@ int main() {
      char *p = testbuf;
      int i;
      int version_num;
 +    memset(p, 0, sizeof(testbuf));
      /* T1_GetLibIdent() might return something like '0.8-beta2';
         convert the leading numbers to a single digit: */
-     for (i = 0; i < BUFLEN; i++) {
---- texk/dvipng/configure
-+++ texk/dvipng/configure	2006-01-17 17:24:52.000000000 +0100
-@@ -2659,6 +2659,7 @@
+     for (i = 0; i < BUFLEN - 1; i++) {
+diff -up texlive-2007/texk/dvipng/configure.t1lib texlive-2007/texk/dvipng/configure
+--- texlive-2007/texk/dvipng/configure.t1lib	2007-01-04 17:14:52.000000000 +0100
++++ texlive-2007/texk/dvipng/configure	2008-08-27 13:37:53.000000000 +0200
+@@ -5680,6 +5680,7 @@ int main() {
      char *p = testbuf;
      int i;
      int version_num;
 +    memset(p, 0, sizeof(testbuf));
      /* T1_GetLibIdent() might return something like '0.8-beta2';
         convert the leading numbers to a single digit: */
-     for (i = 0; i < BUFLEN; i++) {
---- texk/xdvik/configure
-+++ texk/xdvik/configure	2006-01-17 17:24:32.000000000 +0100
-@@ -4227,6 +4227,7 @@
+     for (i = 0; i < BUFLEN - 1; i++) {
+diff -up texlive-2007/texk/xdvik/configure.t1lib texlive-2007/texk/xdvik/configure
+--- texlive-2007/texk/xdvik/configure.t1lib	2006-07-16 19:26:38.000000000 +0200
++++ texlive-2007/texk/xdvik/configure	2008-08-27 13:37:53.000000000 +0200
+@@ -4280,6 +4280,7 @@ int main() {
      char *p = testbuf;
      int i;
      int version_num;
 +    memset(p, 0, sizeof(testbuf));
      /* T1_GetLibIdent() might return something like '0.8-beta2';
         convert the leading numbers to a single digit: */
-     for (i = 0; i < BUFLEN; i++) {
+     for (i = 0; i < BUFLEN - 1; i++) {
diff --git a/texlive-texdoc.patch b/texlive-texdoc.patch
index 6d39671..8a0b193 100644
--- a/texlive-texdoc.patch
+++ b/texlive-texdoc.patch
@@ -1,77 +1,6 @@
-diff -up texlive-2007/texk/tetex/texdoc.man.texdoc texlive-2007/texk/tetex/texdoc.man
---- texlive-2007/texk/tetex/texdoc.man.texdoc	2008-01-22 09:34:54.000000000 +0100
-+++ texlive-2007/texk/tetex/texdoc.man	2008-01-22 09:37:03.000000000 +0100
-@@ -28,28 +28,37 @@ distribution\&.
- .PP 
- .SH "OPTIONS" 
- .PP 
--.IP "\fB--help\fP" 
-+.IP "\fB\-\-help\fP" 
- Display a brief summary of options\&.
- .IP 
--.IP "\fB-l\fP" 
-+.IP "\fB\-l\fP" 
- List matching files\&.  Does not start a viewer\&.
--.IP "\fB-v\fP" 
-+.PP
-+.IP "\fB\-s\fP"
-+Search the disk. From all documentation files found by texdoc, the
-+ones whose names match the remaining arguments (as egrep pattern) will
-+be displayed.
-+.IP "\fB\-v\fP" 
- Sets verbose mode\&.  Shows the command being used to
- display the documentation\&.
- .PP 
- .SH "ENVIRONMENT" 
- .PP 
- .IP "\fB$TEXDOCVIEW_dvi\fP" 
--DVI viewer\&.  Defaults to \fBxdvi\fP(1)\&.
-+DVI viewer\&. The default is to use the program specified
-+by the freedesktop standard\&.
- .IP "\fB$TEXDOCVIEW_pdf\fP" 
--PDF viewer\&.  Defaults to \fBacroread\fP(1)\&.
-+PDF viewer\&. The default is to use the program specified
-+by the freedesktop standard\&.
- .IP "\fB$TEXDOCVIEW_ps\fP" 
--PostScript viewer\&.  Defaults to
--\fBghostview\fP(1)\&.
-+PostScript viewer\&. The default is to use the program specified
-+by the freedesktop standard\&.
- .IP "\fB$TEXDOCVIEW_html\fP" 
--HTML viewer\&.  Defaults to \fBnetscape\fP(1)\&.
-+HTML viewer\&. The default is to use a program through
-+\fBxdg-open\fP\&.
- .IP "\fB$TEXDOCVIEW_txt\fP" 
--Text viewer\&.  Defaults to \fB$PAGER-more\fP\&.
-+Text viewer\&.  Defaults is to use the program specified
-+by the freedesktop standard\&.
- .PP 
- The environment variables should be set with a ``%s\&'\&' as a placeholder
- for the name of the file\&.  For example,
-@@ -66,10 +75,18 @@ hostname$ TEXDOCVIEW_html="mozilla %s"
- hostname$ export TEXDOCVIEW_html
- .EE 
- .PP 
-+.SH "SPECIFIC TO DEBIAN AND FEDORA"
-+.PP
-+The Debian and Fedora TeX Live packages texdoc use the mime-support package to determine
-+the appropriate viewer for the respective file type except for
-+\fIdvi\fP. texdoc of Debian and Fedora is able to handle gzip- and
-+bzip2-compressed files. If texdoc finds more than on file for a string
-+the first hit is displayed. The file extensions are regarded and the
-+search order can be configured in \fItexmf.cnf\fP (\fI90TeXDoc.cnf\fP).
-+.PP 
- .SH "SEE ALSO" 
- .PP 
--\fBacroread\fP(1), \fBgv\fP(1), \fBkpsewhich\fP(1),
--\fBless\fP(1), \fBmore\fP(1), \fBxdvi\fP(1)
-+\fBxdg-open\fP(1)
- .PP 
- Web page: <http://tug\&.org/teTeX/>
- .PP 
 diff -up texlive-2007/texk/tetex/texdoc.texdoc texlive-2007/texk/tetex/texdoc
 --- texlive-2007/texk/tetex/texdoc.texdoc	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/tetex/texdoc	2008-01-22 09:39:17.000000000 +0100
++++ texlive-2007/texk/tetex/texdoc	2008-08-27 13:35:33.000000000 +0200
 @@ -17,6 +17,15 @@
  #
  # Support for compressed documentation implemented by adopting changes
@@ -214,3 +143,74 @@ diff -up texlive-2007/texk/tetex/texdoc.texdoc texlive-2007/texk/tetex/texdoc
          eval "$uncompress $filename > $tmpdir/$src"
          filename=$tmpdir/$src
          viewer=`eval echo $viewer | sed -e "s|%s|$filename; rm -f $filename; cleanup|"`
+diff -up texlive-2007/texk/tetex/texdoc.man.texdoc texlive-2007/texk/tetex/texdoc.man
+--- texlive-2007/texk/tetex/texdoc.man.texdoc	2008-08-27 13:35:29.000000000 +0200
++++ texlive-2007/texk/tetex/texdoc.man	2008-08-27 13:35:33.000000000 +0200
+@@ -28,28 +28,37 @@ distribution\&.
+ .PP 
+ .SH "OPTIONS" 
+ .PP 
+-.IP "\fB--help\fP" 
++.IP "\fB\-\-help\fP" 
+ Display a brief summary of options\&.
+ .IP 
+-.IP "\fB-l\fP" 
++.IP "\fB\-l\fP" 
+ List matching files\&.  Does not start a viewer\&.
+-.IP "\fB-v\fP" 
++.PP
++.IP "\fB\-s\fP"
++Search the disk. From all documentation files found by texdoc, the
++ones whose names match the remaining arguments (as egrep pattern) will
++be displayed.
++.IP "\fB\-v\fP" 
+ Sets verbose mode\&.  Shows the command being used to
+ display the documentation\&.
+ .PP 
+ .SH "ENVIRONMENT" 
+ .PP 
+ .IP "\fB$TEXDOCVIEW_dvi\fP" 
+-DVI viewer\&.  Defaults to \fBxdvi\fP(1)\&.
++DVI viewer\&. The default is to use the program specified
++by the freedesktop standard\&.
+ .IP "\fB$TEXDOCVIEW_pdf\fP" 
+-PDF viewer\&.  Defaults to \fBacroread\fP(1)\&.
++PDF viewer\&. The default is to use the program specified
++by the freedesktop standard\&.
+ .IP "\fB$TEXDOCVIEW_ps\fP" 
+-PostScript viewer\&.  Defaults to
+-\fBghostview\fP(1)\&.
++PostScript viewer\&. The default is to use the program specified
++by the freedesktop standard\&.
+ .IP "\fB$TEXDOCVIEW_html\fP" 
+-HTML viewer\&.  Defaults to \fBnetscape\fP(1)\&.
++HTML viewer\&. The default is to use a program through
++\fBxdg-open\fP\&.
+ .IP "\fB$TEXDOCVIEW_txt\fP" 
+-Text viewer\&.  Defaults to \fB$PAGER-more\fP\&.
++Text viewer\&.  Defaults is to use the program specified
++by the freedesktop standard\&.
+ .PP 
+ The environment variables should be set with a ``%s\&'\&' as a placeholder
+ for the name of the file\&.  For example,
+@@ -66,10 +75,18 @@ hostname$ TEXDOCVIEW_html="mozilla %s"
+ hostname$ export TEXDOCVIEW_html
+ .EE 
+ .PP 
++.SH "SPECIFIC TO DEBIAN AND FEDORA"
++.PP
++The Debian and Fedora TeX Live packages texdoc use the mime-support package to determine
++the appropriate viewer for the respective file type except for
++\fIdvi\fP. texdoc of Debian and Fedora is able to handle gzip- and
++bzip2-compressed files. If texdoc finds more than on file for a string
++the first hit is displayed. The file extensions are regarded and the
++search order can be configured in \fItexmf.cnf\fP (\fI90TeXDoc.cnf\fP).
++.PP 
+ .SH "SEE ALSO" 
+ .PP 
+-\fBacroread\fP(1), \fBgv\fP(1), \fBkpsewhich\fP(1),
+-\fBless\fP(1), \fBmore\fP(1), \fBxdvi\fP(1)
++\fBxdg-open\fP(1)
+ .PP 
+ Web page: <http://tug\&.org/texlive/>
+ .PP 
diff --git a/texlive.spec b/texlive.spec
index 3d162ea..81d8144 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -1,15 +1,11 @@
 # This spec file is based on texjive project created by Michael A. Peters.
 # Adopted and modified for Fedora by Jindrich Novy.
-%define f8_packaging	0
 
 %define texlive_ver	2007
 %define ptex_src_ver	3.1.10
 %define pdvipsk_ver	p1.7a
 %define mendexk_ver	2.6e
 %define dvipdfm_ver	0.13.2d
-%if %{f8_packaging}
-%define dvipng_ver	1.9
-%endif
 
 %define desktop_file_utils_version 0.9
 %define default_letter_paper 0
@@ -26,7 +22,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	31%{?dist}
+Release:	32%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -80,12 +76,12 @@ Patch26:	texlive-dviljktemp.patch
 Patch27:	texlive-poppler.patch
 Patch28:	texlive-man-notetex.patch
 Patch29:	texlive-man-context.patch
+Patch30:	texlive-lacheck.patch
 
 ######
 # mpeters contributed patches
 ######
 # fixes man pages to utf-8
-Patch41:	texlive-2007-kuesterei-man.patch
 Patch42:	texlive-2007-copyright-utf8-man.patch
 # use proper shellbang
 Patch43:	texlive-2007-epstopdf-shellbang.patch
@@ -138,19 +134,14 @@ BuildRequires:	ncurses-devel zlib-devel libpng-devel gd-devel t1lib-devel
 BuildRequires:	libSM-devel libICE-devel
 # for non-modular xorg - use xorg-devel instead of above
 BuildRequires:	Xaw3d-devel
-%if %{f8_packaging}
-BuildRequires:	poppler-devel >= 0.6.2-1
-%else
 BuildRequires:	poppler-devel >= 0.6.2-2
-%endif
 BuildRequires:	teckit-devel
 Requires:	texlive-texmf = %{version}
 Requires:	texlive-texmf-fonts = %{version}
 Requires:	texlive-texmf-errata = %{version}
 # make sure fonts package installed before running post - since
 # fmtutil-sys is symlink to fmtutil
-Requires(post):	%{_bindir}/fmtutil /sbin/restorecon
-Requires(preun,postun): /sbin/restorecon
+Requires(post):	%{_bindir}/fmtutil
 Provides:	tex(tex)
 Obsoletes:	tetex < 3.0-99
 Provides:	tetex = 3.0-99
@@ -179,7 +170,6 @@ Obsoletes: tetex-afm < 3.0-99
 Provides:  tetex-afm = 3.0-99
 Requires: texlive-texmf-afm = %{version}
 Requires: texlive-texmf-errata = %{version}
-Requires(post,postun): /sbin/restorecon
 
 %description afm
 texlive-afm provides afm2tfm, a converter for PostScript(TM) font metric
@@ -232,7 +222,7 @@ Group: Applications/Publishing
 Requires: texlive = %{version}-%{release}
 Requires: texlive-texmf-xetex = %{version}
 Requires: dvipdfmx xdvipdfmx
-Requires(post,postun): /sbin/restorecon
+Provides: tex(xetex)
 
 %description xetex
 XeTeX is a TeX typesetting engine using Unicode and supporting modern
@@ -252,7 +242,6 @@ Requires: texlive-texmf-dvips = %{version}
 Requires: texlive-texmf-errata = %{version}
 Provides: tex(dvips)
 Requires: psutils
-Requires(post,postun): /sbin/restorecon
 
 %description dvips
 Dvips converts .dvi files, for example those produced by the TeX text
@@ -269,7 +258,6 @@ Summary: A collection of utilities for working with dvi files
 Group: Applications/Publishing
 # not positive about this requires, pretty sure though
 Requires: texlive = %{version}-%{release}
-Requires(post,postun): /sbin/restorecon
 # used to be in tetex, but has a separate upstream
 Requires: dvipng dvipdfm
 # some dvi utilities used to be in tetex
@@ -287,7 +275,6 @@ Requires: netpbm-progs
 # make sure main and fonts package installed before running post
 Requires(post): %{_bindir}/fmtutil %{_bindir}/fmtutil-sys
 Requires(post): %{_bindir}/texconfig-sys /sbin/install-info
-Requires(post,preun,postun): /sbin/restorecon
 BuildRequires: ghostscript netpbm-progs
 Obsoletes: tetex < 3.0-99
 Obsoletes: tetex-latex < 3.0-99
@@ -312,7 +299,6 @@ Requires: texlive = %{version}-%{release}
 Requires: texlive-latex = %{version}-%{release}
 Requires: texlive-texmf-dvips = %{version}
 Requires: texlive-texmf-errata-east-asian = %{version}
-Requires(post,postun): /sbin/restorecon
 Requires: mendexk
 Obsoletes: texlive-japanese < 2007-20
 Provides: texlive-japanese = %{version}-%{release}
@@ -326,9 +312,9 @@ East Asian support for TeXLive.
 Summary: ConTeXt is a document preparation system based on TeX
 Group: Applications/Publishing
 Requires: texlive = %{version}-%{release}
+Requires: texlive-texmf-context = %{version}
 Requires: texlive-texmf-errata-context = %{version}
 Requires: ruby
-Requires(post,postun): /sbin/restorecon
 Provides: tex(context)
 
 %description context
@@ -339,7 +325,6 @@ Summary: Shared library needed by kpathsea and info files
 Group:   Development/Libraries
 Obsoletes: tetex-fonts < 3.0-99
 Requires: texlive = %{version}-%{release}
-Requires(post,preun,postun): /sbin/restorecon
 
 %description -n kpathsea
 Shared library needed by kpathsea and info files.
@@ -356,20 +341,6 @@ symbolic link.
 You only need to install this package if you will be compiling software that
 wants to link against the kpathsea library.
 
-%if %{f8_packaging}
-%package -n dvipng
-Summary: DVI-to-PNG converter
-Version: %{dvipng_ver}
-Group: Applications/Publishing
-Requires(post,preun,postun): /sbin/restorecon
-#Url: http://savannah.nongnu.org/projects/dvipng/
-#Source0: http://download.savannah.gnu.org/releases/dvipng/dvipng-%{dvipng_ver}.tar.gz
-
-%description -n dvipng
-This program makes PNG and/or GIF graphics from DVI files as obtained
-from TeX and its relatives.
-%endif
-
 %package -n mendexk
 Summary: Replacement for makeindex with many enhancements
 Group: Applications/Publishing
@@ -437,9 +408,9 @@ chmod -x texk/dvipdfm/encodings.c
 %patch27 -p1 -b .poppler
 %patch28 -p1 -b .notetex
 %patch29 -p1 -b .man-context
+%patch30 -p1 -b .lacheck
 
 # fix non utf man pages
-%patch41 -p1 -b .notutf8
 %patch42 -p1 -b .notutf8-2
 # user a proper shellbang
 %patch43 -p1 -b .perl
@@ -463,7 +434,7 @@ chmod -x texk/dvipdfm/encodings.c
 %patch202 -p1 -b .pdftex
 
 %patch300 -p0
-%patch301 -p0
+%patch301 -p1
 %patch302 -p0
 %patch303 -p0
 %patch306 -p0
@@ -552,11 +523,9 @@ popd
 	--without-xdvik \
 	--with-mf-x-toolkit=yes \
 	--without-cxx-runtime-hack \
-%if !%{f8_packaging}
 	--without-dvipng \
 	--without-dvipdfmx \
 	--without-xdvipdfmx
-%endif
 
 # Remove everything except:
 # icu: includes some changes
@@ -714,6 +683,10 @@ rm -f %{buildroot}%{_bindir}/dvipdfmx
 rm -f %{buildroot}%{_bindir}/xdvipdfmx
 rm -rf %{buildroot}%{_texmf_main}/dvipdfm
 
+# remove tcfmgr stuff, it is packaged in texlive-texmf (#442135)
+rm -rf %{buildroot}%{_texmf_main}/texconfig/tcfmgr*
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -722,33 +695,45 @@ rm -rf %{buildroot}
 [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/web2c.info.gz %{_infodir}/dir
 %{_bindir}/fmtutil-sys --all &> /dev/null
 %{_bindir}/updmap-sys --syncwithtrees &> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post afm
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post context
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post dvips
 [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/dvips.info.gz %{_infodir}/dir
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post dviutils
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post east-asian
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post latex
@@ -756,33 +741,34 @@ rm -rf %{buildroot}
 %{_bindir}/texconfig-sys init &> /dev/null
 %{_bindir}/texconfig-sys rehash 2> /dev/null
 %{_bindir}/fmtutil-sys --all &> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post xetex
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %post -n kpathsea
 /sbin/ldconfig
 [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/kpathsea.info.gz %{_infodir}/dir
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
-:
-
-%if %{f8_packaging}
-%post -n dvipng
-[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/dvipng.info.gz %{_infodir}/dir
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
-%endif
 
 
 %preun
 if [ "$1" = 0 ]; then
   [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/web2c.info.gz %{_infodir}/dir
 fi
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %preun dvips
@@ -791,20 +777,13 @@ if [ "$1" = 0 ]; then
 fi
 :
 
-%if %{f8_packaging}
-%preun -n dvipng
-if [ "$1" = 0 ]; then
-  [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/dvipng.info.gz %{_infodir}/dir
-fi
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
-:
-%endif
-
 %preun latex
 if [ "$1" = 0 ]; then
   [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/latex.info.gz %{_infodir}/dir
 fi
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %preun -n kpathsea
@@ -812,59 +791,72 @@ fi
 if [ "$1" = 0 ]; then
   [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/kpathsea.info.gz %{_infodir}/dir
 fi
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun afm
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun context
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun east-asian
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun dviutils
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun dvips
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun latex
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %postun xetex
 %{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
-:
-
-%if %{f8_packaging}
-%postun -n dvipng
-%{_bindir}/texconfig-sys rehash 2> /dev/null
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
-%endif
 
 %postun -n kpathsea
 /sbin/ldconfig
-[ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+  [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/
+fi
 :
 
 %files
@@ -1057,7 +1049,6 @@ fi
 %{_texmf_main}/web2c/mktexnam
 %{_texmf_main}/web2c/mktexupd
 %{_texmf_main}/bibtex/
-%{_texmf_main}/texconfig/tcfmgr*
 
 %files utils
 %defattr(-,root,root,-)
@@ -1185,14 +1176,6 @@ fi
 #  against the shared. I can't name any, but so i hear.
 %{_libdir}/libkpathsea.a
 
-%if %{f8_packaging}
-%files -n dvipng
-%defattr(-,root,root,-)
-%{_bindir}/dvipng
-%{_mandir}/man1/dvipng.1*
-%{_infodir}/dvipng.info*
-%endif
-
 %files -n mendexk
 %defattr(-,root,root,-)
 %doc %{_texmf_main}/doc/mendexk-%{name}/
@@ -1278,6 +1261,18 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Tue Oct 14 2008 Jindrich Novy <jnovy@redhat.com> - 2007-32
+- texlive-context requires texlive-texmf-context (#455163)
+- fix lacheck to not to segfault (#451513)
+- texlive-xetex now provides tex(xetex) (#451774)
+- avoid multiple ownership of texconfig stuff (#442135)
+- don't build/package dvipdfm, it's now packaged separately (#445983),
+  thanks to Jonathan Underwood
+- do not directly depend on restorecon and run it only if
+  selinux is enabled
+- remove F8 related chunks from spec
+- rediff some patches to be applicable with zero fuzz
+
 * Mon Jun 30 2008 Jindrich Novy <jnovy@redhat.com> - 2007-31
 - platex belongs to texlive-east-asian otherwise it is a dangling
   symlink in texlive-latex (#453275)