Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (321ae4a9af4a214510d1a4f22d5f1f7a09cae17c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Peng Chang (Charles)" <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (321ae4a9af4a214510d1a4f22d5f1f7a09cae17c)
  • Date: Sat, 17 Jul 2010 08:53:48 -0500

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

latex/texlive-texmf/DETAILS | 10 -
latex/texlive-texmf/HISTORY | 5
latex/texlive-texmf/INSTALL | 1
latex/texlive/BUILD | 13 -
latex/texlive/DEPENDS | 36 ++--
latex/texlive/DETAILS | 10 -
latex/texlive/HISTORY | 15 ++
latex/texlive/INSTALL | 11 +
latex/texlive/PRE_BUILD | 34 ----
latex/texlive/fix_paths.patch | 276
+++++++++++++++++++++++++++++++++++++
latex/texlive/fix_scripts.patch | 22 --
latex/texlive/fix_scripts_2.patch | 29 ---
latex/texlive/gcc44.patch | 11 -
latex/texlive/rename_getline.patch | 45 ------
latex/texlive/texmf.cnf_fix.patch | 14 -
15 files changed, 348 insertions(+), 184 deletions(-)

New commits:
commit 321ae4a9af4a214510d1a4f22d5f1f7a09cae17c
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

texlive: => 20091107

Please help test this update, especially the fix_paths.patch, which is
hand hacked by myself as complete as possible. I believe I didn't miss
anything for everything now goes to /usr/share/texmf{,-dist} instead of
/usr/texmf{,-dist}, and the installed symlinks are also correct. At
least this version of texlive works for my CJK documents.

If you happen to find similar patches from more trusted places, please
replace mine with them.

commit 15562a492af4730a2066cc2ee68608f671f6b39b
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

texlive-texmf: => 20091107

diff --git a/latex/texlive-texmf/DETAILS b/latex/texlive-texmf/DETAILS
index 8e48d40..8a95f0a 100755
--- a/latex/texlive-texmf/DETAILS
+++ b/latex/texlive-texmf/DETAILS
@@ -1,9 +1,9 @@
SPELL=texlive-texmf
- VERSION=20080822
- SOURCE="texlive-${VERSION}-texmf.tar.lzma"
- SOURCE_URL[0]=ftp://tug.org/texlive/historic/2008/${SOURCE}
-
SOURCE_HASH=sha512:4b89770b6e9d9e9efe67fba4e3168f85b2d91cd04608bdeff6edab691c8856117f92a43669ffc0113c3323be1e7ea55053a08bd29390cffd2ab83570197d8a50
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.lzma}"
+ 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_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.xz}"
WEB_SITE="http://www.tug.org/texlive";
LICENSE[0]="LATER"
ENTERED=20090729
diff --git a/latex/texlive-texmf/HISTORY b/latex/texlive-texmf/HISTORY
index 1e437c6..120c3f2 100644
--- a/latex/texlive-texmf/HISTORY
+++ b/latex/texlive-texmf/HISTORY
@@ -1,3 +1,8 @@
+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

diff --git a/latex/texlive-texmf/INSTALL b/latex/texlive-texmf/INSTALL
index 018b761..6d3bf40 100755
--- a/latex/texlive-texmf/INSTALL
+++ b/latex/texlive-texmf/INSTALL
@@ -3,7 +3,6 @@ mkdir -vp $INSTALL_ROOT/usr/share/man/man{1,5} &&
cp -Rv texmf/doc/man/man1/*.1 $INSTALL_ROOT/usr/share/man/man1/ &&
cp -Rv texmf/doc/man/man5/*.5 $INSTALL_ROOT/usr/share/man/man5/ &&
cp -Rv texmf/doc $INSTALL_ROOT/usr/share/doc/texmf/texmf &&
-cp -Rv texmf-doc $INSTALL_ROOT/usr/share/doc/texmf/texmf-doc &&
cp -Rv texmf-dist/doc $INSTALL_ROOT/usr/share/doc/texmf-dist/ &&
cp -Rv texmf $INSTALL_ROOT/usr/share/ &&
cp -Rv texmf-dist $INSTALL_ROOT/usr/share/
diff --git a/latex/texlive/BUILD b/latex/texlive/BUILD
index 76eefc6..4cfc045 100755
--- a/latex/texlive/BUILD
+++ b/latex/texlive/BUILD
@@ -12,15 +12,16 @@ LIBS="-lpng" $SOURCE_DIRECTORY/configure
--prefix=${INSTALL_ROOT}/usr \
--with-pdftex \
--with-tetex \
--with-pdfetex \
- --without-gsftopk \
- --without-xindy \
- --without-etex \
- --without-omega \
- --without-aleph \
- --without-luatex \
+ --disable-gsftopk \
+ --disable-xindy \
+ --disable-etex \
+ --disable-omega \
+ --disable-aleph \
+ --disable-luatex \
--without-graphite \
--disable-multiplatform \
--without-x \
+ --disable-native-texlive-build \
$OPTS &&
make_single &&
make &&
diff --git a/latex/texlive/DEPENDS b/latex/texlive/DEPENDS
index 457f85f..395dc5b 100755
--- a/latex/texlive/DEPENDS
+++ b/latex/texlive/DEPENDS
@@ -6,25 +6,23 @@ depends flex &&
depends expat &&
depends ed &&
depends ghostscript '--with-gs=gs' &&
-depends fontconfig "--with-xetex --with-fontconfig=/usr/lib" &&
-depends freetype2 "--with-system-freetype2
--with-freetype2-include=/usr/include/freetype2" &&
-depends ncurses "--with-system-ncurses --with-ncurses-libdir=/lib
--with-ncurses-include=/usr/include" &&
-depends libpng "--with-system-pnglib --with-pnglib-include=/usr/include
--with-pnglib-libdir=/usr/lib" &&
-depends zlib "--with-system-zlib --with-zlib-libdir=/usr/lib
--with-zlib-include=/usr/include" &&
-depends t1lib "--with-system-t1lib --with-t1lib-libdir=/usr/lib
--with-t1lib-include=/usr/include" &&
-depends gd "--with-system-gd --with-gd-libdir=/usr/lib
--with-gd-include=/usr/include" &&
-depends psutils '--without-psutils' &&
-depends t1utils '--without-t1utils' &&
-depends dialog '--without-dialog' &&
-depends texinfo '--without-texinfo' &&
-runtime_depends detex '--without-detex' &&
-runtime_depends dvi2tty '--without-dvi2tty' &&
-runtime_depends ps2eps '--without-ps2eps' &&
-runtime_depends dvipdfmx "--without-dvipdfm --without-dvipdfmx" &&
-runtime_depends dvipng '--without-dvipng' &&
-runtime_depends lacheck '--without-lacheck' &&
-runtime_depends lcdf-typetools '--without-lcdf-typetools' &&
-suggest_depends XDVI '--without-xdvik' '--without-xdvik' \
+depends fontconfig "--enable-xetex" &&
+depends freetype2 "--with-system-freetype2" &&
+depends libpng "--with-system-libpng --with-libpng-include=/usr/includes
--with-libpng-libdir=/usr/lib" &&
+depends zlib "--with-system-zlib --with-zlib-libdir=/usr/lib
--with-zlib-include=/usr/includes" &&
+depends t1lib "--with-system-t1lib --with-t1lib-libdir=/usr/lib
--with-t1lib-includes=/usr/include" &&
+depends gd "--with-system-gd --with-gd-libdir=/usr/lib
--with-gd-include=/usr/includes" &&
+depends psutils '--disable-psutils' &&
+depends t1utils '--disable-t1utils' &&
+depends dialog '--disable-dialog' &&
+runtime_depends detex '--disable-detex' &&
+runtime_depends dvi2tty '--disable-dvi2tty' &&
+runtime_depends ps2eps '--disable-ps2eps' &&
+runtime_depends dvipdfmx "--disable-dvipdfmx" &&
+runtime_depends dvipng '--disable-dvipng' &&
+runtime_depends lacheck '--disable-lacheck' &&
+runtime_depends lcdf-typetools '--disable-lcdf-typetools' &&
+suggest_depends XDVI '--disable-xdvik' '--disable-xdvik' \
"For an X DVI viewer"
# still beta and possibly broken
#optional_depends lua \
diff --git a/latex/texlive/DETAILS b/latex/texlive/DETAILS
index 38c3213..52a9d93 100755
--- a/latex/texlive/DETAILS
+++ b/latex/texlive/DETAILS
@@ -1,9 +1,9 @@
SPELL=texlive
- VERSION=20080816
- SOURCE="${SPELL}-${VERSION}-source.tar.lzma"
- SOURCE_URL[0]=ftp://tug.org/${SPELL}/historic/2008/${SOURCE}
-
SOURCE_HASH=sha512:b3d8016b05412e48eafa2459d4f9c986a3a1eb2528ee7f16b81611827739764943c31edfec08e45824ac189b5d696aae483caecbfb25e52a964282b51bcaec0f
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.lzma}"
+ VERSION=20091107
+ 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_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.xz}"
WEB_SITE="http://www.tug.org/texlive";
LICENSE[0]="LATER"
ENTERED=20090729
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index b2f155e..e12da8e 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,18 @@
+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)
diff --git a/latex/texlive/INSTALL b/latex/texlive/INSTALL
index 0993f26..27e6abf 100755
--- a/latex/texlive/INSTALL
+++ b/latex/texlive/INSTALL
@@ -1,2 +1,11 @@
default_install &&
-ln -svf mf /usr/bin/mf-nowin
+
+# in version 20091107, texlive does not install wrappers like latex, pdflatex
+# automatically, so copy these files explicitly
+for i in texk/texlive/* ; do
+ if file $i | grep 'script text executable' 2>&1 >/dev/null; then
+ cp -v $i $INSTALL_ROOT/usr/bin
+ fi
+done &&
+
+ln -svf mf $INSTALL_ROOT/usr/bin/mf-nowin
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index e922687..4d44e22 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -4,10 +4,9 @@ verify_file '' &&
xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
cd $SOURCE_DIRECTORY &&
#--
-## these two patches fix the scripts so that it gets
+## this patche fix the Makefile.in's so that everything gets
## installed to FHS locations
-patch -p0 < $SPELL_DIRECTORY/fix_scripts.patch &&
-patch -p0 < $SPELL_DIRECTORY/fix_scripts_2.patch &&
+patch -p1 < $SPELL_DIRECTORY/fix_paths.patch &&
#--
#--
## the sed on the patch is live so it will take into
@@ -15,33 +14,6 @@ patch -p0 < $SPELL_DIRECTORY/fix_scripts_2.patch &&
sed "s:/usr/share:$INSTALL_ROOT/usr/share:g"
$SPELL_DIRECTORY/texmf.cnf_fix.patch | patch -p0 &&
#--
#--
-## getline rename where it's defined
-patch -p0 < $SPELL_DIRECTORY/rename_getline.patch &&
-#--
-#--
-## this has been suggested by Finn Haedicke
-sed -i '/^[^#]*\.p:/ {n; a \
- sed -i "s/getline/tex_getline/g" $@
-}' texk/web2c/Makefile.in &&
-sed -i '/^[^#]*\.p:/ {n; a \
- sed -i "s/getline/tex_getline/g" $@
-}' texk/web2c/omegadir/omega.mk &&
-#--
-#--
-## cleanup all the extra getlines
-sed -i "s/getline/tex_getline/g" texk/web2c/mpware/mpto.c &&
-sed -i "s/getline/tex_getline/g" texk/afm2pl/afm2pl.c &&
-sed -i "s/getline/tex_getline/g" texk/dvipsk/afm2tfm.c &&
-sed -i "s/getline/tex_getline/g" texk/ttf2pk/newobj.h &&
-sed -i "s/getline/tex_getline/g" texk/ttf2pk/newobj.c &&
-sed -i "s/getline/tex_getline/g" texk/ttf2pk/parse.c &&
-#--
## 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}
&&
-
-#
-# Fix compilation with GCC 4.4
-#
-patch $SOURCE_DIRECTORY/libs/teckit/source/Compiler.cpp \
- $SCRIPT_DIRECTORY/gcc44.patch
+rm -rf
libs/{freetype2,lua51,libpng,jpeg,expat,gd,luafilesystem,luafontforge,luamd5,luapeg,luazip,luazlib,ncurses,t1lib,unzip}
diff --git a/latex/texlive/fix_paths.patch b/latex/texlive/fix_paths.patch
new file mode 100644
index 0000000..7b83b12
--- /dev/null
+++ b/latex/texlive/fix_paths.patch
@@ -0,0 +1,276 @@
+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
+-@texlive_build_TRUE@glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist
++@texlive_build_TRUE@glyphlistdir =
${prefix}/share/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 = ${prefix}/share/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 -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@install-exec-hook: xindy
+-@TETEX_BUILD_TRUE@ $(MKDIR_P) "$(DESTDIR)$(prefix)/texmf/scripts/xindy"
++@TETEX_BUILD_TRUE@ $(MKDIR_P)
"$(DESTDIR)$(prefix)/share/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@ 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@ 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@ $(INSTALL_SCRIPT) xindy
$(DESTDIR)$(prefix)/share/texmf/scripts/xindy/xindy.pl
++@TETEX_BUILD_TRUE@ $(INSTALL_SCRIPT) $(srcdir)/texindy
$(DESTDIR)$(prefix)/share/texmf/scripts/xindy/texindy.pl
++@TETEX_BUILD_TRUE@ if test -d
"$(DESTDIR)$(bindir)/../../share/texmf/scripts/xindy"; then \
++@TETEX_BUILD_TRUE@ ln -s ../../share/texmf/scripts/xindy/xindy.pl
$(DESTDIR)$(bindir)/xindy; \
++@TETEX_BUILD_TRUE@ ln -s ../../share/texmf/scripts/xindy/texindy.pl
$(DESTDIR)$(bindir)/texindy; \
++@TETEX_BUILD_TRUE@ elif test -d
"$(DESTDIR)$(bindir)/../share/texmf/scripts/xindy"; then \
++@TETEX_BUILD_TRUE@ ln -s ../share/texmf/scripts/xindy/xindy.pl
$(DESTDIR)$(bindir)/xindy; \
++@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.patch b/latex/texlive/fix_scripts.patch
deleted file mode 100644
index 041145b..0000000
--- a/latex/texlive/fix_scripts.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- texk/texlive/Makefile.in.orig 2009-08-05 18:57:18.000000000 +0200
-+++ texk/texlive/Makefile.in 2009-08-05 18:57:43.000000000 +0200
-@@ -107,15 +107,10 @@
- target=$(scriptdir)/`basename $$s | sed 's,\.[^/]*$$,,' | tr
'[A-Z]' '[a-z]'`; \
- target=$$target; \
- rm -f $$target; \
-- case "$(scriptdir)" in \
-- */bin) d=..;; \
-- */bin/*) d=../..;; \
-- *) echo "$(scriptdir): strange directory for linked scripts" >&2;\
-- exit 1;; \
-- esac; \
-- $(SHELL) $(srcdir)/../mkinstalldirs $(prefix)/`dirname $$s`; \
-- $(INSTALL_SCRIPT) $(srcdir)/linked_scripts/`basename $$s`
$(prefix)/$$s; \
-- ln -s $$d/$$s $$target; \
-+ d=../share/; \
-+ $(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/`dirname $$s`; \
-+ $(INSTALL_SCRIPT) $(srcdir)/linked_scripts/`basename $$s`
$(datadir)/$$s; \
-+ ln -vs $$d/$$s $$target; \
- done
- rm -f $(scriptdir)/getnonfreefonts-sys
- ln -s getnonfreefonts $(scriptdir)/getnonfreefonts-sys
diff --git a/latex/texlive/fix_scripts_2.patch
b/latex/texlive/fix_scripts_2.patch
deleted file mode 100644
index 88f1d39..0000000
--- a/latex/texlive/fix_scripts_2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- texk/tex4htk/Makefile.in.orig 2009-08-05 19:17:14.000000000 +0200
-+++ texk/tex4htk/Makefile.in 2009-08-05 19:18:01.000000000 +0200
-@@ -32,19 +32,19 @@
- install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-- $(INSTALL) -d "$(prefix)/texmf-dist/scripts/tex4ht"
-- for p in $(shell_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p
"$(prefix)/texmf-dist/scripts/tex4ht/$$p.sh"; done
-- for p in $(perl_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p
"$(prefix)/texmf-dist/scripts/tex4ht/$$p.pl"; done
-+ $(INSTALL) -d "$(datadir)/texmf-dist/scripts/tex4ht"
-+ for p in $(shell_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p
"$(datadir)/texmf-dist/scripts/tex4ht/$$p.sh"; done
-+ for p in $(perl_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p
"$(datadir)/texmf-dist/scripts/tex4ht/$$p.pl"; done
- if test -d "$(bindir)/../../texmf-dist/scripts/tex4ht"; then \
- d=../../texmf-dist/scripts/tex4ht; \
-- elif test -d "$(bindir)/../texmf-dist/scripts/tex4ht"; then \
-- d=../texmf-dist/scripts/tex4ht; \
-+ elif test -d "$(bindir)/../share/texmf-dist/scripts/tex4ht"; then \
-+ d=../share/texmf-dist/scripts/tex4ht; \
- else \
- echo "Error: texmf-dist/scripts/tex4ht directory not found" >&2; \
- exit 1; \
- fi; \
-- for p in $(shell_scripts); do rm -f $(bindir)/$$p; ln -s $$d/$$p.sh
$(bindir)/$$p; done; \
-- for p in $(perl_scripts); do rm -f $(bindir)/$$p; ln -s $$d/$$p.pl
$(bindir)/$$p; done
-+ for p in $(shell_scripts); do rm -f $(bindir)/$$p; ln -vs $$d/$$p.sh
$(bindir)/$$p; done; \
-+ for p in $(perl_scripts); do rm -f $(bindir)/$$p; ln -vs $$d/$$p.pl
$(bindir)/$$p; done
-
- uninstall-exec:
- for p in $(programs) $(scripts); do rm -f $(bindir)/$$p; done
diff --git a/latex/texlive/gcc44.patch b/latex/texlive/gcc44.patch
deleted file mode 100644
index fd1fe85..0000000
--- a/latex/texlive/gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/rename_getline.patch
b/latex/texlive/rename_getline.patch
deleted file mode 100644
index fb7cd9b..0000000
--- a/latex/texlive/rename_getline.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- texk/web2c/tangleboot.p.orig 2009-08-06 13:53:53.000000000 +0200
-+++ texk/web2c/tangleboot.p 2009-08-06 13:54:25.000000000 +0200
-@@ -577,7 +577,7 @@
- if not inputln(webfile)then begin begin writeln(stdout);
- write(stdout,'! WEB file ended during a change');error;end;
- inputhasended:=true;goto 10;end;if linesdontmatch then n:=n+1;end;
--10:end;{:132}{135:}procedure getline;label 20;
-+10:end;{:132}{135:}procedure tex_getline;label 20;
- begin 20:if changing then{137:}begin line:=line+1;
- if not inputln(changefile)then begin begin writeln(stdout);
- write(stdout,'! Change file ended without @z');error;end;buffer[0]:=64;
-@@ -604,13 +604,13 @@
- 60:controlcode:=135;61:controlcode:=2;92:controlcode:=3;
- others:controlcode:=0 end;end;{:139}{140:}function skipahead:eightbits;
- label 30;var c:eightbits;
--begin while true do begin if loc>limit then begin getline;
-+begin while true do begin if loc>limit then begin tex_getline;
- if inputhasended then begin c:=136;goto 30;end;end;buffer[limit+1]:=64;
- while buffer[loc]<>64 do loc:=loc+1;if loc<=limit then begin loc:=loc+2;
- c:=controlcode(buffer[loc-1]);if(c<>0)or(buffer[loc-1]=62)then goto 30;
- end;end;30:skipahead:=c;end;{:140}{141:}procedure skipcomment;label 10;
- var bal:eightbits;c:ASCIIcode;begin bal:=0;
--while true do begin if loc>limit then begin getline;
-+while true do begin if loc>limit then begin tex_getline;
- if inputhasended then begin begin writeln(stdout);
- write(stdout,'! Input ended in mid-comment');error;end;goto 10;end;end;
- c:=buffer[loc];loc:=loc+1;{142:}if c=64 then begin c:=buffer[loc];
-@@ -622,7 +622,7 @@
- then bal:=bal+1 else if c=125 then begin if bal=0 then goto 10;
- bal:=bal-1;end{:142};end;10:end;{:141}{145:}function getnext:eightbits;
- label 20,30,31;var c:eightbits;d:eightbits;j,k:0..longestname;
--begin 20:if loc>limit then begin getline;
-+begin 20:if loc>limit then begin tex_getline;
- if inputhasended then begin c:=136;goto 31;end;end;c:=buffer[loc];
- loc:=loc+1;
- if scanninghex then{146:}if((c>=48)and(c<=57))or((c>=65)and(c<=70))then
-@@ -647,7 +647,7 @@
- 64:{150:}begin c:=controlcode(buffer[loc]);loc:=loc+1;
- if c=0 then goto 20 else if c=13 then scanninghex:=true else if c=135
- then{151:}begin{153:}k:=0;
--while true do begin if loc>limit then begin getline;
-+while true do begin if loc>limit then begin tex_getline;
- if inputhasended then begin begin writeln(stdout);
- write(stdout,'! Input ended in section name');error;end;goto 30;end;end;
- d:=buffer[loc];{154:}if d=64 then begin d:=buffer[loc+1];
diff --git a/latex/texlive/texmf.cnf_fix.patch
b/latex/texlive/texmf.cnf_fix.patch
index 0affb71..5cd1032 100644
--- a/latex/texlive/texmf.cnf_fix.patch
+++ b/latex/texlive/texmf.cnf_fix.patch
@@ -1,6 +1,6 @@
---- texk/kpathsea/texmf.cnf.orig 2009-08-06 10:33:17.000000000 +0200
-+++ texk/kpathsea/texmf.cnf 2009-08-06 10:34:21.000000000 +0200
-@@ -44,18 +44,18 @@
+--- 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
+@@ -53,15 +53,15 @@

% The tree containing the runtime files closely related to the specific
% program version used:
@@ -11,10 +11,6 @@
-TEXMFDIST = $SELFAUTOPARENT/texmf-dist
+TEXMFDIST = /usr/share/texmf-dist

- % Our documentation-only tree, arranged by language:
--TEXMFDOC = $SELFAUTOPARENT/texmf-doc
-+TEXMFDOC = /usr/share/texmf-doc
-
% 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.
@@ -23,7 +19,7 @@

% TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
% With teTeX-3.0 or later, this must be set.
-@@ -63,7 +63,7 @@
+@@ -69,7 +69,7 @@
% TEXMFSYSVAR = $TEXMFMAIN
% For using a separate tree:
% TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
@@ -32,7 +28,7 @@

% TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
% With teTeX-3.0 or later, this must be set.
-@@ -71,7 +71,7 @@
+@@ -77,7 +77,7 @@
% TEXMFSYSCONFIG = $TEXMFMAIN
% For using a separate tree:
% TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config




Archive powered by MHonArc 2.6.24.

Top of Page