[SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (495370fdcdb3ff882881b7509a76109a8088dfe5)

Peng Chang (Charles) scm at sourcemage.org
Sun Jul 18 01:43:33 EDT 2010


GIT changes to master grimoire by Peng Chang (Charles) <chp at sourcemage.org>:

 latex/texlive-texmf/DETAILS       |    2 
 latex/texlive-texmf/HISTORY       |    9 -
 latex/texlive/HISTORY             |   36 ++--
 latex/texlive/PRE_BUILD           |   10 +
 latex/texlive/fix_paths.patch     |  276 --------------------------------------
 latex/texlive/fix_scripts_3.patch |  262 ++++++++++++++++++++++++++++++++++++
 latex/texlive/gcc44.patch         |   11 +
 latex/texlive/texmf.cnf_fix.patch |    4 
 8 files changed, 306 insertions(+), 304 deletions(-)

New commits:
commit d6b1b2784a4fa54bdca24f6dd814c0902f09fbc3
Author: Peng Chang (Charles) <chp at sourcemage.org>
Commit: Peng Chang (Charles) <chp at sourcemage.org>

    Revert "texlive-texmf: => 20091107"
    
    This reverts commit 15562a492af4730a2066cc2ee68608f671f6b39b.

commit 238a90812981c78d2be69d92c00fa18efec059ed
Author: Peng Chang (Charles) <chp at sourcemage.org>
Commit: Peng Chang (Charles) <chp at sourcemage.org>

    Revert "texlive: => 20091107"
    
    This reverts commit 321ae4a9af4a214510d1a4f22d5f1f7a09cae17c.
    
    There's WIP update in branch devel-texlive

commit 5e4c73346213613f8308c3dda9222b0ad105bcd3
Author: Peng Chang (Charles) <chp at sourcemage.org>
Commit: Peng Chang (Charles) <chp at sourcemage.org>

    texlive: update spell comments, fix path in texmf.cnf_fix.patch

commit 0aece6c498c963d44f0da2217cbd78a5b468ce44
Author: Peng Chang (Charles) <chp at sourcemage.org>
Commit: Peng Chang (Charles) <chp at sourcemage.org>

    texlive: install wrappers like latex, pdflatex
    
    This problem is specific to this version (I hope)

commit 49bc889e5ae985bdac1ef34216126ace1245f965
Author: Peng Chang (Charles) <chp at sourcemage.org>
Commit: Peng Chang (Charles) <chp at sourcemage.org>

    texlive: many --without options are --disable now

commit 3375f9a2a0291ad206a7782934fad6e387324711
Author: Peng Chang (Charles) <chp at sourcemage.org>
Commit: Peng Chang (Charles) <chp at sourcemage.org>

    texlive: upstream hash

commit da3123c502dbbc3766f32fc4cabb138927494611
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn_haedicke at gmx.net>

    texlive: updated patch
    
    * to install working symlinks
    * to skip overwriting /usr/bin/man

commit 4833bc34e1b39b3bb1213f14f8e529734de3367c
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn_haedicke at gmx.net>

    texlive: removed old patches

commit 82cf92d515080e203f7d79bb9d917970c580a04b
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn_haedicke at gmx.net>

    texlive: removed getline fixes (not needed)

commit c282990884f58bd0026d43e38eef7c7642c9ccec
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn_haedicke at gmx.net>

    texlive: use appropriate flag instead of changing configure

commit 5663e5c94b47f52e7675b0738f8ab575324a8c5f
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn_haedicke at gmx.net>

    texlive: HISTORY added for 20091107 update

commit e16468fbda3548f2b418f13cc3331a495b073817
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn_haedicke at gmx.net>

    texlive => 20091107
    
    * matches upstream sha256
    * mangled PRE_BUILD to make texlive compile
      (disabled check in configure)
    * disabled old patches and created new ones to not install to /usr/texmf.
    * updated texmf_cnf patch

commit ee0652af2b7bd433751fca3456a8cf8a60036c08
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn_haedicke at gmx.net>

    texlive-texmf => 20091107
    (matches upstream sha256)

diff --git a/latex/texlive-texmf/DETAILS b/latex/texlive-texmf/DETAILS
index 8a95f0a..e366741 100755
--- a/latex/texlive-texmf/DETAILS
+++ b/latex/texlive-texmf/DETAILS
@@ -2,7 +2,7 @@
          VERSION=20091107
           SOURCE="texlive-${VERSION}-texmf.tar.xz"
    SOURCE_URL[0]=ftp://tug.org/texlive/historic/${VERSION:0:4}/${SOURCE}
-     SOURCE_HASH=sha512:42c062a4a39551a8e8e7da400a67064ec943a1bee1cd9f9b141fa01b204f206cf817762248891461551492fd1253768d33019acb99781348b10cb7e013f1be4a:UPSTREAM_HASH
+     SOURCE_HASH=sha512:42c062a4a39551a8e8e7da400a67064ec943a1bee1cd9f9b141fa01b204f206cf817762248891461551492fd1253768d33019acb99781348b10cb7e013f1be4a
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.xz}"
         WEB_SITE="http://www.tug.org/texlive"
       LICENSE[0]="LATER"
diff --git a/latex/texlive-texmf/HISTORY b/latex/texlive-texmf/HISTORY
index 120c3f2..9472eee 100644
--- a/latex/texlive-texmf/HISTORY
+++ b/latex/texlive-texmf/HISTORY
@@ -1,14 +1,13 @@
-2010-07-17 Peng Chang (Charles) <chp at sourcemage.org>
-	* DETAILS: Fixed SOURCE_URL[0], SOURCE_DIRECTORY
-	  updated spell to 20091107, UPSTREAM_HASH
-	* INSTALL: no longer a texmf-doc directory
-
 2010-05-01 Ismael Luceno <ismael at sourcemage.org>
 	* DETAILS: fix description
 
 2010-01-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* volatiles: marked volatile files as such
 
+2009-11-10 Finn Haedicke <finn_haedicke at gmx.net>
+	* DETAILS: version 20091107, new tarball suffix
+	* INSTALL: removed nonexistent folder
+
 2009-11-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* INSTALL: fixed failure due to use of mv
 
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index e12da8e..390ec03 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,21 +1,21 @@
-2010-07-17 Peng Chang (Charles) <chp at sourcemage.org>
-	* DETAILS: Fixed SOURCE_URL[0], SOURCE_DIRECTORY
-	  updated spell to 20091107, UPSTREAM_HASH
-	* BUILD: changing a bunch of options from --without to --disable,
-	  added --disable-native-texlive-build for it is not default now
-	* DEPENDS: changing --without to --disable,
-	  removed ncurses and texinfo for they are dependencies of basesystem
-	  and there are no special flags for them
-	* INSTALL: cp wrappers like latex, pdflatex (specific to this version)
-	* PRE_BUILD: a lot of changes for patching
-	* gcc44.patch, rename_getline.patch: not needed, fixed upstream
-	* fix_scripts.patch, fix_scripts_2.patch: no longer apply
-	* texmf.cnf_fix.patch: regenerated by me
-	* fix_paths.patch: FHS patch generated by me
-
-2010-04-20 Eric Sandall <sandalle at sourcemage.org>
-	gcc44.patch: From http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/texlive/texlive-gcc44.patch?rev=1.1;content-type=text/plain
-	* PRE_BUILD: Apply gcc44.patch (Bug #15535)
+2010-07-18 Peng Chang (Charles) <chp at sourcemage.org>
+	* DETAILS: UPSTREAM_HASH
+	* BUILD: many --without options are --disable now
+	* DEPDENDS: --without -> --disable, removed dependencies ncurses and
+	  texinfo as they are dependencies of basesystem and there are no flags
+	  for them now
+	* INSTALL: install wrappers like latex, pdflatex (specific to 20091107)
+	  /usr/bin/mf-nowin -> $INSTALL_ROOT/usr/bin/mf-nowin
+	* PRE_BUILD: update comments
+	* texmf.cnf_fix.patch: texmf-local should also go to /usr/share
+
+2009-11-10 Finn Haedicke <finn_haedicke at gmx.net>
+	* DETAILS: updated to 20091107, fixed source
+	* BUILD: added flag to build with external libs
+	* PRE_BUILD,fix_scripts_3.patch,texmf.cnd_fix.patch
+	  replaced old patches for install path /usr/share/texmf
+	  updated texmf.cnf patch 
+	  removed getline fixes/patches
 
 2009-09-28 Eric Sandall <sandalle at sourcemage.org>
 	* CONFLICTS: conflict -> conflicts
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index 4d44e22..e1b9bf9 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -6,7 +6,7 @@ cd $SOURCE_DIRECTORY &&
 #--
 ## this patche fix the Makefile.in's so that everything gets
 ## installed to FHS locations
-patch -p1 < $SPELL_DIRECTORY/fix_paths.patch &&
+patch -p1 < $SPELL_DIRECTORY/fix_scripts_3.patch &&
 #--
 #--
 ## the sed on the patch is live so it will take into
@@ -16,4 +16,10 @@ sed "s:/usr/share:$INSTALL_ROOT/usr/share:g" $SPELL_DIRECTORY/texmf.cnf_fix.patc
 #--
 ## removing as much internal things as possible
 rm -rf utils/{dialog,gzip,lzma,ps2eps,psutils,t1utils,texinfo,pdfopen} &&
-rm -rf libs/{freetype2,lua51,libpng,jpeg,expat,gd,luafilesystem,luafontforge,luamd5,luapeg,luazip,luazlib,ncurses,t1lib,unzip}
+rm -rf libs/{freetype2,lua51,libpng,jpeg,expat,gd,luafilesystem,luafontforge,luamd5,luapeg,luazip,luazlib,ncurses,t1lib,unzip} &&
+
+#
+# Fix compilation with GCC 4.4
+#
+patch $SOURCE_DIRECTORY/libs/teckit/source/Compiler.cpp \
+      $SCRIPT_DIRECTORY/gcc44.patch
diff --git a/latex/texlive/fix_paths.patch b/latex/texlive/fix_paths.patch
deleted file mode 100644
index 7b83b12..0000000
--- a/latex/texlive/fix_paths.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-diff -ur texlive-20091107-source.orig/texk/bibtex8/Makefile.in texlive-20091107-source/texk/bibtex8/Makefile.in
---- texlive-20091107-source.orig/texk/bibtex8/Makefile.in	2009-06-19 01:15:24.000000000 +0800
-+++ texlive-20091107-source/texk/bibtex8/Makefile.in	2010-07-17 00:48:58.074062142 +0800
-@@ -263,7 +263,7 @@
- 
- bibtex8_DEPENDENCIES = $(KPATHSEA_DEPEND)
- LDADD = $(KPATHSEA_LIBS)	
--csfdir = ${prefix}/texmf-dist/bibtex/csf/base
-+csfdir = ${prefix}/share/texmf-dist/bibtex/csf/base
- dist_csf_DATA = \
- 	csf/88591lat.csf \
- 	csf/88591sca.csf \
-@@ -274,7 +274,7 @@
- 	csf/cp866rus.csf \
- 	csf/csfile.txt
- 
--btdocdir = ${prefix}/texmf/doc/bibtex8
-+btdocdir = ${prefix}/share/texmf/doc/bibtex8
- dist_btdoc_DATA = \
- 	00readme.txt \
- 	HISTORY \
-diff -ur texlive-20091107-source.orig/texk/bibtexu/Makefile.in texlive-20091107-source/texk/bibtexu/Makefile.in
---- texlive-20091107-source.orig/texk/bibtexu/Makefile.in	2009-10-09 00:07:57.000000000 +0800
-+++ texlive-20091107-source/texk/bibtexu/Makefile.in	2010-07-17 00:48:41.894061307 +0800
-@@ -289,7 +289,7 @@
- 
- bibtexu_DEPENDENCIES = $(KPATHSEA_DEPEND) $(ICU_DEPEND)
- LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) -lm
--csfdir = ${prefix}/texmf-dist/bibtex/csf/base
-+csfdir = ${prefix}/share/texmf-dist/bibtex/csf/base
- dist_csf_DATA = \
- 	csf/88591lat.csf \
- 	csf/88591sca.csf \
-@@ -300,7 +300,7 @@
- 	csf/cp866rus.csf \
- 	csf/csfile.txt
- 
--btdocdir = ${prefix}/texmf/doc/bibtexu
-+btdocdir = ${prefix}/share/texmf/doc/bibtexu
- dist_btdoc_DATA = \
- 	00readme.txt \
- 	HISTORY \
-diff -ur texlive-20091107-source.orig/texk/dvipdfmx/data/Makefile.in texlive-20091107-source/texk/dvipdfmx/data/Makefile.in
---- texlive-20091107-source.orig/texk/dvipdfmx/data/Makefile.in	2009-06-15 23:14:49.000000000 +0800
-+++ texlive-20091107-source/texk/dvipdfmx/data/Makefile.in	2010-07-17 01:15:07.504125133 +0800
-@@ -208,20 +208,20 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--configdatadir = ${prefix}/texmf/dvipdfmx
-+configdatadir = ${prefix}/share/texmf/dvipdfmx
- dist_configdata_DATA = \
-   $(srcdir)/dvipdfmx.cfg
- 
--glyphlistdatadir = ${prefix}/texmf-dist/fonts/map/glyphlist
-+glyphlistdatadir = ${prefix}/share/texmf-dist/fonts/map/glyphlist
- dist_glyphlistdata_DATA = \
-   $(srcdir)/glyphlist.txt \
-   $(srcdir)/pdfglyphlist.txt
- 
--mapdatadir = ${prefix}/texmf/fonts/map/dvipdfm/dvipdfmx
-+mapdatadir = ${prefix}/share/texmf/fonts/map/dvipdfm/dvipdfmx
- dist_mapdata_DATA = \
-   $(srcdir)/cid-x.map
- 
--cmapdatadir = ${prefix}/texmf/fonts/cmap/dvipdfmx
-+cmapdatadir = ${prefix}/share/texmf/fonts/cmap/dvipdfmx
- dist_cmapdata_DATA = \
-   $(srcdir)/EUC-UCS2
- 
-diff -ur texlive-20091107-source.orig/texk/dvipsk/Makefile.in texlive-20091107-source/texk/dvipsk/Makefile.in
---- texlive-20091107-source.orig/texk/dvipsk/Makefile.in	2009-06-23 17:46:14.000000000 +0800
-+++ texlive-20091107-source/texk/dvipsk/Makefile.in	2010-07-17 01:12:22.149312340 +0800
-@@ -376,7 +376,7 @@
- 	tex.lpro \
- 	texps.lpro
- 
--prologdir = ${prefix}/texmf/dvips/base
-+prologdir = ${prefix}/share/texmf/dvips/base
- prologues = $(dist_prologues:.lpro=.pro) texc.pro
- SUFFIXES = .pro .lpro
- EXTRA_DIST = $(dist_prologues) texc.script dvips.test pfbincl.test \
-diff -ur texlive-20091107-source.orig/texk/gsftopk/Makefile.in texlive-20091107-source/texk/gsftopk/Makefile.in
---- texlive-20091107-source.orig/texk/gsftopk/Makefile.in	2009-06-22 15:25:39.000000000 +0800
-+++ texlive-20091107-source/texk/gsftopk/Makefile.in	2010-07-17 01:15:27.990063403 +0800
-@@ -256,7 +256,7 @@
- gsftopk_DEPENDENCIES = $(KPATHSEA_DEPEND)
- LDADD = $(KPATHSEA_LIBS)
- dist_gsftopkpsheader_DATA = render.ps
--gsftopkpsheaderdir = ${prefix}/texmf/dvips/gsftopk
-+gsftopkpsheaderdir = ${prefix}/share/texmf/dvips/gsftopk
- nodist_man1_MANS = gsftopk.1
- DISTCLEANFILES = gsftopk.1 sedscript
- EXTRA_DIST = gsftopk1.sed mksedscript
-diff -ur texlive-20091107-source.orig/texk/kpathsea/Makefile.in texlive-20091107-source/texk/kpathsea/Makefile.in
---- texlive-20091107-source.orig/texk/kpathsea/Makefile.in	2009-07-02 21:04:27.000000000 +0800
-+++ texlive-20091107-source/texk/kpathsea/Makefile.in	2010-07-17 01:15:51.607054071 +0800
-@@ -432,7 +432,7 @@
- kpseaccess_SOURCES = access.c
- kpsereadlink_SOURCES = readlink.c
- kpsewhich_LDADD = libkpathsea.la
--web2cdir = ${prefix}/texmf/web2c
-+web2cdir = ${prefix}/share/texmf/web2c
- dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
- dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
- dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
-diff -ur texlive-20091107-source.orig/texk/lcdf-typetools/Makefile.in texlive-20091107-source/texk/lcdf-typetools/Makefile.in
---- texlive-20091107-source.orig/texk/lcdf-typetools/Makefile.in	2009-09-04 04:09:39.000000000 +0800
-+++ texlive-20091107-source/texk/lcdf-typetools/Makefile.in	2010-07-17 00:53:19.596049631 +0800
-@@ -275,9 +275,9 @@
- DISTCHECK_CONFIGURE_FLAGS = --without-kpathsea
- SUBDIRS = $(SELECTED_SUBDIRS)
- DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
-- at texlive_build_TRUE@glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist
-+ at texlive_build_TRUE@glyphlistdir = ${prefix}/share/texmf-dist/fonts/map/glyphlist
- @texlive_build_TRUE at glyphlist_DATA = glyphlist.txt texglyphlist.txt
-- at texlive_build_TRUE@encdir = ${prefix}/texmf-dist/fonts/enc/dvips/base
-+ at texlive_build_TRUE@encdir = ${prefix}/share/texmf-dist/fonts/enc/dvips/base
- @texlive_build_TRUE at enc_DATA = 7t.enc
- @texlive_build_FALSE at pkgdata_DATA = glyphlist.txt texglyphlist.txt 7t.enc
- EXTRA_DIST = ONEWS lcdf-typetools.spec include/lcdf/bezier.hh \
-diff -ur texlive-20091107-source.orig/texk/tetex/Makefile.in texlive-20091107-source/texk/tetex/Makefile.in
---- texlive-20091107-source.orig/texk/tetex/Makefile.in	2009-09-28 23:46:20.000000000 +0800
-+++ texlive-20091107-source/texk/tetex/Makefile.in	2010-07-17 09:32:29.799063942 +0800
-@@ -254,14 +254,14 @@
- 	fmtutil.cnf.5 \
- 	updmap.cfg.5
- 
--tetexdocdir = ${prefix}/texmf/doc/tetex
-+tetexdocdir = ${prefix}/share/texmf/doc/tetex
- dist_tetexdoc_DATA = \
- 	doc/TETEXDOC.dvi \
- 	doc/TETEXDOC.pdf \
- 	doc/TETEXDOC.ps \
- 	doc/teTeX-FAQ
- 
--texconfdir = ${prefix}
-+texconfdir = ${prefix}/share
- nobase_dist_texconf_DATA = \
- 	texmf/texconfig/README \
- 	texmf/texconfig/g/generic \
-@@ -269,10 +269,10 @@
- 	texmf/texconfig/v/vt100 \
- 	texmf/texconfig/x/xterm
- 
--texconfigdir = ${prefix}/texmf/texconfig
-+texconfigdir = ${prefix}/share/texmf/texconfig
- dist_texconfig_SCRIPTS = tcfmgr
- dist_texconfig_DATA = tcfmgr.map
--web2cdir = ${prefix}/texmf/web2c
-+web2cdir = ${prefix}/share/texmf/web2c
- dist_web2c_DATA = fmtutil.cnf
- EXTRA_DIST = README.a2ping README.texdoctk doc/Makefile \
- 	doc/TETEXDOC.bib doc/TETEXDOC.tex fontinst.bat pdfetex-pl.pool \
-diff -ur texlive-20091107-source.orig/texk/tex4htk/Makefile.in texlive-20091107-source/texk/tex4htk/Makefile.in
---- texlive-20091107-source.orig/texk/tex4htk/Makefile.in	2009-06-18 22:50:50.000000000 +0800
-+++ texlive-20091107-source/texk/tex4htk/Makefile.in	2010-07-17 00:50:19.333067714 +0800
-@@ -272,7 +272,7 @@
- 	wcontext wlatex wmex wtex wtexi wxelatex wxetex xhcontext \
- 	xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \
- 	xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java
--tex4ht_subdir = texmf-dist/scripts/tex4ht
-+tex4ht_subdir = share/texmf-dist/scripts/tex4ht
- tex4htdir = ${prefix}/$(tex4ht_subdir)
- tex4ht_SCRIPTS = 
- bin_SCRIPTS = 
-diff -ur texlive-20091107-source.orig/texk/texlive/linked_scripts/Makefile.in texlive-20091107-source/texk/texlive/linked_scripts/Makefile.in
---- texlive-20091107-source.orig/texk/texlive/linked_scripts/Makefile.in	2009-10-15 07:39:50.000000000 +0800
-+++ texlive-20091107-source/texk/texlive/linked_scripts/Makefile.in	2010-07-17 09:53:22.230064779 +0800
-@@ -156,7 +156,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- bin_SCRIPTS = 
--scriptxdir = ${prefix}/texmf/scripts
-+scriptxdir = ${prefix}/share/texmf/scripts
- nobase_dist_scriptx_SCRIPTS = \
- 	a2ping/a2ping.pl \
- 	getnonfreefonts/getnonfreefonts.pl \
-@@ -167,7 +167,7 @@
- 	texlive/rungs.tlu \
- 	texlive/tlmgr.pl
- 
--scriptdir = ${prefix}/texmf-dist/scripts
-+scriptdir = ${prefix}/share/texmf-dist/scripts
- nobase_dist_script_SCRIPTS = \
- 	accfonts/mkt1font \
- 	accfonts/vpl2ovp \
-@@ -554,16 +554,16 @@
- 	  for s in $(nobase_dist_scriptx_SCRIPTS); do \
- 	    target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
- 	    rm -f $$target; \
--	    echo "creating link '$$target' -> '$(REL)/texmf/scripts/$$s'"; \
--	    $(LN_S) $(REL)/texmf/scripts/$$s $$target; \
-+	    echo "creating link '$$target' -> '$(REL)/share/texmf/scripts/$$s'"; \
-+	    $(LN_S) $(REL)/share/texmf/scripts/$$s $$target; \
- 	  done && \
- 	  for s in $(nobase_dist_script_SCRIPTS); do \
- 	    target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
- 	    echo "$$s" | grep listings-ext.sh >/dev/null \
- 	    || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
- 	    rm -f $$target; \
--	    echo "creating link '$$target' -> '$(REL)/texmf-dist/scripts/$$s'"; \
--	    $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target; \
-+	    echo "creating link '$$target' -> '$(REL)/share/texmf-dist/scripts/$$s'"; \
-+	    $(LN_S) $(REL)/share/texmf-dist/scripts/$$s $$target; \
- 	  done && \
- 	  rm -f rpdfcrop && \
- 	  echo "creating link 'rpdfcrop' -> 'pdfcrop'" && \
-@@ -573,10 +573,7 @@
- 	  $(LN_S) epstopdf repstopdf && \
- 	  rm -f getnonfreefonts-sys && \
- 	  echo "creating link 'getnonfreefonts-sys' -> 'getnonfreefonts'" && \
--	  $(LN_S) getnonfreefonts getnonfreefonts-sys && \
--	  rm -f man && \
--	  echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
--	  (ln -s $(REL)/texmf/doc/man man || :)
-+	  $(LN_S) getnonfreefonts getnonfreefonts-sys
- 
- uninstall-hook:
- 	@for s in $(nobase_dist_scriptx_SCRIPTS) $(nobase_dist_script_SCRIPTS); do \
-diff -ur texlive-20091107-source.orig/texk/xdvik/Makefile.in texlive-20091107-source/texk/xdvik/Makefile.in
---- texlive-20091107-source.orig/texk/xdvik/Makefile.in	2009-06-16 20:01:38.000000000 +0800
-+++ texlive-20091107-source/texk/xdvik/Makefile.in	2010-07-17 01:11:18.764319683 +0800
-@@ -436,9 +436,9 @@
- 	xdvi.icon xdvizilla xdvizilla.1
- CLEANFILES = psheader.c sedscript xdvi.1
- nodist_man1_MANS = xdvi.1
--xdvidir = ${prefix}/texmf/xdvi
-+xdvidir = ${prefix}/share/texmf/xdvi
- dist_xdvi_DATA = texmf/XDvi
--pixmapdir = ${prefix}/texmf/xdvi/pixmap
-+pixmapdir = ${prefix}/share/texmf/xdvi/pixmap
- dist_pixmap_DATA = pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
- dist_noinst_DATA = texmf/xdvi.cfg
- all: c-auto.h
-diff -ur texlive-20091107-source.orig/texk/xdvipdfmx/data/Makefile.in texlive-20091107-source/texk/xdvipdfmx/data/Makefile.in
---- texlive-20091107-source.orig/texk/xdvipdfmx/data/Makefile.in	2008-06-26 18:21:46.000000000 +0800
-+++ texlive-20091107-source/texk/xdvipdfmx/data/Makefile.in	2010-07-17 01:14:02.343062640 +0800
-@@ -62,7 +62,7 @@
- dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(dist_pkgdata_DATA)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--pkgdatadir = $(datadir)/texmf/dvipdfm
-+pkgdatadir = $(datadir)/share/texmf/dvipdfm
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
- AR = @AR@
-diff -ur texlive-20091107-source.orig/utils/xindy/user-commands/Makefile.in texlive-20091107-source/utils/xindy/user-commands/Makefile.in
---- texlive-20091107-source.orig/utils/xindy/user-commands/Makefile.in	2009-05-22 20:38:02.000000000 +0800
-+++ texlive-20091107-source/utils/xindy/user-commands/Makefile.in	2010-07-17 01:09:15.327310949 +0800
-@@ -501,16 +501,16 @@
- 
- 
- @TETEX_BUILD_TRUE at install-exec-hook: xindy
-- at TETEX_BUILD_TRUE@	$(MKDIR_P) "$(DESTDIR)$(prefix)/texmf/scripts/xindy"
-+ at TETEX_BUILD_TRUE@	$(MKDIR_P) "$(DESTDIR)$(prefix)/share/texmf/scripts/xindy"
- @TETEX_BUILD_TRUE@	-rm -f $(DESTDIR)$(bindir)/xindy $(DESTDIR)$(bindir)/texindy
-- at TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) xindy $(DESTDIR)$(prefix)/texmf/scripts/xindy/xindy.pl
-- at TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) $(srcdir)/texindy $(DESTDIR)$(prefix)/texmf/scripts/xindy/texindy.pl
-- at TETEX_BUILD_TRUE@	if test -d "$(DESTDIR)$(bindir)/../../texmf/scripts/xindy"; then \
-- at TETEX_BUILD_TRUE@	  ln -s ../../texmf/scripts/xindy/xindy.pl $(DESTDIR)$(bindir)/xindy; \
-- at TETEX_BUILD_TRUE@	  ln -s ../../texmf/scripts/xindy/texindy.pl $(DESTDIR)$(bindir)/texindy; \
-- at TETEX_BUILD_TRUE@	elif test -d "$(DESTDIR)$(bindir)/../texmf/scripts/xindy"; then \
-- at TETEX_BUILD_TRUE@	  ln -s ../texmf/scripts/xindy/xindy.pl $(DESTDIR)$(bindir)/xindy; \
-- at TETEX_BUILD_TRUE@	  ln -s ../texmf/scripts/xindy/texindy.pl $(DESTDIR)$(bindir)/texindy; \
-+ at TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) xindy $(DESTDIR)$(prefix)/share/texmf/scripts/xindy/xindy.pl
-+ at TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) $(srcdir)/texindy $(DESTDIR)$(prefix)/share/texmf/scripts/xindy/texindy.pl
-+ at TETEX_BUILD_TRUE@	if test -d "$(DESTDIR)$(bindir)/../../share/texmf/scripts/xindy"; then \
-+ at TETEX_BUILD_TRUE@	  ln -s ../../share/texmf/scripts/xindy/xindy.pl $(DESTDIR)$(bindir)/xindy; \
-+ at TETEX_BUILD_TRUE@	  ln -s ../../share/texmf/scripts/xindy/texindy.pl $(DESTDIR)$(bindir)/texindy; \
-+ at TETEX_BUILD_TRUE@	elif test -d "$(DESTDIR)$(bindir)/../share/texmf/scripts/xindy"; then \
-+ at TETEX_BUILD_TRUE@	  ln -s ../share/texmf/scripts/xindy/xindy.pl $(DESTDIR)$(bindir)/xindy; \
-+ at TETEX_BUILD_TRUE@	  ln -s ../share/texmf/scripts/xindy/texindy.pl $(DESTDIR)$(bindir)/texindy; \
- @TETEX_BUILD_TRUE@	else \
- @TETEX_BUILD_TRUE@	  echo "Error: texmf/scripts/xindy directory not found" >&2; \
- @TETEX_BUILD_TRUE@	  exit 1; \
diff --git a/latex/texlive/fix_scripts_3.patch b/latex/texlive/fix_scripts_3.patch
new file mode 100644
index 0000000..26f8189
--- /dev/null
+++ b/latex/texlive/fix_scripts_3.patch
@@ -0,0 +1,262 @@
+diff -ru texlive-20091107-source/texk/bibtex8/Makefile.in tl/texk/bibtex8/Makefile.in
+--- texlive-20091107-source/texk/bibtex8/Makefile.in	2009-11-10 07:51:56.076903492 +0100
++++ tl/texk/bibtex8/Makefile.in	2009-11-10 08:11:55.197300678 +0100
+@@ -263,7 +263,7 @@
+ 
+ bibtex8_DEPENDENCIES = $(KPATHSEA_DEPEND)
+ LDADD = $(KPATHSEA_LIBS)	
+-csfdir = ${prefix}/texmf-dist/bibtex/csf/base
++csfdir = ${datadir}/texmf-dist/bibtex/csf/base
+ dist_csf_DATA = \
+ 	csf/88591lat.csf \
+ 	csf/88591sca.csf \
+@@ -274,7 +274,7 @@
+ 	csf/cp866rus.csf \
+ 	csf/csfile.txt
+ 
+-btdocdir = ${prefix}/texmf/doc/bibtex8
++btdocdir = ${datadir}/texmf/doc/bibtex8
+ dist_btdoc_DATA = \
+ 	00readme.txt \
+ 	HISTORY \
+diff -ru texlive-20091107-source/texk/bibtexu/Makefile.in tl/texk/bibtexu/Makefile.in
+--- texlive-20091107-source/texk/bibtexu/Makefile.in	2009-11-10 07:51:56.056903463 +0100
++++ tl/texk/bibtexu/Makefile.in	2009-11-10 09:35:40.604997976 +0100
+@@ -289,7 +289,7 @@
+ 
+ bibtexu_DEPENDENCIES = $(KPATHSEA_DEPEND) $(ICU_DEPEND)
+ LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) -lm
+-csfdir = ${prefix}/texmf-dist/bibtex/csf/base
++csfdir = ${datadir}/texmf-dist/bibtex/csf/base
+ dist_csf_DATA = \
+ 	csf/88591lat.csf \
+ 	csf/88591sca.csf \
+@@ -300,7 +300,7 @@
+ 	csf/cp866rus.csf \
+ 	csf/csfile.txt
+ 
+-btdocdir = ${prefix}/texmf/doc/bibtexu
++btdocdir = ${datadir}/texmf/doc/bibtexu
+ dist_btdoc_DATA = \
+ 	00readme.txt \
+ 	HISTORY \
+diff -ru texlive-20091107-source/texk/dvipdfmx/data/Makefile.in tl/texk/dvipdfmx/data/Makefile.in
+--- texlive-20091107-source/texk/dvipdfmx/data/Makefile.in	2009-11-10 07:51:56.128902281 +0100
++++ tl/texk/dvipdfmx/data/Makefile.in	2009-11-10 09:46:53.505445330 +0100
+@@ -208,20 +208,20 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-configdatadir = ${prefix}/texmf/dvipdfmx
++configdatadir = ${datadir}/texmf/dvipdfmx
+ dist_configdata_DATA = \
+   $(srcdir)/dvipdfmx.cfg
+ 
+-glyphlistdatadir = ${prefix}/texmf-dist/fonts/map/glyphlist
++glyphlistdatadir = ${datadir}/texmf-dist/fonts/map/glyphlist
+ dist_glyphlistdata_DATA = \
+   $(srcdir)/glyphlist.txt \
+   $(srcdir)/pdfglyphlist.txt
+ 
+-mapdatadir = ${prefix}/texmf/fonts/map/dvipdfm/dvipdfmx
++mapdatadir = ${datadir}/texmf/fonts/map/dvipdfm/dvipdfmx
+ dist_mapdata_DATA = \
+   $(srcdir)/cid-x.map
+ 
+-cmapdatadir = ${prefix}/texmf/fonts/cmap/dvipdfmx
++cmapdatadir = ${datadir}/texmf/fonts/cmap/dvipdfmx
+ dist_cmapdata_DATA = \
+   $(srcdir)/EUC-UCS2
+ 
+diff -ru texlive-20091107-source/texk/dvipsk/Makefile.in tl/texk/dvipsk/Makefile.in
+--- texlive-20091107-source/texk/dvipsk/Makefile.in	2009-11-10 07:51:56.156903115 +0100
++++ tl/texk/dvipsk/Makefile.in	2009-11-10 09:46:58.166678965 +0100
+@@ -376,7 +376,7 @@
+ 	tex.lpro \
+ 	texps.lpro
+ 
+-prologdir = ${prefix}/texmf/dvips/base
++prologdir = ${datadir}/texmf/dvips/base
+ prologues = $(dist_prologues:.lpro=.pro) texc.pro
+ SUFFIXES = .pro .lpro
+ EXTRA_DIST = $(dist_prologues) texc.script dvips.test pfbincl.test \
+diff -ru texlive-20091107-source/texk/gsftopk/Makefile.in tl/texk/gsftopk/Makefile.in
+--- texlive-20091107-source/texk/gsftopk/Makefile.in	2009-11-10 07:51:56.072902704 +0100
++++ tl/texk/gsftopk/Makefile.in	2009-11-10 09:35:44.064408320 +0100
+@@ -256,7 +256,7 @@
+ gsftopk_DEPENDENCIES = $(KPATHSEA_DEPEND)
+ LDADD = $(KPATHSEA_LIBS)
+ dist_gsftopkpsheader_DATA = render.ps
+-gsftopkpsheaderdir = ${prefix}/texmf/dvips/gsftopk
++gsftopkpsheaderdir = ${datadir}/texmf/dvips/gsftopk
+ nodist_man1_MANS = gsftopk.1
+ DISTCLEANFILES = gsftopk.1 sedscript
+ EXTRA_DIST = gsftopk1.sed mksedscript
+diff -ru texlive-20091107-source/texk/kpathsea/Makefile.in tl/texk/kpathsea/Makefile.in
+--- texlive-20091107-source/texk/kpathsea/Makefile.in	2009-11-10 07:51:56.100902493 +0100
++++ tl/texk/kpathsea/Makefile.in	2009-11-10 09:35:52.163678762 +0100
+@@ -432,7 +432,7 @@
+ kpseaccess_SOURCES = access.c
+ kpsereadlink_SOURCES = readlink.c
+ kpsewhich_LDADD = libkpathsea.la
+-web2cdir = ${prefix}/texmf/web2c
++web2cdir = ${datadir}/texmf/web2c
+ dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
+ dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
+ dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
+diff -ru texlive-20091107-source/texk/lcdf-typetools/Makefile.in tl/texk/lcdf-typetools/Makefile.in
+--- texlive-20091107-source/texk/lcdf-typetools/Makefile.in	2009-11-10 07:51:56.116902013 +0100
++++ tl/texk/lcdf-typetools/Makefile.in	2009-11-10 09:36:02.871630882 +0100
+@@ -275,9 +275,9 @@
+ DISTCHECK_CONFIGURE_FLAGS = --without-kpathsea
+ SUBDIRS = $(SELECTED_SUBDIRS)
+ DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
+- at texlive_build_TRUE@glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist
++ at texlive_build_TRUE@glyphlistdir = ${datadir}/texmf-dist/fonts/map/glyphlist
+ @texlive_build_TRUE at glyphlist_DATA = glyphlist.txt texglyphlist.txt
+- at texlive_build_TRUE@encdir = ${prefix}/texmf-dist/fonts/enc/dvips/base
++ at texlive_build_TRUE@encdir = ${datadir}/texmf-dist/fonts/enc/dvips/base
+ @texlive_build_TRUE at enc_DATA = 7t.enc
+ @texlive_build_FALSE at pkgdata_DATA = glyphlist.txt texglyphlist.txt 7t.enc
+ EXTRA_DIST = ONEWS lcdf-typetools.spec include/lcdf/bezier.hh \
+diff -ru texlive-20091107-source/texk/tetex/Makefile.in tl/texk/tetex/Makefile.in
+--- texlive-20091107-source/texk/tetex/Makefile.in	2009-11-10 07:51:56.124903449 +0100
++++ tl/texk/tetex/Makefile.in	2009-11-10 09:58:37.661294317 +0100
+@@ -254,14 +254,14 @@
+ 	fmtutil.cnf.5 \
+ 	updmap.cfg.5
+ 
+-tetexdocdir = ${prefix}/texmf/doc/tetex
++tetexdocdir = ${datadir}/texmf/doc/tetex
+ dist_tetexdoc_DATA = \
+ 	doc/TETEXDOC.dvi \
+ 	doc/TETEXDOC.pdf \
+ 	doc/TETEXDOC.ps \
+ 	doc/teTeX-FAQ
+ 
+-texconfdir = ${prefix}
++texconfdir = ${datadir}
+ nobase_dist_texconf_DATA = \
+ 	texmf/texconfig/README \
+ 	texmf/texconfig/g/generic \
+@@ -269,10 +269,10 @@
+ 	texmf/texconfig/v/vt100 \
+ 	texmf/texconfig/x/xterm
+ 
+-texconfigdir = ${prefix}/texmf/texconfig
++texconfigdir = ${datadir}/texmf/texconfig
+ dist_texconfig_SCRIPTS = tcfmgr
+ dist_texconfig_DATA = tcfmgr.map
+-web2cdir = ${prefix}/texmf/web2c
++web2cdir = ${datadir}/texmf/web2c
+ dist_web2c_DATA = fmtutil.cnf
+ EXTRA_DIST = README.a2ping README.texdoctk doc/Makefile \
+ 	doc/TETEXDOC.bib doc/TETEXDOC.tex fontinst.bat pdfetex-pl.pool \
+diff -ru texlive-20091107-source/texk/tex4htk/Makefile.in tl/texk/tex4htk/Makefile.in
+--- texlive-20091107-source/texk/tex4htk/Makefile.in	2009-11-10 07:51:56.104901674 +0100
++++ tl/texk/tex4htk/Makefile.in	2009-11-10 16:10:41.826690047 +0100
+@@ -273,7 +273,7 @@
+ 	xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \
+ 	xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java
+ tex4ht_subdir = texmf-dist/scripts/tex4ht
+-tex4htdir = ${prefix}/$(tex4ht_subdir)
++tex4htdir = ${datadir}/$(tex4ht_subdir)
+ tex4ht_SCRIPTS = 
+ bin_SCRIPTS = 
+ all: c-auto.h
+@@ -833,8 +833,8 @@
+ 	  $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.sh"; \
+ 	done
+ 	case "$(bindir)" in \
+-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
++	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=../share install-links;; \
++	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../../share install-links;; \
+ 	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+ 	     exit 1;; \
+ 	esac
+diff -ru texlive-20091107-source/texk/texlive/linked_scripts/Makefile.in tl/texk/texlive/linked_scripts/Makefile.in
+--- texlive-20091107-source/texk/texlive/linked_scripts/Makefile.in	2009-11-10 07:51:55.952902523 +0100
++++ tl/texk/texlive/linked_scripts/Makefile.in	2009-11-10 16:36:12.771395316 +0100
+@@ -156,7 +156,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ bin_SCRIPTS = 
+-scriptxdir = ${prefix}/texmf/scripts
++scriptxdir = ${datadir}/texmf/scripts
+ nobase_dist_scriptx_SCRIPTS = \
+ 	a2ping/a2ping.pl \
+ 	getnonfreefonts/getnonfreefonts.pl \
+@@ -167,7 +167,7 @@
+ 	texlive/rungs.tlu \
+ 	texlive/tlmgr.pl
+ 
+-scriptdir = ${prefix}/texmf-dist/scripts
++scriptdir = ${datadir}/texmf-dist/scripts
+ nobase_dist_script_SCRIPTS = \
+ 	accfonts/mkt1font \
+ 	accfonts/vpl2ovp \
+@@ -542,8 +542,8 @@
+ 
+ install-data-hook:
+ 	case "$(bindir)" in \
+-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
++	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=../share install-links;; \
++	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../../share install-links;; \
+ 	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+ 	     exit 1;; \
+ 	esac
+@@ -574,9 +574,7 @@
+ 	  rm -f getnonfreefonts-sys && \
+ 	  echo "creating link 'getnonfreefonts-sys' -> 'getnonfreefonts'" && \
+ 	  $(LN_S) getnonfreefonts getnonfreefonts-sys && \
+-	  rm -f man && \
+-	  echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
+-	  (ln -s $(REL)/texmf/doc/man man || :)
++	  true
+ 
+ uninstall-hook:
+ 	@for s in $(nobase_dist_scriptx_SCRIPTS) $(nobase_dist_script_SCRIPTS); do \
+diff -ru texlive-20091107-source/texk/xdvik/Makefile.in tl/texk/xdvik/Makefile.in
+--- texlive-20091107-source/texk/xdvik/Makefile.in	2009-11-10 07:51:56.084902344 +0100
++++ tl/texk/xdvik/Makefile.in	2009-11-10 09:35:48.058678814 +0100
+@@ -436,9 +436,9 @@
+ 	xdvi.icon xdvizilla xdvizilla.1
+ CLEANFILES = psheader.c sedscript xdvi.1
+ nodist_man1_MANS = xdvi.1
+-xdvidir = ${prefix}/texmf/xdvi
++xdvidir = ${datadir}/texmf/xdvi
+ dist_xdvi_DATA = texmf/XDvi
+-pixmapdir = ${prefix}/texmf/xdvi/pixmap
++pixmapdir = ${datadir}/texmf/xdvi/pixmap
+ dist_pixmap_DATA = pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
+ dist_noinst_DATA = texmf/xdvi.cfg
+ all: c-auto.h
+diff -ru texlive-20091107-source/utils/xindy/user-commands/Makefile.in tl/utils/xindy/user-commands/Makefile.in
+--- texlive-20091107-source/utils/xindy/user-commands/Makefile.in	2009-11-10 07:51:55.580901938 +0100
++++ tl/utils/xindy/user-commands/Makefile.in	2009-11-10 08:09:09.322065690 +0100
+@@ -501,16 +501,16 @@
+ 
+ 
+ @TETEX_BUILD_TRUE at install-exec-hook: xindy
+- at TETEX_BUILD_TRUE@	$(MKDIR_P) "$(DESTDIR)$(prefix)/texmf/scripts/xindy"
++ at TETEX_BUILD_TRUE@	$(MKDIR_P) "$(DESTDIR)$(datadir)/texmf/scripts/xindy"
+ @TETEX_BUILD_TRUE@	-rm -f $(DESTDIR)$(bindir)/xindy $(DESTDIR)$(bindir)/texindy
+- at TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) xindy $(DESTDIR)$(prefix)/texmf/scripts/xindy/xindy.pl
+- at TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) $(srcdir)/texindy $(DESTDIR)$(prefix)/texmf/scripts/xindy/texindy.pl
++ at TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) xindy $(DESTDIR)$(datadir)/texmf/scripts/xindy/xindy.pl
++ at TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) $(srcdir)/texindy $(DESTDIR)$(datadir)/texmf/scripts/xindy/texindy.pl
+ @TETEX_BUILD_TRUE@	if test -d "$(DESTDIR)$(bindir)/../../texmf/scripts/xindy"; then \
+- at TETEX_BUILD_TRUE@	  ln -s ../../texmf/scripts/xindy/xindy.pl $(DESTDIR)$(bindir)/xindy; \
+- at TETEX_BUILD_TRUE@	  ln -s ../../texmf/scripts/xindy/texindy.pl $(DESTDIR)$(bindir)/texindy; \
++ at TETEX_BUILD_TRUE@	  ln -s $(datadir)/texmf/scripts/xindy/xindy.pl $(DESTDIR)$(bindir)/xindy; \
++ at TETEX_BUILD_TRUE@	  ln -s $(datadir)/texmf/scripts/xindy/texindy.pl $(DESTDIR)$(bindir)/texindy; \
+ @TETEX_BUILD_TRUE@	elif test -d "$(DESTDIR)$(bindir)/../texmf/scripts/xindy"; then \
+- at TETEX_BUILD_TRUE@	  ln -s ../texmf/scripts/xindy/xindy.pl $(DESTDIR)$(bindir)/xindy; \
+- at TETEX_BUILD_TRUE@	  ln -s ../texmf/scripts/xindy/texindy.pl $(DESTDIR)$(bindir)/texindy; \
++ at TETEX_BUILD_TRUE@	  ln -s $(datadir)/texmf/scripts/xindy/xindy.pl $(DESTDIR)$(bindir)/xindy; \
++ at TETEX_BUILD_TRUE@	  ln -s $(datadir)/texmf/scripts/xindy/texindy.pl $(DESTDIR)$(bindir)/texindy; \
+ @TETEX_BUILD_TRUE@	else \
+ @TETEX_BUILD_TRUE@	  echo "Error: texmf/scripts/xindy directory not found" >&2; \
+ @TETEX_BUILD_TRUE@	  exit 1; \
diff --git a/latex/texlive/gcc44.patch b/latex/texlive/gcc44.patch
new file mode 100644
index 0000000..fd1fe85
--- /dev/null
+++ b/latex/texlive/gcc44.patch
@@ -0,0 +1,11 @@
+# From http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/texlive/texlive-gcc44.patch?rev=1.1;content-type=text/plain
+--- texlive-20080816-source/libs/teckit/source/Compiler.cpp~	2008-04-25 16:56:15.000000000 +0200
++++ texlive-20080816-source/libs/teckit/source/Compiler.cpp	2009-04-29 15:53:08.413971395 +0200
+@@ -33,6 +33,7 @@
+ #include <iomanip>
+ #include <algorithm>
+ #include <cstring>
++#include <cstdio>
+ 
+ #include "zlib.h"
+ 
diff --git a/latex/texlive/texmf.cnf_fix.patch b/latex/texlive/texmf.cnf_fix.patch
index 5cd1032..64c1cd9 100644
--- a/latex/texlive/texmf.cnf_fix.patch
+++ b/latex/texlive/texmf.cnf_fix.patch
@@ -1,5 +1,5 @@
---- texk/kpathsea/texmf.cnf.orig	2010-07-16 23:51:42.218049253 +0800
-+++ texk/kpathsea/texmf.cnf	2010-07-16 23:54:26.523333022 +0800
+--- texk/kpathsea/texmf.cnf	2009-10-20 01:12:04.000000000 +0200
++++ texk/kpathsea/texmf.cnf	2009-11-10 10:35:25.714694176 +0100
 @@ -53,15 +53,15 @@
  
  % The tree containing the runtime files closely related to the specific



More information about the SM-Commit mailing list