4 files changed, 81 insertions, 20 deletions
diff --git a/extra/bootchart/PKGBUILD b/extra/bootchart/PKGBUILD
new file mode 100644
index 000000000..5eb0b3d28
--- /dev/null
+++ b/extra/bootchart/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 154392 2012-03-27 12:40:40Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+pkgname="bootchart"
+pkgver=1.15
+pkgrel=1
+pkgdesc="a 'startup' graphing tool"
+url="https://meego.gitorious.org/meego-developer-tools/bootchart"
+license=('GPL2')
+arch=(i686 x86_64)
+depends=('glibc')
+source=("http://foo-projects.org/~sofar/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+	'build.patch')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i ../build.patch
+
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('e24cad9db140521fca5193a88589e669'
+         '5546709bc77b775290cb54a29affa6ec')
diff --git a/extra/bootchart/build.patch b/extra/bootchart/build.patch
new file mode 100644
index 000000000..82c6e1bfd
--- /dev/null
+++ b/extra/bootchart/build.patch
@@ -0,0 +1,34 @@
+From 4fe62e6b4c072676d246be02ba92a1df3a9d0feb Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Fri, 16 Mar 2012 01:34:10 +0100
+Subject: [PATCH] Makefile: move binary and avoid empty dirs
+
+Install to /usr/bin by default, and don't install an empty /etc.
+---
+ Makefile |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 566a848..c017509 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,12 +6,10 @@ CC := gcc
+ all: bootchartd
+ 
+ install: bootchartd
+-	mkdir -p $(DESTDIR)/sbin
+-	mkdir -p $(DESTDIR)/etc
+-	mkdir -p $(DESTDIR)/usr/share/doc/bootchart/
+-	install -m0755 bootchartd $(DESTDIR)/sbin/
+-	install -m0644 bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
+-	install -m0644 README COPYING $(DESTDIR)/usr/share/doc/bootchart/
++	install -d $(DESTDIR)/usr/bin
++	install -d $(DESTDIR)/usr/share/doc/bootchart
++	install -m0755 bootchartd $(DESTDIR)/usr/bin/
++	install -m0644 README COPYING bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
+ 
+ OBJS := log.o svg.o bootchart.o
+ 
+-- 
+1.7.9.4
+
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 6419aeede..eb146c9d0 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153414 2012-03-13 02:15:42Z dan $
+# $Id: PKGBUILD 154397 2012-03-27 14:31:30Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.9.4
+pkgver=1.7.9.5
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -64,8 +64,8 @@ package() {
     INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
 
   # bash completion
-  mkdir -p "$pkgdir"/etc/bash_completion.d/
-  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git 
+  mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
+  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git 
   # more contrib stuff
   cp -a ./contrib $pkgdir/usr/share/git/ 
   # scripts are for python 2.x
@@ -92,7 +92,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('05d2ff75ffd3356516d096f992b4fb3b8b6c0079'
-          '833dc143d2d296754d681c57b41a008ff433b225'
+sha1sums=('33f5a5b0b6c8f8addbbec0b042731c44fd79f90c'
+          '37a162c22127adc82ce9fb75aacddb6428c565da'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 1ebf77ac2..f50c28492 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 146574 2012-01-13 19:50:27Z ibiru $
+# $Id: PKGBUILD 154405 2012-03-27 21:06:46Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
-pkgver=1.6.5
+pkgver=1.6.6
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
 url="http://www.wireshark.org/"
 options=(!libtool)
-source=(http://www.wireshark.org/download/src/$pkgbase-$pkgver.tar.bz2)
-md5sums=('794948a10d387fc8e37d824ea11dbac9')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('61145ccd7684b3cfb159fc902fedfecf')
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   ./configure \
       --prefix=/usr \
@@ -30,14 +30,14 @@ package_wireshark-cli() {
   install=wireshark.install
   conflicts=(wireshark)
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 
   #wireshark uid group is 150
-  chgrp 150 "$pkgdir/usr/bin/dumpcap"
-  chmod 754 "$pkgdir/usr/bin/dumpcap"
-  rm "$pkgdir/usr/bin/wireshark"
+  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+  chmod 754 "${pkgdir}/usr/bin/dumpcap"
+  rm "${pkgdir}/usr/bin/wireshark"
 }
 
 package_wireshark-gtk() {
@@ -47,11 +47,11 @@ package_wireshark-gtk() {
   replaces=(wireshark)
   conflicts=(wireshark)
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  install -Dm755 .libs/wireshark "$pkgdir/usr/bin/wireshark"
+  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
   for d in 16 32 48; do
-      install -Dm644 image/hi${d}-app-wireshark.png "$pkgdir/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
+      install -Dm644 image/hi${d}-app-wireshark.png "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
   done
-  install -Dm644 wireshark.desktop "$pkgdir/usr/share/applications/wireshark.desktop"
+  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
 }