[arch-commits] Commit in texlive-bin/repos (extra-x86_64 extra-x86_64/PKGBUILD)
François Charette
francois at archlinux.org
Wed Nov 12 09:15:27 UTC 2008
Date: Wednesday, November 12, 2008 @ 04:15:26
Author: francois
Revision: 18954
Merged revisions 18910 via svnmerge from
svn+ssh://archlinux.org/home/svn-packages/texlive-bin/trunk
........
r18910 | francois | 2008-11-10 11:34:26 +0100 (Mon, 10 Nov 2008) | 1 line
bugfix for xindy; changed usage of $startdir
........
Modified:
texlive-bin/repos/extra-x86_64/ (properties)
texlive-bin/repos/extra-x86_64/PKGBUILD
----------+
PKGBUILD | 123 +++++++++++++++++++++++++++++++------------------------------
1 file changed, 63 insertions(+), 60 deletions(-)
Property changes on: texlive-bin/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /texlive-bin/trunk:1-18721
+ /texlive-bin/trunk:1-18953
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-11-12 08:32:45 UTC (rev 18953)
+++ extra-x86_64/PKGBUILD 2008-11-12 09:15:26 UTC (rev 18954)
@@ -2,7 +2,7 @@
pkgname=texlive-bin
pkgver=2008
-pkgrel=2
+pkgrel=3
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64')
@@ -29,15 +29,15 @@
'554287c3e458da776edd684506048d45'
'bac8aee05595fb80fcae8e864ba063f6')
build() {
- cd $startdir/src
+ cd $srcdir
if [ "${CARCH}" = "x86_64" ]; then
export CFLAGS="${CFLAGS} -fPIC"
export CXXFLAGS="${CXXFLAGS} -fPIC"
fi
lzma --force -dc texlive-bin-2008-texmf.tar.lzma | tar xf - || return 1
- install -m755 -d $startdir/pkg/usr/share || return 1
- find texmf -type d -exec install -d -m755 $startdir/pkg/usr/share/'{}' \; || return 1
- find texmf -type f -exec install -m644 '{}' $startdir/pkg/usr/share/'{}' \; || return 1
+ install -m755 -d $pkgdir/usr/share || return 1
+ find texmf -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \; || return 1
+ find texmf -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \; || return 1
lzma --force -dc texlive-20080816-source.tar.lzma | tar xf - || return 1
cd texlive-20080816-source || return 1
# This trick is for avoiding exiting when latex is not available,
@@ -47,8 +47,8 @@
cd Work
echo "--> Here we go with configure..."
../configure --prefix=/usr \
- --datarootdir=$startdir/pkg/usr/share \
- --datadir=$startdir/pkg/usr/share \
+ --datarootdir=$pkgdir/usr/share \
+ --datadir=$pkgdir/usr/share \
--disable-multiplatform --without-dialog \
--without-psutils --without-texinfo --without-t1utils \
--with-system-zlib --with-system-pnglib \
@@ -58,9 +58,9 @@
--with-freetype2-include=/usr/include/freetype2 \
--with-xdvi-x-toolkit=xaw --with-cxx-runtime-hack \
--without-omega --without-aleph --without-graphite || return 1
- ### FIXME these fixes should be temporary: send patch upstream
- find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $startdir/pkg/usr|" '{}' \; || return 1
- # we skip that, coz it requires an almost full texlive installation for compilation of the documentation:
+ ### fixes for xindy
+ find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" '{}' \; || return 1
+ ### we skip that, coz it requires an almost full texlive installation for compilation of the documentation:
sed -i -e "s|^MAKE_RULES = make-rules|MAKE_RULES = ''|" -e "s|^DOCS = doc|DOCS = ''|" utils/xindy/Makefile || return 1
#############################################################
echo "-------------------------------------------------------"
@@ -69,18 +69,18 @@
#############################################################
echo "-------------------------------------------------------"
echo "--> ... proceeding with make install"
- install -d -m755 $startdir/pkg/usr/share/man/man5
- make prefix=$startdir/pkg/usr texmf=$startdir/pkg/usr/share/texmf install || return 1
+ install -d -m755 $pkgdir/usr/share/man/man5
+ make prefix=$pkgdir/usr texmf=$startdir/pkg/usr/share/texmf install || return 1
echo "-------------------------------------------------------"
echo "--> ...fixing wrong symlinks to scripts under /usr/bin/"
- for f in $startdir/pkg/usr/bin/* ; do
+ for f in $pkgdir/usr/bin/* ; do
if [ -L $f ]; then
target=`ls -l "$f" | sed 's/^.\+ -> //'`
if [[ "$target" == ..* ]]; then
newtarget=`echo $target | sed -e 's|../|/usr/share/|'`
rm -f $f
ln -s $newtarget $f
- test -f $startdir/pkg/$newtarget && chmod a+x $startdir/pkg/$newtarget
+ test -f $pkgdir/$newtarget && chmod a+x $startdir/pkg/$newtarget
fi
fi
done
@@ -89,85 +89,88 @@
## CLEAN UP...
echo "Cleaning up"
# remove tlmgr from PATH
- rm -f $startdir/pkg/usr/bin/tlmgr
+ rm -f $pkgdir/usr/bin/tlmgr
- for d in $startdir/pkg/usr/texmf/scripts/*; do
+ for d in $pkgdir/usr/texmf/scripts/*; do
dname=`basename $d`
- test ! -d $startdir/pkg/usr/share/texmf/scripts/$dname && mv $d $startdir/pkg/usr/share/texmf/scripts/
+ test ! -d $pkgdir/usr/share/texmf/scripts/$dname && mv $d $startdir/pkg/usr/share/texmf/scripts/
done
- rm -rf $startdir/pkg/usr/{texmf,texmf-dist}
+ rm -rf $pkgdir/usr/{texmf,texmf-dist}
# most man files went to two different places:
for i in 1 5; do
# remove pdf versions of manpages:
- rm -f $startdir/pkg/usr/share/texmf/man/man$i/*.pdf
- for f in $startdir/pkg/usr/share/texmf/doc/man/man$i/*; do
+ rm -f $pkgdir/usr/share/texmf/man/man$i/*.pdf
+ for f in $pkgdir/usr/share/texmf/doc/man/man$i/*; do
bf=`basename $f`
- if [[ ! -f $startdir/pkg/usr/share/man/man$i/$bf ]]; then
- mv -f $f $startdir/pkg/usr/share/man/man$i/
+ if [[ ! -f $pkgdir/usr/share/man/man$i/$bf ]]; then
+ mv -f $f $pkgdir/usr/share/man/man$i/
fi
done
done
# remove extra documentation:
- rm -rf $startdir/pkg/usr/share/texmf/doc/
+ rm -rf $pkgdir/usr/share/texmf/doc/
# those files are also in base, but "make install" duplicated them here:
- rm -rf $startdir/pkg/usr/share/texmf/bibtex/
+ rm -rf $pkgdir/usr/share/texmf/bibtex/
#TODO leave info files ?
- rm -rf $startdir/pkg/usr/share/{info,doc}
+ rm -rf $pkgdir/usr/share/{info,doc}
# remove files that belong to texinfo
for f in info infokey install-info makeinfo texi2dvi pdftexi2dvi texi2pdf texindex; do
- rm -f $startdir/pkg/usr/share/man/man1/$f.1
+ rm -f $pkgdir/usr/share/man/man1/$f.1
done
for f in texinfo info ; do
- rm -f $startdir/pkg/usr/share/man/man5/$f.5
+ rm -f $pkgdir/usr/share/man/man5/$f.5
done
# remove files that belong to t1utils
for f in t1ascii t1asm t1binary t1disasm t1mac t1unmac; do
- rm -f $startdir/pkg/usr/share/man/man1/$f.1
+ rm -f $pkgdir/usr/share/man/man1/$f.1
done
# remove files that belong to psutils
for f in epsffit extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps fixscribeps fixtpps fixwfwps fixwpps fixwwps getafm includeres psbook psmerge psnup psresize psselect pstops; do
- rm -f $startdir/pkg/usr/share/man/man1/$f.1
+ rm -f $pkgdir/usr/share/man/man1/$f.1
done
# remove man files that belong to omega/aleph
for f in omega lambda odvicopy odvips odvitype ofm2opl opl2ofm otp2ocp outocp ovf2ovp ovp2ovf oxdvi ; do
- rm -f $startdir/pkg/usr/share/man/man1/$f.1
+ rm -f $pkgdir/usr/share/man/man1/$f.1
done
# replace upstream texmf.cnf with ours
- rm -f $startdir/pkg/usr/share/texmf/web2c/texmf.cnf
- install -m644 $startdir/src/texmf.cnf $startdir/pkg/usr/share/texmf/web2c/texmf.cnf
+ rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf
+ install -m644 $srcdir/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf
## remove omega and aleph from fmtutil.cnf
- sed -i -e '/omega/d' -e '/aleph/d' $startdir/pkg/usr/share/texmf/web2c/fmtutil.cnf || return 1
+ sed -i -e '/omega/d' -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf || return 1
###################################################################
# copy config files to texmf-config tree
- install -d -m755 $startdir/pkg/usr/share/texmf-config/web2c
- install -d -m755 $startdir/pkg/usr/share/texmf-config/dvips/config
- install -d -m755 $startdir/pkg/usr/share/texmf-config/dvipdfm/config
- install -d -m755 $startdir/pkg/usr/share/texmf-config/dvipdfmx
- install -d -m755 $startdir/pkg/usr/share/texmf-config/tex/generic/config
- install -d -m755 $startdir/pkg/usr/share/texmf-config/xdvi
- cp -a $startdir/pkg/usr/share/texmf/web2c/mktex.cnf \
- $startdir/pkg/usr/share/texmf-config/web2c/
- cp -a $startdir/pkg/usr/share/texmf/web2c/updmap.cfg \
- $startdir/pkg/usr/share/texmf-config/web2c/
- cp -a $startdir/pkg/usr/share/texmf/web2c/fmtutil.cnf \
- $startdir/pkg/usr/share/texmf-config/web2c/
- cp -a $startdir/pkg/usr/share/texmf/dvips/config/config.ps \
- $startdir/pkg/usr/share/texmf-config/dvips/config/
- cp -a $startdir/pkg/usr/share/texmf/dvipdfm/config/config \
- $startdir/pkg/usr/share/texmf-config/dvipdfm/config/
- cp -a $startdir/pkg/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
- $startdir/pkg/usr/share/texmf-config/dvipdfmx/
- cp -a $startdir/pkg/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
- $startdir/pkg/usr/share/texmf-config/tex/generic/config/
- cp -a $startdir/pkg/usr/share/texmf/tex/generic/config/language.dat \
- $startdir/pkg/usr/share/texmf-config/tex/generic/config/
- cp -a $startdir/pkg/usr/share/texmf/xdvi/XDvi \
- $startdir/pkg/usr/share/texmf-config/xdvi/
+ install -d -m755 $pkgdir/usr/share/texmf-config/web2c
+ install -d -m755 $pkgdir/usr/share/texmf-config/dvips/config
+ install -d -m755 $pkgdir/usr/share/texmf-config/dvipdfm/config
+ install -d -m755 $pkgdir/usr/share/texmf-config/dvipdfmx
+ install -d -m755 $pkgdir/usr/share/texmf-config/tex/generic/config
+ install -d -m755 $pkgdir/usr/share/texmf-config/xdvi
+ cp -a $pkgdir/usr/share/texmf/web2c/mktex.cnf \
+ $pkgdir/usr/share/texmf-config/web2c/
+ cp -a $pkgdir/usr/share/texmf/web2c/updmap.cfg \
+ $pkgdir/usr/share/texmf-config/web2c/
+ cp -a $pkgdir/usr/share/texmf/web2c/fmtutil.cnf \
+ $pkgdir/usr/share/texmf-config/web2c/
+ cp -a $pkgdir/usr/share/texmf/dvips/config/config.ps \
+ $pkgdir/usr/share/texmf-config/dvips/config/
+ cp -a $pkgdir/usr/share/texmf/dvipdfm/config/config \
+ $pkgdir/usr/share/texmf-config/dvipdfm/config/
+ cp -a $pkgdir/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
+ $pkgdir/usr/share/texmf-config/dvipdfmx/
+ cp -a $pkgdir/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
+ $pkgdir/usr/share/texmf-config/tex/generic/config/
+ cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.dat \
+ $pkgdir/usr/share/texmf-config/tex/generic/config/
+ cp -a $pkgdir/usr/share/texmf/xdvi/XDvi \
+ $pkgdir/usr/share/texmf-config/xdvi/
# clean updmap.cfg
- sed -i '/^\(Map\|MixedMap\)/d' $startdir/pkg/usr/share/texmf-config/web2c/updmap.cfg
- sed -i '/^#! \(Map\|MixedMap\)/d' $startdir/pkg/usr/share/texmf-config/web2c/updmap.cfg
+ sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/usr/share/texmf-config/web2c/updmap.cfg
+ sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/usr/share/texmf-config/web2c/updmap.cfg
# fix hard-coded paths in /usr/bin/xindy
- sed -i "s|'/.\+/pkg/usr|'/usr|" $startdir/pkg/usr/bin/xindy
+ sed -i "s|'/.\+/pkg/usr|'/usr|" $pkgdir/usr/bin/xindy
+ # move xindy modules to /usr/share/xindy
+ rm -rf $pkgdir/usr/share/xindy
+ mv $pkgdir/usr/share/texmf/xindy $pkgdir/usr/share/
}
More information about the arch-commits
mailing list