[arch-commits] Commit in cmucl/trunk (PKGBUILD)

[Jürgen Hötzel]

    Date: Saturday, June 11, 2016 @ 10:24:26
  Author: juergen
Revision: 269323

upgpkg: cmucl 21a-1

Modified:
  cmucl/trunk/PKGBUILD

----------+
 PKGBUILD |   74 +++++++++++++++++++++++--------------------------------------
 1 file changed, 29 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-11 07:17:16 UTC (rev 269322)
+++ PKGBUILD	2016-06-11 08:24:26 UTC (rev 269323)
@@ -1,66 +1,50 @@
-# $Id$
 # Contributor: John Proctor <jproctor at prium.net>
+# Contributor: Alain Kalker <a.c.kalker at gmail.com>
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=cmucl
-pkgver=20d
+pkgver=21a
 pkgrel=1
 pkgdesc="CMU Common Lisp"
-depends=('glibc' 'lesstif')
+depends_i686=('glibc' 'lesstif')
+depends_x86_64=('lib32-glibc' 'lesstif')
 provides=('common-lisp')
 makedepends=('sed' 'bc')
 license=('custom')
 #license PublicDomain
-source=(http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2{,.asc} \
-  http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2{,.asc})
+source=("https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2"
+        "https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2")
 
-md5sums=('95700138a53f21231f58e3ab5702b40c' '0f578aea21cad3f729230911a246030c'
-         '947528c8c1abdabdc0e99c093e0e77ad' '1685fe47db90f7a3fe63d178dbbee162')
-url="http://www.cons.org/cmucl/"
-arch=(i686)
+sha256sums=('41604a4f828a134dbf8a58623f45bd81b76ae05fc5c4cea5ccb74edfdc9e3167'
+            '02d00c025723e7a2fa7a44e43d3f27ec39c9b871ea0332e472a439ada2620d71')
+url="https://www.cons.org/cmucl/"
+arch=('i686' 'x86_64')
 
+prepare() {
+  cd "${srcdir}"
+
+  if [[ $CARCH == "i686" ]]; then
+    sed -i 's|i386\*|i686\*|' bin/build-all.sh
+  fi
+}
+
 build() {
   cd "${srcdir}"
-  export CMUCLCORE="${srcdir}"/lib/cmucl/lib/lisp-x87.core
-  # Create target buildroot
-  ./bin/create-target.sh $CHOST 
-  # Use binary-dist lisp to create initial kernel.core
-  ./bin/build-world.sh $CHOST "${srcdir}"/bin/lisp
-  # build native lisp binary
-  ./bin/rebuild-lisp.sh $CHOST 
-  # Generate lisp.core
-  ./bin/load-world.sh $CHOST  ${pkgver}
-  # rebuild kernel.core using native lisp 
-  ./bin/build-world.sh $CHOST $CHOST/lisp/lisp
-  # "(Re)generate lisp.core"
-  ./bin/load-world.sh $CHOST ${pkgver} 
-  # Build auxilary stuff
-  ./bin/build-utils.sh $CHOST 
-  # make new binary dist archives
-  ./bin/make-dist.sh $CHOST ${pkgver} x86 linux
+  export CMUCLLIB="${srcdir}"/lib/cmucl/lib
+  # Build using binary-dist lisp
+  ./bin/build-all.sh -o "${srcdir}"/bin/lisp
 }
 
 package() {
   cd "${srcdir}"
-  mkdir -p "${pkgdir}"/usr/lib/cmucl/
-  mkdir -p "${pkgdir}"/usr/share/man/man1
-  mkdir dist
-  tar xjf cmucl-${pkgver}-x86-linux.tar.bz2 -C dist 
-  tar xjf cmucl-${pkgver}-x86-linux.extra.tar.bz2 -C dist
-  cp -a dist/bin "${pkgdir}"/usr/lib/cmucl
-  cp -a dist/lib/cmucl "${pkgdir}"/usr/lib/ 
-  cp -a dist/man/man1/* "${pkgdir}"/usr/share/man/man1/
-
-  ## Setup app-wrapper
-  install -m755 -p -D lib/cmucl/sample-wrapper "${pkgdir}"/usr/bin/cmucl
-  # Fixup paths in wrapper
-  sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=/usr/lib/cmucl/lib|" "${pkgdir}"/usr/bin/cmucl
-  sed -i -e "s|/<<your-cmucl-path>>|/usr/lib/cmucl|"      "${pkgdir}"/usr/bin/cmucl
-  # many apps (ie, maxima) expect to find the wrapper named 'lisp' too
-  ln -sf cmucl "${pkgdir}"/usr/bin/lisp
-  ## Unpackaged files
-  rm -f "${pkgdir}"/usr/lib/cmucl/sample-wrapper
+  # install distribution
+  ./bin/make-dist.sh -I "${pkgdir}"/usr -M share/man/man1 linux-4
+  # move docs
+  mv "${pkgdir}"/usr/doc "${pkgdir}"/usr/share/
+  # backwards compatibility
+  ln -sf lisp "${pkgdir}"/usr/bin/cmucl
   # license
   install -D -m644 "${srcdir}"/src/general-info/COPYRIGHTS \
-                   "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+                   "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
+