Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/chntpw/PKGBUILD
	community/hardinfo/PKGBUILD
	community/obconf/obconf.install
	community/xplc/PKGBUILD
	community/zziplib/PKGBUILD
	core/rp-pppoe/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/icon-naming-utils/PKGBUILD
	extra/lxmenu-data/PKGBUILD
	extra/openbox/PKGBUILD
	extra/phonon-xine/PKGBUILD
	extra/qt/PKGBUILD
	extra/zope-interface/PKGBUILD
	libre/pacman/PKGBUILD
	libre/pacman/pacman.conf.mips64el
	libre/pacman/rePKGBUILD
	testing/coreutils/PKGBUILD
	testing/net-tools/PKGBUILD

5 files changed, 20 insertions, 15 deletions

diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index c5f14f278..8bff9c211 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,35 +1,40 @@
-# $Id: PKGBUILD 109346 2011-02-08 18:56:38Z bisson $
-# Maintainer: Dale Blount <dale@archlinux.org>
+# $Id: PKGBUILD 127029 2011-06-09 21:38:42Z bisson $
+# Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
-pkgver=0.97
+pkgver=0.97.1
 pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2' 'zlib' 'libtool')
 options=('!libtool')
-install="$pkgname.install"
 license=('GPL')
 backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
 url='http://www.clamav.net/'
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-        'clamav'
-        'clamav.confd'
-        'clamav.logrotate'
+        'rc.d'
+        'conf.d'
+        'logrotate'
         'config.patch')
-
-sha1sums=('68f5a6736b3f67d608c4064ef839777877f09115'
+sha1sums=('1b3a4667dcc278bc7eab38acbc0f35269aa05387'
           '7f15f0b13a1c11235bc99ef0add01efd8a442f07'
           'cb116cdab49a810381a515cbcfb6a6c148547f07'
           'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
           '701a61571788d10ff7af01597785835c6bfea918')
 
+install=install
+
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	patch -p1 < ../config.patch
-	./configure --prefix=/usr --sysconfdir=/etc/clamav \
-		--with-dbdir=/var/lib/clamav --disable-clamav
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc/clamav \
+		--with-dbdir=/var/lib/clamav \
+		--disable-clamav \
+
 	make
 }
 
@@ -37,14 +42,14 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 
-	# make sure conf files get installed, cause make install
+	# make sure conf files get installed, because make install
 	# doesn't do that if clamav is already installed upon building.
 	install -D -m644 etc/clamd.conf "$pkgdir/etc/clamav/clamd.conf"
 	install -D -m644 etc/freshclam.conf "$pkgdir/etc/clamav/freshclam.conf"
 
-	install -D -m644 ../clamav.logrotate "$pkgdir/etc/logrotate.d/clamav"
-	install -D -m644 ../clamav.confd "$pkgdir/etc/conf.d/clamav"
-	install -D -m755 ../clamav "$pkgdir/etc/rc.d/clamav"
+	install -D -m644 ../logrotate "$pkgdir/etc/logrotate.d/clamav"
+	install -D -m644 ../conf.d "$pkgdir/etc/conf.d/clamav"
+	install -D -m755 ../rc.d "$pkgdir/etc/rc.d/clamav"
 
 	# un-distribute databases to require freshclam
 	rm "$pkgdir"/var/lib/clamav/*.cvd
diff --git a/extra/clamav/clamav.confd b/extra/clamav/conf.d
index 9cd44d9f8..9cd44d9f8 100644
--- a/extra/clamav/clamav.confd
+++ b/extra/clamav/conf.d
diff --git a/extra/clamav/clamav.install b/extra/clamav/install
index 9116dc394..9116dc394 100644
--- a/extra/clamav/clamav.install
+++ b/extra/clamav/install
diff --git a/extra/clamav/clamav.logrotate b/extra/clamav/logrotate
index d1dc94dce..d1dc94dce 100644
--- a/extra/clamav/clamav.logrotate
+++ b/extra/clamav/logrotate
diff --git a/extra/clamav/clamav b/extra/clamav/rc.d
index 8e9c6afa9..8e9c6afa9 100644
--- a/extra/clamav/clamav
+++ b/extra/clamav/rc.d