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

[Jan de Groot]

    Date: Sunday, August 16, 2009 @ 17:44:37
  Author: jgc
Revision: 49929

Resolve conflict

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

----------+
 PKGBUILD |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)


Property changes on: came/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /came/trunk:1
   + /came/trunk:1-49928

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-16 21:41:13 UTC (rev 49928)
+++ extra-i686/PKGBUILD	2009-08-16 21:44:37 UTC (rev 49929)
@@ -2,26 +2,30 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Curtis Campbell <curtisjamescampbell at hotmail.com>
 # Contributor: dorphell <dorphell at archlinux.org>
+
 pkgname=came
 pkgver=1.9
-pkgrel=4
+pkgrel=5
 pkgdesc="Replacement for xawtv webcam application"
 arch=(i686 x86_64)
 license=('GPL')
 url='http://linuxbrit.co.uk/camE/'
-depends=('giblib' 'curl>=7.16.2')
+depends=('giblib' 'curl>=7.19.6')
 source=(http://linuxbrit.co.uk/downloads/camE-${pkgver}.tar.gz
         came-1.9-curl-friendly.patch)
+md5sums=('8bdc049b01cd32088eef8cccf3c096ab'
+         'e0f1375b7a554e11c1d161d5112dd53d')
 
 build() {
-  cd ${startdir}/src/camE-${pkgver}
-  patch -Np1 -i ${startdir}/src/came-1.9-curl-friendly.patch || return 1
-  sed -i 's|#define VERSION "1.7"|#define VERSION "1.7"\n#define TRUE 1\n#define FALSE 0|' webcam.c
+  cd "${srcdir}/camE-${pkgver}"
+  patch -Np1 -i "${srcdir}/came-1.9-curl-friendly.patch" || return 1
+  sed -i 's|#define VERSION "1.7"|#define VERSION "1.7"\n#define TRUE 1\n#define FALSE 0|' webcam.c || return 1
   make || return 1
-  install -D -m 755 camE ${startdir}/pkg/usr/bin/camE
-  install -D -m 644 example.camErc ${startdir}/pkg/usr/share/came/camErc
-  install -D -m 644 example.camErc.ssh ${startdir}/pkg/usr/share/came/camErc.ssh
+
+  install -m755 -d "${pkgdir}/usr/bin"
+  install -m755 -d "${pkgdir}/usr/share/came"
+
+  install -m755 camE "${pkgdir}/usr/bin/" || return 1
+  install -m644 example.camErc "${pkgdir}/usr/share/came/camErc" || return 1
+  install -m644 example.camErc.ssh "${pkgdir}/usr/share/came/camErc.ssh" || return 1
 }
-
-md5sums=('8bdc049b01cd32088eef8cccf3c096ab'
-         'e0f1375b7a554e11c1d161d5112dd53d')