From 2f81ea0c34e4e3124ca481c37ad7ab942578555a Mon Sep 17 00:00:00 2001
From: marino <marino@FreeBSD.org>
Date: Sun, 12 Oct 2014 10:46:34 +0000
Subject: net/hostapd: Update WWW + MASTER_SITES and support DragonFly

The domain for hostapd has changed from hostap.epitest.fi to w1.fi
although the former still redirects.  Update WWW and MASTER_SITES to
reflect the new name.

Regenerate the l2 packet patch so that hostapd also builds on DragonFly
(no-op for FreeBSD).

While here, rearrange makefile to remove need for <pre> and <post> and
use of $PORTNAME in $WRKSRC which would break if PORTNAME changes.
---
 net/hostapd/Makefile                                      | 14 ++++++--------
 net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c | 11 +++++++----
 net/hostapd/pkg-descr                                     |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'net/hostapd')

diff --git a/net/hostapd/Makefile b/net/hostapd/Makefile
index 3277d8346ea4..41357d819435 100644
--- a/net/hostapd/Makefile
+++ b/net/hostapd/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	hostapd
 PORTVERSION=	2.2
 CATEGORIES=	net
-MASTER_SITES=	http://hostap.epitest.fi/releases/
+MASTER_SITES=	http://w1.fi/releases/
 
 MAINTAINER=	leres@ee.lbl.gov
 COMMENT=	IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
@@ -12,16 +12,14 @@ COMMENT=	IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 LICENSE=	BSD3CLAUSE
 
 USES=		gmake
-BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/hostapd
 
 PLIST_FILES=	sbin/hostapd sbin/hostapd_cli man/man1/hostapd_cli.1.gz \
 		man/man8/hostapd.8.gz
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
+BROKEN_ia64=	does not compile
+BROKEN_powerpc=	does not compile
+BROKEN_sparc64=	does not compile
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@$$(E) "  CC " $$<|@$$(E) "  $$(CC) " $$<|' \
@@ -39,4 +37,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/hostapd/hostapd.8 \
 		${STAGEDIR}${MANPREFIX}/man/man8
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c b/net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c
index 0811796c25cd..8b34e0fbdd89 100644
--- a/net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c
+++ b/net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c
@@ -1,11 +1,14 @@
---- src/l2_packet/l2_packet_freebsd.c.orig	2011-02-05 17:11:19.000000000 -0800
-+++ src/l2_packet/l2_packet_freebsd.c	2011-02-05 17:11:35.000000000 -0800
-@@ -14,7 +14,7 @@
+--- src/l2_packet/l2_packet_freebsd.c.orig	2014-06-04 13:26:14 UTC
++++ src/l2_packet/l2_packet_freebsd.c
+@@ -8,7 +8,10 @@
   */
  
  #include "includes.h"
 -#if defined(__APPLE__) || defined(__GLIBC__)
-+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__GLIBC__)
++#if defined(__FreeBSD__) \
++ || defined(__DragonFly__) \
++ || defined(__APPLE__) \
++ || defined(__GLIBC__)
  #include <net/bpf.h>
  #endif /* __APPLE__ */
  #include <pcap.h>
diff --git a/net/hostapd/pkg-descr b/net/hostapd/pkg-descr
index da2c084e450e..35d892575e55 100644
--- a/net/hostapd/pkg-descr
+++ b/net/hostapd/pkg-descr
@@ -10,4 +10,4 @@ To use the ports version instead of the base, add:
 
 to /etc/rc.conf
 
-WWW: http://hostap.epitest.fi/hostapd/
+WWW: http://w1.fi/hostapd/
-- 
cgit