Let's get rid of another build def, WISTUMBLER2_USES_GTK, by splitting

wistumbler2 in two packages: wistumbler2, with console support only,
and wistumbler2-gtk, with GTK2 and console support.  This provides a
choice for users of binary packages and lets us catch build problems
in both cases during bulk builds.

While here, fix several issues:
- In the GTK case, depend on pkg-config, needed during the build.
- Patch files during pre-configure, not post-patch.
- Fix the CONF_FILES stuff; it was pointing to non-existent files.
- Reword DESCR.

Because of these changes, that affect the binary package, bump the revision
of wistumbler2 to 1, thus resulting in 2.00pre9nb1.  The new wistumbler2-gtk
package is at version 2.00pre9.

7 files changed, 92 insertions, 64 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index f3d676df3cd..b2a8f3b0e9e 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7756 2004/11/07 21:15:28 kristerw Exp $
+$NetBSD: CHANGES,v 1.7757 2004/11/07 21:44:21 jmmv Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -5151,3 +5151,5 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated perl to 5.8.5 [wiz 2004-11-07]
 	Added bmon-2.0.1 [minskim 2004-11-07]
 	Updated gxmame to 0.34bnb4 [kristerw 2004-11-07]
+	Updated wistumbler2 to 2.00pre9nb1 [jmmv 2004-11-07]
+	Added wistumbler2-gtk-2.00pre9 [jmmv 2004-11-07]
diff --git a/net/Makefile b/net/Makefile
index 3f925fc34ca..9c51b142fe9 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.512 2004/11/05 10:40:35 seb Exp $
+# $NetBSD: Makefile,v 1.513 2004/11/07 21:44:22 jmmv Exp $
 #
 
 COMMENT=	Networking tools
@@ -397,6 +397,7 @@ SUBDIR+=	whoson
 SUBDIR+=	wimon
 SUBDIR+=	wistumbler
 SUBDIR+=	wistumbler2
+SUBDIR+=	wistumbler2-gtk
 SUBDIR+=	wminet
 SUBDIR+=	wmnet
 SUBDIR+=	wmpload
diff --git a/net/wistumbler2-gtk/DESCR b/net/wistumbler2-gtk/DESCR
new file mode 100644
index 00000000000..1ec6a69ce46
--- /dev/null
+++ b/net/wistumbler2-gtk/DESCR
@@ -0,0 +1,14 @@
+This is a network stumbler for WaveLAN/IEEE wireless.  WiStumbler2 is a fork
+of the original wistumbler, because it seems that its development does not
+progress.
+
+The differences of this version compared to the original one are:
+- GTK2 and theme support.
+- Correct usage of some GTK widgets.
+- Support for console mode (no X needed).
+- Allow log-saving on the fly (new button).
+- Some GPS pointer fixes (solves segfaults).
+- Speaker beeps like windows-stumbler. (ear-wardriving)
+- FreeBSD port finished.
+
+This package is built with GTK2 and console support only.
diff --git a/net/wistumbler2-gtk/Makefile b/net/wistumbler2-gtk/Makefile
new file mode 100644
index 00000000000..c75a4d732f2
--- /dev/null
+++ b/net/wistumbler2-gtk/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2004/11/07 21:44:22 jmmv Exp $
+#
+
+.include "../../net/wistumbler2/Makefile.common"
+
+PKGNAME:=		${PKGNAME:S/wistumbler-/wistumbler-gtk-/}
+
+CONFLICTS+=		wistumbler-[0-9]*
+
+USE_X11=		yes
+
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/wistumbler2/DESCR b/net/wistumbler2/DESCR
index 95dd507395a..a15d71b7429 100644
--- a/net/wistumbler2/DESCR
+++ b/net/wistumbler2/DESCR
@@ -1,20 +1,14 @@
-======== WiStumler2 ======================
-Network stumbler for WaveLAN/IEEE wireless
-==========================================
-
-Original code: Isao SEKI <iseki@gongon.com>
-Fork&patches:  pancake <pancake@phreaker.net>
-
-WiStumbler2 is a fork of original wistumbler caused by the incommunication
-of the original author, because seems that development was getting stopped.
-
-In the fork of wistumbler I add some new features and bugfixes.
-
-Diff on wistumbler:
- - gtk2 and theme support.
- - some gtk widgets wasn't correctly used.
- - Support for console mode (no X needed).
- - Allow log-saving on the fly (new button).
- - Patches some GPS pointers that segfaults.
- - Speaker beeps like windows-stumbler. (ear-wardriving)
- - FreeBSD port finished.
+This is a network stumbler for WaveLAN/IEEE wireless.  WiStumbler2 is a fork
+of the original wistumbler, because it seems that its development does not
+progress.
+
+The differences of this version compared to the original one are:
+- GTK2 and theme support.
+- Correct usage of some GTK widgets.
+- Support for console mode (no X needed).
+- Allow log-saving on the fly (new button).
+- Some GPS pointer fixes (solves segfaults).
+- Speaker beeps like windows-stumbler. (ear-wardriving)
+- FreeBSD port finished.
+
+This package is built with console support only.
diff --git a/net/wistumbler2/Makefile b/net/wistumbler2/Makefile
index 266c5d1a9a6..a56e523a034 100644
--- a/net/wistumbler2/Makefile
+++ b/net/wistumbler2/Makefile
@@ -1,49 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2004/10/30 15:24:02 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/07 21:44:22 jmmv Exp $
 
-DISTNAME=	wistumbler2.00-pre9
-PKGNAME=	${DISTNAME:S/wistumbler/wistumbler-/}
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.nopcode.org/prj/wistumbler2/
+.include "Makefile.common"
 
-MAINTAINER=	pancake@phreaker.net
-HOMEPAGE=	http://www.nopcode.org/?t=wistumbler2
-COMMENT=	Fork of original WaveLAN/IEEE network stumbler
+PKGREVISION=		1
 
-USE_BUILDLINK3=	YES
-HAS_CONFIGURE=	YES
-MANCOMPRESSED=	YES
-USE_PKGINSTALL=	YES
-CONFIGURE_ENV+=	PREFIX=${PREFIX}
+CONFLICTS+=		wistumbler-gtk-[0-9]*
 
-NOT_FOR_PLATFORM=	NetBSD-[01].[012345]*-*
-ONLY_FOR_PLATFORM=	NetBSD-*-* FreeBSD-*-* OpenBSD-*-*
-
-WISTUMBLER2_USES_GTK?=	yes
-
-BUILD_DEFS+=		WISTUMBLER2_USES_GTK
-
-CONF_FILES=	${PREFIX}/share/wistumber2/wistumber2.conf \
-		${PKG_SYSCONFDIR}/wistumber2.conf
-
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
-SUBST_FILES.conf=	src/userconf.c 
-SUBST_SED.conf=		-e "s|/etc|${PKG_SYSCONFDIR}|g"
-SUBST_MESSAGE.conf=	"Fixing configuration files."
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(WISTUMBLER2_USES_GTK:M[Yy][Ee][Ss])
-USE_X11=		yes
-.include "../../x11/gtk2/buildlink3.mk"
-.else
 CONFIGURE_ENV+=		USE_GTK=0
-.endif
-
-post-extract:
-	@${CHMOD} ${PKGDIRMODE} ${WRKSRC}/doc
-	@${CHMOD} ${PKGDIRMODE} ${WRKSRC}/img
 
-.include "../../net/libpcap/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wistumbler2/Makefile.common b/net/wistumbler2/Makefile.common
new file mode 100644
index 00000000000..89d0ce380fb
--- /dev/null
+++ b/net/wistumbler2/Makefile.common
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile.common,v 1.1 2004/11/07 21:44:22 jmmv Exp $
+#
+
+DISTNAME=	wistumbler2.00-pre9
+PKGNAME=	${DISTNAME:S/wistumbler/wistumbler-/}
+CATEGORIES=	net
+MASTER_SITES=	ftp://ftp.nopcode.org/prj/wistumbler2/
+
+MAINTAINER=	pancake@phreaker.net
+HOMEPAGE=	http://www.nopcode.org/?t=wistumbler2
+COMMENT=	Fork of original WaveLAN/IEEE network stumbler
+
+DISTINFO_FILE=		${.CURDIR}/../../net/wistumbler2/distinfo
+PATCHDIR=		${.CURDIR}/../../net/wistumbler2/patches
+PLIST_SRC=		${.CURDIR}/../../net/wistumbler2/PLIST
+
+NOT_FOR_PLATFORM=	NetBSD-[01].[012345]*-*
+ONLY_FOR_PLATFORM=	NetBSD-*-* FreeBSD-*-* OpenBSD-*-*
+
+HAS_CONFIGURE=		YES
+MANCOMPRESSED=		YES
+USE_BUILDLINK3=		YES
+USE_PKGINSTALL=		YES
+
+CONFIGURE_ENV+=		PREFIX=${PREFIX}
+
+CONF_FILES=		${PREFIX}/share/examples/wistumbler2/wistumbler2.conf \
+			${PKG_SYSCONFDIR}/wistumbler2.conf
+
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-configure
+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"