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

Conflicts:
	community-staging/happy/PKGBUILD
	community-staging/haskell-dataenc/PKGBUILD
	community-staging/haskell-quickcheck/PKGBUILD
	community/gnonlin/PKGBUILD
	extra/bochs/PKGBUILD

3 files changed, 18 insertions, 18 deletions

diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD
index 7ef27a9bd..6fb801418 100644
--- a/extra/bochs/PKGBUILD
+++ b/extra/bochs/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 151161 2012-02-25 06:28:51Z pierre $
+# $Id: PKGBUILD 166567 2012-09-11 23:15:35Z eric $
 #Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=bochs
-pkgver=2.5.1
+pkgver=2.6
 pkgrel=1
 pkgdesc="A portable x86 PC emulation software package"
 arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
 url="http://bochs.sourceforge.net/"
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+license=('LGPL')
 depends=('gcc-libs' 'libxrandr')
-md5sums=('4fe5325ec422a7f74dbb0adb52c76bb6')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('7e25e1a4d2f7e0464e8d6381f38741d9')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --without-wx --enable-cpu-level=6 \
-              --enable-fpu --enable-3dnow
+              --enable-fpu --enable-3dnow --enable-disasm
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make prefix=${pkgdir}/usr install
-  install -D -m 644 .bochsrc ${pkgdir}/etc/bochsrc-sample.txt
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m 644 .bochsrc "${pkgdir}/etc/bochsrc-sample.txt"
 }
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 75d055041..64f173e66 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165835 2012-08-31 19:34:55Z giovanni $
+# $Id: PKGBUILD 166562 2012-09-11 07:22:15Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.08.31
+pkgver=2012.09.11
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('f8d2b0e4809b4dfa97ec2e6b557eb4b4')
+md5sums=('2ea74ee10caa15d79f0a2ea3681703f2')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index 7f0fb0ddc..58e266a47 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 166317 2012-09-06 01:14:06Z stephane $
+# $Id: PKGBUILD 166564 2012-09-11 14:37:47Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=nasm
-pkgver=2.10.04
+pkgver=2.10.05
 pkgrel=1
 pkgdesc="An 80x86 assembler designed for portability and modularity"
 url="http://www.nasm.us"
 license=('BSD')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
-makedepends=('ghostscript')
 source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('d80b5ea8f59a4929efddcb8e90d00b8a0fc00cb5')
+sha1sums=('fb9cd57680ed8026c9b612f0db8ecf8df05a1e3c')
 install=nasm.install
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   ./configure --prefix=/usr
-  make everything
+  make
+  make -C doc info
 }
 
 package() {