[pkgsrc/trunk]: pkgsrc/net Update to 2.0pre10:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e15742e2e88
branches:  trunk
changeset: 494556:1e15742e2e88
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed May 25 14:47:05 2005 +0000

description:
Update to 2.0pre10:

pre10: (2005-05-24)
   - disable ifup every time. heavy for kernel
   - add -s to disable the sniffer
   - better checks in GUI
   - fix gui message
   - port to ACR
   - change distname to wistumbler2-2.00preXX
   - drop some deprecated GTK tips
   - fix return value in error_polling
   - fixups in X/noX modes
   - fixups in stumbler code
   - Add SYSCONFDIR in configure
   - indent code (gg=G)
   - Add Kismet code for gpsdrive sync
     (Christoph Lohmann)

Package change:
Change PKGNAME to wistumbler2{,-gtk} to sync with directory and
program name.

diffstat:

 net/wistumbler2-gtk/Makefile    |   6 +++---
 net/wistumbler2/Makefile        |   9 ++++-----
 net/wistumbler2/Makefile.common |  13 ++++---------
 net/wistumbler2/PLIST           |   4 +++-
 net/wistumbler2/distinfo        |  12 ++++--------
 5 files changed, 18 insertions(+), 26 deletions(-)

diffs (106 lines):

diff -r d964c608f919 -r 1e15742e2e88 net/wistumbler2-gtk/Makefile
--- a/net/wistumbler2-gtk/Makefile      Wed May 25 14:12:20 2005 +0000
+++ b/net/wistumbler2-gtk/Makefile      Wed May 25 14:47:05 2005 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2004/11/07 21:46:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/25 14:47:06 wiz Exp $
 #
 
 .include "../../net/wistumbler2/Makefile.common"
 
-PKGNAME:=              ${PKGNAME:S/wistumbler-/wistumbler-gtk-/}
+PKGNAME=               ${DISTNAME:S/wistumbler2-/wistumbler2-gtk-/}
 
-CONFLICTS+=            wistumbler-[0-9]*
+CONFLICTS+=            wistumbler2-[0-9]*
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff -r d964c608f919 -r 1e15742e2e88 net/wistumbler2/Makefile
--- a/net/wistumbler2/Makefile  Wed May 25 14:12:20 2005 +0000
+++ b/net/wistumbler2/Makefile  Wed May 25 14:47:05 2005 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2004/11/07 21:44:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/25 14:47:05 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=           1
+CONFLICTS+=            wistumbler-gtk-[0-9]*
+CONFLICTS+=            wistumbler2-gtk-[0-9]*
 
-CONFLICTS+=            wistumbler-gtk-[0-9]*
-
-CONFIGURE_ENV+=                USE_GTK=0
+CONFIGURE_ARGS+=       --without-gtk
 
 .include "../../mk/bsd.pkg.mk"
diff -r d964c608f919 -r 1e15742e2e88 net/wistumbler2/Makefile.common
--- a/net/wistumbler2/Makefile.common   Wed May 25 14:12:20 2005 +0000
+++ b/net/wistumbler2/Makefile.common   Wed May 25 14:47:05 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:47:02 tv Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/05/25 14:47:05 wiz Exp $
 #
 
-DISTNAME=      wistumbler2.00-pre9
-PKGNAME=       ${DISTNAME:S/wistumbler/wistumbler-/}
+DISTNAME=      wistumbler2-2.0pre10
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.nopcode.org/prj/wistumbler2/
 
@@ -16,9 +15,9 @@
 
 NOT_FOR_PLATFORM=      NetBSD-[01].[012345]*-*
 ONLY_FOR_PLATFORM=     NetBSD-*-* FreeBSD-*-* OpenBSD-*-*
+CONFLICTS+=            wistumbler-[0-9]*
 
 HAS_CONFIGURE=         YES
-MANCOMPRESSED=         YES
 USE_PKGINSTALL=                YES
 
 CONFIGURE_ENV+=                PREFIX=${PREFIX}
@@ -28,13 +27,9 @@
 
 SUBST_CLASSES+=                conf
 SUBST_STAGE.conf=      pre-configure
-SUBST_FILES.conf=      src/userconf.c 
+SUBST_FILES.conf=      src/userconf.c
 SUBST_SED.conf=                -e "s|/etc|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.conf=    "Fixing path to configuration files."
 
-post-extract:
-       ${CHMOD} ${PKGDIRMODE} ${WRKSRC}/doc
-       ${CHMOD} ${PKGDIRMODE} ${WRKSRC}/img
-
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r d964c608f919 -r 1e15742e2e88 net/wistumbler2/PLIST
--- a/net/wistumbler2/PLIST     Wed May 25 14:12:20 2005 +0000
+++ b/net/wistumbler2/PLIST     Wed May 25 14:47:05 2005 +0000
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/30 15:24:02 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/05/25 14:47:05 wiz Exp $
 bin/wistumbler2
 man/man1/wistumbler2.1
 share/examples/wistumbler2/wistumbler2.conf
+share/wistumbler2/wist2.png
 @dirrm share/examples/wistumbler2
+@dirrm share/wistumbler2
diff -r d964c608f919 -r 1e15742e2e88 net/wistumbler2/distinfo
--- a/net/wistumbler2/distinfo  Wed May 25 14:12:20 2005 +0000
+++ b/net/wistumbler2/distinfo  Wed May 25 14:47:05 2005 +0000
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:14:07 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/05/25 14:47:05 wiz Exp $
 
-SHA1 (wistumbler2.00-pre9.tar.gz) = c33709bdc9ff7c7ec6bb23132f2594ec4a143a71
-RMD160 (wistumbler2.00-pre9.tar.gz) = d85b62f5f151b6478f10c97ee440bca0ce7ff014
-Size (wistumbler2.00-pre9.tar.gz) = 40641 bytes
-SHA1 (patch-aa) = 26313441ad1686f42d505b5823101b51abe425be
-SHA1 (patch-ab) = 6efc148573cb17d5ca149f1d5bd1265753f2ca58
-SHA1 (patch-ac) = 00e6e6cd043f39265d960ef1c113dd077939813b
-SHA1 (patch-ad) = 2fb6fd5c08a30e13800cff8459b868aac49c9518
+SHA1 (wistumbler2-2.0pre10.tar.gz) = 1167dfbc53cdf43cca357fefd2153be9f4657669
+RMD160 (wistumbler2-2.0pre10.tar.gz) = 27a1539c93560c753d9951c5c236108bf38d8639
+Size (wistumbler2-2.0pre10.tar.gz) = 45972 bytes