[arch-commits] Commit in nmap/repos (3 files)

[Eric Belanger]

    Date: Wednesday, July 23, 2008 @ 21:20:58
  Author: eric
Revision: 6272

Merged revisions 4861-6271 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/nmap/trunk

........
  r6094 | hugo | 2008-07-23 14:18:24 -0400 (Wed, 23 Jul 2008) | 2 lines
  
  upgpkg: nmap 4.68-3
      pygtk added in optdepends. This fix FS#10994
........

Modified:
  nmap/repos/extra-x86_64/	(properties)
  nmap/repos/extra-x86_64/ChangeLog
  nmap/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |    3 +++
 PKGBUILD  |   17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)


Property changes on: nmap/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /nmap/trunk:1-4860
   + /nmap/trunk:1-6271

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-07-24 01:19:11 UTC (rev 6271)
+++ extra-x86_64/ChangeLog	2008-07-24 01:20:58 UTC (rev 6272)
@@ -1,4 +1,7 @@
+2008-07-23 Hugo Doria  <hugo at archlinux.org>
 
+        * Added pygtk in optdepends: 4.68-3
+
 2008-07-09  Douglas Soares de Andrade  <douglas at archlinux.org>
 
 	* Fixing the pixmaps path for i686: 4.68

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-24 01:19:11 UTC (rev 6271)
+++ extra-x86_64/PKGBUILD	2008-07-24 01:20:58 UTC (rev 6272)
@@ -1,31 +1,32 @@
 # $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
+# Maintainer: Hugo Doria <hugo at archlinux.org>
 
 pkgname=nmap
 pkgver=4.68
-pkgrel=2
+pkgrel=3
 pkgdesc="A network exploration tool and security/port scanner"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://nmap.org"
 license=('custom:GPL')
 depends=('pcre' 'openssl' 'libpcap>=0.9.8' 'lua')
 # python is needed for zenmap
 makedepends=('python')
+optdepends=('pygtk')
 options=('!makeflags')
-source=(http://download.insecure.org/nmap/dist/$pkgname-$pkgver.tgz)
+source=(http://download.insecure.org/nmap/dist/${pkgname}-${pkgver}.tgz)
 md5sums=('a1373c992e4b21d8db4d65c6eb8fec42')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --libexecdir=/usr/lib
   make || return 1
-  make DESTDIR="$startdir/pkg" install
+  make DESTDIR="${pkgdir}" install
 
   # remove zenmap uninstall script
-  rm "$startdir/pkg/usr/bin/uninstall_zenmap"
+  rm "${pkgdir}/usr/bin/uninstall_zenmap"
 
   # install custom GPL2 license
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }