[arch-commits] Commit in texlive-bin/trunk (PKGBUILD archlinux-build.patch)

[Rémy Oudompheng]

    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
===================================================================
--- PKGBUILD	2011-12-10 11:25:45 UTC (rev 144921)
+++ PKGBUILD	2011-12-10 19:07:17 UTC (rev 144922)
@@ -2,7 +2,7 @@
 # Contributor: francois <francois.archlinux.org>
 
 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.000000000 +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.000000000 +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.000000000 +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 test -z "$$REL"; then \
- 	  echo 'unable to compute relative path for linked scripts' >&2; \
- 	  exit 1; \