Make this port build again under both 3.x-stable and 4.x-current.

It used to depend on a bunch of files from the FreeBSD source tree.
But the import of gdb-4.18 and the restructuring connected with
that broke the port.  I have created a second distfile containing
the needed files, and this port now gets them from there.

Also mark this port broken for everything except i386/elf.  I don't
have time to fix the other platforms before the 3.3-RELEASE ports
freeze.

5 files changed, 44 insertions, 15 deletions

diff --git a/lang/m3gdb/Makefile b/lang/m3gdb/Makefile
index 6d619dfe8b63..bc8231c89a16 100644
--- a/lang/m3gdb/Makefile
+++ b/lang/m3gdb/Makefile
@@ -6,24 +6,26 @@
 # $FreeBSD$
 #
 
-DISTNAME=      m3gdb-4.17
-CATEGORIES=    lang devel
-MASTER_SITES=  http://www.freebsd.org/~jdp/distfiles/
+DISTNAME=	m3gdb-4.17
+CATEGORIES=	lang devel
+MASTER_SITES=	http://www.freebsd.org/~jdp/distfiles/
+DISTFILES=	m3gdb-4.17.tar.gz \
+		m3gdb-fbsd-4.17.tar.gz
 
-MAINTAINER=    jdp@FreeBSD.org
+MAINTAINER=	jdp@FreeBSD.org
 
-MAN1=          m3gdb.1
-MANCOMPRESSED= yes
+MAN1=		m3gdb.1
+MANCOMPRESSED=	yes
+ONLY_FOR_ARCHS=	i386
 
-pre-fetch:
-	@if [ ! -d /usr/src/contrib/gdb ]; then \
-	    ${ECHO_MSG} "To build this port you must have the FreeBSD" \
-		"sources in \"/usr/src\"."; \
-	    exit 1; \
-	fi
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "aout"
+BROKEN=		does not support a.out systems
+.endif
 
 pre-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} make depend
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} make libbuild
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/m3gdb/distinfo b/lang/m3gdb/distinfo
index 7ad2a31b5105..44023ddb4117 100644
--- a/lang/m3gdb/distinfo
+++ b/lang/m3gdb/distinfo
@@ -1 +1,2 @@
 MD5 (m3gdb-4.17.tar.gz) = 017ac31f4eea81621a396af5970323bd
+MD5 (m3gdb-fbsd-4.17.tar.gz) = 28623f55044ce6ec864f2cb3d372dec6
diff --git a/lang/m3gdb/files/patch-aa b/lang/m3gdb/files/patch-aa
index 2f452844efa8..f8f5fcadec42 100644
--- a/lang/m3gdb/files/patch-aa
+++ b/lang/m3gdb/files/patch-aa
@@ -1,5 +1,5 @@
 --- Makefile.orig	Wed Feb 17 09:55:20 1999
-+++ Makefile	Sun Feb 28 19:23:16 1999
++++ Makefile	Wed Sep  8 09:35:39 1999
 @@ -1,23 +1,25 @@
  #	$Id: Makefile,v 1.38 1998/10/15 14:15:09 bde Exp $
  
@@ -10,7 +10,7 @@
 -.if ${OBJFORMAT} == elf
 -BFDDIR= ${.CURDIR}/../../binutils/libbfd/${MACHINE_ARCH}
 -BINDIR=	/usr/local/bin
-+FBSDGDBDIR=	/usr/src/gnu/usr.bin/gdb/gdb
++FBSDGDBDIR=	${.CURDIR}/../src/gnu/usr.bin/gdb/gdb
 +
 +GDBDIR=		${FBSDGDBDIR}/../../../../contrib/gdb
 +
diff --git a/lang/m3gdb/files/patch-ae b/lang/m3gdb/files/patch-ae
new file mode 100644
index 000000000000..4e680810f397
--- /dev/null
+++ b/lang/m3gdb/files/patch-ae
@@ -0,0 +1,13 @@
+--- src/gnu/usr.bin/gdb/gdb/freebsd-nat.c.orig	Mon Sep 14 15:49:02 1998
++++ src/gnu/usr.bin/gdb/gdb/freebsd-nat.c	Wed Sep  8 10:33:06 1999
+@@ -115,9 +115,7 @@
+   for (regno = 0; regno < NUM_REGS; regno++)
+     {
+       cregno = tregmap[regno];
+-      if (cregno == tFS)
+-        addr = offsetof (struct user, u_pcb) + offsetof (struct pcb, pcb_fs);
+-      else if (cregno == tGS)
++      if (cregno == tGS)
+         addr = offsetof (struct user, u_pcb) + offsetof (struct pcb, pcb_gs);
+       else
+         addr = offset + 4 * cregno;
diff --git a/lang/m3gdb/files/patch-af b/lang/m3gdb/files/patch-af
new file mode 100644
index 000000000000..a30c3972b895
--- /dev/null
+++ b/lang/m3gdb/files/patch-af
@@ -0,0 +1,13 @@
+--- kvm-fbsd.c.orig	Sun Feb  7 04:36:10 1999
++++ kvm-fbsd.c	Wed Sep  8 10:38:14 1999
+@@ -835,9 +835,8 @@
+   supply_register (6, (char *)&pcb.pcb_esi);
+   supply_register (7, (char *)&pcb.pcb_edi);
+   supply_register (PC_REGNUM, (char *)&pcb.pcb_eip);
+-  for (i = 9; i < 13; ++i)		/* eflags, cs, ss, ds, es */
++  for (i = 9; i < 14; ++i)		/* eflags, cs, ss, ds, es, fs */
+     supply_register (i, (char *)&noreg);
+-  supply_register (14, (char *)&pcb.pcb_fs);
+   supply_register (15, (char *)&pcb.pcb_gs);
+ 
+   /* XXX 80387 registers? */