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

Rémy Oudompheng remy at archlinux.org
Sun Jun 5 11:59:52 UTC 2011 

    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
===================================================================
--- PKGBUILD	2011-06-05 11:59:07 UTC (rev 126443)
+++ PKGBUILD	2011-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}  \
         ${_langgreek_scripts}  \
         ${_latexextra_scripts} \
+        ${_music_scripts}      \
         ${_pictures_scripts}   \
         ${_pstricks_scripts}   \
         ${_science_scripts}    \

Added: archlinux-build.patch
===================================================================
--- archlinux-build.patch	                        (rev 0)
+++ archlinux-build.patch	2011-06-05 11:59:52 UTC (rev 126444)
@@ -0,0 +1,40 @@
+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.000000000 +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.
+ 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.000000000 +0200
++++ source/texk/tetex/Makefile.am	2011-06-05 10:28:40.287025375 +0200
+@@ -35,7 +35,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 -ur source.old/texk/texlive/linked_scripts/Makefile.am source/texk/texlive/linked_scripts/Makefile.am
+--- source.old/texk/texlive/linked_scripts/Makefile.am	2011-05-31 11:47:04.000000000 +0200
++++ source/texk/texlive/linked_scripts/Makefile.am	2011-06-05 09:41:50.997250443 +0200
+@@ -165,8 +165,8 @@
+ 	done
+ else !WIN32
+ 	case "$(bindir)" in \
+-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
++	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \
++	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \
+ 	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+ 	     exit 1;; \
+ 	esac

More information about the arch-commits mailing list