7 files changed, 74 insertions, 42 deletions
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 2ef6f8f57..db8a5fc82 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 140836 2011-10-20 05:41:37Z ibiru $
+# $Id: PKGBUILD 142974 2011-11-19 10:42:16Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgname=anjuta
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'python2' 'shared-mime-info' 'desktop-file-utils')
+depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
 makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
 url="http://anjuta.sourceforge.net/"
 install=anjuta.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('1e59aed63312e293c55f2934c4766411e9908fa512dd86e1422e3d906fe75613')
+sha256sums=('909fee6af9b86192eecac47e417f1de8bd8c759dfd2bf3ee288bb146a575683e')
 
 build() {
-  cd "${srcdir}/anjuta-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper
   make
 }
 
 package(){
-  cd "${srcdir}/anjuta-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
   sed -i "1s|#!/usr/bin/python$|&2|" \
     $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
diff --git a/extra/anjuta/anjuta.install b/extra/anjuta/anjuta.install
index c6fcfec11..59113c6f5 100644
--- a/extra/anjuta/anjuta.install
+++ b/extra/anjuta/anjuta.install
@@ -1,9 +1,9 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-mime-database usr/share/mime > /dev/null
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
+  update-mime-database /usr/share/mime > /dev/null
 }
 
 pre_upgrade() {
diff --git a/extra/libffado/60-ffado.rules b/extra/libffado/60-ffado.rules
new file mode 100644
index 000000000..6ab8ef851
--- /dev/null
+++ b/extra/libffado/60-ffado.rules
@@ -0,0 +1,27 @@
+SUBSYSTEM!="firewire", GOTO="ffado_end"
+
+ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S
+ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc.
+ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp.
+ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation
+ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG
+ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation
+ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH
+ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio
+ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc.
+ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc.
+ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc.
+ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited
+ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation
+ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH
+ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems
+ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd.
+ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION
+
+# The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those.
+
+ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW
+ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire
+ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME
+
+LABEL="ffado_end"
diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD
index e97c9273f..580f63adc 100644
--- a/extra/libffado/PKGBUILD
+++ b/extra/libffado/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 106834 2011-01-19 12:28:15Z andrea $
-# Maintainer: Ray Rashif <schivmeister@gmail.com>
+# $Id: PKGBUILD 142989 2011-11-19 21:35:53Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: galiyosha@gmail.com
 # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
 
 pkgname=libffado
 pkgver=2.0.1
-pkgrel=3
+pkgrel=5
 pkgdesc="Driver for FireWire audio devices"
 arch=('i686' 'x86_64')
 url="http://www.ffado.org/"
@@ -13,10 +13,13 @@ license=('GPL')
 depends=('libiec61883' 'libavc1394' 'libsigc++'
           'libxml++' 'alsa-lib' 'dbus')
 makedepends=('scons' 'python2-qt')
-optdepends=('python2-qt: mixer applet')
+optdepends=('python2: ffado-diag'
+            'python2-qt: mixer applet')
 provides=('ffado')
-source=(http://www.ffado.org/files/$pkgname-$pkgver.tar.gz)
-md5sums=('786f31facd417e6207e429f50af0e15e')
+source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz"
+        '60-ffado.rules')
+md5sums=('786f31facd417e6207e429f50af0e15e'
+         'f03a3e950801c4405b8934084651bca8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -41,7 +44,12 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  scons DESTDIR="$pkgdir/" WILL_DEAL_WITH_XDG_MYSELF="True" install
+  scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install
+
+  # add audio device rules
+  # see https://bugs.archlinux.org/task/26342
+  install -Dm644 "$srcdir/60-ffado.rules" \
+    "$pkgdir/lib/udev/rules.d/60-ffado.rules"
 
   # python2 fix
   for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do
diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD
index 2a80a320e..51e4c5126 100644
--- a/extra/perl-tk/PKGBUILD
+++ b/extra/perl-tk/PKGBUILD
@@ -1,44 +1,41 @@
-# $Id: PKGBUILD 124660 2011-05-23 20:07:22Z remy $
+# $Id: PKGBUILD 142966 2011-11-19 08:36:20Z eric $
 # Maintainer: François Charette <francois ατ archlinux δοτ org>
 # Contributor: Jason Chu <jchu@xentac.net>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=perl-tk
 _cpanname=Tk
-pkgver=804.029
-pkgrel=3
+pkgver=804.030
+pkgrel=1
 pkgdesc="A graphical user interface toolkit for Perl"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/${_cpanname}"
 license=('PerlArtistic' 'GPL' 'custom')
-depends=('libx11' 'libpng' 'libjpeg' 'tk' 'perl')
+depends=('libpng' 'libjpeg' 'tk' 'perl')
 options=('!emptydirs')
 replaces=('perltk')
 provides=('perltk')
-source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) 
-md5sums=('f4aebe6fcdb309a8480514f2ccf8117c')
+source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz)
+md5sums=('13275e85f99ee467a86d9598a437abff')
 
 build() {
-  cd $srcdir/${_cpanname}-$pkgver
+  cd "$srcdir/${_cpanname}-$pkgver"
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  /bin/chmod -R u+w *
-  # The Xlib header is wrong...
-  sed -i 's/XKeycodeToKeysym\(.*\)unsigned int/XKeycodeToKeysym\1KeyCode/' pTk/Xlib.h
   make
 }
 
 #check() {
-#  cd $srcdir/${_cpanname}-$pkgver
+#  cd "$srcdir/${_cpanname}-$pkgver"
 #  make test
 #}
 
 package() {
-  cd $srcdir/${_cpanname}-$pkgver
-  make install DESTDIR=$pkgdir
+  cd "$srcdir/${_cpanname}-$pkgver"
+  make install DESTDIR="$pkgdir"
 
   # license
   install -D -m644 pTk/license.terms \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/tk.license
+                   "${pkgdir}/usr/share/licenses/${pkgname}/tk.license"
   install -D -m644 pTk/Tix.license \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/tix.license
+                   "${pkgdir}/usr/share/licenses/${pkgname}/tix.license"
 }
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 01ca3542a..237cdbc04 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141895 2011-11-02 20:35:14Z guillaume $
+# $Id: PKGBUILD 142976 2011-11-19 11:40:12Z 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.3
+pkgver=1.6.4
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -11,7 +11,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'li
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('5012c75c379ffd47fbcf395d9a6e417e')
+md5sums=('a348521c514fcdd890d974f2a0b59db3')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -37,7 +37,7 @@ package_wireshark-cli() {
   #wireshark uid group is 150
   chgrp 150 "${pkgdir}/usr/bin/dumpcap"
   chmod 754 "${pkgdir}/usr/bin/dumpcap"
-  rm "$pkgdir/usr/bin/wireshark"
+  rm "${pkgdir}/usr/bin/wireshark"
 }
 
 package_wireshark-gtk() {
diff --git a/extra/yasm/PKGBUILD b/extra/yasm/PKGBUILD
index 950d609ca..0affd661c 100644
--- a/extra/yasm/PKGBUILD
+++ b/extra/yasm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98381 2010-11-08 19:21:18Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 142979 2011-11-19 15:19:43Z roman $
+# Maintainer: Роман Кирилич (Roman Kyrylych) <roman@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Vinay S Shastry <vinayshastry@gmail.com>
 
 pkgname=yasm
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://www.tortall.net/projects/yasm/"
 depends=('glibc')
 source=(http://www.tortall.net/projects/yasm/releases/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('8392e5f2235c2c2a981e1a633f2698cb')
+md5sums=('4cfc0686cf5350dd1305c4d905eb55a6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}