Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/jack2/PKGBUILD
	community/tremulous/PKGBUILD
	extra/audiofile/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/jhead/PKGBUILD
	extra/redland/PKGBUILD
	multilib/nspluginwrapper/PKGBUILD

1 files changed, 20 insertions, 22 deletions

diff --git a/community/conkeror-git/PKGBUILD b/community/conkeror-git/PKGBUILD
index d44bd1188..0cc4cc632 100644
--- a/community/conkeror-git/PKGBUILD
+++ b/community/conkeror-git/PKGBUILD
@@ -1,17 +1,17 @@
 # Contributor: Heeru Kiyura <M8R-p9i5nh@mailinator.com>
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
-_commit=c53588e0e42330f65e8c3be41900900da17a7eda
+_commit=b0882d615876ec7c1554e50b652bed79209da4d6
 pkgname=conkeror-git
 pkgver=1.0pre
-pkgrel=2
+pkgrel=3
 pkgdesc="A highly programmable web browser based on Mozilla XULRunner."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://conkeror.mozdev.org/"
 license=('MPL' 'GPL' 'LGPL')
 depends=('xulrunner' 'desktop-file-utils')
-makedepends=('git' 'imagemagick')
-provides=(conkeror)
+makedepends=('git')
+provides=('conkeror')
 source=(conkeror_gimpfile.xpm conkeror.sh)
 md5sums=('b592582a5b923db1707615564a95737f'
          '11c6c76a2639254754b34a542f1965a1')
@@ -21,10 +21,10 @@ __gitroot="git://repo.or.cz/conkeror.git"
 __gitname="conkeror"
 
 build() {
-  cd $srcdir
+  cd "$srcdir"
 
  ## Git checkout
-  if [ -d $srcdir/${__gitname} ] ; then
+  if [ -d "$srcdir/${__gitname}" ] ; then
     msg "Git checkout:  Updating existing tree"
     cd ${__gitname} && git checkout ${_commit}
     msg "Git checkout:  Tree has been updated"
@@ -35,24 +35,22 @@ build() {
   msg "Checkout completed"
 
  ## Build
-  [ -d ${__gitname}-build ] || rm -rf $srcdir/${__gitname}-build
-  git clone $srcdir/${__gitname} $srcdir/${__gitname}-build
-  cd $srcdir/${__gitname}-build
+  [ -d ${__gitname}-build ] || rm -rf "$srcdir/${__gitname}-build"
+  git clone "$srcdir/${__gitname}" "$srcdir/${__gitname}-build"
+  cd "$srcdir/${__gitname}-build"
   make
 }
 
 package() { 
-  cd $srcdir/${__gitname}-build
-  install -d $pkgdir/usr/share/conkeror
-  install -d $pkgdir/usr/share/man/man1
-  cp -a $srcdir/${__gitname}-build/* $pkgdir/usr/share/conkeror 
-  install -Dm644 $pkgdir/usr/share/conkeror/contrib/man/conkeror.1 \
-    $pkgdir/usr/share/man/man1/conkeror.1
-  rm -r $pkgdir/usr/share/conkeror/contrib/man
-  install -Dm644 $srcdir/${__gitname}-build/debian/conkeror.desktop \
-    $pkgdir/usr/share/applications/conkeror.desktop
-  rm -r $pkgdir/usr/share/conkeror/debian
-  install -d $pkgdir/usr/share/pixmaps
-  install -Dm644 $srcdir/conkeror_gimpfile.xpm $pkgdir/usr/share/pixmaps
-  install -Dm755 $srcdir/conkeror.sh $pkgdir/usr/bin/conkeror
+  cd "$srcdir/${__gitname}-build"
+  install -d "$pkgdir"/usr/share/{conkeror,man/man1}
+  cp -a "$srcdir"/${__gitname}-build/* "$pkgdir/usr/share/conkeror"
+  install -Dm644 "$pkgdir/usr/share/conkeror/contrib/man/conkeror.1" \
+    "$pkgdir/usr/share/man/man1/conkeror.1"
+  rm -r "$pkgdir/usr/share/conkeror/contrib/man"
+  install -Dm644 "$srcdir/${__gitname}-build/debian/conkeror.desktop" \
+    "$pkgdir/usr/share/applications/conkeror.desktop"
+  rm -r "$pkgdir/usr/share/conkeror/debian"
+  install -Dm644 "$srcdir/conkeror_gimpfile.xpm" "$pkgdir/usr/share/pixmaps/conkeror_gimpfile.xpm"
+  install -Dm755 "$srcdir/conkeror.sh" "$pkgdir/usr/bin/conkeror"
 }