Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (214b2f0fb950cfda56d927a34f8b8f5a7bd240dd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (214b2f0fb950cfda56d927a34f8b8f5a7bd240dd)
  • Date: Wed, 7 Sep 2011 06:32:02 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

latex/texlive-texmf/DETAILS | 4
latex/texlive-texmf/HISTORY | 3
latex/texlive/DETAILS | 4
latex/texlive/HISTORY | 7
latex/texlive/PRE_BUILD | 3
latex/texlive/fix_scripts_3.patch | 291
+++++---------------------------------
latex/texlive/texmf.cnf_fix.patch | 53 ++----
7 files changed, 79 insertions(+), 286 deletions(-)

New commits:
commit 214b2f0fb950cfda56d927a34f8b8f5a7bd240dd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

texlive: Fix patches for the upgrade

commit 0d3251779bd4287b9c5ec7b88775f71afbcabc60
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

texlive: update spell to 20110705

commit 847f156c1514864d1a842f155711b10639a8548a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

texlive-texmf: update spell to 20110705

diff --git a/latex/texlive-texmf/DETAILS b/latex/texlive-texmf/DETAILS
index 7f48359..05dc9ec 100755
--- a/latex/texlive-texmf/DETAILS
+++ b/latex/texlive-texmf/DETAILS
@@ -1,8 +1,8 @@
SPELL=texlive-texmf
- VERSION=20091107
+ VERSION=20110705
SOURCE="texlive-${VERSION}-texmf.tar.xz"
SOURCE_URL[0]=ftp://tug.org/texlive/historic/${VERSION:0:4}/${SOURCE}
-
SOURCE_HASH=sha512:42c062a4a39551a8e8e7da400a67064ec943a1bee1cd9f9b141fa01b204f206cf817762248891461551492fd1253768d33019acb99781348b10cb7e013f1be4a
+
SOURCE_HASH=sha512:80cd946980f93aaee698b2c1fe668934c9378dbc9383bcac209e443b49b631c206c8cf7c7f53db26db392626521bb21aa7ceae5bff0255ecf78a397bcdcbfe0a
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 8bd90b6..1b1cc3f 100644
--- a/latex/texlive-texmf/HISTORY
+++ b/latex/texlive-texmf/HISTORY
@@ -1,3 +1,6 @@
+2011-09-05 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 20110705
+
2010-08-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PREPARE: added explanation and queries for size saving
* PRE_BUILD: remove the extra pdfs if requested
diff --git a/latex/texlive/DETAILS b/latex/texlive/DETAILS
index 1875ff6..297efad 100755
--- a/latex/texlive/DETAILS
+++ b/latex/texlive/DETAILS
@@ -1,8 +1,8 @@
SPELL=texlive
- VERSION=20091107
+ VERSION=20110705
SOURCE="${SPELL}-${VERSION}-source.tar.xz"
SOURCE_URL[0]=ftp://tug.org/${SPELL}/historic/${VERSION:0:4}/${SOURCE}
-
SOURCE_HASH=sha512:6e0761bb587f5574be7a3ae0d147827b11ef2194c4594727979f622bbfe332a428a35c10c62919a3f798c6df0f4a1e701afc61707b4b7905d4af9718ae7986b1:UPSTREAM_HASH
+
SOURCE_HASH=sha512:1efb5713bf80379f5104b41576911a4194d378ce35be5afb568c3b4aff6461b2b22e72fb34bc294021cf14a28d07bab083872f17752441f269f36c50f9363cc1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.xz}"
WEB_SITE="http://www.tug.org/texlive";
LICENSE[0]="LPPL GPL"
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index f33752e..1cbec3f 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,10 @@
+2011-09-07 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, fix_scripts_3.patch, texmf.cnf_fix.patch:
+ Fixed patches for the upgrade
+
+2011-09-05 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 20110705
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index e3bd397..b90a4a0 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -6,12 +6,13 @@ cd $SOURCE_DIRECTORY &&
#--
## this patche fix the Makefile.in's so that everything gets
## installed to FHS locations
+sed -i 's:\(\$.\)prefix\(./tex\):\1datadir\2:' $(find -name Makefile.in) &&
patch -p1 < $SPELL_DIRECTORY/fix_scripts_3.patch &&
#--
#--
## the sed on the patch is live so it will take into
## account INSTALL_ROOT
-sed "s:/usr/share:$INSTALL_ROOT/usr/share:g"
$SPELL_DIRECTORY/texmf.cnf_fix.patch | patch -p0 &&
+patch -p1 < $SPELL_DIRECTORY/texmf.cnf_fix.patch &&
#--
#--
## removing as much internal things as possible
diff --git a/latex/texlive/fix_scripts_3.patch
b/latex/texlive/fix_scripts_3.patch
index 26f8189..4ab3125 100644
--- a/latex/texlive/fix_scripts_3.patch
+++ b/latex/texlive/fix_scripts_3.patch
@@ -1,262 +1,59 @@
-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
--@texlive_build_TRUE@glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist
-+@texlive_build_TRUE@glyphlistdir = ${datadir}/texmf-dist/fonts/map/glyphlist
- @texlive_build_TRUE@glyphlist_DATA = glyphlist.txt texglyphlist.txt
--@texlive_build_TRUE@encdir = ${prefix}/texmf-dist/fonts/enc/dvips/base
-+@texlive_build_TRUE@encdir = ${datadir}/texmf-dist/fonts/enc/dvips/base
- @texlive_build_TRUE@enc_DATA = 7t.enc
- @texlive_build_FALSE@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 @@
+--- a/texk/tetex/Makefile.in
++++ b/texk/tetex/Makefile.in
+@@ -254,7 +254,7 @@ dist_man5_MANS = \
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
+--- a/texk/tex4htk/Makefile.in
++++ b/texk/tex4htk/Makefile.in
+@@ -269,7 +269,7 @@ nodist_bin_SCRIPTS = $(am__append_1)
+ all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
+ @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
+ @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript =
$(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+-texmfdir = ${prefix}/$(scriptsdir)
++texmfdir = ${datadir}/$(scriptsdir)
+ dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
+ @WIN32_TRUE@dist_bin_SCRIPTS = $(shell_scripts:=.bat)
+ CLEANFILES = $(nodist_bin_SCRIPTS)
+@@ -992,8 +992,8 @@ install-shell-links:
+ # We support both multiplatform and non-multiplatform builds.
+ install-links:
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; \
+- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT)
make-links;; \
+- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT)
make-links;; \
++ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=../share TYPE=$(TYPE) EXT=$(EXT)
make-links;; \
++ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../../share TYPE=$(TYPE)
EXT=$(EXT) make-links;; \
+ *) echo "strange directory '$(bindir)' for linked $(TYPE) 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 && \
+--- a/texk/texlive/linked_scripts/Makefile.in
++++ b/texk/texlive/linked_scripts/Makefile.in
+@@ -620,8 +620,8 @@ install-data-hook:
+ @WIN32_TRUE@ $(INSTALL_SCRIPT) $(runscript)
$(DESTDIR)$(bindir)/$$link.exe || exit 1; \
+ @WIN32_TRUE@ done
+ @WIN32_FALSE@ case "$(bindir)" in \
+-@WIN32_FALSE@ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+-@WIN32_FALSE@ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
++@WIN32_FALSE@ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=../share install-links;;
\
++@WIN32_FALSE@ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../../share
install-links;; \
+ @WIN32_FALSE@ *) echo "strange directory '$(bindir)' for linked scripts"
>&2; \
+ @WIN32_FALSE@ exit 1;; \
+ @WIN32_FALSE@ esac
+@@ -650,11 +650,7 @@ install-links:
+ echo "creating link '$$link' -> '$$file'"; \
+ $(LN_S) $$file $$link || exit 1; \
+ done && \
- rm -f man && \
-- echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
-- (ln -s $(REL)/texmf/doc/man man || :)
+- if test -d $(REL)/texmf/doc/man; then \
+- echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
+- (ln -s $(REL)/texmf/doc/man man || :); \
+- else :; fi
+ 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@install-exec-hook: xindy
--@TETEX_BUILD_TRUE@ $(MKDIR_P) "$(DESTDIR)$(prefix)/texmf/scripts/xindy"
-+@TETEX_BUILD_TRUE@ $(MKDIR_P) "$(DESTDIR)$(datadir)/texmf/scripts/xindy"
- @TETEX_BUILD_TRUE@ -rm -f $(DESTDIR)$(bindir)/xindy
$(DESTDIR)$(bindir)/texindy
--@TETEX_BUILD_TRUE@ $(INSTALL_SCRIPT) xindy
$(DESTDIR)$(prefix)/texmf/scripts/xindy/xindy.pl
--@TETEX_BUILD_TRUE@ $(INSTALL_SCRIPT) $(srcdir)/texindy
$(DESTDIR)$(prefix)/texmf/scripts/xindy/texindy.pl
-+@TETEX_BUILD_TRUE@ $(INSTALL_SCRIPT) xindy
$(DESTDIR)$(datadir)/texmf/scripts/xindy/xindy.pl
-+@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 \
--@TETEX_BUILD_TRUE@ ln -s ../../texmf/scripts/xindy/xindy.pl
$(DESTDIR)$(bindir)/xindy; \
--@TETEX_BUILD_TRUE@ ln -s ../../texmf/scripts/xindy/texindy.pl
$(DESTDIR)$(bindir)/texindy; \
-+@TETEX_BUILD_TRUE@ ln -s $(datadir)/texmf/scripts/xindy/xindy.pl
$(DESTDIR)$(bindir)/xindy; \
-+@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 \
--@TETEX_BUILD_TRUE@ ln -s ../texmf/scripts/xindy/xindy.pl
$(DESTDIR)$(bindir)/xindy; \
--@TETEX_BUILD_TRUE@ ln -s ../texmf/scripts/xindy/texindy.pl
$(DESTDIR)$(bindir)/texindy; \
-+@TETEX_BUILD_TRUE@ ln -s $(datadir)/texmf/scripts/xindy/xindy.pl
$(DESTDIR)$(bindir)/xindy; \
-+@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; \
+ @for s in $(nobase_dist_texmf_scripts_SCRIPTS)
$(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
diff --git a/latex/texlive/texmf.cnf_fix.patch
b/latex/texlive/texmf.cnf_fix.patch
index 64c1cd9..b673c4f 100644
--- a/latex/texlive/texmf.cnf_fix.patch
+++ b/latex/texlive/texmf.cnf_fix.patch
@@ -1,39 +1,24 @@
---- 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 @@
+--- a/texk/kpathsea/texmf.cnf
++++ b/texk/kpathsea/texmf.cnf
+@@ -49,7 +49,7 @@
+ % (http://tug.org/tds), or files may not be found.
+ %
+ % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
+-TEXMFROOT = $SELFAUTOPARENT
++TEXMFROOT = $SELFAUTOPARENT/share

- % The tree containing the runtime files closely related to the specific
- % program version used:
--TEXMFMAIN = $SELFAUTOPARENT/texmf
-+TEXMFMAIN = /usr/share/texmf
+ % The tree containing runtime files related to the specific
+ % distribution and version.
+@@ -59,10 +59,10 @@ TEXMFMAIN = $TEXMFROOT/texmf
+ TEXMFDIST = $TEXMFROOT/texmf-dist

- % The main distribution tree:
--TEXMFDIST = $SELFAUTOPARENT/texmf-dist
-+TEXMFDIST = /usr/share/texmf-dist
+ % Local additions to the distribution trees.
+-TEXMFLOCAL = $TEXMFROOT/../texmf-local
++TEXMFLOCAL = $TEXMFROOT/texmf-local

- % A place for local additions to a "standard" texmf tree.
- % This tree is not used for local configuration maintained by
- % texconfig, it uses TEXMFCONFIG below.
--TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local
-+TEXMFLOCAL = /usr/share/texmf-local
-
- % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
- % With teTeX-3.0 or later, this must be set.
-@@ -69,7 +69,7 @@
- % TEXMFSYSVAR = $TEXMFMAIN
- % For using a separate tree:
- % TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
--TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
+ % TEXMFSYSVAR, where *-sys store cached runtime data.
+-TEXMFSYSVAR = $TEXMFROOT/texmf-var
+TEXMFSYSVAR = /var/tmp/texmf-var

- % TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
- % With teTeX-3.0 or later, this must be set.
-@@ -77,7 +77,7 @@
- % TEXMFSYSCONFIG = $TEXMFMAIN
- % For using a separate tree:
- % TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
--TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
-+TEXMFSYSCONFIG = /usr/share/texmf-config
-
- % User texmf trees are allowed as follows.
- % This used to be HOMETEXMF.
+ % TEXMFSYSCONFIG, where *-sys store configuration data.
+ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (214b2f0fb950cfda56d927a34f8b8f5a7bd240dd), Ismael Luceno, 09/07/2011

Archive powered by MHonArc 2.6.24.

Top of Page