- Update to 1.0.0301 (20050312)

PR:		ports/79889
Submitted by:	Quinton Dolan <q@onthenet.com.au> (maintainer)

7 files changed, 10 insertions, 49 deletions

diff --git a/net/nvnet/Makefile b/net/nvnet/Makefile
index dc99c352607c..9e2f55c81a9d 100644
--- a/net/nvnet/Makefile
+++ b/net/nvnet/Makefile
@@ -1,5 +1,4 @@
 # Ports collection makefile for: nvnet
-#
 # Date created:	1 Oct 2003
 # Whom: 	Quinton Dolan <q@onthenet.com.au>
 #
@@ -7,51 +6,33 @@
 #
 
 PORTNAME=	nvnet
-PORTVERSION=	1.0.${NVVERSION}
-PORTREVISION?=	0
+PORTVERSION=	1.0.0301
 CATEGORIES=	net
-MASTER_SITES=	http://download.nvidia.com/XFree86/nforce/1.0-${NVVERSION}/:nvidia \
-		ftp://download.nvidia.com/XFree86/nforce/1.0-${NVVERSION}/:nvidia \
-		http://download1.nvidia.com/XFree86/nforce/1.0-${NVVERSION}/:nvidia \
-		ftp://download1.nvidia.com/XFree86/nforce/1.0-${NVVERSION}/:nvidia \
-		http://www.onthenet.com.au/~q/nvnet/:nvnet
-DISTFILES=	NVIDIA_nforce-1.0-${NVVERSION}${EXTRACT_SUFX}:nvidia \
-		nvnet-src-${NVNETVERSION}${EXTRACT_SUFX}:nvnet
+MASTER_SITES=	http://www.onthenet.com.au/~q/nvnet/
+DISTFILES=	${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	q@onthenet.com.au
 COMMENT=	Driver for NVIDIA MCP Ethernet adapter
 
-NVNETVERSION=	20040813
+DISTVERSION=	20050312
 
 NO_PACKAGE=	Depends on kernel
 ONLY_FOR_ARCHS=	amd64 i386
-MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 WRKSRC=		${WRKDIR}/nvnet
-MODULES_WITH_WORLD=
 PLIST_SUB=	KMODDIR=${KMODDIR}
 PORTDOCS=	README nvidia_pci.c.diff
 MAN4=		nvnet.4
+MAKE_ENV=	OSTYPE=${OPSYS}
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 480100 || ${OSVERSION} >= 500000 && ${OSVERSION} < 501000
-BROKEN=		"Systems prior to FreeBSD 4.9 & 5.1 are not supported"
-.endif
-
-.if ${ARCH} == "i386"
-NVVERSION=	0274
-.elif ${ARCH} == "amd64"
-NVVERSION=	0275
-.else
-NVVERSION=	0
+IGNORE=		Systems prior to FreeBSD 4.9 & 5.1 are not supported
 .endif
 
 pre-fetch:
 .if !exists(${SRC_BASE}/sys/Makefile)
-	@${ECHO} "*************************************************"; \
-	${ECHO}  "This port requires the kernel source be available"; \
-	${ECHO}  "*************************************************"; \
-	exit 1
+IGNORE=		Kernel source files required
 .endif
 
 do-install:
diff --git a/net/nvnet/distinfo b/net/nvnet/distinfo
new file mode 100644
index 000000000000..013ad4532843
--- /dev/null
+++ b/net/nvnet/distinfo
@@ -0,0 +1,2 @@
+MD5 (nvnet-src-20050312.tar.gz) = 3e663986eab7deb5bf315a9f795bee7d
+SIZE (nvnet-src-20050312.tar.gz) = 91425
diff --git a/net/nvnet/distinfo.amd64 b/net/nvnet/distinfo.amd64
deleted file mode 100644
index 4aafd2a49161..000000000000
--- a/net/nvnet/distinfo.amd64
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (NVIDIA_nforce-1.0-0275.tar.gz) = b11e5fb81d629b27be546b6a731d99ea
-SIZE (NVIDIA_nforce-1.0-0275.tar.gz) = 126011
-MD5 (nvnet-src-20040813.tar.gz) = 425b9bb3495a1d7f68db817293653d0a
-SIZE (nvnet-src-20040813.tar.gz) = 18821
diff --git a/net/nvnet/distinfo.i386 b/net/nvnet/distinfo.i386
deleted file mode 100644
index c875b3f87180..000000000000
--- a/net/nvnet/distinfo.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (NVIDIA_nforce-1.0-0274.tar.gz) = b84b5a34639b547ef897d6447c3c5415
-SIZE (NVIDIA_nforce-1.0-0274.tar.gz) = 126450
-MD5 (nvnet-src-20040813.tar.gz) = 425b9bb3495a1d7f68db817293653d0a
-SIZE (nvnet-src-20040813.tar.gz) = 18821
diff --git a/net/nvnet/files/patch-src_if__nv.c b/net/nvnet/files/patch-src_if__nv.c
deleted file mode 100644
index c064cfdfac29..000000000000
--- a/net/nvnet/files/patch-src_if__nv.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/if_nv.c.orig	Sat Jun 26 11:58:36 2004
-+++ src/if_nv.c	Sat Jun 26 11:59:07 2004
-@@ -72,6 +72,7 @@
- #include <sys/socket.h>
- #include <sys/sysctl.h>
- #include <sys/queue.h>
-+#include <sys/module.h>
- 
- #include <net/if.h>
- #include <net/if_arp.h>
diff --git a/net/nvnet/pkg-descr b/net/nvnet/pkg-descr
index 313028893f36..9cd8951bacca 100644
--- a/net/nvnet/pkg-descr
+++ b/net/nvnet/pkg-descr
@@ -1,6 +1,6 @@
 This port contains a driver for the NVIDIA nForce MCP Ethernet adapter.
 It contains a wrapper that replaces the Linux nvnet.c, and links against
-the Linux binary only object file (nvnetlib.o) included in the NVIDIA
+the Linux binary only object file (nvenetlib.o) included from the NVIDIA
 driver source distribution.
 
 This should work on all nForce and nForce2 based motherboards that have
diff --git a/net/nvnet/pkg-message b/net/nvnet/pkg-message
index ce8efb6b10c8..c3890917ca9e 100644
--- a/net/nvnet/pkg-message
+++ b/net/nvnet/pkg-message
@@ -4,4 +4,3 @@
 * nature of FreeBSD it may be necessary to rebuild the module after a kernel  *
 * source update.  To do this reinstall the port.                              *
 *******************************************************************************
-