From owner-svn-ports-head@FreeBSD.ORG Sun Oct 12 10:46:36 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D81E2FDD; Sun, 12 Oct 2014 10:46:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C3C78685; Sun, 12 Oct 2014 10:46:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9CAkZnK074234; Sun, 12 Oct 2014 10:46:35 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9CAkZXI074231; Sun, 12 Oct 2014 10:46:35 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201410121046.s9CAkZXI074231@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 12 Oct 2014 10:46:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370693 - in head/net/hostapd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Oct 2014 10:46:36 -0000 Author: marino Date: Sun Oct 12 10:46:34 2014 New Revision: 370693 URL: https://svnweb.freebsd.org/changeset/ports/370693 QAT: https://qat.redports.org/buildarchive/r370693/ Log: 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 
 and  and
  use of $PORTNAME in $WRKSRC which would break if PORTNAME changes.

Modified:
  head/net/hostapd/Makefile
  head/net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c
  head/net/hostapd/pkg-descr

Modified: head/net/hostapd/Makefile
==============================================================================
--- head/net/hostapd/Makefile	Sun Oct 12 09:05:54 2014	(r370692)
+++ head/net/hostapd/Makefile	Sun Oct 12 10:46:34 2014	(r370693)
@@ -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
 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 
-
-.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 
+.include 

Modified: head/net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c
==============================================================================
--- head/net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c	Sun Oct 12 09:05:54 2014	(r370692)
+++ head/net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c	Sun Oct 12 10:46:34 2014	(r370693)
@@ -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 
  #endif /* __APPLE__ */
  #include 

Modified: head/net/hostapd/pkg-descr
==============================================================================
--- head/net/hostapd/pkg-descr	Sun Oct 12 09:05:54 2014	(r370692)
+++ head/net/hostapd/pkg-descr	Sun Oct 12 10:46:34 2014	(r370693)
@@ -10,4 +10,4 @@ To use the ports version instead of the 
 
 to /etc/rc.conf
 
-WWW: http://hostap.epitest.fi/hostapd/
+WWW: http://w1.fi/hostapd/