sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (6d02e42ed516ee3716ff3dc42fceb6c73caa05d8)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (6d02e42ed516ee3716ff3dc42fceb6c73caa05d8)
- Date: Mon, 31 Oct 2011 13:07:45 -0500
GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:
audio-players/xmms2/CONFIGURE | 8 --
audio-players/xmms2/DEPENDS | 4 -
audio-players/xmms2/DETAILS | 4 -
audio-players/xmms2/HISTORY | 6 +
audio-players/xmms2/PRE_BUILD | 10 +-
collab/subversion/BUILD | 1
collab/subversion/CONFIGURE | 3
collab/subversion/DEPENDS | 6 +
collab/subversion/HISTORY | 3
collab/subversion/INSTALL | 1
graphics/fotoxx/DETAILS | 5 -
graphics/fotoxx/HISTORY | 6 +
graphics/gmic/DETAILS | 1
graphics/gmic/HISTORY | 3
kde4-look/qtcurve-gtk2/DETAILS | 4 -
kde4-look/qtcurve-gtk2/HISTORY | 3
kde4-support/phonon/DETAILS | 7 -
kde4-support/phonon/HISTORY | 4 +
kde4-support/phonon/PRE_BUILD | 6 +
latex/texlive-texmf/HISTORY | 7 +
latex/texlive-texmf/PRE_BUILD | 10 ++
latex/texlive-texmf/texmfcnf.lua_fix.patch | 20 +++++
latex/texlive/09-texlive-fonts.conf | 10 ++
latex/texlive/BUILD | 4 -
latex/texlive/DEPENDS | 19 +---
latex/texlive/HISTORY | 27 ++++++
latex/texlive/INSTALL | 40 ++++++----
latex/texlive/PRE_BUILD | 29 ++++---
latex/texlive/fix_paths.patch | 112
+++++++++++++++++++++++++++++
latex/texlive/fix_scripts_3.patch | 59 ---------------
latex/texlive/mtxrun_fix.patch | 26 ++++++
latex/texlive/texmf.cnf_fix.patch | 8 +-
32 files changed, 327 insertions(+), 129 deletions(-)
New commits:
commit 053c2414c478d6efce4b80e10666e05222a8fc5c
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
qtcurve-gtk2: updated spell to 1.8.12
commit da7cbc82512831c0e9944223bbfff46c9bdb52a6
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>
fotoxx: update to 11.10
commit 15d88fa9d8256f3c09201c9ec001f96ecb9bb3fe
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>
xmms2: update to 0.8DrO_o
commit 9c0ccf129d82db2c845091ca35cc4633e5b610f3
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
gmic: added "old" url as SOURCE_URL[1]
commit 1052d0b61bcb39c5077093807ce4791ed7d44ad0
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
fotoxx: added archive url as SOURCE_URL[1]
commit 3de8c2bdee933992abe00c4febdfa564f3192f36
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
phonon: updated spell to 4.5.1 (.bz2 -> .xz)
commit 2dd412772a9ffdab1c7b2d40e6775135e0d994ba
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>
texlive-texmf: fix paths for LuaTeX and ConTeXt
removed texmf.cnf so the version supplied with the texlive spell is used
commit 735e80d24fc49c0b690ae4b2ecd728f5212c659f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>
texlive: fix for luatex and context
Change TEXMFLOCAL to /usr/local/share/texmf
BUILD:
- added banner configure option
DEPENDS:
- clean up depends for luatex
- added suggest_depends for RUBY and perl
INSTALL:
- Move old TEXMFLOCAL to new (/usr/share/texmf-local to
/usr/local/share/texmf)
- Explicitly define texlinks format file and destination so it reinstalls
correctly recreate the filename DB and create the proper formats
- install fontconfig conf file and regenerate fontconfig cache - needed
for XeTeX and XeLaTeX
- If luatex is installed, generate files and fonts for ConTeXt and LuaTeX
PRE_BUILD:
- use sed to edit files to use /usr/share/texmf and /usr/share/texmf-dist
- patch mtxrun for luatex
FINAL:
- added
- notify user of TEXMFLOCAL change
see HISTORY for more info
commit 2da306a75e5773bde4f994bb7e07dad350dd7ac1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
subversion: JAVA bindings added (javahl)
diff --git a/audio-players/xmms2/CONFIGURE b/audio-players/xmms2/CONFIGURE
index 656f288..bab1c79 100755
--- a/audio-players/xmms2/CONFIGURE
+++ b/audio-players/xmms2/CONFIGURE
@@ -3,6 +3,8 @@ XMMS2_OPTS="${XMMS2_OPTS/--without-xmms2d=0/--with-xmms2d}"
XMMS2_OPTS="${XMMS2_OPTS/--without-xmms2d=1/--without-xmms2d}"
XMMS2_OPTS="${XMMS2_OPTS/--with-plugins=lastfm,lastfmeta,curl}"
XMMS2_OPTS="${XMMS2_OPTS/--with-plugins=lastfm,lastfmeta,curl}"
+XMMS2_OPTS="${XMMS2_OPTS/--with-optionals=cli/--with-optionals=nycli}"
+XMMS2_OPTS="${XMMS2_OPTS/--without-optionals=cli/--without-optionals=nycli}"
message "NOTE: not all of these options might be relevant to your selected"
&&
message "tree and version but they don't affect anything or in other words"
&&
message "NOTHING WILL BREAK IF IT ISN'T SUPPORTED" &&
@@ -163,12 +165,6 @@ config_query_option XMMS2_OPTS
\
"--with-plugins=karaoke" \
"--without-plugins=karaoke"
fi &&
-
-config_query_option XMMS2_OPTS \
- "Do you want to build the cli client" \
- y \
- "--with-optionals=cli" \
- "--without-optionals=cli" &&
config_query_option XMMS2_OPTS \
"Do you want to build the new cli client" \
y \
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index a53dd0f..a6df3fe 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -119,11 +119,11 @@ depends curl
depends libsamplerate &&
depends fftw
fi
-fi &&
optional_depends libofa \
"--with-plugins=ofa" \
"--without-plugins=ofa" \
- "For acoustic fingerprint plugin." &&
+ "For acoustic fingerprint plugin."
+fi &&
#Clients &&
optional_depends gamin \
diff --git a/audio-players/xmms2/DETAILS b/audio-players/xmms2/DETAILS
index fde5c73..8c39762 100755
--- a/audio-players/xmms2/DETAILS
+++ b/audio-players/xmms2/DETAILS
@@ -13,11 +13,11 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${XMMS2_TREE}
FORCE_DOWNLOAD=ON
SOURCE_IGNORE=volatile
else
- VERSION=0.7DrNo
+ VERSION=0.8DrO_o
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:e991c0c5d598ccfd868b81ae932255352bd3be014f86e05f1fa782d240b7ce059054cad746cf52c8c383058feba1fdf5675c43ec6495955c06b6e5e9f949ca01
+
SOURCE_HASH=sha512:478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8
fi
WEB_SITE=http://wiki.xmms2.xmms.se/index.php/Main_Page
ENTERED=20040527
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index 9f4e461..6c90a3c 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,9 @@
+2011-10-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 0.8DrO_o
+ * PRE_BUILD: no more patching
+ * CONFIGURE: no more old cli
+ * DEPENDS: move one dependency into the daemon if
+
2010-04-02 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: Only apply the wscript for mpg123 1.11.0 .
This is subject to removal once we are sure that this version
diff --git a/audio-players/xmms2/PRE_BUILD b/audio-players/xmms2/PRE_BUILD
index b7586d2..6ca446b 100755
--- a/audio-players/xmms2/PRE_BUILD
+++ b/audio-players/xmms2/PRE_BUILD
@@ -3,9 +3,9 @@ cd $SOURCE_DIRECTORY &&
unpack_file &&
cd xmms* &&
echo -e "#!/bin/sh\ncd xmms*\n./waf configure --help" > ../configure &&
-chmod +x ../configure &&
-patch -p0 < $SPELL_DIRECTORY/fix_flags.diff &&
+chmod +x ../configure
+#patch -p0 < $SPELL_DIRECTORY/fix_flags.diff &&
# Be prepared for mpg123 == 1.11.0, newer mpg123 does not need this.
-if spell_ok mpg123 && [[ $(installed_version mpg123) == 1.11.0 ]]; then
- cp -v "$SCRIPT_DIRECTORY/xmms2-0.6_and_0.7_mpg123-wscript"
src/plugins/mpg123/wscript
-fi
+#if spell_ok mpg123 && [[ $(installed_version mpg123) == 1.11.0 ]]; then
+# cp -v "$SCRIPT_DIRECTORY/xmms2-0.6_and_0.7_mpg123-wscript"
src/plugins/mpg123/wscript
+#fi
diff --git a/collab/subversion/BUILD b/collab/subversion/BUILD
index b927664..d0aff2f 100755
--- a/collab/subversion/BUILD
+++ b/collab/subversion/BUILD
@@ -38,6 +38,7 @@ if [[ "$SVN_PERL" == y ]]; then
fi &&
if [[ "$SVN_PYTHON" == y ]]; then make swig-py; fi &&
if [[ "$SVN_RUBY" == y ]]; then make swig-rb; fi &&
+if [[ "$SVN_JAVA" == y ]]; then make javahl; fi &&
# Test if built from current source
if [[ "$SVN_HEAD" == y ]] && spell_ok python; then
diff --git a/collab/subversion/CONFIGURE b/collab/subversion/CONFIGURE
index 2c0cc84..3969da5 100755
--- a/collab/subversion/CONFIGURE
+++ b/collab/subversion/CONFIGURE
@@ -5,4 +5,5 @@ function spell_ok_yesno {
config_query SVN_PERL 'Install Subversion bindings for Perl?'
$(spell_ok_yesno perl) &&
config_query SVN_PYTHON 'Install Subversion bindings for Python?'
$(spell_ok_yesno python) &&
-config_query SVN_RUBY 'Install Subversion bindings for Ruby?'
$(spell_ok_yesno ruby)
+config_query SVN_RUBY 'Install Subversion bindings for Ruby?'
$(spell_ok_yesno ruby) &&
+config_query SVN_JAVA 'Install Subversion bindings for JAVA?'
$(spell_ok_yesno JAVA)
diff --git a/collab/subversion/DEPENDS b/collab/subversion/DEPENDS
index 60fe6fc..6abdd5f 100755
--- a/collab/subversion/DEPENDS
+++ b/collab/subversion/DEPENDS
@@ -12,13 +12,15 @@ fi &&
if [[ "$SVN_PERL" == y ]] \
|| [[ "$SVN_PYTHON" == y ]] \
- || [[ "$SVN_RUBY" == y ]]
+ || [[ "$SVN_RUBY" == y ]] \
+ || [[ "$SVN_JAVA" == y ]]
then
depends swig '--with-swig' &&
if [[ "$SVN_PERL" == y ]]; then depends perl; fi &&
if [[ "$SVN_PYTHON" == y ]]; then depends python; fi &&
- if [[ "$SVN_RUBY" == y ]]; then depends RUBY; fi
+ if [[ "$SVN_RUBY" == y ]]; then depends RUBY; fi &&
+ if [[ "$SVN_JAVA" == y ]]; then depends JAVA; fi
fi &&
optional_depends zlib '--with-zlib=/usr' '--without-zlib' 'for stream
compression support' &&
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index fbda294..31bc532 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2011-10-30 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFIGURE, DEPENDS, BUILD, INSTALL: JAVA bindings added (javahl)
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 4E24517C.gpg: added gpg keyring
diff --git a/collab/subversion/INSTALL b/collab/subversion/INSTALL
index 542a0cd..ac3ddcc 100755
--- a/collab/subversion/INSTALL
+++ b/collab/subversion/INSTALL
@@ -3,6 +3,7 @@ default_install &&
if [[ "$SVN_PERL" == y ]]; then make install-swig-pl; fi &&
if [[ "$SVN_PYTHON" == y ]]; then make install-swig-py; fi &&
if [[ "$SVN_RUBY" == y ]]; then make install-swig-rb; fi &&
+if [[ "$SVN_JAVA" == y ]]; then make install-javahl; fi &&
make_normal &&
if [[ -d "$INSTALL_ROOT/etc/httpd" ]]; then
diff --git a/graphics/fotoxx/DETAILS b/graphics/fotoxx/DETAILS
index 8f07511..49e7372 100755
--- a/graphics/fotoxx/DETAILS
+++ b/graphics/fotoxx/DETAILS
@@ -1,8 +1,9 @@
SPELL=fotoxx
- VERSION=11.09
+ VERSION=11.10
SOURCE="${SPELL}-$VERSION.tar.gz"
SOURCE_URL[0]=http://kornelix.squarespace.com/storage/downloads/${SOURCE}
-
SOURCE_HASH=sha512:3a68dc535b97efffbec871d7aeb975591775d69cb986affc9c86d175fb1e277881847ae31bf5c0df9b403da0135e7a1c5d7879e8a20493961ace63a319f3538a
+ SOURCE_URL[1]=http://kornelix.squarespace.com/storage/archive/${SOURCE}
+
SOURCE_HASH=sha512:ddc0db1ccc7a50b71982b57961914676c8160a8974202639941fea11bca21615eea5e237cd8baaf737057e57ebbc7a1cb62a1d5ca0a15566012d2b033531bffa
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
WEB_SITE="http://kornelix.squarespace.com/fotoxx";
LICENSE[0]=GPL
diff --git a/graphics/fotoxx/HISTORY b/graphics/fotoxx/HISTORY
index b2863a5..0f20f6e 100644
--- a/graphics/fotoxx/HISTORY
+++ b/graphics/fotoxx/HISTORY
@@ -1,3 +1,9 @@
+2011-10-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 11.10
+
+2011-10-31 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: added archive url as SOURCE_URL[1]
+
2011-09-20 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 11.09
* INSTALL: fixed for update
diff --git a/graphics/gmic/DETAILS b/graphics/gmic/DETAILS
index 6023eef..71c635b 100755
--- a/graphics/gmic/DETAILS
+++ b/graphics/gmic/DETAILS
@@ -2,6 +2,7 @@
VERSION=1.5.0.4
SOURCE="${SPELL}_${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SOURCE}
+ SOURCE_URL[1]=$SOURCEFORGE_URL/project/${SPELL}/old/${SOURCE}
SOURCE_HASH=sha512:35b37dd257e0b9558ea04a3886f39af6adece219fe6390917a90fcbfedde356ddd8301e53f90bcff60d986de7822e79cf3c2372e06b997a4763cde3349c021c6
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://gmic.sourceforge.net/";
diff --git a/graphics/gmic/HISTORY b/graphics/gmic/HISTORY
index f3cbd13..4b67b42 100644
--- a/graphics/gmic/HISTORY
+++ b/graphics/gmic/HISTORY
@@ -1,3 +1,6 @@
+2011-10-31 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: added "old" url as SOURCE_URL[1]
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.5.0.4
* DEPENDS: removed dependency on opencv since gmic doesn't compile
diff --git a/kde4-look/qtcurve-gtk2/DETAILS b/kde4-look/qtcurve-gtk2/DETAILS
index 86eedc1..e26683b 100755
--- a/kde4-look/qtcurve-gtk2/DETAILS
+++ b/kde4-look/qtcurve-gtk2/DETAILS
@@ -1,11 +1,11 @@
SPELL=qtcurve-gtk2
- VERSION=1.8.11
+ VERSION=1.8.12
SOURCE=QtCurve-Gtk2-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/QtCurve-Gtk2-$VERSION
SOURCE_URL[0]=http://craigd.wikispaces.com/file/view/$SOURCE
WEB_SITE=http://www.kde-look.org/content/show.php/QtCurve+%28KDE4%2C+KDE3%2C+%26+Gtk2+Theme%29?content=40492
ENTERED=20070805
-
SOURCE_HASH=sha512:f0a3ebc8b431fa4962a5a1fb028b0280f3f74b67c6bc6e3ac57019b624812635ad942e2720a8d88624af2757df1bb19a250ba8c00be3cc509cfda673e95f9433
+
SOURCE_HASH=sha512:d08216633798a7a6a6316dde76d713b1f0c10d9d5ce660d4f8c97ae6452d065878116fa89b4bcabf7e0e410060b5898636afcb02ef01002178c74509898630a1
LICENSE[0]=GPL
KEYWORDS="kde style theme qt gtk compatibility widget"
SHORT="A set of QT widget styles (used to unify look of KDE and
GNOME applications)."
diff --git a/kde4-look/qtcurve-gtk2/HISTORY b/kde4-look/qtcurve-gtk2/HISTORY
index c0e0a80..51f8da1 100644
--- a/kde4-look/qtcurve-gtk2/HISTORY
+++ b/kde4-look/qtcurve-gtk2/HISTORY
@@ -1,3 +1,6 @@
+2011-10-31 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 1.8.12
+
2011-10-18 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.8.11
diff --git a/kde4-support/phonon/DETAILS b/kde4-support/phonon/DETAILS
index caece03..4f39557 100755
--- a/kde4-support/phonon/DETAILS
+++ b/kde4-support/phonon/DETAILS
@@ -11,10 +11,9 @@ fi
SOURCE_URL[0]=git://gitorious.org/$SPELL/$SPELL.git:$SPELL-git
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
else
- VERSION=4.5.0
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:19833320431d7a0f1601a5a395fc9e3f808768fae4c2fd89f916b29406088c385467d36b618e26412b0739449fd1b14a6b06cbe20e60e1f9353e86b478589927
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=4.5.1
+
SOURCE_HASH=sha512:da6d994fb6c8477fb0c054c3dab9263fbb121d1ac4987fbc3dcae39f903360f884f24e2d547f648fbe6cd87523c76fa2e4316aa6f8d3f0bc29203f982db14add
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$KDE_URL/stable/phonon/$VERSION/src/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index e8ad8a7..9cdcf7d 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,7 @@
+2011-10-31 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 4.5.1 (.bz2 -> .xz)
+ * PRE_BUILD: added, unpack xz source
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change
diff --git a/kde4-support/phonon/PRE_BUILD b/kde4-support/phonon/PRE_BUILD
new file mode 100755
index 0000000..624577e
--- /dev/null
+++ b/kde4-support/phonon/PRE_BUILD
@@ -0,0 +1,6 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - &&
+cd $SOURCE_DIRECTORY
+
diff --git a/latex/texlive-texmf/HISTORY b/latex/texlive-texmf/HISTORY
index 1b1cc3f..b671bf0 100644
--- a/latex/texlive-texmf/HISTORY
+++ b/latex/texlive-texmf/HISTORY
@@ -1,3 +1,10 @@
+2011-10-31 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: patch texmfcnf.lua for proper luatex dirs
+ rm texmf.cnf so the version in the texlive spell is used
+ * texmfcnf.lua_fix.patch: added, adds correct path for TEXMF
+ use TEXMFVAR (~/.texlive2011/texmf-var) before
+ TEXMFSYSVAR (/usr/share/texmf-var) for TEXMFCACHE
+
2011-09-05 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 20110705
diff --git a/latex/texlive-texmf/PRE_BUILD b/latex/texlive-texmf/PRE_BUILD
index 9a93cfa..e7a2d70 100755
--- a/latex/texlive-texmf/PRE_BUILD
+++ b/latex/texlive-texmf/PRE_BUILD
@@ -12,4 +12,12 @@ if [[ $TTMF_SMALL == y ]]; then
rm "$p.pdf"
fi
done
-fi
+fi &&
+
+
+cd ${SOURCE_DIRECTORY} &&
+# patch texmfcnf.lua for luatex
+patch -p0 < ${SPELL_DIRECTORY}/texmfcnf.lua_fix.patch &&
+
+# rm texmf.cnf so it doesn't overwrite patched version
+rm ${SOURCE_DIRECTORY}/texmf/web2c/texmf.cnf
diff --git a/latex/texlive-texmf/texmfcnf.lua_fix.patch
b/latex/texlive-texmf/texmfcnf.lua_fix.patch
new file mode 100644
index 0000000..b373a59
--- /dev/null
+++ b/latex/texlive-texmf/texmfcnf.lua_fix.patch
@@ -0,0 +1,20 @@
+--- texmf/web2c/texmfcnf.lua
++++ texmf/web2c/texmfcnf.lua
+@@ -50,7 +50,7 @@
+ -- We have only one cache path but there can be more. The first
writable one
+ -- will be chosen but there can be more readable paths.
+
+- TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR",
++ TEXMFCACHE = "$TEXMFVAR;$TEXMFSYSVAR",
+ TEXMFCONFIG = "home:.texlive2011/texmf-config",
+
+ -- I don't like this texmf under home and texmf-home would make
more
+@@ -77,7 +77,7 @@
+ -- We need texmfos for a few rare files but as I have a few
more bin trees
+ -- a hack is needed. Maybe other users also have
texmf-platform-new trees.
+
+- TEXMF =
"{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN}",
++ TEXMF =
"{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN,/usr/share/texmf-dist}",
+
+ TEXFONTMAPS =
".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//",
+ ENCFONTS =
".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//",
diff --git a/latex/texlive/09-texlive-fonts.conf
b/latex/texlive/09-texlive-fonts.conf
new file mode 100644
index 0000000..6b8b79c
--- /dev/null
+++ b/latex/texlive/09-texlive-fonts.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <dir>/usr/share/texmf-dist/fonts/opentype</dir>
+ <dir>/usr/share/texmf-dist/fonts/truetype</dir>
+ <dir>/usr/share/texmf/fonts/opentype</dir>
+ <dir>/usr/share/texmf/fonts/truetype</dir>
+ <dir>/usr/local/share/texmf/fonts/opentype</dir>
+ <dir>/usr/local/share/texmf/fonts/truetype</dir>
+</fontconfig>
diff --git a/latex/texlive/BUILD b/latex/texlive/BUILD
index 4cfc045..d1aa528 100755
--- a/latex/texlive/BUILD
+++ b/latex/texlive/BUILD
@@ -22,7 +22,9 @@ LIBS="-lpng" $SOURCE_DIRECTORY/configure
--prefix=${INSTALL_ROOT}/usr \
--disable-multiplatform \
--without-x \
--disable-native-texlive-build \
+ --with-banner-add="/Source Mage GNU/Linux" \
$OPTS &&
make_single &&
make &&
-make_normal
+make_normal
+#make -C ${SOURCE_DIRECTORY}/texk/kpathsea
diff --git a/latex/texlive/DEPENDS b/latex/texlive/DEPENDS
index 663e071..a940d78 100755
--- a/latex/texlive/DEPENDS
+++ b/latex/texlive/DEPENDS
@@ -23,16 +23,11 @@ runtime_depends dvipdfmx "--disable-dvipdfmx" &&
runtime_depends dvipng '--disable-dvipng' &&
runtime_depends lacheck '--disable-lacheck' &&
runtime_depends lcdf-typetools '--disable-lcdf-typetools' &&
+optional_depends lua \
+ '--enable-luatex' \
+ '--without-luatex' \
+ 'Extended version of pdfTeX with Lua, required for XeTeX
and ConTeXt MkII and MKIV' &&
suggest_depends XDVI '--disable-xdvik' '--disable-xdvik' \
- "For an X DVI viewer"
-# still beta and possibly broken
-#optional_depends lua \
-# '--with-luatex' \
-#
'--without-luatex' \
-# 'Extended
version of pdfTeX with Lua' &&
-#if is_depends_enabled $SPELL lua ; then
-#depends luafilesystem &&
-#depends lpeg &&
-#depends lzlib
-#fi &&
-
+ "For an X DVI viewer" &&
+suggest_depends RUBY '' '' "required for epspdf, context, hyph-utf8
(Hyphenation patterns expressed in UTF-8), & Huhyphn (hungarian hyphenation)"
&&
+suggest_depends perl '' '' "required for latexmk, epstopdf, psutils,
ps2eps, TeXcount, latexdiff, context, pdfcrop, thumbpdf, perlTeX, texdef,
mathsPIC, ptex, mathpazo, a2ping, vpe, sty2dtx, & various other scripts"
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index fb4e391..0f8d51a 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,30 @@
+2011-10-31 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: added banner configure option
+ * DEPENDS: clean up depends for luatex
+ added suggest_depends for RUBY and perl
+ * INSTALL: Move old TEXMFLOCAL to new (/usr/share/texmf-local to
/usr/local/share/texmf)
+ Explicitly define texlinks format file and destination so it
+ reinstalls correctly
+ remove aleph files since they are no longer supported
+ recreate the filename DB and create the proper formats
+ install fontconfig conf file and regenerate fontconfig cache,
+ needed for XeTeX and XeLaTeX
+ If luatex is installed, generate files and fonts for ConTeXt and
LuaTeX
+ * PRE_BUILD: use sed to edit files to use /usr/share/texmf and
/usr/share/texmf-dist
+ patch mtxrun for luatex, see below
+ * FINAL: added, display message notifying the user of TEXMFLOCAL
change
+ if using luatex, notify user that they may have to generate
+ context's formats themselves. Not done in INSTALL, because it fails
+ on recasts due to luatex using the wrong cache path.
+ * fixed_scripts_3.patch: removed, replaced with fix_paths.patch
+ * fix_paths.patch: fix paths not fixed by sed in PRE_BUILD
+ * texmf.cnf_fix.patch: change TEXMFLOCAL to /usr/local/share/texmf
+ * 09-texlive-fonts.conf: added, fontconfig conf file
+ * mtxrun_fix.patch: fix paths for luatex
+ set ownpath to fixed value because it has trouble finding the
correct
+ path on recasts
+ fix SELFAUTOPARENT becuase mtxrun expects the script to be in
+
2011-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL: fixed install failure
diff --git a/latex/texlive/INSTALL b/latex/texlive/INSTALL
index 43974b4..40cbb73 100755
--- a/latex/texlive/INSTALL
+++ b/latex/texlive/INSTALL
@@ -1,16 +1,30 @@
default_install &&
-# in version 20091107, texlive does not install wrappers like latex, pdflatex
-# automatically, so copy these files explicitly
-local i &&
-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 &&
+# move old local to new local, can eventually get rid of this
+if [ -d "/usr/share/texmf-local" ]; then
+ mv ${INSTALL_ROOT}/usr/share/texmf-local
${INSTALL_ROOT}/usr/local/share/texmf
+fi &&
-ln -svf mf $INSTALL_ROOT/usr/bin/mf-nowin &&
-sedit '/aleph/d' ${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf &&
-sedit '/luatex/d' ${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf &&
-texlinks -f /usr/share/texmf/web2c/fmtutil.cnf &&
-fmtutil-sys --all
+ln -svf mf ${INSTALL_ROOT}/usr/bin/mf-nowin &&
+
+# don't create aleph files
+sed -i -e '/aleph/d' ${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf &&
+
+# create symlinks to latex, pdflatex, etc
+${INSTALL_ROOT}/usr/bin/texlinks -f
${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf ${INSTALL_ROOT}/usr/bin &&
+
+# update filename db & create all formats
+mktexlsr &&
+fmtutil-sys --cnffile ${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf
--fmtdir ${INSTALL_ROOT}/usr/share/texmf/web2c --all &&
+
+# allow fontconfig to see latex fonts
+install -Cv ${SPELL_DIRECTORY}/09-texlive-fonts.conf
${INSTALL_ROOT}/etc/fonts/conf.avail &&
+ln -fs ${INSTALL_ROOT}/etc/fonts/conf.avail/09-texlive-fonts.conf
${INSTALL_ROOT}/etc/fonts/conf.d &&
+fc-cache -fsv &&
+
+if is_depends_enabled $SPELL lua ; then
+ # update filename db & create formats for context
+ mtxrun --generate &&
+ # generate fonts for luatex & context
+
OSFONTDIR="${INSTALL_ROOT}/usr/share/texmf-dist/fonts/;${INSTALL_ROOT}/usr/share/texmf/fonts/;${INSTALL_ROOT}/usr/local/share/texmf/fonts"
mtxrun --script fonts --reload
+fi
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index b90a4a0..9bd0d53 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -3,18 +3,21 @@ cd $BUILD_DIRECTORY &&
verify_file '' &&
xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
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
-patch -p1 < $SPELL_DIRECTORY/texmf.cnf_fix.patch &&
-#--
-#--
-## removing as much internal things as possible
+
+# Use /usr/share/texmf and /usr/share/texmf-dist, adapted from lunarlinux
+find -name Makefile\* -exec sed -i -e
"s:\(\$.\)prefix\(./tex\):\1datadir\2:" {} \; &&
+find -name configure -exec sed -i -e "s:\(\$.\)prefix\(./tex\):\1datadir\2:"
{} \; &&
+find -name \*.info -exec sed -i -e "s:/usr/local:/usr:" {} \; &&
+find -name \*.texi -exec sed -i -e "s:/usr/local:/usr:" {} \; &&
+# fix the remaining locations
+patch -p0 < ${SPELL_DIRECTORY}/fix_paths.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 mtxrun for context taking into account $INSTALL_ROOT, see HISTORY
+sed "s:/usr/bin:$INSTALL_ROOT/usr/bin:g" $SPELL_DIRECTORY/mtxrun_fix.patch |
patch -p0 &&
+
+# 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}
diff --git a/latex/texlive/fix_paths.patch b/latex/texlive/fix_paths.patch
new file mode 100644
index 0000000..ae7b114
--- /dev/null
+++ b/latex/texlive/fix_paths.patch
@@ -0,0 +1,112 @@
+--- texk/tetex/Makefile.in
++++ texk/tetex/Makefile.in
+@@ -225,7 +225,7 @@
+ 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_FALSE@dist_bin_SCRIPTS = $(sh_scripts)
+ CLEANFILES = $(nodist_bin_SCRIPTS)
+@@ -254,7 +254,7 @@
+ fmtutil.cnf.5 \
+ updmap.cfg.5
+
+-texconfdir = ${prefix}
++texconfdir = ${datadir}
+ nobase_dist_texconf_DATA = \
+ texmf/texconfig/README \
+ texmf/texconfig/g/generic \
+--- texk/tex4htk/Makefile.in
++++ texk/tex4htk/Makefile.in
+@@ -269,7 +269,7 @@
+ 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 @@
+ # We support both multiplatform and non-multiplatform builds.
+ install-links:
+ case "$(bindir)" in \
+- */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
+--- texk/texlive/linked_scripts/Makefile.in
++++ texk/texlive/linked_scripts/Makefile.in
+@@ -620,8 +620,8 @@
+ @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 @@
+ echo "creating link '$$link' -> '$$file'"; \
+ $(LN_S) $$file $$link || exit 1; \
+ done && \
+- rm -f 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_texmf_scripts_SCRIPTS)
$(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
+--- utils/chktex/Makefile.in
++++ utils/chktex/Makefile.in
+@@ -254,7 +254,7 @@
+ 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)
+ nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+ @WIN32_FALSE@bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
+
+--- utils/ps2eps/Makefile.in
++++ utils/ps2eps/Makefile.in
+@@ -213,7 +213,7 @@
+ 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)
+ nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl
+ CLEANFILES = $(nodist_bin_SCRIPTS)
+ all: all-am
+--- utils/psutils/Makefile.in
++++ utils/psutils/Makefile.in
+@@ -302,7 +302,7 @@
+ 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)
+ nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+ @WIN32_FALSE@bin_SCRIPTS = $(sh_scripts)
+ nodist_man1_MANS = \
+--- utils/xindy/Makefile.in
++++ utils/xindy/Makefile.in
+@@ -257,7 +257,7 @@
+ 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)
+ nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+ CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
+ all: all-recursive
diff --git a/latex/texlive/fix_scripts_3.patch
b/latex/texlive/fix_scripts_3.patch
deleted file mode 100644
index 4ab3125..0000000
--- a/latex/texlive/fix_scripts_3.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/texk/tetex/Makefile.in
-+++ b/texk/tetex/Makefile.in
-@@ -254,7 +254,7 @@ dist_man5_MANS = \
- fmtutil.cnf.5 \
- updmap.cfg.5
-
--texconfdir = ${prefix}
-+texconfdir = ${datadir}
- nobase_dist_texconf_DATA = \
- texmf/texconfig/README \
- texmf/texconfig/g/generic \
---- 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=.. 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
---- 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 && \
-- 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_texmf_scripts_SCRIPTS)
$(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
diff --git a/latex/texlive/mtxrun_fix.patch b/latex/texlive/mtxrun_fix.patch
new file mode 100644
index 0000000..a5d1edb
--- /dev/null
+++ b/latex/texlive/mtxrun_fix.patch
@@ -0,0 +1,26 @@
+--- texk/texlive/context/mtxrun
++++ texk/texlive/context/mtxrun
+@@ -9801,7 +9801,7 @@
+ local args = environment.originalarguments or arg -- this needs a
cleanup
+
+ local ownbin = environment.ownbin or args[-2] or arg[-2] or args[-1]
or arg[-1] or arg[0] or "luatex"
+- local ownpath = environment.ownpath or os.selfdir
++ local ownpath = '/usr/bin'
+
+ ownbin = file.collapsepath(ownbin)
+ ownpath = file.collapsepath(ownpath)
+@@ -9873,12 +9873,12 @@
+
+ do
+
+- local ownpath = environment.ownpath or dir.current()
++ local ownpath = '/usr/bin'
+
+ if ownpath then
+ ossetenv('SELFAUTOLOC', file.collapsepath(ownpath))
+ ossetenv('SELFAUTODIR', file.collapsepath(ownpath .. "/.."))
+- ossetenv('SELFAUTOPARENT', file.collapsepath(ownpath .. "/../.."))
++ ossetenv('SELFAUTOPARENT', file.collapsepath(ownpath ..
"/../share"))
+ else
+ report_initialization("error: unable to locate ownpath")
+ os.exit()
diff --git a/latex/texlive/texmf.cnf_fix.patch
b/latex/texlive/texmf.cnf_fix.patch
index b4dfb1e..deb0fa0 100644
--- a/latex/texlive/texmf.cnf_fix.patch
+++ b/latex/texlive/texmf.cnf_fix.patch
@@ -1,11 +1,11 @@
---- a/texk/kpathsea/texmf.cnf
-+++ b/texk/kpathsea/texmf.cnf
+--- texk/kpathsea/texmf.cnf
++++ 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 = $SELFAUTODIR/share
++TEXMFROOT = $SELFAUTODIR/share
% The tree containing runtime files related to the specific
% distribution and version.
@@ -14,7 +14,7 @@
% Local additions to the distribution trees.
-TEXMFLOCAL = $TEXMFROOT/../texmf-local
-+TEXMFLOCAL = $TEXMFROOT/texmf-local
++TEXMFLOCAL = $SELFAUTODIR/local/share/texmf
% TEXMFSYSVAR, where *-sys store cached runtime data.
-TEXMFSYSVAR = $TEXMFROOT/texmf-var
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (6d02e42ed516ee3716ff3dc42fceb6c73caa05d8), Eric Sandall, 10/31/2011
Archive powered by MHonArc 2.6.24.