Update gxemul to 0.6.0. Okay'ed by wiz@, in PR pkg/43296 by me.

---
The main change between release 0.4.7.2 and 0.6.0 is:

 * Since late 2007, a complete rewrite of the emulator's base framework
   has been going on. GXemul 0.6.0 is a very early release of the new
   framework. So far, only the testm88k machine mode has been rewritten
   to use the new framework, all other machine modes run in legacy mode
   using the old framework (which is still included).

   In other words: For most emulation modes, 0.6.0 will be exactly
   like 0.4.7.2.

 In addition to the new framework, a couple of other changes are
 worth mentioning:

 * Many unused, rarely used, and bogus emulation modes and features
   were removed, to reduce the maintenance burden.

 * Some operating systems listed on the guest OS page have had
   new releases; the documentation has been updated to reflect this.

 * New source code (but not the legacy part) is documented using
   Doxygen comments, and there is a unit testing framework in place.

 * There is now finally an install Makefile target, and the -j make
   option can be used to parallelize builds.

Please read the HISTORY file for more details.
---

Also update pkgsrc files:
 * update COMMENT and DESCR per the latest release note
 * remove MAKE_JOBS_SAFE=no as mentioned in the above changes list.

7 files changed, 42 insertions, 95 deletions

diff --git a/emulators/gxemul/DESCR b/emulators/gxemul/DESCR
index 37c31470c09..9989208acd4 100644
--- a/emulators/gxemul/DESCR
+++ b/emulators/gxemul/DESCR
@@ -3,16 +3,17 @@ Several processor architectures and machine types have been implemented.
 It is working well enough to allow unmodified "guest" operating systems to
 run inside the emulator, as if they were running on real hardware.
 
-The emulator emulates (networks of) real machines. The machines may
-consist of ARM, MIPS, PowerPC, and SuperH processors, and various
+The emulator emulates (networks of) real machines. The machines may consist
+of ARM, MIPS, Motorola 88K, PowerPC, and SuperH processors, and various
 surrounding hardware components such as framebuffers, busses, interrupt
 controllers, ethernet controllers, disk controllers, and serial port
 controllers.
 
-GXemul, including the dynamic translation system, is implemented in
-portable C, which means that the emulator will run on practically any host
-architecture.
+GXemul, including the dynamic translation system, is implemented in portable
+C++, which means that the emulator will (at least in theory) run on
+practically any modern host architecture and unix-like operating system, for
+which a C++ compiler is available.
 
-The documentation lists the machines and guest operating systems that can
-be regarded as "working" in GXemul. The best working guest operating
-systems are probably NetBSD/pmax and NetBSD/cats.
+The documentation lists the machines and specific guest operating systems
+that can be regarded as "working" in GXemul. The guest operating system
+that works best in GXemul is NetBSD/pmax.
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index 9374767f723..4a28d5a6aef 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.42 2009/07/21 20:52:21 asau Exp $
+# $NetBSD: Makefile,v 1.43 2010/05/13 14:48:53 tsutsui Exp $
 #
 
-DISTNAME=	gxemul-0.4.7.2
+DISTNAME=	gxemul-0.6.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://gxemul.sourceforge.net/src/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gxemul.sourceforge.net/
-COMMENT=	Machine emulator
+COMMENT=	Framework for full-system computer architecture emulation
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-MAKE_JOBS_SAFE=	no
-
 USE_TOOLS+=	pax
 
-USE_LANGUAGES=	c
+USE_LANGUAGES=	c c++
 HAS_CONFIGURE=	yes
 BUILD_TARGET=	build
 
@@ -25,7 +23,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/${PKGBASE}
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gxemul ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/gxemul.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-.for f in README HISTORY TODO RELEASE.html LICENSE
+.for f in README HISTORY LICENSE
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 .endfor
 	cd ${WRKSRC}/doc && pax -rwppm . ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/emulators/gxemul/PLIST b/emulators/gxemul/PLIST
index e45ad6694ae..5cabff23764 100644
--- a/emulators/gxemul/PLIST
+++ b/emulators/gxemul/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2009/07/18 18:43:56 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.24 2010/05/13 14:48:53 tsutsui Exp $
 bin/gxemul
 man/man1/gxemul.1
 share/doc/gxemul/20040504-ultrix45-boot1.png
@@ -77,11 +77,18 @@ share/doc/gxemul/20070616-netbsd-pmppc-diskless.png
 share/doc/gxemul/20070616-netbsd-pmppc-diskless_small.png
 share/doc/gxemul/20081103-openbsd-landisk-small.png
 share/doc/gxemul/20081103-openbsd-landisk.png
+share/doc/gxemul/Doxyfile
 share/doc/gxemul/HISTORY
 share/doc/gxemul/LICENSE
 share/doc/gxemul/README
 share/doc/gxemul/RELEASE.html
-share/doc/gxemul/TODO
+share/doc/gxemul/TODO.html
+share/doc/gxemul/components/component_cpu.html
+share/doc/gxemul/components/component_dummy.html
+share/doc/gxemul/components/component_m88k_cpu.html
+share/doc/gxemul/components/component_mainbus.html
+share/doc/gxemul/components/component_mips_cpu.html
+share/doc/gxemul/components/component_ram.html
 share/doc/gxemul/configfiles.html
 share/doc/gxemul/debian-1-small.png
 share/doc/gxemul/debian-1.png
@@ -113,12 +120,25 @@ share/doc/gxemul/debian-8-small.png
 share/doc/gxemul/debian-8.png
 share/doc/gxemul/debian-9-small.png
 share/doc/gxemul/debian-9.png
+share/doc/gxemul/doxygen.css
+share/doc/gxemul/doxygen_footerFile.html
+share/doc/gxemul/doxygen_headerFile.html
 share/doc/gxemul/dreamcast.html
 share/doc/gxemul/experiments.html
+share/doc/gxemul/framework.html
+share/doc/gxemul/generate_machine_doc.sh
 share/doc/gxemul/guestoses.html
 share/doc/gxemul/index.html
 share/doc/gxemul/intro.html
-share/doc/gxemul/maddr.gif
+share/doc/gxemul/machine_template.html
+share/doc/gxemul/machines/machine_mvme187.html.SKEL
+share/doc/gxemul/machines/machine_sgi_ip32.html.SKEL
+share/doc/gxemul/machines/machine_testm88k-thumb.png
+share/doc/gxemul/machines/machine_testm88k.html.SKEL
+share/doc/gxemul/machines/machine_testm88k.png
+share/doc/gxemul/machines/machine_testmips-thumb.png
+share/doc/gxemul/machines/machine_testmips.html.SKEL
+share/doc/gxemul/machines/machine_testmips.png
 share/doc/gxemul/misc.html
 share/doc/gxemul/networking.html
 share/doc/gxemul/openbsd-pmax-20040710.png
@@ -128,6 +148,7 @@ share/doc/gxemul/sgi-o2-real_small.jpg
 share/doc/gxemul/simplified_dyntrans.png
 share/doc/gxemul/sprite-20040711.png
 share/doc/gxemul/sprite-20040711_small.png
+share/doc/gxemul/tail.html
 share/doc/gxemul/technical.html
 share/doc/gxemul/translation.html
 share/doc/gxemul/ultrix4.5-20040706.png
diff --git a/emulators/gxemul/distinfo b/emulators/gxemul/distinfo
index 80b518c59cf..724e6cc5733 100644
--- a/emulators/gxemul/distinfo
+++ b/emulators/gxemul/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.29 2009/07/18 18:43:56 tsutsui Exp $
+$NetBSD: distinfo,v 1.30 2010/05/13 14:48:53 tsutsui Exp $
 
-SHA1 (gxemul-0.4.7.2.tar.gz) = 63a20b810ef4ea9d7ec4678f135470fb324f61f1
-RMD160 (gxemul-0.4.7.2.tar.gz) = a54fb4f1ecf567ff9f62e8b1541018b38dea1e1a
-Size (gxemul-0.4.7.2.tar.gz) = 3374450 bytes
-SHA1 (patch-aa) = 4ac6d1dae6b906c4f39a78eb70a5239820840923
-SHA1 (patch-ab) = f18ee9eb9b67f66e4bb2fbfe06dc1c7d94e0bbd9
-SHA1 (patch-ac) = 1c65a7bd85bcdda950c512fbc1329610532cd211
+SHA1 (gxemul-0.6.0.tar.gz) = aa37ad5f200eee045b1da2b1d3f651401cf474af
+RMD160 (gxemul-0.6.0.tar.gz) = ac6291a5f8bc9c0d1988d3ce39750339fe90a8ce
+Size (gxemul-0.6.0.tar.gz) = 3598795 bytes
diff --git a/emulators/gxemul/patches/patch-aa b/emulators/gxemul/patches/patch-aa
deleted file mode 100644
index a6472d0cdcf..00000000000
--- a/emulators/gxemul/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2009/07/18 18:43:56 tsutsui Exp $
-
-A patch pulled from upstream trunk for NetBSD/arc:
-http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5473
-
---- src/promemul/arcbios.c	2009/07/04 19:41:47
-+++ src/promemul/arcbios.c	2009/07/11 10:04:28
-@@ -2363,20 +2363,19 @@
- 		add_environment_string(cpu, "kernname=unix", &addr);
- 	} else {
- 		char *tmp;
--		size_t mlen = strlen(machine->bootarg) +
--		    strlen("OSLOADOPTIONS=") + 2;
-+		size_t mlen = ARC_BOOTSTR_BUFLEN;
- 		CHECK_ALLOCATION(tmp = malloc(mlen));
- 		snprintf(tmp, mlen, "OSLOADOPTIONS=%s", machine->bootarg);
--		store_pointer_and_advance(cpu, &addr2, addr, is64bit);
--		add_environment_string(cpu, tmp, &addr);
- 
- 		store_pointer_and_advance(cpu, &addr2, addr, is64bit);
--		add_environment_string(cpu, "OSLOADPARTITION=scsi(0)cdrom(6)"
--		    "fdisk(0);scsi(0)disk(0)rdisk(0)partition(1)", &addr);
-+		add_environment_string(cpu, tmp, &addr);
- 
- 		store_pointer_and_advance(cpu, &addr2, addr, is64bit);
--		add_environment_string(cpu, "SYSTEMPARTITION=scsi(0)cdrom(6)"
--		    "fdisk(0);scsi(0)disk(0)rdisk(0)partition(1)", &addr);
-+		snprintf(tmp, mlen,
-+		    "OSLOADPARTITION=scsi(0)disk(%d)rdisk(0)partition(1)",
-+		    machine->bootdev_id);
-+		add_environment_string(cpu, tmp, &addr);
-+		free(tmp);
- 	}
- 
- 	/*  End the environment strings with an empty zero-terminated
diff --git a/emulators/gxemul/patches/patch-ab b/emulators/gxemul/patches/patch-ab
deleted file mode 100644
index a3803223065..00000000000
--- a/emulators/gxemul/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2009/07/18 18:43:56 tsutsui Exp $
-
-A patch pulled from upstream trunk for NetBSD/cobalt:
-http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5485
-
---- src/devices/bus_pci.c	2009/07/04 19:41:47
-+++ src/devices/bus_pci.c	2009/07/12 11:35:33
-@@ -974,7 +974,11 @@
- 	 *  netbsd/usr/src/sys/arch/cobalt/cobalt/machdep.c read_board_id()
- 	 *  for details.
- 	 */
--	PCI_SET_DATA(0x94, 4 << 4);
-+	if (machine->machine_type == MACHINE_COBALT) {
-+#define	COBALT_PCIB_BOARD_ID_REG	0x94
-+#define	COBALT_QUBE2_ID			5
-+		PCI_SET_DATA(COBALT_PCIB_BOARD_ID_REG, COBALT_QUBE2_ID << 4);
-+	}
- }
- 
- struct vt82c586_ide_extra {
diff --git a/emulators/gxemul/patches/patch-ac b/emulators/gxemul/patches/patch-ac
deleted file mode 100644
index e49f1d69146..00000000000
--- a/emulators/gxemul/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/07/18 18:43:56 tsutsui Exp $
-
-A patch pulled from upstream trunk for NetBSD/hpcmips:
-http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5472
-
---- src/devices/dev_vr41xx.c	2009/07/04 19:41:47
-+++ src/devices/dev_vr41xx.c	2009/07/10 16:07:32
-@@ -590,6 +590,7 @@
- 			switch (relative_addr) {
- 			case 0xc0:
- 				odata = (tv.tv_sec & 1) << 15;
-+				odata += (uint64_t)tv.tv_usec * 32768 / 1000000;
- 				break;
- 			case 0xc2:
- 				odata = (tv.tv_sec >> 1) & 0xffff;