Fix build on amd64 -- machine/speaker.h is not needed. Add DESTDIR

support.

6 files changed, 31 insertions, 13 deletions

diff --git a/net/wistumbler2-gtk/Makefile b/net/wistumbler2-gtk/Makefile
index a61db2fecfb..b89ab3ec730 100644
--- a/net/wistumbler2-gtk/Makefile
+++ b/net/wistumbler2-gtk/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/04/17 13:46:44 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/10/02 13:35:02 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../net/wistumbler2/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/wistumbler2-/wistumbler2-gtk-/}
diff --git a/net/wistumbler2/Makefile b/net/wistumbler2/Makefile
index fdefad61294..287ecdbb397 100644
--- a/net/wistumbler2/Makefile
+++ b/net/wistumbler2/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2005/05/25 14:47:05 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/02 13:35:02 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
diff --git a/net/wistumbler2/Makefile.common b/net/wistumbler2/Makefile.common
index 0ef3c2928cc..8d1383f7ec8 100644
--- a/net/wistumbler2/Makefile.common
+++ b/net/wistumbler2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2006/04/22 09:22:13 rillig Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/10/02 13:35:02 joerg Exp $
 #
 
 DISTNAME=	wistumbler2-2.0pre10
@@ -19,7 +19,8 @@ CONFLICTS+=		wistumbler-[0-9]*
 
 HAS_CONFIGURE=		YES
 
-CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
+CONFIGURE_ENV+=		PREFIX=${PREFIX} PKGMANDIR=${PKGMANDIR}
+MAKE_FLAGS=		PREFIX=${DESTDIR}${PREFIX} 
 
 CONF_FILES=		${PREFIX}/share/examples/wistumbler2/wistumbler2.conf \
 			${PKG_SYSCONFDIR}/wistumbler2.conf
diff --git a/net/wistumbler2/distinfo b/net/wistumbler2/distinfo
index 40770b5e071..e78ca109ff4 100644
--- a/net/wistumbler2/distinfo
+++ b/net/wistumbler2/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.9 2006/01/08 21:22:58 joerg Exp $
+$NetBSD: distinfo,v 1.10 2008/10/02 13:35:02 joerg Exp $
 
 SHA1 (wistumbler2-2.0pre10.tar.gz) = 1167dfbc53cdf43cca357fefd2153be9f4657669
 RMD160 (wistumbler2-2.0pre10.tar.gz) = 27a1539c93560c753d9951c5c236108bf38d8639
 Size (wistumbler2-2.0pre10.tar.gz) = 45972 bytes
 SHA1 (patch-aa) = 0b5c4409489d334f235373b67dcb3344f7839ea2
-SHA1 (patch-ab) = 87149860de4e4f75609748a3f8e5912320f98575
+SHA1 (patch-ab) = de998de5ac130b42c068ecefcd179644e3f8c0b9
 SHA1 (patch-ac) = 039363ed35c94c971187d9bf98f97c7560b3fbeb
-SHA1 (patch-ad) = bac9decfec5dde5b870042d4b26b8ff623660e8d
+SHA1 (patch-ad) = caae5b0afe7e9a1650f0954e88d6e152e98ad77a
 SHA1 (patch-ae) = 04ff3efea6225917e872522eb3fabcb0a0e83eeb
+SHA1 (patch-af) = a024d16ffd945f609a1c15077438c0ea419e1023
diff --git a/net/wistumbler2/patches/patch-ab b/net/wistumbler2/patches/patch-ab
index a5752da49d4..0c6b2b078b2 100644
--- a/net/wistumbler2/patches/patch-ab
+++ b/net/wistumbler2/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2006/01/08 21:22:58 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2008/10/02 13:35:02 joerg Exp $
 
---- configure.orig	2006-01-08 21:08:17.000000000 +0000
+--- configure.orig	2005-05-24 18:36:28.000000000 +0200
 +++ configure
 @@ -267,7 +267,7 @@ echo "ERROR: ${CPP} cannot parse sources
  
@@ -19,3 +19,12 @@ $NetBSD: patch-ab,v 1.3 2006/01/08 21:22:58 joerg Exp $
  if [ "${TARGET_OS}" = "freebsd" ]; then OS_OK="1" ; fi ;
  if [ "${TARGET_OS}" = "openbsd" ]; then OS_OK="1" ; fi ;
  
+@@ -396,7 +397,7 @@ rm -f test.c a.out
+ echo "done"
+ echo ""
+ echo "Final report:"
+-for A in  PREFIX USE_GTK HAVE_PTHREAD HAVE_LIB_PCAP USE_BEEP CFLAGS ; do
++for A in  PREFIX USE_GTK HAVE_PTHREAD HAVE_LIB_PCAP USE_BEEP CFLAGS PKGMANDIR; do
+   eval "VAL=\$${A}"
+   if [ -z "${VAL}" ]; then VAL="(null)"; fi
+   echo " - ${A} = ${VAL}"
diff --git a/net/wistumbler2/patches/patch-ad b/net/wistumbler2/patches/patch-ad
index 11075aa1c14..528057c375b 100644
--- a/net/wistumbler2/patches/patch-ad
+++ b/net/wistumbler2/patches/patch-ad
@@ -1,13 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2006/01/08 21:22:58 joerg Exp $
+$NetBSD: patch-ad,v 1.4 2008/10/02 13:35:02 joerg Exp $
 
---- src/speaker.c.orig	2006-01-08 21:10:38.000000000 +0000
+--- src/speaker.c.orig	2004-11-27 22:04:09.000000000 +0100
 +++ src/speaker.c
-@@ -38,7 +38,7 @@
+@@ -38,9 +38,9 @@
  #include <stdlib.h>
  
  #ifdef SPEAKER_PRESENT
 -#ifdef __FreeBSD__
 +#if defined(__FreeBSD__) || defined(__DragonFly__)
  #include <machine/speaker.h>
- #else
+-#else
++#elif !defined(__NetBSD__)
  #include <machine/spkr.h>
+ #endif
+ #endif