From 31645469022c4d4032be8fc7721fd9a84e188cc1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 30 Apr 2014 17:44:20 +0200
Subject: [PATCH] texlive-bin: fix x86 installation; misc tweaks.

---
 srcpkgs/texlive-bin/INSTALL                   | 10 ++++----
 .../files/{void.tmpl => void.profile}         |  0
 srcpkgs/texlive-bin/template                  | 23 +++++++++++--------
 3 files changed, 19 insertions(+), 14 deletions(-)
 rename srcpkgs/texlive-bin/files/{void.tmpl => void.profile} (100%)

diff --git a/srcpkgs/texlive-bin/INSTALL b/srcpkgs/texlive-bin/INSTALL
index f3013a27017..1e640a5e15a 100644
--- a/srcpkgs/texlive-bin/INSTALL
+++ b/srcpkgs/texlive-bin/INSTALL
@@ -30,7 +30,7 @@ post)
   You may need to reboot to ensure that PATH is update correctly,
   for the impatients, if you want you can type
 
-  $ sudo source /etc/profile
+  $ source /etc/profile
 
   and check the PATH.
 
@@ -38,11 +38,11 @@ post)
 
   To update you TeXLive installation use only the program 
 
-  /opt/texlive/????/<arch>/tlmgr.
+  /opt/texlive/${VERSION}/<arch>/tlmgr.
 
-  where the ???? is the TeXLive version and <arch> is:
-    - X86_64-linux  ==> voidlinux X86_64 architecture
-    - i386-linux    ==> voidlinux i386 architecture
+  where <arch> is:
+    - X86_64-linux  ==> x86_64 architecture
+    - i386-linux    ==> i386 architecture
 
   see:
 
diff --git a/srcpkgs/texlive-bin/files/void.tmpl b/srcpkgs/texlive-bin/files/void.profile
similarity index 100%
rename from srcpkgs/texlive-bin/files/void.tmpl
rename to srcpkgs/texlive-bin/files/void.profile
diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template
index b65f10df633..85f40ec53c2 100644
--- a/srcpkgs/texlive-bin/template
+++ b/srcpkgs/texlive-bin/template
@@ -1,12 +1,12 @@
 # Template file for 'texlive-bin'
 pkgname=texlive-bin
 version=2013
-revision=1
+revision=2
 maintainer="Carlo Dormeletti <carlo.dormeletti@email.it>"
 homepage="http://tug.org/texlive/"
 license="GPL-2"
 short_desc="Texlive Binary distribution through tl-install"
-provides="textlive-${version}_${revision}"
+provides="texlive-${version}_${revision}"
 depends="cairo pixman graphite t1lib gd poppler libsigsegv
    zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
    ghostscript"
@@ -25,18 +25,17 @@ desc_option_full="Install TeXLive using scheme-full"
 build_options_default="small"
 
 pre_install(){
-    _dir="${wrksrc}/install-tl*/tlpkg/installer/xz"		
+    _dir="${wrksrc}/install-tl*/tlpkg/installer/xz"
     rm ${_dir}/*exe ${_dir}/*bsd ${_dir}/*solaris ${_dir}/*irix
     rm ${_dir}/*alpha-linux ${_dir}/*darwin ${_dir}/*powerpc-linux
     rm ${_dir}/*arm??-linux ${_dir}/*mipsel-linux
     rm -rf ${wrksrc}/install-tl*/tlpkg/installer/wget
-   	
 }
 
 do_install(){
     vmkdir opt/texlive-installer
     vcopy "install-tl-*/*" /opt/texlive-installer
-    vinstall ${FILESDIR}/void.tmpl 644 opt/texlive-installer void.profile
+    vinstall ${FILESDIR}/void.profile 644 opt/texlive-installer
     if [ "$build_options_default" = "basic" ]; then
         echo "selected_scheme scheme-basic" >> ${DESTDIR}/opt/texlive-installer/void.profile
     elif [ "$build_options_default" = "small" ]; then
@@ -51,9 +50,15 @@ do_install(){
     vmkdir etc/profile.d
     # For system environment vars and desktop extra shortcut
     case "$XBPS_TARGET_MACHINE" in
-         i686) sed -e 's/@@ARCH@@/i386-linux/' ${FILESDIR}/texlive.sh > ${DESTDIR}/etc/profile.d/texlive.sh ;;
-         x86_64) sed -e 's/@@ARCH@@/x86_64-linux/' ${FILESDIR}/texlive.sh > ${DESTDIR}/etc/profile.d/texlive.sh ;;
+         i686)
+		sed -e 's/@@ARCH@@/i386-linux/' ${FILESDIR}/texlive.sh \
+			> ${DESTDIR}/etc/profile.d/texlive.sh
+		rm ${DESTDIR}/opt/texlive-installer/tlpkg/installer/xz/xzdec.x86_64-linux
+		;;
+         x86_64)
+		sed -e 's/@@ARCH@@/x86_64-linux/' ${FILESDIR}/texlive.sh \
+			> ${DESTDIR}/etc/profile.d/texlive.sh
+		rm ${DESTDIR}/opt/texlive-installer/tlpkg/installer/xz/xzdec.i386-linux
+		;;
     esac
-
-   	
 }