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

Conflicts:
	community/chmsee/PKGBUILD
	community/darkstat/PKGBUILD
	community/dbmail/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/epic4/PKGBUILD
	community/fb-client/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/fdupes/PKGBUILD
	community/flobopuyo/PKGBUILD
	community/intel-tbb/PKGBUILD
	community/openbsd-netcat/PKGBUILD
	community/sunpinyin/PKGBUILD
	community/tinc/PKGBUILD
	community/uudeview/PKGBUILD
	community/zathura/PKGBUILD
	core/libedit/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	core/openssl/PKGBUILD
	core/util-linux/PKGBUILD
	extra/lua/PKGBUILD
	gnome-unstable/pidgin/PKGBUILD
	testing/openssl/PKGBUILD
	testing/sudo/PKGBUILD
	testing/udev/PKGBUILD
	testing/util-linux/PKGBUILD

1 files changed, 29 insertions, 46 deletions

diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index 182925d56..36f86cf3b 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,67 +1,50 @@
-# $Id: PKGBUILD 42470 2011-03-16 21:11:47Z jelle $
+# $Id: PKGBUILD 67633 2012-03-13 14:56:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
-pkgver=2.2.17
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64' 'mips64el')
-# mhash libevent libzdb
-depends=('gmime22')
-makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'  'sqlite3' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve')
-optdepends=('postgresql-libs: for PostgreSQL storage backend' 
-            'sqlite3: for SQLite storage backend' 
-	    'libmysqlclient: for MySQL storage backend' 
-	    'libldap: for LDAP authentication' 
+depends=('gmime24' 'libzdb' 'mhash' 'libevent')
+makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'
+	     'sqlite3' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve')
+optdepends=('postgresql-libs: for PostgreSQL storage backend'
+	    'sqlite3: for SQLite storage backend'
+	    'libmysqlclient: for MySQL storage backend'
+	    'libldap: for LDAP authentication'
 	    'libsieve: for dbmail-sieve')
 url="http://www.dbmail.org"
 license=('GPL')
 options=('!libtool' 'zipman')
 backup=(etc/conf.d/dbmail)
-source=(http://www.dbmail.org/download/2.2/$pkgname-${pkgver}.tar.gz \
-	dbmail.conf.d \
+conflicts=('dbmail')
+provides=('dbmail')
+source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
+	dbmail.conf.d
 	dbmail.rc.d)
-md5sums=('20d90596d6aea066e701a6cb91445a39'
+md5sums=('eb32235abffdf967253ee9d004e0e4a9'
          'e7f72bc360decdb2475266391ad12329'
          '099225611da20ec194c092ac9befc33c')
 
 build() {
-  cd $srcdir/$pkgname-${pkgver}/
+  cd $srcdir/dbmail-${pkgver/_/-}/
 
-# Uncoment this if you want pam authentication
-#  patch -p1 <$srcdir/dbmail-2.2.10-pam-support.patch
-#  automake
-#  autoconf
-
-# Apply these patches if you want to use MySQL 5.1.* < 5.1.47
-# See MySQL bug: http://bugs.mysql.com/bug.php?id=38745
-if false; then
-  patch -p0 dbmail-message.c <<EOF
-744c744
-< 		"FROM %smessageblks "
----
-> 		"FROM %smessageblks use index(physmessage_id_index) "
-EOF
-  patch -p0 db.c <<EOF
-2139c2139
-< 		 "SELECT message_idnr FROM %smessages "
----
-> 		 "SELECT message_idnr FROM %smessages use index(mailbox_idnr_index) "
-EOF
-fi
-
-  ./configure --prefix=/usr --with-mysql --with-pgsql --with-sqlite --with-ldap --with-sieve
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  [ -f Makefile ] || ./configure --prefix=/usr --with-ldap --with-sieve
+  make
+}
 
-  (cd man && make && make install DESTDIR=$pkgdir) || return 1
+package() {
+  cd $srcdir/dbmail-${pkgver/_/-}/
+  make DESTDIR=$pkgdir install
+  (cd man && make && make install DESTDIR=$pkgdir)
 
-  mkdir $pkgdir/etc && \
-  install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample && \
-  install -Dm644 ../${pkgname}.conf.d $pkgdir/etc/conf.d/${pkgname} && \
-  install -Dm755 ../${pkgname}.rc.d $pkgdir/etc/rc.d/${pkgname} && \
-  mkdir $pkgdir/usr/share/dbmail && \
-  cp -r sql/* $pkgdir/usr/share/dbmail/ && \
+  mkdir $pkgdir/etc
+  install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
+  install -Dm644 ../dbmail.conf.d $pkgdir/etc/conf.d/dbmail
+  install -Dm755 ../dbmail.rc.d $pkgdir/etc/rc.d/dbmail
+  mkdir $pkgdir/usr/share/dbmail
+  cp -r sql/* $pkgdir/usr/share/dbmail/
   cp dbmail.schema $pkgdir/usr/share/dbmail/
 }