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

Conflicts:
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/emerald/PKGBUILD
	community/gmic/PKGBUILD
	community/libcompizconfig/PKGBUILD
	core/xinetd/PKGBUILD
	extra/archboot/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/kipi-plugins/PKGBUILD
	extra/libmpdclient/PKGBUILD
	extra/live-media/PKGBUILD
	extra/mysql/PKGBUILD
	extra/pyopenssl/PKGBUILD
	extra/r/PKGBUILD
	extra/telepathy-mission-control/PKGBUILD
	libre/libretools/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-libldap/PKGBUILD
	multilib/lib32-libldap/ntlm.patch
	multilib/wine/PKGBUILD
	testing/mesa/PKGBUILD

1 files changed, 17 insertions, 12 deletions

diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index a765a3d05..68bd5942d 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,34 +1,39 @@
-# $Id: PKGBUILD 125239 2011-05-25 19:13:43Z foutrelis $
+# $Id: PKGBUILD 131650 2011-07-13 08:13:14Z andrea $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=net-snmp
 pkgver=5.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.net-snmp.org/"
 license=('custom')
-depends=('openssl' 'tcp_wrappers' 'libnl')
+depends=('openssl' 'libnl')
 makedepends=('setuptools')
 optdepends=('perl-term-readkey: for snmpcheck application' 
             'perl-tk: for snmpcheck and tkmib applications'
-	    'python2: for the python modules')
+            'python2: for the python modules')
 provides=('ucd-snmp')
 options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-	'snmpd.rc')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'snmpd.rc')
 md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
          '9f0d13676ba1fae1eb7eb178edd85b43')
-sha1sums=('45bbf1295253d5379a5d1efd918593160387fd00' '2c679b564a2c319d9ce2714a9776aa0e6d89c60a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
-    --enable-ucd-snmp-compatibility --enable-ipv6 --with-libwrap --with-python-modules \
-    --with-default-snmp-version="3" --with-sys-contact="root@localhost" \
-    --with-sys-location="Unknown" --with-logfile="/var/log/snmpd.log" \
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man \
+    --enable-ucd-snmp-compatibility \
+    --enable-ipv6 \
+    --with-python-modules \
+    --with-default-snmp-version="3" \
+    --with-sys-contact="root@localhost" \
+    --with-sys-location="Unknown" \
+    --with-logfile="/var/log/snmpd.log" \
     --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
     --with-persistent-directory="/var/net-snmp" \
     PYTHONPROG=/usr/bin/python2
@@ -39,5 +44,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
   install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }