adjust

3 files changed, 16 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0c379f9dc22..206f55665d6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,8 +9,6 @@ pkgbase = freegish-git
 	license = GPL
 	makedepends = git
 	makedepends = cmake
-	makedepends = mesa
-	makedepends = imagemagick
 	depends = sdl
 	depends = openal
 	depends = libvorbis
diff --git a/PKGBUILD b/PKGBUILD
index 6311c0435a4a..362e78e5f096 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,11 +8,10 @@ pkgver=1.60.181.f53d915
 pkgrel=1
 pkgdesc="Free version of gish, a physics platformer"
 arch=('x86_64' 'i686')
-#url="http://github.com/FrozenCow/gish"
 url="http://github.com/freegish/freegish"
 license=('GPL')
 depends=('sdl' 'openal' 'libvorbis' 'libpng' 'libgl')
-makedepends=('git' 'cmake' 'mesa' 'imagemagick')
+makedepends=('git' 'cmake')
 provides=('freegish')
 conflicts=('freegish')
 install='freegish.install'
@@ -30,28 +29,28 @@ pkgver() {
   echo 1.60.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
-build() {
+prepare() {
   cd "$srcdir/$_pkgname"
 
   # libmath fix...
   patch -p1 < ../libmath.patch
-  mkdir build && cd build
-  cmake ..
+}
+
+build() {
+  cd "$srcdir/$_pkgname"
+  mkdir -p build
+  cd build
+	cmake .. -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd $srcdir/$_pkgname
-  install -Dm755 ${_pkgname} $pkgdir/usr/bin/${_pkgname}
-  install -dm755 $pkgdir/usr/share/${_pkgname}
-  mkdir -p $pkgdir/usr/share/{icons,applications}
-
-  # i don't know if there's a better way instead of using imagemagick... hmm
-  convert ${_pkgname}.bmp $pkgdir/usr/share/icons/${_pkgname}.png
+	cd "$srcdir/$_pkgname"
+	cd build
+	make install DESTDIR="$pkgdir"
 
-  install -m644 ${srcdir}/${_pkgname}.desktop $pkgdir/usr/share/applications/${_pkgname}.desktop
-  # there's no texturesets or tile0{1,2,3} dir in git repo...
-  cp -r animation level music sound texture $pkgdir/usr/share/${_pkgname}
+	cd "$srcdir/$_pkgname"
+  cp -r music "$pkgdir/usr/share/$_pkgname"
 }
 
 # vim: sw=2:ts=2 et:
diff --git a/freegish.install b/freegish.install
index 7f4b3bcaa77a..905229fc33e4 100644
--- a/freegish.install
+++ b/freegish.install
@@ -1,5 +1,5 @@
 post_install() {
-cat << _EOF
+cat << END
 If you own original assets from purchased version,
 copy the following directories into /usr/share/freegish:
  * animation
@@ -8,13 +8,9 @@ copy the following directories into /usr/share/freegish:
  * sound
  * texture
  * tile01 ... tile07
-_EOF
+END
 }
 
 post_upgrade() {
 	post_install
 }
-
-op=$1
-shift
-$op $*