Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

sbcl/PKGBUILD

@@ -4,11 +4,10 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-# include global config
+# no cross-compiling for this package, use i686 host
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=sbcl
-pkgver=1.0.47
+pkgver=1.0.55
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 arch=('i686' 'x86_64')
@@ -17,18 +16,20 @@ depends=('glibc')
 provides=('common-lisp' 'cl-asdf')
 makedepends=('sbcl' 'texinfo')
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "chakra-fixes.lisp")
-md5sums=('2e90fca5ffec9ce19ed232b24f09cd0a' '7ac0c1936547f4278198b8bf7725204d')
+md5sums=('128fb15c80e8e3f8d4024bd8e04635e0' '7ac0c1936547f4278198b8bf7725204d')
 url="http://www.sbcl.org/"
 install=sbcl.install
 
 build() {
-  export CFLAGS="${CFLAGS} -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
+  cd "$srcdir/$pkgname-$pkgver"
+
+  export CFLAGS+=" -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
   export GNUMAKE="make -e"
 
   # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS
-  export LINKFLAGS="$LD_FLAGS" 
+  export LINKFLAGS="$LDFLAGS"
   unset LDFLAGS
-  cd ${startdir}/src/${pkgname}-${pkgver}
+
   # Make a multi-threaded SBCL, disable LARGEFILE
   cat >customize-target-features.lisp <<EOF
 (lambda (features)
@@ -39,37 +40,30 @@ build() {
 EOF
 
   sh make.sh sbcl
-  mkdir -p ${startdir}/pkg/usr
+  make -C doc/manual info
-  pushd doc/manual
+}
-  make info || return 1
+
-  popd 
+package() {
-  INSTALL_ROOT=${startdir}/pkg/usr sh install.sh
+  cd "$srcdir/$pkgname-$pkgver"
+
+  INSTALL_ROOT="$pkgdir/usr" sh install.sh
 
   src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/chakra-fixes.lisp
   mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core
 
-# sources
+  # sources
-  mkdir -p ${startdir}/pkg/usr/share/sbcl-source
+  mkdir -p "$pkgdir/usr/share/sbcl-source"
-  cp -R -t ${startdir}/pkg/usr/share/sbcl-source \
+  cp -R -t "$pkgdir/usr/share/sbcl-source" "$srcdir/$pkgname-$pkgver/"{src,contrib}
-    ${startdir}/src/${pkgname}-${pkgver}/{src,contrib}
-
-# drop unwanted files
-  find ${startdir}/pkg/usr/share/sbcl-source -type f \
-    -name \*.fasl -or \
-    -name \*.o -or \
-    -name \*.log -or \
-    -name \*.so -or \
-    -name a.out -delete
-
-  rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl
-  rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl.nm
-
-  find ${startdir}/pkg \( -name Makefile -o -name .cvsignore \) -delete
-
-  rm $startdir/pkg/usr/share/info/dir
-  gzip -9nf $startdir/pkg/usr/share/info/*
 
   # license
-  install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \
+  install -D -m644 "$srcdir/$pkgname-$pkgver/COPYING" \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt
+                   "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+
+  # drop unwanted files
+  find "$pkgdir" \( -name Makefile -o -name .cvsignore \) -delete
+  find "$pkgdir/usr/share/sbcl-source" -type f \
+    \( -name \*.fasl -o -name \*.o -o -name \*.log -o -name \*.so -o -name a.out \) -delete
+
+  rm "$pkgdir/usr/share/sbcl-source/src/runtime/sbcl"{,.nm}
+
 }

startup-notification/PKGBUILD

@@ -5,20 +5,26 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=startup-notification
-pkgver=0.10
+pkgver=0.12
-pkgrel=2
+pkgrel=1
-pkgdesc="Monitor and display application startup"
+pkgdesc="Monitor and display application startup."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('libx11' 'libsm' 'xcb-util>=0.3.4')
 options=('!libtool')
 url="http://www.freedesktop.org"
-source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz)
+source=("http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('bca0ed1c74bc4e483ea2ed12a5717354')
+md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || return 1
+  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc
-  make || return 1
+  make
-  make DESTDIR="${pkgdir}" install || return 1
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:

xorg-utils/PKGBUILD

@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xorg-utils
 pkgver=7.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Collection of client utilities used to query the X server"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -24,7 +24,7 @@ source=(${url}/releases/individual/app/xdpyinfo-1.2.0.tar.bz2
         ${url}/releases/individual/app/xfd-1.1.0.tar.bz2
         ${url}/releases/individual/app/xfontsel-1.0.3.tar.bz2
         ${url}/releases/individual/app/xlsatoms-1.1.0.tar.bz2
-        ${url}/releases/individual/app/xlsclients-1.1.1.tar.bz2
+        ${url}/releases/individual/app/xlsclients-1.1.2.tar.bz2
         ${url}/releases/individual/app/xlsfonts-1.0.3.tar.bz2
         ${url}/releases/individual/app/xprop-1.2.0.tar.bz2
         ${url}/releases/individual/app/xvinfo-1.1.1.tar.bz2
@@ -38,7 +38,7 @@ md5sums=('c52fda7bbc80e74b7839f29298cb1d77'
          '17d8ef0d490301158f8abf7641cca243'
          '299fabe7d7be92b6572d814895ce3bb1'
          'c543ccb6489b629d427810d9a57d0724'
-         '6d42621616da0c720f640d23873604ce'
+         '760099f0af112401735801e3b9aa8595'
          'bf6f3e7074479839d5182ffed735d2be'
          'e6d0673a1e1e469f0a6220a6868fb94b'
          'c88feb501083951a8f47a21aaeb1529d'
@@ -58,7 +58,7 @@ build() {
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
-      ./configure --prefix=/usr --mandir=/usr/share/man --without-xprint || return 1
+      ./configure --prefix=/usr --mandir=/usr/share/man || return 1
       make || return 1
       make DESTDIR="${pkgdir}" install || return 1
       install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*} || return 1