From 54feb91247563d027b1a3106655bdd98cbc00326 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 12 Jul 2013 23:55:21 +0000
Subject: [PATCH] Remove net/urtwn-firmware-kmod, integrated to head/ as of
 r253139.

Submitted by:	hiren
---
 LEGAL                             |  1 -
 MOVED                             |  1 +
 net/Makefile                      |  1 -
 net/urtwn-firmware-kmod/Makefile  | 46 -------------------------------
 net/urtwn-firmware-kmod/distinfo  |  2 --
 net/urtwn-firmware-kmod/pkg-descr |  1 -
 net/urtwn-firmware-kmod/pkg-plist |  2 --
 7 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 net/urtwn-firmware-kmod/Makefile
 delete mode 100644 net/urtwn-firmware-kmod/distinfo
 delete mode 100644 net/urtwn-firmware-kmod/pkg-descr
 delete mode 100644 net/urtwn-firmware-kmod/pkg-plist

diff --git a/LEGAL b/LEGAL
index 7f7c275cb019..5e8acd38d01a 100644
--- a/LEGAL
+++ b/LEGAL
@@ -265,7 +265,6 @@ uDrawGraph-*		graphics/uDrawGraph	Binary under GNU LGPL without accompanying sou
 ue*dev.zip		editors/uemacs		Resale allowed for media cost only
 uplink-demo		games/linux-uplink-demo	Redistribution limited
 uppaal-*.zip		devel/uppaal		Downloading requires completion of a license agreement
-urtwn-firmware-kmod*	net/urtwn-firmware-kmod	This is a modified version of a restricted firmware
 ut2004-lnx-*		games/linux-ut2004-demo	Redistribution limited
 ut_linux_mgr_*		sysutils/linux-megamgr	Redistribution prohibited
 uzap.tar.gz		editors/uzap		This software may not be used to make a profit in any way.
diff --git a/MOVED b/MOVED
index 20aefc1316a1..5a241994d2c6 100644
--- a/MOVED
+++ b/MOVED
@@ -4430,3 +4430,4 @@ databases/embedded_innodb||2013-07-11|Has expired: The Embedded InnoDB project w
 print/lyx16|print/lyx|2013-07-11|Has expired: Unmaintained upstream, upgrading to the 2.x series is advised
 security/py-crack|security/py-cracklib|2013-07-11|Has expired: Superseded by security/py-cracklib
 x11-toolkits/linux-f10-qt33||2013-07-12|Removed
+net/urtwn-firmware-kmod||2013-07-12|Removed, part of base as of r253139
diff --git a/net/Makefile b/net/Makefile
index 4210a771b965..4337133abfa0 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1224,7 +1224,6 @@
     SUBDIR += urelay
     SUBDIR += uriparser
     SUBDIR += urlendec
-    SUBDIR += urtwn-firmware-kmod
     SUBDIR += usbredir
     SUBDIR += userfw
     SUBDIR += ushare
diff --git a/net/urtwn-firmware-kmod/Makefile b/net/urtwn-firmware-kmod/Makefile
deleted file mode 100644
index c3bca8480f55..000000000000
--- a/net/urtwn-firmware-kmod/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	urtwn-firmware
-PORTVERSION=	${FWVERSION}
-CATEGORIES=	net kld
-MASTER_SITES=	http://firmware.openbsd.org/firmware-dist/
-PKGNAMESUFFIX=	-kmod
-DISTNAME=	${FWNAME}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	kevlo@FreeBSD.org
-COMMENT=	Realtek RTL8188CU/RTL8192CU firmware kernel module
-
-DRIVERNAME=	urtwn
-FWVERSION?=	1.1
-FWNAME=		${DRIVERNAME}-${FWVERSION}
-
-WRKSRC=		${WRKDIR}
-KMODDIR=	/boot/modules
-KMODVERSION=	${FWVERSION:C/^(...)$/\1.0/:S/.//g}
-PLIST_SUB=	DRIVERNAME="${DRIVERNAME}" \
-		KMODDIR="${KMODDIR}"
-CFLAGS+=	-D_KERNEL
-
-NO_PACKAGE=	This is a modified version of a restricted firmware
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${MKDIR} ${WRKSRC}/${DRIVERNAME}
-	@${ECHO_CMD} "KMOD= ${DRIVERNAME}" > ${WRKSRC}/${DRIVERNAME}/Makefile
-.for firms in urtwn-rtl8192cfwT urtwn-rtl8192cfwU
-	@${MV} ${WRKSRC}/${firms} ${WRKSRC}/${DRIVERNAME}/${firms}
-	@${ECHO_CMD} "FIRMWS+= ${firms}:${firms}:${KMODVERSION}" >> \
-		${WRKSRC}/${DRIVERNAME}/Makefile
-.endfor
-	@${ECHO_CMD} ".include <bsd.kmod.mk>" >> \
-		${WRKSRC}/${DRIVERNAME}/Makefile
-
-do-build:
-	@cd ${WRKSRC}/${DRIVERNAME}; ${SETENV} KMODDIR="${KMODDIR}" make all
-
-do-install:
-	@cd ${WRKSRC}/${DRIVERNAME}; ${SETENV} KMODDIR="${KMODDIR}" make install
-
-.include <bsd.port.post.mk>
diff --git a/net/urtwn-firmware-kmod/distinfo b/net/urtwn-firmware-kmod/distinfo
deleted file mode 100644
index b34f97be65cf..000000000000
--- a/net/urtwn-firmware-kmod/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (urtwn-1.1.tgz) = bae578e5a95b0d194e28c69527352c0d8fb427f2e441af47ccdf3db0d2ca2d5b
-SIZE (urtwn-1.1.tgz) = 14856
diff --git a/net/urtwn-firmware-kmod/pkg-descr b/net/urtwn-firmware-kmod/pkg-descr
deleted file mode 100644
index cab82a237700..000000000000
--- a/net/urtwn-firmware-kmod/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Firmware for the Realtek Wireless FreeBSD driver urtwn(4).
diff --git a/net/urtwn-firmware-kmod/pkg-plist b/net/urtwn-firmware-kmod/pkg-plist
deleted file mode 100644
index e8247d3cc489..000000000000
--- a/net/urtwn-firmware-kmod/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@cwd %%KMODDIR%%
-%%DRIVERNAME%%.ko