[arch-commits] Commit in tcpdump/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Tuesday, October 28, 2008 @ 21:47:36
  Author: eric
Revision: 17375

fixed svn conflict

Modified:
  tcpdump/repos/extra-x86_64/	(properties)
  tcpdump/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


Property changes on: tcpdump/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /tcpdump/trunk:1
   + /tcpdump/trunk:1-17374

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-28 21:52:54 UTC (rev 17374)
+++ extra-x86_64/PKGBUILD	2008-10-29 01:47:36 UTC (rev 17375)
@@ -1,24 +1,24 @@
 # $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=tcpdump
-pkgver=3.9.8
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="A tool for network monitoring and data acquisition"
-arch=(i686 x86_64)
-url="http://www.tcpdump.org/"
+arch=('i686' 'x86_64')
+url="http://www.tcpdump.org"
 license=('BSD')
 depends=('libpcap>=0.9.8' 'openssl')
 source=(http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c491a78c52fe73f1f7271aa5d8c6ab2e')
+md5sums=('b22ca72890df2301d922c9f2d17867f9')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir}/ install
 
   #install the license
-  install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }