Update to version 6.3.

Submitted by:	grehan (tweaked by me)

4 files changed, 21 insertions, 16 deletions

diff --git a/emulators/psim-freebsd/Makefile b/emulators/psim-freebsd/Makefile
index f1dce62..4a5eba88 100644
--- a/emulators/psim-freebsd/Makefile
+++ b/emulators/psim-freebsd/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	psim-freebsd
-PORTVERSION=	6.0
-PORTREVISION=	1
+PORTVERSION=	6.3
+PORTREVISION?=	0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	gdb/releases
@@ -21,13 +21,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-psim --target=powerpc-freebsd-elf \
-		--program-suffix=psim
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
+		--program-suffix=psim \
+		--disable-nls
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb ${PREFIX}/bin/${PORTNAME}
@@ -44,4 +39,4 @@ cklatest:
 	    ftp://mirrors.rcn.net/mirrors/sources.redhat.com/${MASTER_SITE_SUBDIR}/  \
 	    | ${GREP} gdb+dejagnu-
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/psim-freebsd/distinfo b/emulators/psim-freebsd/distinfo
index ad8369b..d4b5bc9 100644
--- a/emulators/psim-freebsd/distinfo
+++ b/emulators/psim-freebsd/distinfo
@@ -1,2 +1,2 @@
-MD5 (gdb-6.0.tar.bz2) = 14371795b7903b816a6a88c69cace168
-SIZE (gdb-6.0.tar.bz2) = 11965008
+MD5 (gdb-6.3.tar.bz2) = 05b928f41fa5b482e49ca2c24762a0ae
+SIZE (gdb-6.3.tar.bz2) = 13446729
diff --git a/emulators/psim-freebsd/files/README.patches b/emulators/psim-freebsd/files/README.patches
index f8ebc3b..b7dcdee 100644
--- a/emulators/psim-freebsd/files/README.patches
+++ b/emulators/psim-freebsd/files/README.patches
@@ -13,7 +13,3 @@ OpenFirmware callback.
 
 sim/ppc/hw_init.c:
 Allow the simulator to load a dynamically linked OEA environment.
-
-sim/ppc/hw_tab.c:
-Ignore warnings for the improper alignment of the htab. A better fix would be
-to properly align the htab when the memory is allocated in the first place.
diff --git a/emulators/psim-freebsd/files/patch-emul_chirp.c b/emulators/psim-freebsd/files/patch-emul_chirp.c
new file mode 100644
index 0000000..379ef7c
--- /dev/null
+++ b/emulators/psim-freebsd/files/patch-emul_chirp.c
@@ -0,0 +1,14 @@
+--- sim/ppc/emul_chirp.c.orig	Sun Jun 22 23:03:40 2003
++++ sim/ppc/emul_chirp.c	Wed Jan 26 12:06:16 2005
+@@ -1880,6 +1880,11 @@
+ 	       (unsigned long)chirp->sizeof_stack);
+     tree_parse(node, "./wimg %d", 0x7);
+     tree_parse(node, "./pp %d", 0x2);
++    node = tree_parse(root, "/cpus/cpu@0");
++    tree_parse(node, "./translations 0x%lx 0x%lx 0x%0lx 0x%0lx 0x%0lx",
++       (unsigned long)chirp->code_va, (unsigned long)chirp->sizeof_code,
++       (unsigned long)chirp->code_ra, 0); 
++    node = tree_parse(root, "/chosen/mmu */cpus/cpu@0");
+   }
+ 
+   /* map in the chrp openboot callback code */