From aeeb155adf25bea68ca03aea43416fe872ace08f Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 9 Jun 2007 16:45:50 +0000
Subject: [PATCH] fix build after token ring removal; from steven@ but i prefer
 the #ifdef

---
 net/xorp/Makefile                            |  4 ++--
 net/xorp/patches/patch-fea_ifconfig_media_cc | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 net/xorp/patches/patch-fea_ifconfig_media_cc

diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index b37d829f74b..cff0c095f12 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2007/03/30 19:23:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2007/06/09 16:45:50 naddy Exp $
 
 COMMENT-main=	"eXtensible Open Router Platform"
 
 VERSION=	1.4
 DISTNAME=	xorp-${VERSION}
-PKGNAME-main=	${DISTNAME}p0
+PKGNAME-main=	${DISTNAME}p1
 CATEGORIES=	net
 HOMEPAGE=	http://www.xorp.org/
 
diff --git a/net/xorp/patches/patch-fea_ifconfig_media_cc b/net/xorp/patches/patch-fea_ifconfig_media_cc
new file mode 100644
index 00000000000..76a6c8d0487
--- /dev/null
+++ b/net/xorp/patches/patch-fea_ifconfig_media_cc
@@ -0,0 +1,13 @@
+$OpenBSD: patch-fea_ifconfig_media_cc,v 1.1 2007/06/09 16:45:50 naddy Exp $
+--- fea/ifconfig_media.cc.orig	Fri Jun  8 00:04:20 2007
++++ fea/ifconfig_media.cc	Fri Jun  8 00:04:52 2007
+@@ -95,7 +95,9 @@ ifconfig_media_get_link_status(const string& if_name, 
+ 	switch (IFM_TYPE(ifmr.ifm_active)) {
+ 	case IFM_ETHER:
+ 	case IFM_FDDI:
++#if defined(IFM_TOKEN)
+ 	case IFM_TOKEN:
++#endif
+ 	case IFM_IEEE80211:
+ 	    if ((ifmr.ifm_status & IFM_AVALID)
+ 		&& (ifmr.ifm_status & IFM_ACTIVE)) {