fix the bedops and plink

BioArchLinux/bedops/PKGBUILD

@@ -20,12 +20,6 @@ build() {
 
 package() {
     cd "$srcdir"/$pkgname-$pkgver
-<<<<<<< HEAD
-    make install
-    mkdir -p "$pkgdir"/usr/bin
-    mv bin/* $pkgdir/usr/bin 
-=======
     mkdir -p "$pkgdir"/usr
     cp -r bin $pkgdir/usr/
->>>>>>> refs/remotes/origin/master
 }

BioArchLinux/plink/PKGBUILD

@@ -7,6 +7,7 @@ arch=('i686' 'x86_64')
 license=('GPL')
 url="http://zzz.bwh.harvard.edu/plink/download.shtml"
 depends=('r' 'zlib' 'lapack')
+makedepends=('clang' 'make')
 source=(http://zzz.bwh.harvard.edu/plink/dist/${pkgname}-${pkgver}-src.zip
         current_gcc.patch)
 md5sums=('4566376791df4e69459b849bd7078fa3'
@@ -22,7 +23,7 @@ prepare() {
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}-src
-  make
+  make CXX_UNIX='clang++'
 }
 
 package() {