[arch-commits] Commit in scummvm/repos (extra-i686 extra-i686/PKGBUILD)

[Allan McRae]

    Date: Saturday, October 31, 2009 @ 10:40:58
  Author: allan
Revision: 57416

Merged revisions 57415 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/scummvm/trunk

........
  r57415 | allan | 2009-11-01 00:40:02 +1000 (Sun, 01 Nov 2009) | 2 lines
  
  upgpkg: scummvm 0.13.1-2
      FHS man packages
........

Modified:
  scummvm/repos/extra-i686/	(properties)
  scummvm/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)


Property changes on: scummvm/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /scummvm/trunk:1-42101
   + /scummvm/trunk:1-57415

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-31 14:40:02 UTC (rev 57415)
+++ extra-i686/PKGBUILD	2009-10-31 14:40:58 UTC (rev 57416)
@@ -4,32 +4,31 @@
 
 pkgname=scummvm
 pkgver=0.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.scummvm.org/"
-depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'libmpeg2' 'flac>=1.1.4')
+depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'libmpeg2' 'flac>=1.1.4' 'sdl')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ${pkgname}-${pkgver}-gcc4-fix.patch)
 md5sums=('843d9cd4470022bd3b269eb84298dc16' '810a6f483010cd2ccc434f7d01d0436f')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -p1 -i ${startdir}/${pkgname}-${pkgver}-gcc4-fix.patch
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 -i ${srcdir}/${pkgname}-${pkgver}-gcc4-fix.patch
   ./configure --backend=sdl --disable-debug \
 			--with-mpeg2-prefix=/usr \
 			--with-flac-prefix=/usr \
                         --prefix=/usr \
                         --disable-fluidsynth
   /usr/bin/make || return 1
-  install -D -m 755 scummvm ${startdir}/pkg/usr/bin/scummvm
-  install -D -m 644 dists/scummvm.6 ${startdir}/pkg/usr/man/man6/scummvm.6
-  install -m644 -D gui/themes/modern.ini ${startdir}/pkg/usr/share/scummvm/modern.ini
-  install -m644 -D gui/themes/modern.zip ${startdir}/pkg/usr/share/scummvm/modern.zip
+  install -Dm755 scummvm ${pkgdir}/usr/bin/scummvm
+  install -Dm644 dists/scummvm.6 ${pkgdir}/usr/share/man/man6/scummvm.6
+  install -Dm644 gui/themes/modern.ini ${pkgdir}/usr/share/scummvm/modern.ini
+  install -Dm644 gui/themes/modern.zip ${pkgdir}/usr/share/scummvm/modern.zip
   # fixes FS#9118 
-  install -D -m644 dists/${pkgname}.desktop \
-	${startdir}/pkg/usr/share/applications/${pkgname}.desktop
-  install -D -m644  icons/scummvm.xpm \
-	${startdir}/pkg/usr/share/pixmaps/scummvm.xpm
+  install -Dm644 dists/${pkgname}.desktop \
+	${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644  icons/scummvm.xpm \
+	${pkgdir}/usr/share/pixmaps/scummvm.xpm
 }
-# vim: ts=2 sw=2 et ft=sh