4 files changed, 59 insertions, 40 deletions

diff --git a/net/acx100/Makefile b/net/acx100/Makefile
index 3f19f0baec8b..a7385571e5bd 100644
--- a/net/acx100/Makefile
+++ b/net/acx100/Makefile
@@ -5,59 +5,68 @@
 # $FreeBSD$
 #
 
-PORTNAME=	acx100
-PORTVERSION=	20040701
-PORTREVISION=	1
+PORTNAME=	acx
+PORTVERSION=	6.1
+PORTEPOCH=	1
 CATEGORIES=	net kld
-MASTER_SITES=	http://dev.kewl.org/download/:file_0 \
-		ftp://ftp.dlink.co.uk/wireless/dwl-650+/:file_1
+MASTER_SITES=	http://dev.kewl.org/acx100+111/:file_0 \
+		ftp://ftp.dlink.co.uk/wireless/dwl-650+/:file_1 \
+		http://freebsd.csie.nctu.edu.tw/pub/distfiles/acx/:file_1 \
+		http://download.tdc.dk/pub/tdconline/kundeservice/firmware/netkort/:file_2 \
+		ftp://downloads.netgear.com/files/:file_2
 DISTFILES=	${DISTFILE_0}:file_0 \
-		${DISTFILE_1}:file_1
+		${DISTFILE_1}:file_1 \
+		${DISTFILE_2}:file_2
 DIST_SUBDIR=	acx
 EXTRACT_ONLY=	${DISTFILE_0}
 
-MAINTAINER=	leoz.2005@gmail.com
-COMMENT=	Texas Instruments (TI) ACX100 IEEE 802.11 driver
+MAINTAINER=	shuvaev@physik.uni-wuerzburg.de
+COMMENT=	Texas Instruments (TI) ACX100 and ACX111 IEEE 802.11 driver
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 NO_PACKAGE=	This port should be recompiled for a particular FreeBSD kernel
-ONLY_FOR_ARCHS=	i386
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
+ONLY_FOR_ARCHS=	amd64 i386
 
 MAN4=		if_acx.4
 
 DISTFILE_0=	${DISTNAME}.tgz
 DISTFILE_1=	dwl-650+_drv_v3.06_1007_inc_utility.zip
+DISTFILE_2=	wg311v2_v2_0_0_7.zip
 FIRMWAREDIR=	firmware
-INCLUDEDIR=	${PREFIX}/include/acx
+KMODDIR?=	/boot/modules
+
+MAKE_ENV+=	KMODDIR="${KMODDIR}"
+PLIST_SUB+=	KMODDIR=${KMODDIR}
+
+.include <bsd.port.pre.mk>
 
 pre-fetch:
 .if !exists(${SRC_BASE}/sys/Makefile)
-	@${ECHO} "This port requires the kernel sources to be available"
+IGNORE=		requires the kernel sources to be available
+.endif
+
+post-patch:
+.if ${OSVERSION} >= 800049
+	@${REINPLACE_CMD} -e 's/suser(thred)/priv_check(thred, PRIV_DRIVER)/' \
+		${WRKSRC}/acx/if_acxifnet.c
 .endif
 
 pre-build:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_1} ${WRKSRC}/${FIRMWAREDIR} && \
-	cd ${WRKSRC}/${FIRMWAREDIR} && \
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_1} ${WRKSRC}/${FIRMWAREDIR}/acx100 && \
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_2} ${WRKSRC}/${FIRMWAREDIR}/acx111 && \
+	cd ${BUILD_WRKSRC}/${FIRMWAREDIR} && \
 	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 
+# Prevent auxiliary bin2h programm from being installed
 pre-install:
-	@${INSTALL_MAN} ${WRKSRC}/if_acx.4 ${PREFIX}/man/man4
+	@${REINPLACE_CMD} -e 's/bin2h //' ${WRKSRC}/Makefile
 
-	@${MKDIR} ${INCLUDEDIR}
-	@${CP} ${WRKSRC}/include/if_acxioctl.h  ${INCLUDEDIR}
+do-install:
+	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}
+	${INSTALL_MAN} ${WRKSRC}/acx/if_acx.4 ${PREFIX}/man/man4
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 601104
-BROKEN=		Does not compile on FreeBSD >= 6.x
-DEPRECATED=	Has been broken for more than 6 months
-EXPIRATION_DATE=2008-09-19
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net/acx100/distinfo b/net/acx100/distinfo
index 8bd49d98ab71..253b6f26bd3d 100644
--- a/net/acx100/distinfo
+++ b/net/acx100/distinfo
@@ -1,6 +1,9 @@
-MD5 (acx/acx100-20040701.tgz) = 6f026815dbe5de0629e95853fc9c2ff8
-SHA256 (acx/acx100-20040701.tgz) = 4a1bbbdf08668239126caac3dedab37571cbd06bb5dd8be440b30a0ea7409e59
-SIZE (acx/acx100-20040701.tgz) = 49013
+MD5 (acx/acx-6.1.tgz) = c47e882ae34e9cd3f582a5b1ce22edec
+SHA256 (acx/acx-6.1.tgz) = cfdcbed853202e5aa72d78ae440945dcb92f3faffa1ed41eba1c264168c1a4d5
+SIZE (acx/acx-6.1.tgz) = 62929
 MD5 (acx/dwl-650+_drv_v3.06_1007_inc_utility.zip) = 599bfdea54f540b0b68341951a8e2a9f
 SHA256 (acx/dwl-650+_drv_v3.06_1007_inc_utility.zip) = 5922ac7410e1dfc7e34957a9e8cd605087ca1d9fbe5829c7c102fbb72d75708f
 SIZE (acx/dwl-650+_drv_v3.06_1007_inc_utility.zip) = 2464165
+MD5 (acx/wg311v2_v2_0_0_7.zip) = a7406fbb3d48318153d48ee805fb9873
+SHA256 (acx/wg311v2_v2_0_0_7.zip) = 5941f1b113e49c2b9aff3d60bef9ecc9f4ffd972c876df913aa182e925b995bf
+SIZE (acx/wg311v2_v2_0_0_7.zip) = 16518095
diff --git a/net/acx100/pkg-descr b/net/acx100/pkg-descr
index 7fd43d53afa2..30d463b5213b 100644
--- a/net/acx100/pkg-descr
+++ b/net/acx100/pkg-descr
@@ -1,13 +1,17 @@
-Texas Instruments (TI) ACX100 IEEE 802.11 driver.
+Texas Instruments (TI) ACX100/111 IEEE 802.11 driver.
 
-The acx driver supports ACX100 based Cardbus or PCI network adapters.
+The acx driver supports ACX100/111 based Cardbus or PCI network adapters.
 
 The following cards are known to work with the acx driver:
 
-Card                  Bus
-Binatone WL-1000      CARDBUS
-D-Link DWL-650+       CARDBUS
-US Robotics USR2210   CARDBUS
-US Robotics USR2216   PCI
+Card			Bus		Type
+Binatone WL-1000	CARDBUS		ACX100
+D-Link DWL-650+		CARDBUS		ACX100
+US Robotics USR2210	CARDBUS		ACX100
+US Robotics USR2216	PCI		ACX100
+D-Link DWL-G650+	CARDBUS		ACX111
+D-Link DWL-G520+	PCI		ACX111
+US Robotics USR5416	PCI		ACX111
+SAFECOM SWLPT-54125	PCI		ACX111
 
 WWW: http://dev.kewl.org/
diff --git a/net/acx100/pkg-plist b/net/acx100/pkg-plist
index bfbecddc0207..a1052295922c 100644
--- a/net/acx100/pkg-plist
+++ b/net/acx100/pkg-plist
@@ -1,5 +1,8 @@
-@comment $FreeBSD$
-include/acx/if_acxioctl.h
-@dirrm include/acx
-@cwd /boot/kernel
+bin/ifdo
+sbin/acxtool
+@cwd %%KMODDIR%%
 if_acx.ko
+if_acx.ko.symbols
+acx100fw.ko
+acx111fw.ko
+@unexec kldxref %D