diff --git a/package/base/tetex/1-no-texinfo.patch b/package/base/tetex/1-no-texinfo.patch deleted file mode 100644 index 8563af199..000000000 --- a/package/base/tetex/1-no-texinfo.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/tetex/1-no-texinfo.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- tetex-src-2.0.2/Makefile.in.old 2003-02-02 10:48:11.000000000 +0100 -+++ tetex-src-2.0.2/Makefile.in 2003-05-07 09:15:15.793848096 +0200 -@@ -40,11 +40,11 @@ - - ALLPROGS = access pdftosrc afm2tfm bibtex ctangle cweave dmp dvicopy \ - dvilj dvilj2p dvilj4 dvilj4l dvipdfm dvips dvitomp dvitype ebb etex \ -- gftodvi gftopk gftype gsftopk info infokey install-info kpsestat \ -- kpsewhich mag makeindex makeinfo mf mf-nowin mft mfw mpost mpto newer \ -+ gftodvi gftopk gftype gsftopk kpsestat \ -+ kpsewhich mag makeindex mf mf-nowin mft mfw mpost mpto newer \ - odvicopy odvips odvitype omega omfonts otangle otp2ocp outocp oxdvi.bin \ - patgen pdfetex pdftex pfb2pfa pk2bm pktogf pktype pltotf pooltype ps2pk \ -- readlink tangle tcdialog tex texindex tftopl tie ttf2afm vftovp vptovf \ -+ readlink tangle tcdialog tex tftopl tie ttf2afm vftovp vptovf \ - weave xdvi.bin - - # Subdirectories that have makefiles diff --git a/package/base/tetex/2-no-readlink.patch b/package/base/tetex/2-no-readlink.patch deleted file mode 100644 index 7f3d59241..000000000 --- a/package/base/tetex/2-no-readlink.patch +++ /dev/null @@ -1,59 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/tetex/2-no-readlink.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -ur tetex-src-2.0.2/Makefile.in tetex-src-2.0.2-fixed/Makefile.in ---- tetex-src-2.0.2/Makefile.in 2003-05-08 09:56:20.030430704 +0200 -+++ tetex-src-2.0.2-fixed/Makefile.in 2003-05-08 09:48:43.000000000 +0200 -@@ -44,7 +44,7 @@ - kpsewhich mag makeindex mf mf-nowin mft mfw mpost mpto newer \ - odvicopy odvips odvitype omega omfonts otangle otp2ocp outocp oxdvi.bin \ - patgen pdfetex pdftex pfb2pfa pk2bm pktogf pktype pltotf pooltype ps2pk \ -- readlink tangle tcdialog tex tftopl tie ttf2afm vftovp vptovf \ -+ tangle tcdialog tex tftopl tie ttf2afm vftovp vptovf \ - weave xdvi.bin - - # Subdirectories that have makefiles ---- tetex-src-2.0.2/texk/kpathsea/Makefile.in 2003-02-15 18:21:42.000000000 +0100 -+++ tetex-src-2.0.2-fixed/texk/kpathsea/Makefile.in 2003-05-08 11:12:25.569363288 +0200 -@@ -38,7 +38,7 @@ - .c.lo: - $(KPATHSEA_CC) $< $(ALL_CFLAGS) - --default all: kpsewhich kpsestat access readlink $(library).info manfiles -+default all: kpsewhich kpsestat access $(library).info manfiles - - kpsewhich: $(kpathsea) kpsewhich.o - $(kpathsea_link) kpsewhich.o $(LOADLIBES) -@@ -184,7 +184,6 @@ - $(INSTALL_LIBTOOL_PROG) $(bindir) kpsewhich - $(INSTALL_PROGRAM) kpsestat $(bindir) - $(INSTALL_PROGRAM) access $(bindir) -- $(INSTALL_PROGRAM) readlink $(bindir) - uninstall-exec: - rm -f $(bindir)/kpsewhich - -@@ -265,7 +264,7 @@ - rm -f paths.h texmf.cnf texmf.sed stamp-paths - - # The manual pages --manfiles = access.1 kpsestat.1 kpsewhich.1 readlink.1 \ -+manfiles = access.1 kpsestat.1 kpsewhich.1 \ - mktexlsr.1 mktexmf.1 mktextfm.1 mktexpk.1 - - ac_include ../make/man.mk diff --git a/package/base/tetex/tetex.conf b/package/base/tetex/tetex.conf index cbaf69056..6985d37db 100644 --- a/package/base/tetex/tetex.conf +++ b/package/base/tetex/tetex.conf @@ -20,18 +20,43 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -tetex_main() { - rm -rf /usr/lib/teTeX ; mkdir -p /usr/lib/teTeX - rm -rf /usr/share/texmf ; mkdir -p /usr/share/texmf - ln -s ../../share /usr/lib/teTeX/share - ( umask 0 && cd $archdir && - tar -C /usr/share/texmf $taropt tetex-texmf-$ver.tar.bz2 && - tar -C /usr/share/texmf $taropt tetex-texmfsrc-$ver.tar.bz2 - ) || exit 1 - ./configure --prefix=/usr/lib/teTeX --host=$arch_target \ - --disable-multiplatform --without-dialog --without-texinfo - eval "$MAKE $makeopt world" + +maybe_install_texmf() { + texmfdir=$root/$texmfprefix/share/texmf/ + reltxt=$texmfdir/release-tetex-texmf.txt + if [ -f "$reltxt" -a $ver != "$(< $reltxt )" ] ; then + echo "Refusing to update texmf tree of a different release." + false + else + mkdir -p "$root/$prefix/share/" + mkdir -p "$texmfdir" + [ ! -e "$root/$prefix/share/texmf/" ] && \ + ln -sf "/$texmfprefix/share/texmf/" "$root/$prefix/share/" + tar --no-same-owner -C $texmfdir $taropt $archdir/tetex-texmf-$ver.tar.bz2 + tar --no-same-owner -C $texmfdir/tex $taropt $archdir/latex-unicode-20041017.tbz2 + fi +} +preconf="maybe_install_texmf" + +tetex_profile_dot_d() { + if [ "$prefix" != usr -a "$prefix" != usr/local -a "$prefix" != "opt/$pkg" ] ; then + cat <<-EOF > /etc/profile.d/tetex.sh + PATH="/$prefix/bin:\$PATH" + MANPATH="/$prefix/share/man:\$MANPATH" + INFOPATH="/$prefix/share/info:\$INFOPATH" + EOF + fi } +postinstall="tetex_profile_dot_d" + +texmfprefix=$prefix +if [ $prefix_auto = 1 -a "$prefix" = usr ] ; then + prefix=$prefix/lib/teTeX + set_confopt +fi + +createdocs=0 -custmain="tetex_main" +var_append confopt ' ' '--disable-multiplatform --without-dialog' +var_append confopt ' ' '--without-texinfo --without-psutils' diff --git a/package/base/tetex/tetex.desc b/package/base/tetex/tetex.desc index 40bb76f6e..051706a9a 100644 --- a/package/base/tetex/tetex.desc +++ b/package/base/tetex/tetex.desc @@ -24,22 +24,24 @@ [I] The teTeX distribution of LaTeX. [T] teTeX is a LaTeX distribution. LaTeX is a macro package for TeX. TeX is a -[T] powerfull typesetting program. teTeX is a cool and very big package. +[T] powerful typesetting program. -[U] http://www.tug.org The TeX Users Group +[U] http://www.tug.org/teTeX/ The teTeX Homepage -[A] Donald E. Knuth {Author of TeX} +[A] Thomas Esser {Maintainer of teTeX} [A] Leslie Lamport {Original Author of LaTeX} +[A] Donald E. Knuth {Author of TeX} + [M] The ROCK Linux Project [C] extra/office [L] OpenSource [S] Stable -[V] 2.0.2 +[V] 3.0 [P] X -?---5---9 131.400 -[D] 3801799165 tetex-src-2.0.2.tar.gz ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/ -[D] 1386643886 tetex-texmf-2.0.2.tar.gz ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/ -[D] 2350249412 tetex-texmfsrc-2.0.2.tar.gz ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/ +[D] 2660129260 tetex-src-3.0.tar.gz ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/ +[D] 472153487 tetex-texmf-3.0.tar.gz ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/ +[D] 1984791332 latex-unicode-20041017.tgz !http://www.unruh.de/DniQ/latex/unicode/unicode.tgz diff --git a/package/base/tetex/xputenv.patch b/package/base/tetex/xputenv.patch deleted file mode 100644 index a7d0141e3..000000000 --- a/package/base/tetex/xputenv.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/tetex/xputenv.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./texk/kpathsea/xputenv.c~ Tue Jan 26 21:49:35 1999 -+++ ./texk/kpathsea/xputenv.c Sun Jun 27 01:01:15 1999 -@@ -26,6 +26,14 @@ - extern int putenv (); - #endif /* not WIN32 */ - -+/* I don't understand the code here compleatly. My xdvi (and other programms) -+ dump core becouse saved_env_items[i] is set to var_name - but varname is -+ (at least when called from xputenv_int) not a malloced() variable. So it's -+ value at the next invocation is undefined. In my case the assertation for -+ old_item fired ... I just define SMART_PUTENV here. I'm not sure if this -+ is the right thing to do - but it solves my problem - Clifford */ -+#define SMART_PUTENV -+ - /* This `x' function is different from the others in that it takes - different parameters than the standard function; but I find it much - more convenient to pass the variable and the value separately. Also,