[arch-commits] Commit in texlive-bin/trunk (PKGBUILD archlinux-build.patch)
Date: Saturday, December 10, 2011 @ 14:07:17
Author: remy
Revision: 144922
Update to new snapshot.
- add !strip to avoid breaking biber.
- remove now unneeded Makefile patch.
Modified:
texlive-bin/trunk/PKGBUILD
Deleted:
texlive-bin/trunk/archlinux-build.patch
---+
PKGBUILD | 20
archlinux-build.patch | 36
2 files changed, 8 insertions(+), 48 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-12-10 11:25:45 UTC (rev 144921)
+++ PKGBUILD2011-12-10 19:07:17 UTC (rev 144922)
@@ -2,7 +2,7 @@
# Contributor: francois
pkgname=texlive-bin
-pkgver=2011.2
+pkgver=2011.3
_luatex_ver=0.70.1
pkgrel=1
pkgdesc="TeX Live binaries"
@@ -13,15 +13,15 @@
optdepends=('ed: for texconfig')
provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
conflicts=('pdfjam')
-options=('!libtool')
+options=('!libtool' '!strip')
url='http://tug.org/texlive/'
install="texlive.install"
source=('texmf.cnf'
'fix-fontforge-encoding.patch'
'09-texlive-fonts.conf'
'archlinux-build.patch'
-
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20111204.tar.xz'
-
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20111204.tar.xz'
+
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20111210.tar.xz'
+
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20111210.tar.xz'
#
"http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2";
'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz'
)
@@ -43,8 +43,8 @@
'bfb9716aa00c86c08cd31e5b32edeb98'
'393a4bf67adc7ca5df2b386759d1a637'
'ec009f1a1e5aee701ccc1dd0910db1c4'
- '94c4a11fe6c6a152b6ccf1a3a64fae07'
- '7da3ef4faed74dd2234708e1e7b82ce2'
+ 'c7bb38c0ab30c2b64cf4cf83a736b35c'
+ '5d8f06a3683ce88a3c33e15f5ba6a858'
'e7f0197559ef865d8c01683dab3b8526')
build() {
@@ -101,11 +101,6 @@
#
### configure
cd source
- patch -Np1 -i ${srcdir}/archlinux-build.patch
- for _dir in texk/tetex texk/texlive texk/tex4htk \
- utils/ps2eps utils/chktex utils/psutils utils/xindy; do
- (cd ${_dir} && automake) || true
- done
## prevent compiling Xdvi with libXp
sed -i~ 's|-lXp ||' texk/xdvik/configure
test ! -d Work && mkdir Work
@@ -230,7 +225,7 @@
echo "---"
cd Work
make DESTDIR=${pkgdir} texmf=$pkgdir/usr/share/texmf install
- rm -rf ${pkgdir}/usr/{texmf,texmf-dist}
+ rm -rf ${pkgdir}/usr/{texmf,share/texmf-dist}
## install luatex binary
#install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex
$pkgdir/usr/bin/
@@ -261,6 +256,7 @@
ctanify
ctanupload
de-macro
+dosepsbin
dviasm
epstopdf
findhyph
Deleted: archlinux-build.patch
===
--- archlinux-build.patch 2011-12-10 11:25:45 UTC (rev 144921)
+++ archlinux-build.patch 2011-12-10 19:07:17 UTC (rev 144922)
@@ -1,36 +0,0 @@
-diff -aur source/texk/am/script_links.am source.new/texk/am/script_links.am
source/texk/am/script_links.am 2011-09-29 14:17:38.0 +0200
-+++ source.new/texk/am/script_links.am 2011-12-04 13:14:35.480368959 +0100
-@@ -52,7 +52,7 @@
-
- # We support native builds, multiplatform or not, as well as distro builds.
- install-links:
-- @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)'
'$(bindir)' '$(prefix)'`; \
-+ @REL=$(datadir); \
- if test -z "$$REL"; then \
- echo 'unable to compute relative path for linked $(TYPE) scripts'
>&2; \
- exit 1; \
-diff -aur source/texk/tetex/Makefile.am source.new/texk/tetex/Makefile.am
source/texk/tetex/Makefile.am 2011-09-29 14:14:07.0 +0200
-+++ source.new/texk/tetex/Makefile.am 2011-12-04 13:13:32.089463768 +0100
-@@ -37,7 +37,7 @@
-
- include $(srcdir)/../am/script_links.am
-
--texmfdir = ${prefix}/$(scriptsdir)
-+texmfdir = $(datadir)/$(scriptsdir)
- dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
-
- if !WIN32
-diff -aur source/texk/texlive/linked_scripts/Makefile.am
source.new/texk/texlive/linked_scripts/Makefile.am
source/texk/texlive/linked_scripts/Makefile.am 2011-12-03
17:22:19.0 +0100
-+++ source.new/texk/texlive/linked_scripts/Makefile.am 2011-12-04
13:14:20.550940820 +0100
-@@ -177,7 +177,7 @@
- ## Name the link as the basename, removing any extension,
- ## except for listings-ext.sh, which is documented as that name.
- ## Downcase for the sake of TeXcount.pl -> texcount.
-- @REL=`$(relpath) '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \
-+ @REL=$(datadir); \
- if
[arch-commits] Commit in texlive-bin/trunk (PKGBUILD archlinux-build.patch texmf.cnf)
Date: Sunday, December 4, 2011 @ 12:18:44
Author: remy
Revision: 144304
upgpkg: texlive-bin 2011.2-1
Texlive update.
Modified:
texlive-bin/trunk/PKGBUILD
texlive-bin/trunk/archlinux-build.patch
texlive-bin/trunk/texmf.cnf
---+
PKGBUILD | 26 +++-
archlinux-build.patch | 58 +
texmf.cnf | 74 +++-
3 files changed, 105 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-12-04 16:54:45 UTC (rev 144303)
+++ PKGBUILD2011-12-04 17:18:44 UTC (rev 144304)
@@ -2,9 +2,9 @@
# Contributor: francois
pkgname=texlive-bin
-pkgver=2011.1
+pkgver=2011.2
_luatex_ver=0.70.1
-pkgrel=5
+pkgrel=1
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64')
@@ -20,8 +20,8 @@
'fix-fontforge-encoding.patch'
'09-texlive-fonts.conf'
'archlinux-build.patch'
-
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz'
-
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz'
+
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20111204.tar.xz'
+
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20111204.tar.xz'
#
"http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2";
'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz'
)
@@ -39,12 +39,12 @@
etc/texmf/dvipdfm/config/config \
etc/texmf/xdvi/XDvi)
-md5sums=('ff30d6813babd2e41c414365eea9c147'
+md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
'bfb9716aa00c86c08cd31e5b32edeb98'
'393a4bf67adc7ca5df2b386759d1a637'
- '94ef5571a54262790ab64d6d044dd10c'
- '58e8ab64188eaf15897b7acf472dca9f'
- '9f7ae1aa24afd9e34289ac10a8f9e87b'
+ 'ec009f1a1e5aee701ccc1dd0910db1c4'
+ '94c4a11fe6c6a152b6ccf1a3a64fae07'
+ '7da3ef4faed74dd2234708e1e7b82ce2'
'e7f0197559ef865d8c01683dab3b8526')
build() {
@@ -248,13 +248,18 @@
PATH="$PATH:${pkgdir}/usr/bin" texlinks -f
$pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
#
# remove dangling symlinks
- _bibtexextra_scripts="bibexport"
+ _bibtexextra_scripts="
+bibexport
+urlbst
+"
_core_scripts="
afm2afm
arlatex
autoinst
bundledoc
cmap2enc
+ctanify
+ctanupload
de-macro
dviasm
epstopdf
@@ -268,6 +273,8 @@
latexmk
latexrevise
listings-ext.sh
+match_parens
+mf2pt1
mkjobtexmf
mkluatexfontdb
mkt1font
@@ -299,6 +306,7 @@
texdef
texdiff
texdirflatten
+texliveonfly
texloganalyser
thumbpdf
vpl2ovp
Modified: archlinux-build.patch
===
--- archlinux-build.patch 2011-12-04 16:54:45 UTC (rev 144303)
+++ archlinux-build.patch 2011-12-04 17:18:44 UTC (rev 144304)
@@ -1,21 +1,19 @@
-diff -ur source.old/texk/am/script_links.am source/texk/am/script_links.am
source.old/texk/am/script_links.am 2011-05-02 13:54:33.0 +0200
-+++ source/texk/am/script_links.am 2011-06-05 11:22:53.118216353 +0200
-@@ -51,8 +51,8 @@
- # We support both multiplatform and non-multiplatform builds.
+diff -aur source/texk/am/script_links.am source.new/texk/am/script_links.am
+--- source/texk/am/script_links.am 2011-09-29 14:17:38.0 +0200
source.new/texk/am/script_links.am 2011-12-04 13:14:35.480368959 +0100
+@@ -52,7 +52,7 @@
+
+ # We support native builds, multiplatform or not, as well as distro 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=$(datadir) TYPE=$(TYPE) EXT=$(EXT)
make-links;; \
-+*/bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE)
EXT=$(EXT) make-links;; \
- *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts"
>&2; \
-exit 1;; \
- esac
-diff -ur source.old/texk/tetex/Makefile.am source/texk/tetex/Makefile.am
source.old/texk/tetex/Makefile.am 2011-05-31 11:47:04.0 +0200
-+++ source/texk/tetex/Makefile.am 2011-06-05 10:28:40.287025375 +0200
-@@ -35,7 +35,7 @@
+- @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)'
'$(bindir)' '$(prefix)'`; \
++ @REL=$(datadir); \
+ if test -z "$$REL"; then \
+ echo 'unable to compute relative path for linked $(TYPE) scripts'
>&2; \
+ exit 1; \
+diff -aur source/texk/tetex/Makefile.am source.new/texk/tetex/Makefile.am
+--- source/texk/tetex/Makefile.am 2011-09-29 14:14:07.0 +0200
source.new/texk/tetex/Makefile.am 201
[arch-commits] Commit in texlive-bin/trunk (PKGBUILD archlinux-build.patch)
Date: Sunday, June 5, 2011 @ 07:59:52
Author: remy
Revision: 126444
Simplify build logic and fix symlinks.
Added:
texlive-bin/trunk/archlinux-build.patch
Modified:
texlive-bin/trunk/PKGBUILD
---+
PKGBUILD | 51 +++-
archlinux-build.patch | 40 +
2 files changed, 61 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-05 11:59:07 UTC (rev 126443)
+++ PKGBUILD2011-06-05 11:59:52 UTC (rev 126444)
@@ -19,6 +19,7 @@
source=('texmf.cnf'
'fix-fontforge-encoding.patch'
'09-texlive-fonts.conf'
+'archlinux-build.patch'
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110531.tar.xz'
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110531.tar.xz'
"http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2";
@@ -37,9 +38,10 @@
etc/texmf/dvipdfm/config/config \
etc/texmf/xdvi/XDvi)
-md5sums=('626f900fb59f036d6fea95f08c74b00b'
+md5sums=('ff30d6813babd2e41c414365eea9c147'
'bfb9716aa00c86c08cd31e5b32edeb98'
'393a4bf67adc7ca5df2b386759d1a637'
+ '94ef5571a54262790ab64d6d044dd10c'
'cd31edd460cdc3224281ccb30a4ea38d'
'd6338f70c6b8acde6509076ead4b9f13'
'c9348d4381170204b1a1b0440d8b6918')
@@ -92,10 +94,14 @@
cd "$srcdir"
# this patch removes spurious error message with locale "xx_YY.utf8"
patch -p0 -i fix-fontforge-encoding.patch
-
#
### configure
cd source
+ patch -Np1 -i ${srcdir}/archlinux-build.patch
+ for _dir in texk/tetex texk/texlive texk/tex4htk \
+ utils/ps2eps utils/chktex utils/psutils utils/xindy; do
+ (cd ${_dir} && automake) || true
+ done
## prevent compiling Xdvi with libXp
sed -i~ 's|-lXp ||' texk/xdvik/configure
test ! -d Work && mkdir Work
@@ -103,9 +109,9 @@
echo "--> Initial configuration..."
# we use temporary prefix to avoid messing the existing
$pkgdir/usr/share/texmf tree
../configure --prefix=/usr -C \
- --datarootdir=$srcdir/inst/usr/share \
- --datadir=$srcdir/inst/usr/share \
- --mandir=$srcdir/inst/usr/share/man \
+ --datarootdir=/usr/share \
+ --datadir=/usr/share \
+ --mandir=/usr/share/man \
--disable-native-texlive-build \
--with-banner-add="/Arch Linux" \
--disable-multiplatform \
@@ -219,37 +225,18 @@
echo "--> Proceeding with make install ..."
echo "---"
cd Work
- make prefix=$srcdir/inst/usr texmf=$pkgdir/usr/share/texmf install
+ make DESTDIR=${pkgdir} texmf=$pkgdir/usr/share/texmf install
+ rm -rf ${pkgdir}/usr/{texmf,texmf-dist}
- # restore install location of bin/lib/include
- mv -f $srcdir/inst/usr/bin $pkgdir/usr/bin
- mv -f $srcdir/inst/usr/lib $pkgdir/usr/lib
- mv -f $srcdir/inst/usr/include $pkgdir/usr/include
- # add symlinks to manpages since they are not included in the original
texmf tree
- for m in $srcdir/inst/usr/share/man/man1/*; do
- bm=$(basename $m)
- test -f $pkgdir/usr/share/man/man1/$bm || mv -f $m
$pkgdir/usr/share/man/man1/
- done
-
## install luatex binary
install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex
$pkgdir/usr/bin/
cd $pkgdir/usr/bin
/bin/ln -s luatex texlua
/bin/ln -s luatex texluac
- # symlinks in $pkgdir/usr/bin are incorrect
- echo "--> Fixing symlinks for scripts ..."
- 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 $pkgdir/$newtarget && chmod a+x
$pkgdir/$newtarget
- fi
- fi
- done
+ ## install Perl libraries
+ mkdir -p $pkgdir/usr/share/tlpkg/TeXLive
+ install -m644 ${srcdir}/source/utils/biber/TeXLive/*.pm
$pkgdir/usr/share/tlpkg/TeXLive
# create symlinks for formats
echo "--> Create symlinks for TeX formats ..."
@@ -302,7 +289,9 @@
repstopdf
rpdfcrop
showglyphs
+sty2dtx
texcount
+texdef
texdiff
texdirflatten
texloganalyser
@@ -323,16 +312,18 @@
splitindex \
svn-multi \
vpe"
+ _music_scripts="musixtex musixflx"
_pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
_pstricks_scripts="pst2pdf"
_science_scripts="ulqda"
for s in \
${_bibtexextra_scripts} \
-${_core_scripts} \
+${_core_scripts} \
${_htmlxml_scripts}\
${_langextra_scripts} \
${_langgre
