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

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

1 files changed, 18 insertions, 17 deletions

diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 1ceafa35a..8c8d6aa83 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177952 2013-02-12 12:13:48Z thomas $
+# $Id: PKGBUILD 186140 2013-05-21 09:11:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -13,7 +13,6 @@ conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
-        mdadm 
         mdadm.conf 
         mdadm_install
         mdadm_hook
@@ -22,12 +21,24 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         disable-werror.patch
         mdadm-fix-udev-rules.patch)
 replaces=('raidtools')
+md5sums=('3e255dc71e5144bbcb872788ca647267'
+         '5a37c112aa07dccdde62f9fa5b888607'
+         'af2f73f0094ebee66f503ca4710c7142'
+         'fbfb7d07efcbaf5dc61af424c5f6e352'
+         'b6b0bfd6487c99264578630616dfe5eb'
+         'eb1786b18fa4d13cfd7b71d6b05cfb4f'
+         '4ad87b74a4bc9a34621280abe0e0c3e4'
+         '6c76f2f261c1c3397c7290633f0a9acc')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
   patch -p1 -i ../mdadm-fix-udev-rules.patch
-  make CXFLAGS="$CFLAGS"
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  make CXFLAGS="$CFLAGS" BINDIR=/usr/bin
   # build static mdassemble for Arch's initramfs
   make MDASSEMBLE_AUTO=1 mdassemble
   
@@ -35,22 +46,12 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/usr/bin/install DESTDIR=$pkgdir install
-  install -D -m755 mdassemble $pkgdir/sbin/mdassemble
+  make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+  install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
-  install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
   install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
   install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
   install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev
   # systemd service file
   install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service
 }
-md5sums=('3e255dc71e5144bbcb872788ca647267'
-         '8333d405f550317c2bacd5510bf1cb60'
-         '00cbed931db4f15b6ce49e3e7d433966'
-         '815245a3af16a73ec1c5e5989fb892e9'
-         'fbb5542d9bdf87441a11dd7e7a0a17f8'
-         '0e35422d0cc007c3654a5e2591a9f9b5'
-         'aafb5f9ac8437a284cbf948b9b13b179'
-         '4ad87b74a4bc9a34621280abe0e0c3e4'
-         '0bf45d6dcb3ea14facddbb10b3303806')