Mon Sep 5 23:14:38 UTC 2011

12 files changed, 115 insertions, 73 deletions

diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD
index 14050f70b..2d32793d0 100644
--- a/extra/alsa-oss/PKGBUILD
+++ b/extra/alsa-oss/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 13735 2008-09-28 09:02:32Z tpowa $
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 136976 2011-09-04 11:56:05Z pierre $
+# Contributor: judd <jvinet@zeroflux.org>
+
 pkgname=alsa-oss
 pkgver=1.0.17
-pkgrel=1
+pkgrel=2
 pkgdesc="OSS compatibility library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.alsa-project.org"
-options=(!libtool)
-depends=('glibc' 'alsa-lib>=1.0.17a')
-source=(ftp://ftp.alsa-project.org/pub/oss-lib/$pkgname-$pkgver.tar.bz2)
+options=('!libtool')
+depends=('alsa-lib')
+source=("ftp://ftp.alsa-project.org/pub/oss-lib/$pkgname-$pkgver.tar.bz2")
+md5sums=('1b1850c2fc91476a73d50f537cbd402f')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 }
-md5sums=('1b1850c2fc91476a73d50f537cbd402f')
diff --git a/extra/ftjam/PKGBUILD b/extra/ftjam/PKGBUILD
index b78dac253..42726f3cb 100644
--- a/extra/ftjam/PKGBUILD
+++ b/extra/ftjam/PKGBUILD
@@ -1,30 +1,29 @@
-# $Id: PKGBUILD 49903 2009-08-16 20:18:01Z jgc $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
+# $Id: PKGBUILD 136989 2011-09-04 19:07:07Z eric $
+# Maintainer: Roman Kyrylych <roman@gmail.com>
+# Contributor: Roman Kyrylych <roman@gmail.com>
 
 pkgname=ftjam
 pkgver=2.5.3rc2
-pkgrel=2
+pkgrel=3
 pkgdesc='FT Jam - an enhanced version of the Jam build tool'
 arch=('i686' 'x86_64')
 url="http://freetype.org/jam/"
 license=('custom')
 depends=('glibc')
 provides=('jam')
-conflicts=('jam')
-replaces=('jam')
 #source=(http://downloads.sourceforge.net/freetype/$pkgname-$pkgver.tar.bz2 \
-source=(http://david.freetype.org/jam/${pkgname}-${pkgver}.tar.bz2
-        license.txt)
+source=(http://david.freetype.org/jam/${pkgname}-${pkgver}.tar.bz2 license.txt)
 md5sums=('911cc4191b3e7213905d107962b4529b'
-         '2addc259114b4f50a870fa04881e1200')
+         'ef8ff7da77fe60e25d1e3e740600f1f0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+}
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
 }
diff --git a/extra/ftjam/license.txt b/extra/ftjam/license.txt
index d111145cc..4b633251a 100644
--- a/extra/ftjam/license.txt
+++ b/extra/ftjam/license.txt
@@ -5,4 +5,3 @@ freely, as long as this copyright notice is retained and modifications
 are clearly marked.
 
 ALL WARRANTIES ARE HEREBY DISCLAIMED.
-           
\ No newline at end of file
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 41a1bf574..dc0a8fdfe 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 136756 2011-09-01 08:20:58Z bisson $
+# $Id: PKGBUILD 136997 2011-09-05 01:18:48Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
 pkgver=1.6.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -17,8 +17,10 @@ optdepends=('qt: support for qt4 input method'
             'anthy: support for anthy input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2"
+        'gtk3-crash.patch'
         'qt4-lib64.patch')
 sha1sums=('4ca040981b5a473a8ff70d46e4a92bba39e22405'
+          '5529884d655cf9c95e7bf5ddced3ffed140bbc20'
           '4307b0d7d6dc10f15909c94973c4357caf31de7e')
 
 install=install
@@ -26,6 +28,7 @@ install=install
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../qt4-lib64.patch
+	patch -p1 -i ../gtk3-crash.patch
 	./configure --prefix=/usr --use_i18n=Y
 	make
 }
diff --git a/extra/gcin/gtk3-crash.patch b/extra/gcin/gtk3-crash.patch
new file mode 100644
index 000000000..17cfa6c2d
--- /dev/null
+++ b/extra/gcin/gtk3-crash.patch
@@ -0,0 +1,12 @@
+diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c
+--- old/gtk3-im/gtkimcontextgcin.c	2011-08-31 09:14:58.000000000 -0700
++++ new/gtk3-im/gtkimcontextgcin.c	2011-09-04 13:29:58.838065420 -0700
+@@ -127,6 +127,8 @@
+ {
+   GdkWindow *client_window = context_xim->client_window;
+   GdkScreen *screen = gdk_window_get_screen (client_window);
++  if (screen == NULL)
++	  return;
+   GdkDisplay *display = gdk_screen_get_display (screen);
+   if (!context_xim->gcin_ch) {
+     if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))))
diff --git a/extra/habak/PKGBUILD b/extra/habak/PKGBUILD
index 5ef6cde6f..69899b64e 100644
--- a/extra/habak/PKGBUILD
+++ b/extra/habak/PKGBUILD
@@ -1,19 +1,26 @@
-# $Id: PKGBUILD 4097 2008-07-03 14:48:26Z ronald $
+# $Id: PKGBUILD 136978 2011-09-04 12:05:11Z pierre $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Simo Leone <simo@archlinux.org>
+
 pkgname=habak
 pkgver=0.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A background changing app"
 url="http://fvwm-crystal.org"
 license=('GPL2')
 depends=('imlib2')
-source=(http://download.gna.org/fvwm-crystal/habak/$pkgver/$pkgname-$pkgver.tar.gz)
+source=("http://download.gna.org/fvwm-crystal/habak/$pkgver/$pkgname-$pkgver.tar.gz")
 arch=('i686' 'x86_64')
+options=('!makeflags')
 md5sums=('bee5c394989367f7a4c5cb9ec99d307c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  make || return 1
-  install -m755 -D habak $pkgdir/usr/bin/habak || return 1
+  export LDFLAGS=${LDFLAGS/,--sort-common,--as-needed//}
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  install -m755 -D habak $pkgdir/usr/bin/habak
 }
diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD
index e29d4cf94..56d573eb5 100644
--- a/extra/isapnptools/PKGBUILD
+++ b/extra/isapnptools/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 68051 2010-02-10 15:42:28Z giovanni $
+# $Id: PKGBUILD 136974 2011-09-04 11:49:36Z pierre $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=isapnptools
 pkgver=1.27
-pkgrel=2
+pkgrel=3
 pkgdesc="Allow ISA Plug-And-Play devices to be configured on a Linux machine"
 url="http://www.roestock.demon.co.uk/isapnptools/"
 depends=('glibc')
 arch=('i686' 'x86_64')
 license=('GPL')
-source=(ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz)
+source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz")
 md5sums=('b997ba56583dc850fce9b93d658dfa0c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libmcrypt/PKGBUILD b/extra/libmcrypt/PKGBUILD
index 0bbe97d83..aae45867e 100644
--- a/extra/libmcrypt/PKGBUILD
+++ b/extra/libmcrypt/PKGBUILD
@@ -1,24 +1,32 @@
-# $Id: PKGBUILD 51263 2009-09-06 19:41:24Z giovanni $
+# $Id: PKGBUILD 136970 2011-09-04 11:35:09Z pierre $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libmcrypt
 pkgver=2.5.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A library which provides a uniform interface to several symmetric encryption algorithms"
 url="http://mcrypt.sourceforge.net/"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/mcrypt/${pkgname}-${pkgver}.tar.bz2)
+options=('!libtool' '!emptydirs')
+source=("http://downloads.sourceforge.net/mcrypt/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('c4f491dd411a09e9de3b8702ea6f73eb')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
   ./configure --prefix=/usr --mandir=/usr/share/man
-  make || return 1
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/extra/mahjong/PKGBUILD b/extra/mahjong/PKGBUILD
index 2aaff6579..1b719f79d 100644
--- a/extra/mahjong/PKGBUILD
+++ b/extra/mahjong/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 47741 2009-07-25 22:52:50Z giovanni $
+# $Id: PKGBUILD 136995 2011-09-04 21:27:03Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=mahjong
-pkgver=1.10
+pkgver=1.11
 pkgrel=1
-pkgdesc="The classical game of Mah Jongg (not the solitare version).  Includes network play"
+pkgdesc="The classical game of Mah Jong (not the solitare version) with network support"
 arch=('i686' 'x86_64')
 url="http://www.stevens-bradfield.com/MahJong/"
 license=('GPL' 'custom')
 depends=('gtk2')
 source=(http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz)
-md5sums=('f9bacf9fd6743d5e3a2fd86863607ce2')
+md5sums=('c0cd19620eb3fcef3e0a83eaed6c3780')
 
 build() {
-   cd $srcdir/mj-$pkgver-src
-   make || return 1
-   make DESTDIR=$pkgdir/usr/ MANDIR=share/man/man1 install install.man
-   install -m644 -D tiles-v1/README \
-           $pkgdir/usr/share/licenses/$pkgname/tiles-license.txt
+  cd "$srcdir/mj-$pkgver-src"
+  sed -i 's/& Calling/Calling/' gui-dial.c
+  make
+}
+
+package() {
+  cd "$srcdir/mj-$pkgver-src"
+  make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man
+  install -D -m644 tiles-v1/README "$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt"
 }
diff --git a/extra/mcrypt/PKGBUILD b/extra/mcrypt/PKGBUILD
index 7db28d78c..a3040ad3a 100644
--- a/extra/mcrypt/PKGBUILD
+++ b/extra/mcrypt/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 32911 2009-04-02 16:16:11Z giovanni $
+# $Id: PKGBUILD 136972 2011-09-04 11:41:22Z pierre $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=mcrypt
 pkgver=2.6.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A program for encrypting files or streams"
 url="http://mcrypt.sourceforge.net/"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('mhash' 'libmcrypt>=2.5.8' 'zlib')
-source=(http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.gz)
+depends=('mhash' 'libmcrypt' 'zlib')
+source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.gz")
 md5sums=('97639f8821b10f80943fa17da302607e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  aclocal -I ./m4 || return 1
-  autoconf || return 1
-  automake --force --copy || return 1
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog
index 56ccb2263..40ba5e4e7 100644
--- a/extra/mpd/ChangeLog
+++ b/extra/mpd/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-03 Angel Velasquez <angvp@archlinux.org>
+    * Version bump to 0.16.4
+    * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream
+
 2011-06-25 Angel Velasquez <angvp@archlinux.org>
     * Added a patch for bug with ffmpeg FS#24839 
 
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 046904a22..fcfe8d4a2 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 128638 2011-06-25 09:54:26Z angvp $
+# $Id: PKGBUILD 136986 2011-09-04 17:03:38Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd
-pkgver=0.16.3
-pkgrel=2
+pkgver=0.16.4
+pkgrel=1
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,11 +18,9 @@ makedepends=('pkgconfig' 'doxygen')
 install=${pkgname}.install
 changelog=ChangeLog
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'mpd' 
-        'mpd-0.16.3_ffmpeg_sigsegv.patch')
-md5sums=('6e708c02b0e8c288aec855eecf441a5a'
-         'e5669c2bff4031928531e52475addeb1'
-         '9a730957e213c62339e9335971e4b85e')
+'mpd') 
+md5sums=('ddac46eb7d976c5cc6f9bac9e4e100f1'
+         'e5669c2bff4031928531e52475addeb1')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -35,7 +33,6 @@ build() {
     --disable-libwrap \
     --disable-cue \
     --disable-sidplay 
-  patch -Np1 -i $srcdir/mpd-0.16.3_ffmpeg_sigsegv.patch
   make
 }