From mcsi@agava.com  Wed Oct  9 04:39:41 2002
Return-Path: <mcsi@agava.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0888437B401
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Oct 2002 04:39:41 -0700 (PDT)
Received: from relay2.agava.net.ru (ofc.agava.net [195.161.118.6])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4A07E43E65
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Oct 2002 04:39:40 -0700 (PDT)
	(envelope-from mcsi@agava.com)
Received: from ultra.domain (ultra.domain [192.168.1.58])
	by relay2.agava.net.ru (Postfix) with ESMTP id 381AF4772A7
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Oct 2002 15:39:39 +0400 (MSD)
Received: from ultra.domain (localhost [127.0.0.1])
	by ultra.domain (8.12.6/8.12.5) with ESMTP id g99BfHXP092339
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 9 Oct 2002 15:41:17 +0400 (MSD)
	(envelope-from mcsi@ultra.domain)
Received: (from root@localhost)
	by ultra.domain (8.12.6/8.12.6/Submit) id g99BfHZI092338;
	Wed, 9 Oct 2002 15:41:17 +0400 (MSD)
Message-Id: <200210091141.g99BfHZI092338@ultra.domain>
Date: Wed, 9 Oct 2002 15:41:17 +0400 (MSD)
From: Maxim Maximov <mcsi@agava.com>
Reply-To: Maxim Maximov <mcsi@agava.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: fix build of x11/wscan
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         43856
>Category:       ports
>Synopsis:       fix build of x11/wscan
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 09 04:40:00 PDT 2002
>Closed-Date:    Mon Mar 03 16:45:07 PST 2003
>Last-Modified:  Mon Mar 03 16:45:07 PST 2003
>Originator:     Maxim Maximov
>Release:        FreeBSD 4.7-RC i386
>Organization:
>Environment:
System: FreeBSD ultra.domain 4.7-RC FreeBSD 4.7-RC #9: Fri Oct 4 12:38:44 MSD 2002 mcsi@ultra.domain:/usr/obj/usr/src/sys/ULTRA i386


	
>Description:
this patch fixes build of x11/wscan port. there were two issues:

1. machine/if_wavelan_ieee.h was removed at Mon Jun 17 21:55:02 2002 UTC, so fix __FreeBSD_version as appropriate.
2. MAXWICACHE moved to if_wivar.h, which is not intended to include in userland apps. so, add a hack. however, better solution is to return MAXWICACHE define back into if_wavelan_ieee.h.

the patch made to original distributive version of the file.
	
>How-To-Repeat:
	
>Fix:

--- wibsd_wifi.c.orig	Mon Dec 10 21:06:21 2001
+++ wibsd_wifi.c	Wed Oct  9 15:29:13 2002
@@ -49,7 +49,14 @@
 #include <net/ethernet.h>
 
 #define WICACHE
+#define MAXWICACHE 10
+
+#include <osreldate.h>
+#if __FreeBSD_version >= 460101
+#include <dev/wi/if_wavelan_ieee.h>
+#else
 #include <machine/if_wavelan_ieee.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>
	


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: kris 
State-Changed-When: Mon Mar 3 16:44:49 PST 2003 
State-Changed-Why:  
It looks like a similar patch was already applied, but this 
port is still broken on 5.0. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43856 
>Unformatted:
