Update to version 4.6.10.

PR:		23095
Submitted by:	maintainer

4 files changed, 25 insertions, 68 deletions

diff --git a/net/etherboot/Makefile b/net/etherboot/Makefile
index 3d3991994538..a66d45286e2c 100644
--- a/net/etherboot/Makefile
+++ b/net/etherboot/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	etherboot
-PORTVERSION=	4.6.1
+PORTVERSION=	4.6.10
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://www.us.kernel.org/pub/linux/devel/gcc/ \
-		http://www.ambrisko.com/doug/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}.tar.gz ${BINUTILS_VER}.tar.gz
 
 MAINTAINER=	ambrisko@whistle.com
 
@@ -21,15 +18,6 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 NO_PACKAGE=	lots of configuration necessary
 USE_GMAKE=1
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-BINUTILS_VER=   binutils-2.9.1.0.25  # need newer version of gas for data32
-
-pre-configure:
-	cd ${WRKDIR}/${BINUTILS_VER} ; \
-	   ./configure -host=i386-unknown-freebsdelf
-
-pre-build:
-	cd ${WRKDIR}/${BINUTILS_VER} ; \
-	make
 
 do-install:
 	@${ECHO} Refer ${DESCR} and ${WRKDIR}/${PKGNAME}/doc for how to
diff --git a/net/etherboot/distinfo b/net/etherboot/distinfo
index 461577ef00d7..973266bbdf8f 100644
--- a/net/etherboot/distinfo
+++ b/net/etherboot/distinfo
@@ -1,2 +1 @@
-MD5 (etherboot-4.6.1.tar.gz) = 2d450c003c5f3e5de936ded468fd2e5a
-MD5 (binutils-2.9.1.0.25.tar.gz) = 2350a282f8fd53b409f523e77fccb904
+MD5 (etherboot-4.6.10.tar.gz) = 2fe80de7cdfabed05cc2094cfad58f5d
diff --git a/net/etherboot/files/patch-aa b/net/etherboot/files/patch-aa
index 0d35ff11ff50..4fb53b6d1fed 100644
--- a/net/etherboot/files/patch-aa
+++ b/net/etherboot/files/patch-aa
@@ -1,19 +1,7 @@
-*** Makefile.orig	Sat Mar 18 00:30:20 2000
---- Makefile	Sat Mar 18 19:46:12 2000
+*** Makefile.orig	Mon Oct 16 21:24:09 2000
+--- Makefile	Sun Oct 22 10:05:01 2000
 ***************
-*** 90,95 ****
---- 90,98 ----
-  IDENT16=		'Etherboot/16 $(VERSION) (GPL) $@'
-  IDENT32=		'Etherboot/32 $(VERSION) (GPL) $@'
-  
-+ AS=          `echo ../../bin*/gas/as-new`
-+ LD32=          `echo ../../bin*/ld/ld-new`
-+ 
-  # Find out if we're using binutils 2.9.5 which uses a different syntax in some
-  # places (most prominently in the opcode prefix area).
-  NEWGAS:=	$(shell $(AS) --version | grep -q '2\.9\.1' || echo -DGAS295)
-***************
-*** 142,148 ****
+*** 149,155 ****
   #AS86=		as86
   # If you have made changes to the *.S files and you want to rebuild *loader.bin
   # and {floppy,com}load.bin and you have nasm (not most people)
@@ -21,7 +9,7 @@
   
   # if your as has trouble with the data32 directive, uncomment this
   # but note that the premade start*.o will be larger than necessary because it
---- 145,151 ----
+--- 149,155 ----
   #AS86=		as86
   # If you have made changes to the *.S files and you want to rebuild *loader.bin
   # and {floppy,com}load.bin and you have nasm (not most people)
@@ -29,21 +17,3 @@
   
   # if your as has trouble with the data32 directive, uncomment this
   # but note that the premade start*.o will be larger than necessary because it
-***************
-*** 207,213 ****
-  	|| { $(RM) $@; echo "ERROR: code size exceeds limit!"; exit 1; }
-  
-  # Make sure that the relocation address is acceptable for all ROM sizes
-! RELOCADDR=0x98000
-  # Evaluate ROMLIMIT only once - it is constant during the make run.
-  # Note that the 3K safety margin below is for the 1K extended BIOS data area
-  # and for the Etherboot runtime stack.  Under normal situations, 2K of stack
---- 211,218 ----
-  	|| { $(RM) $@; echo "ERROR: code size exceeds limit!"; exit 1; }
-  
-  # Make sure that the relocation address is acceptable for all ROM sizes
-! #RELOCADDR=0x98000
-! RELOCADDR=0x8f000
-  # Evaluate ROMLIMIT only once - it is constant during the make run.
-  # Note that the 3K safety margin below is for the 1K extended BIOS data area
-  # and for the Etherboot runtime stack.  Under normal situations, 2K of stack
diff --git a/net/etherboot/files/patch-ab b/net/etherboot/files/patch-ab
index 328288314780..719016ea8870 100644
--- a/net/etherboot/files/patch-ab
+++ b/net/etherboot/files/patch-ab
@@ -1,19 +1,19 @@
-*** Config.orig	Mon May 15 10:15:18 2000
---- Config	Mon May 15 10:16:04 2000
+*** main.c.orig	Sun Oct 22 10:07:25 2000
+--- main.c	Sun Oct 22 10:07:58 2000
 ***************
-*** 143,149 ****
-  # CFLAGS32+=	-DCONSOLE_DUAL -DCOMCONSOLE=0x3f8 -DCONSPEED=9600
-  
-  # Enable generic ELF, Multiboot ELF or FreeBSD ELF/a.out boot image support
-! # CFLAGS32+=	-DELF_IMAGE -DAOUT_IMAGE -DIMAGE_MULTIBOOT -DIMAGE_FREEBSD
-  
-  # Change download protocol to NFS.  Only available for Etherboot/32 for now.
-  # CFLAGS32+=	-DDOWNLOAD_PROTO_NFS
---- 143,149 ----
-  # CFLAGS32+=	-DCONSOLE_DUAL -DCOMCONSOLE=0x3f8 -DCONSPEED=9600
-  
-  # Enable generic ELF, Multiboot ELF or FreeBSD ELF/a.out boot image support
-! CFLAGS32+=	-DELF_IMAGE -DAOUT_IMAGE -DIMAGE_MULTIBOOT -DIMAGE_FREEBSD
-  
-  # Change download protocol to NFS.  Only available for Etherboot/32 for now.
-  # CFLAGS32+=	-DDOWNLOAD_PROTO_NFS
+*** 940,946 ****
+  		memset(motd, 0, sizeof(motd));
+  #endif
+  		end_of_rfc1533 = NULL;
+! 		vendorext_isvalid = 0;
+  		if (memcmp(p, rfc1533_cookie, 4))
+  			return(0); /* no RFC 1533 header found */
+  		p += 4;
+--- 940,946 ----
+  		memset(motd, 0, sizeof(motd));
+  #endif
+  		end_of_rfc1533 = NULL;
+! 		vendorext_isvalid = 1; /* FreeBSD uses this field for swap */
+  		if (memcmp(p, rfc1533_cookie, 4))
+  			return(0); /* no RFC 1533 header found */
+  		p += 4;