pkg/41742: updating gxemul-0.4.7.2

[tsutsui%ceres.dti.ne.jp@localhost]

>Number:         41742
>Category:       pkg
>Synopsis:       updating gxemul-0.4.7.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Jul 16 12:40:00 +0000 2009
>Originator:     Izumi Tsutsui
>Release:        NetBSD 5.99.13
>Organization:
>Environment:
NetBSD/i386 5.99.13
Architecture: i386
Machine: i386
>Description:
The attached patch updates gxemul package to 0.4.7.2
with some patches from upstream trunk.

>How-To-Repeat:
>Fix:

patch-aa:
 similar fix with the previous one, but based on integrated version
 in upstream trunk:
http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5473

patch-ab:
 the previous change has been integrated into the latest release,
http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5265
 and pull another change from upstream trunk for cobalt machine ID
http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5485

patch-ac:
 pulled from upstream trunk for hpcmips clock issue
http://gxemul.svn.sourceforge.net/viewvc/gxemul?view=rev&revision=5472

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/gxemul/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile    14 Nov 2008 06:42:34 -0000      1.40
+++ Makefile    16 Jul 2009 12:35:25 -0000
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.40 2008/11/14 06:42:34 minskim Exp $
 #
 
-DISTNAME=      gxemul-0.4.6.6
+DISTNAME=      gxemul-0.4.7.2
 CATEGORIES=    emulators
-MASTER_SITES=  http://gavare.se/gxemul/src/
+MASTER_SITES=  http://gxemul.sourceforge.net/src/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://gavare.se/gxemul/
+HOMEPAGE=      http://gxemul.sourceforge.net/
 COMMENT=       Machine emulator
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/gxemul/PLIST,v
retrieving revision 1.22
diff -u -r1.22 PLIST
--- PLIST       14 Jun 2009 17:51:05 -0000      1.22
+++ PLIST       16 Jul 2009 12:35:25 -0000
@@ -132,3 +132,4 @@
 share/doc/gxemul/translation.html
 share/doc/gxemul/ultrix4.5-20040706.png
 share/doc/gxemul/ultrix4.5-20040706_small.png
+share/doc/gxemul/unsupported.html
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/gxemul/distinfo,v
retrieving revision 1.28
diff -u -r1.28 distinfo
--- distinfo    14 Nov 2008 06:42:34 -0000      1.28
+++ distinfo    16 Jul 2009 12:35:25 -0000
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.28 2008/11/14 06:42:34 minskim Exp $
 
-SHA1 (gxemul-0.4.6.6.tar.gz) = 599072df5a14565dcd10eb31faddc96a92a49cbc
-RMD160 (gxemul-0.4.6.6.tar.gz) = e29e863587340982ddaa14f65a17d29621efd461
-Size (gxemul-0.4.6.6.tar.gz) = 3345312 bytes
-SHA1 (patch-aa) = d8dbe0cb32d02d392957d1434446e4c1bf1f58ea
-SHA1 (patch-ab) = beeb04eb1b987b8ed095b5551804b640fbce36dc
+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) = 4c58db415df0ffd8a73910b7c8d7b0116ec4b0d5
+SHA1 (patch-ab) = 2e05f2b8b6808af19a134fcab77191161688a254
+SHA1 (patch-ac) = d26e015b0ede7eb4e943e7d4f226f635a85127fb
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/gxemul/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- patches/patch-aa    24 Oct 2008 19:31:01 -0000      1.6
+++ patches/patch-aa    16 Jul 2009 12:35:25 -0000
@@ -1,20 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2008/10/24 19:31:01 minskim Exp $
+$NetBSD$
 
---- src/promemul/arcbios.c.orig        2008-01-18 11:12:33.000000000 -0800
-+++ src/promemul/arcbios.c
-@@ -2211,7 +2211,10 @@ static void arc_environment_setup(struct
-       }
- 
-       if (machine->machine_type == MACHINE_ARC)
--              strlcat(init_bootpath, "\\", bootpath_len);
-+              snprintf(init_bootpath + strlen(init_bootpath),
-+                  bootpath_len - strlen(init_bootpath),
-+                  "scsi(0)disk(%i)rdisk(0)partition(1)",
-+                  machine->bootdev_id);
- 
-       CHECK_ALLOCATION(machine->bootstr = malloc(ARC_BOOTSTR_BUFLEN));
- 
-@@ -2362,20 +2365,17 @@ static void arc_environment_setup(struct
+--- 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;
@@ -23,13 +11,14 @@
 +              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, 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);
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/gxemul/patches/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- patches/patch-ab    24 Oct 2008 19:55:10 -0000      1.3
+++ patches/patch-ab    16 Jul 2009 12:35:25 -0000
@@ -1,13 +1,17 @@
-$NetBSD: patch-ab,v 1.3 2008/10/24 19:55:10 minskim Exp $
+$NetBSD$
 
---- src/devices/bus_pci.c.orig 2008-01-18 11:12:27.000000000 -0800
-+++ src/devices/bus_pci.c
-@@ -776,6 +776,8 @@ int piix_ide_cfg_reg_write(struct pci_de
-       void *wdc1 = ((struct piix_ide_extra *)pd->extra)->wdc1;
-       int enabled = 0;
+--- 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);
++      }
+ }
  
-+      PCI_SET_DATA(reg, value);
-+
-       switch (reg) {
-       case PCI_COMMAND_STATUS_REG:
-               if (value & PCI_COMMAND_IO_ENABLE)
+ struct vt82c586_ide_extra {
--- /dev/null   2009-07-16 21:32:37.000000000 +0900
+++ patches/patch-ac    2009-07-16 20:43:56.000000000 +0900
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- 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;