Update to the 20040813 release that also works on amd64.

On 6.x and 5.x, module is installed into /boot/module so
each "make installkernel" doesn't blow it away.

5 files changed, 29 insertions, 21 deletions

diff --git a/net/nvnet/Makefile b/net/nvnet/Makefile
index fce5ce6ef777..dc99c352607c 100644
--- a/net/nvnet/Makefile
+++ b/net/nvnet/Makefile
@@ -21,11 +21,15 @@ DISTFILES=	NVIDIA_nforce-1.0-${NVVERSION}${EXTRACT_SUFX}:nvidia \
 MAINTAINER=	q@onthenet.com.au
 COMMENT=	Driver for NVIDIA MCP Ethernet adapter
 
-NVVERSION=	0261
-NVNETVERSION=	20031214
+NVNETVERSION=	20040813
 
-ONLY_FOR_ARCHS=	i386
+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
 
 .include <bsd.port.pre.mk>
@@ -34,10 +38,12 @@ MAN4=		nvnet.4
 BROKEN=		"Systems prior to FreeBSD 4.9 & 5.1 are not supported"
 .endif
 
-.if ${OSVERSION} < 500000
-PLIST_SUB+=	FREEBSD5="@comment " FREEBSD4=""
+.if ${ARCH} == "i386"
+NVVERSION=	0274
+.elif ${ARCH} == "amd64"
+NVVERSION=	0275
 .else
-PLIST_SUB+=	FREEBSD5="" FREEBSD4="@comment "
+NVVERSION=	0
 .endif
 
 pre-fetch:
@@ -48,13 +54,15 @@ pre-fetch:
 	exit 1
 .endif
 
-port-install:
-.if !defined(NOPORTSDOCS)
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/module/if_nv.ko ${KMODDIR}
+	${INSTALL_MAN} ${WRKSRC}/man/nvnet.4 ${PREFIX}/man/man4
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALLMAN} ${WRKSRC}/doc/README ${WRKSRC}/doc/nvidia_pci.c.diff \
-	    ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DOCSDIR}
+.endfor
 .endif
-	${INSTALLMAN} ${WRKSRC}/man/nvnet.4 ${PREFIX}/man/man4
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net/nvnet/distinfo b/net/nvnet/distinfo
deleted file mode 100644
index 0827e2cd868c..000000000000
--- a/net/nvnet/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (NVIDIA_nforce-1.0-0261.tar.gz) = 19e9c6592e8db6ba55c08d42dc49163f
-SIZE (NVIDIA_nforce-1.0-0261.tar.gz) = 87301
-MD5 (nvnet-src-20031214.tar.gz) = 5938d2a2f78cacdd93c9af05bdbe5217
-SIZE (nvnet-src-20031214.tar.gz) = 17407
diff --git a/net/nvnet/distinfo.amd64 b/net/nvnet/distinfo.amd64
new file mode 100644
index 000000000000..4aafd2a49161
--- /dev/null
+++ b/net/nvnet/distinfo.amd64
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000000..c875b3f87180
--- /dev/null
+++ b/net/nvnet/distinfo.i386
@@ -0,0 +1,4 @@
+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/pkg-plist b/net/nvnet/pkg-plist
index 1b137967eb57..e0b509b8b348 100644
--- a/net/nvnet/pkg-plist
+++ b/net/nvnet/pkg-plist
@@ -1,8 +1,4 @@
 @comment $FreeBSD$
 @comment We just copy the file in the kernel module dir.
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/nvidia_pci.c.diff
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%FREEBSD4%%@cwd /modules
-%%FREEBSD5%%@cwd /boot/kernel
-if_nv.ko
+@cwd /
+%%KMODDIR%%/if_nv.ko