Mon Jul 9 00:02:00 UTC 2012

7 files changed, 63 insertions, 82 deletions

diff --git a/extra/cppunit/PKGBUILD b/extra/cppunit/PKGBUILD
index a5e98d62f..988124454 100644
--- a/extra/cppunit/PKGBUILD
+++ b/extra/cppunit/PKGBUILD
@@ -1,26 +1,31 @@
-# $Id: PKGBUILD 146794 2012-01-18 13:02:35Z stephane $
+# $Id: PKGBUILD 163110 2012-07-07 09:30:05Z andyrtr $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 
 pkgname=cppunit
-pkgver=1.12.1
-pkgrel=4
+pkgver=1.13.0
+pkgrel=1
+_hash=0c65c839854edd43d9294d1431a2b292
 pkgdesc="A C++ unit testing framework"
 arch=('i686' 'x86_64')
-url="http://cppunit.sourceforge.net"
+url="http://www.freedesktop.org/wiki/Software/cppunit"
 license=('LGPL')
 depends=('sh' 'gcc-libs')
 options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('f1ab8986af7a1ffa6760f4bacf5622924639bf4a')
+source=(http://dev-www.libreoffice.org/src/${_hash}-${pkgname}-${pkgver}.tar.gz)
+md5sums=(${_hash})
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
-   export LDFLAGS+=" -ldl"
-   ./configure --prefix=/usr
+   ./configure --prefix=/usr --disable-static
    make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
 package() {
    cd "${srcdir}/${pkgname}-${pkgver}"
    make DESTDIR="${pkgdir}" install
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index cebb90f9e..368d58db9 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163098 2012-07-07 03:02:52Z schiv $
+# $Id: PKGBUILD 163131 2012-07-07 19:15:48Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -96,7 +96,7 @@ package_opencv-docs() {
 
   # install license file
   install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$_realname/LICENSE"
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_opencv-samples() {
@@ -112,7 +112,7 @@ package_opencv-samples() {
 
   # install license file
   install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$_realname/LICENSE"
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 6d90f8126..180419bd0 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163015 2012-07-05 15:59:41Z foutrelis $
+# $Id: PKGBUILD 163104 2012-07-07 05:24:14Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.5
+pkgver=2.10.6
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
@@ -17,7 +17,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'networkmanager')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('6943d95a84d881adec9982685a8b41b68b1114335ae2ae4e18d22658f5c9e7aa')
+sha256sums=('3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 6d9dc3245..9232270ae 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 159315 2012-05-21 13:58:46Z bisson $
+# $Id: PKGBUILD 163134 2012-07-08 02:03:27Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
 pkgver=2.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
 arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite' 'libldap' 'db')
+depends=('pcre' 'libsasl' 'libldap' 'db'
+         'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb')
 backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
@@ -20,8 +21,7 @@ sha1sums=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
 provides=('smtp-server' 'smtp-forwarder')
-replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder')
+conflicts=('smtp-server' 'smtp-forwarder')
 
 install=install
 
@@ -35,6 +35,7 @@ build() {
 		-DHAS_MYSQL -I/usr/include/mysql \
 		-DHAS_PGSQL -I/usr/include/postgresql \
 		-DHAS_SQLITE \
+		-DHAS_CDB \
 	' AUXLIBS=' \
 		-lsasl2 \
 		-lldap -llber \
@@ -42,6 +43,7 @@ build() {
 		-lmysqlclient -lz -lm \
 		-lpq \
 		-lsqlite3 -lpthread \
+		-lcdb \
 	' OPT="${CFLAGS} ${LDFLAGS}"
 
 	make
@@ -54,10 +56,11 @@ package() {
 		install_root="${pkgdir}" \
 		daemon_directory="/usr/lib/${pkgname}" \
 		sample_directory="/etc/${pkgname}/sample" \
-		manpage_directory="/usr/share/man"
+		manpage_directory="/usr/share/man" \
+		readme_directory="/usr/share/doc/${pkgname}" \
 
 	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
 	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	sed 's/\(^\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
+	sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
 	cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch
 }
diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD
index bbfec5b5a..253bd1146 100644
--- a/extra/timidity++/PKGBUILD
+++ b/extra/timidity++/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 148660 2012-02-05 11:45:59Z ibiru $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# $Id: PKGBUILD 163107 2012-07-07 06:45:30Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=timidity++
-pkgver=2.13.2
-pkgrel=11
+pkgver=2.14.0
+pkgrel=1
 pkgdesc="A MIDI to WAVE converter and player"
 arch=('i686' 'x86_64')
 url="http://timidity.sourceforge.net"
@@ -14,42 +13,18 @@ makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw')
 optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \
             'xaw3d: for using the Xaw interface')
 backup=('etc/timidity++/timidity.cfg')
-source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.bz2 \
-        timidity.cfg timidity++.sh 2.13.2-gcc4.patch TiMidity++-2.13.2+flac-1.1.3.patch \
-        timidity++-2.13.2-exiterror.patch timidity++-2.13.2-gtk26.patch \
-        timidity++-2.13.2-polling.patch)
-md5sums=('a82ceeb2245e22f4de2b41da21eaee32'
-         '3fcc8f065c959205113fa7e9ab2be3c6'
-         '35606c12af9c6be9361d64fc536f046f'
-         '0868926c5290817cacb9a1849bc043c2'
-         'fcbd27ff83066f69a3f8bd2442a3b3e2'
-         '31bdaea612f18e2c3d45a8a73ab44c81'
-         '16a4adec164836d4390dc6b0f9a69ce9'
-         '3f0034ead451cdd1078868e9e9b0494c')
-sha1sums=('8e603146e1164335303a5ac5dff291f369241b4e'
+source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \
+        timidity.cfg timidity++.sh)
+sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b'
           '660b3afbb720d26e8f008034cee66dd8da082d6e'
-          '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
-          '8d50618a2379c078b07e8d0fc59457855c16106c'
-          '59b0dbe3cde8f7b41d83676d8c37809255d3fb36'
-          '7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60'
-          'ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4'
-          '6abaedaecdecabf9dc76c062f7157571aed53984')
+          '9f3e732a7ca1e97119a76df62ecf154df04d4f77')
 
 build() {
   cd "${srcdir}/TiMidity++-${pkgver}"
-  patch -p1 < ../2.13.2-gcc4.patch
-  patch -p1 < ../TiMidity++-2.13.2+flac-1.1.3.patch
-  patch -p1 < ../timidity++-2.13.2-exiterror.patch
-  patch -p0 < ../timidity++-2.13.2-gtk26.patch
-  patch -p0 < ../timidity++-2.13.2-polling.patch
-  sed -i 's/tcl8.4/tcl8.5/' configure
-  sed -i 's/tk8.4/tk8.5/' configure
-
   ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \
-	--enable-server --enable-alsaseq --enable-spectrogram \
-	--enable-audio=alsa,oss,ao,vorbis,flac,jack \
-	--enable-dynamic=ncurses,tcltk,vt100,xaw,gtk \
-	--disable-gtktest
+    --enable-server --enable-alsaseq --enable-spectrogram --enable-network --enable-xft \
+    --enable-audio=alsa,oss,ao,vorbis,flac,jack \
+    --enable-dynamic=ncurses,tcltk,vt100,xaw,gtk
   make
 }
 
diff --git a/extra/tinycdb/PKGBUILD b/extra/tinycdb/PKGBUILD
index 406690e22..2e803febd 100644
--- a/extra/tinycdb/PKGBUILD
+++ b/extra/tinycdb/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 163096 2012-07-07 02:43:05Z bisson $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# $Id: PKGBUILD 163135 2012-07-08 02:03:57Z bisson $
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=tinycdb
-pkgver=0.77
-pkgrel=4
-pkgdesc="very fast and simple package for creating and reading constant data bases"
-arch=(i686 x86_64)
-url="http://www.corpit.ru/mjt/tinycdb.html"
-license=("GPL")
-depends=(glibc)
-source=(http://www.corpit.ru/mjt/tinycdb/${pkgname}_$pkgver.tar.gz)
-md5sums=('c00e5fb96c30356ac3b67b2ab5d5641b')
+pkgver=0.78
+pkgrel=1
+pkgdesc='Very fast and simple package for creating and reading constant data bases'
+url='http://www.corpit.ru/mjt/tinycdb.html'
+license=('custom')
+arch=('i686' 'x86_64')
+source=("http://www.corpit.ru/mjt/tinycdb/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('ade42ee1e7c56f66a63cb933206c089b9983adba')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  make sharedlib staticlib cdb
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed -e 's/all: static/all: shared/' -e '/libcdb.a/d' -i Makefile
+	make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
 
-  install -D -m 0644 cdb.h $pkgdir/usr/include/cdb.h
-  install -D -m 0644 cdb.3 $pkgdir/usr/share/man/man3/cdb.3
-  install -D -m 0644 cdb.1 $pkgdir/usr/share/man/man1/cdb.1
-  install -D -m 0644 cdb.5 $pkgdir/usr/share/man/man5/cdb.5
-  install -D -m 0755 cdb $pkgdir/usr/bin/cdb
-  install -D -m 0644 libcdb.a $pkgdir/usr/lib/libcdb.a
-  install -D -m 0644 libcdb.so $pkgdir/usr/lib/libcdb.so
-  install -D -m 0644 libcdb.so.1 $pkgdir/usr/lib/libcdb.so.1
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" prefix=/usr mandir=/usr/share/man \
+		INSTALLPROG=cdb-shared install-{all,sharedlib}
+	install -Dm644 debian/copyright "${pkgdir}"/usr/share/licenses/tinycdb/copyright
 }
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 1d8c537f8..724c41920 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 158002 2012-04-30 22:34:00Z ibiru $
+# $Id: PKGBUILD 163113 2012-07-07 10:34:53Z tomegun $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.16
+pkgver=0.9.17
 pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
 url="http://upower.freedesktop.org"
 license=('GPL')
-depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
+depends=('systemd-tools' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
 options=('!libtool')
 source=($url/releases/$pkgname-$pkgver.tar.xz)
-sha256sums=('eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -32,3 +31,4 @@ package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
+md5sums=('9ef7fc8ec438542f014f3a34552822aa')