Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/fdupes/PKGBUILD
	core/nfs-utils/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/maxima/PKGBUILD
	extra/qt4/PKGBUILD
	extra/sbcl/PKGBUILD

1 files changed, 32 insertions, 12 deletions

diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index d032d9d56..2d46784a0 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178213 2013-02-18 09:01:22Z juergen $
+# $Id: PKGBUILD 185032 2013-05-10 12:58:50Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.1.4
+pkgver=1.1.7
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
@@ -13,20 +13,39 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('glibc' 'zlib')
 provides=('common-lisp' 'cl-asdf')
-makedepends=('sbcl' 'texinfo')
+makedepends=('sbcl')
 [ "$CARCH" = "mips64el" ] && \
-makedepends=('clisp' 'texinfo')
+makedepends=('clisp')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
-        "arch-fixes.lisp")
-md5sums=('9d82ec89abbaf265fbfc71a24445dd66'
-         '7ac0c1936547f4278198b8bf7725204d')
+  "arch-fixes.lisp"
+  "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz"
+  "texinfo-4.13a-data_types.patch")
+md5sums=('ca3dd0ce2943e10a1c86ff5f40db3f85'
+         '7ac0c1936547f4278198b8bf7725204d'
+         '71ba711519209b5fb583fed2b3d86fcb'
+         'd8574782ff7def1e2dc5c291dbeaec18')
+
+
+# Temporary Texinfo legacy build
+# See: http://sourceforge.net/mailarchive/message.php?msg_id=30747919
+
+build-texinfo-legacy() {
+  cd ${srcdir}/texinfo-4.13
+  patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch
+  mkdir -p $srcdir/texinfo-instroot
+  ./configure --prefix=$srcdir/texinfo-instroot
+  make install
+}
 
 build() {
+  build-texinfo-legacy
+  export PATH=$srcdir/texinfo-instroot/bin:$PATH
+
   cd "$srcdir/$pkgname-$pkgver"
 
-  export CFLAGS+=" -D_GNU_SOURCE -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
-  export GNUMAKE="make -e"
+  export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl"
+  export GNUMAKE="make"
 
   # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS
   export LINKFLAGS="$LDFLAGS"
@@ -43,9 +62,9 @@ build() {
 EOF
 
   if [ "$CARCH" = "mips64el" ]; then
-    sh make.sh clisp
+    sh make.sh clisp --prefix=/usr
   else
-    sh make.sh sbcl
+    sh make.sh sbcl --prefix=/usr
   fi
   make -C doc/manual info
 }
@@ -53,7 +72,8 @@ EOF
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  INSTALL_ROOT="$pkgdir/usr" sh install.sh
+  # cannot have both SBCL_HOME and INSTALL_ROOT
+  SBCL_HOME="" INSTALL_ROOT="$pkgdir/usr" sh install.sh
 
   src/runtime/sbcl --core output/sbcl.core --script "${srcdir}/arch-fixes.lisp"
   mv sbcl-new.core "${pkgdir}/usr/lib/sbcl/sbcl.core"