updated with changes from plmday

2 files changed, 19 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a9c8c10e4e5c..02684e3c0343 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = io-git
 	pkgdesc = Io is a prototype-based programming language inspired by Smalltalk
 	pkgver = 20110905
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.iolanguage.com/
-	arch = i686,
+	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = git
@@ -11,6 +11,7 @@ pkgbase = io-git
 	depends = libevent
 	depends = yajl
 	depends = pcre
+	conflicts = io
 
 pkgname = io-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8890a574cb60..11774517bc7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,20 @@
-# Maintainer: nandub <dev@nandub-dev.tk>
+# Maintainer: nandub <dev@nandub.info>
+# Contributor: plmday
+
 pkgname=io-git
 pkgver=20110905
-pkgrel=1
-pkgdesc="Io is a prototype-based programming language inspired by Smalltalk"
-arch=('i686', 'x86_64')
+pkgrel=2
+pkgdesc="Io is a prototype-based programming language inspired by
+Smalltalk"
+arch=('i686' 'x86_64')
 url="http://www.iolanguage.com/"
 license=('BSD')
 depends=('libevent' 'yajl' 'pcre')
 makedepends=('git' 'cmake')
+conflicts=('io')
 
-_gitroot=https://github.com/stevedekorte/io.git
-_gitname=io
+_gitroot="https://github.com/stevedekorte/io.git"
+_gitname="io"
 
 build() {
   cd "$srcdir"
@@ -21,21 +25,21 @@ build() {
     msg "The local files are updated."
   else
     git clone --depth=1 "$_gitroot" "$_gitname"
+    cd "$_gitname"
   fi
 
   msg "GIT checkout done or server timeout"
   msg "Starting build..."
 
-  rm -rf "$_gitname-build"
-  mkdir -p "$_gitname-build"
-  cd "$_gitname-build"
+  rm -rf "build"
+  mkdir "build"
+  cd "build"
 
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=release
-  make 
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
 }
 
 package() {
-  cd "$srcdir/$_gitname/$_gitname-build"
+  cd "$srcdir/$_gitname/build"
   make DESTDIR="$pkgdir/" install
 }