Hi ports@,
Here is a diff to update gxemul to 0.6.0.2.
This allows getting rid of all patches but the configure one.
Comments? OK?
Index: Makefile
===
RCS file: /cvs/ports/emulators/gxemul/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile24 Oct 2018 14:28:01 - 1.41
+++ Makefile5 Nov 2018 09:17:46 -
@@ -2,9 +2,8 @@
COMMENT= ARM/M88k/MIPS/PowerPC/SuperH machines emulator
-DISTNAME = gxemul-0.6.0.1
+DISTNAME = gxemul-0.6.0.2
CATEGORIES=emulators
-REVISION = 5
HOMEPAGE= http://gxemul.sourceforge.net/
Index: distinfo
===
RCS file: /cvs/ports/emulators/gxemul/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo12 Oct 2014 13:26:16 - 1.22
+++ distinfo5 Nov 2018 09:17:46 -
@@ -1,2 +1,2 @@
-SHA256 (gxemul-0.6.0.1.tar.gz) = B5CCPY1/iEjJgxis6Cn3oBWaX5t52AvYw2f7FwFNzak=
-SIZE (gxemul-0.6.0.1.tar.gz) = 5420978
+SHA256 (gxemul-0.6.0.2.tar.gz) = CgzrS13mRjSHsocp1A6OCm526pVTBul6paXHSvrrZjY=
+SIZE (gxemul-0.6.0.2.tar.gz) = 5498962
Index: patches/patch-configure
===
RCS file: /cvs/ports/emulators/gxemul/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 12 Oct 2014 13:26:16 - 1.3
+++ patches/patch-configure 5 Nov 2018 09:17:46 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.3 2014/10/12 13:26:16 bcallah Exp $
configure.orig Sat Oct 11 17:32:31 2014
-+++ configure Sat Oct 11 17:32:49 2014
-@@ -597,19 +597,6 @@ fi
+Index: configure
+--- configure.orig
configure
+@@ -580,19 +580,6 @@ fi
rm -f _testprog _testprog.error _testprog.stdout
Index: patches/patch-src_components_cpu_CPUDyntransComponent_cc
===
RCS file: patches/patch-src_components_cpu_CPUDyntransComponent_cc
diff -N patches/patch-src_components_cpu_CPUDyntransComponent_cc
--- patches/patch-src_components_cpu_CPUDyntransComponent_cc28 Apr 2017
07:37:00 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_components_cpu_CPUDyntransComponent_cc,v 1.1 2017/04/28
07:37:00 fcambus Exp $
src/components/cpu/CPUDyntransComponent.cc.origSun Aug 17 10:45:14 2014
-+++ src/components/cpu/CPUDyntransComponent.cc Mon Apr 24 15:28:54 2017
-@@ -194,7 +194,7 @@ void CPUDyntransComponent::DyntransClearICPage(struct
- // Fill the page with "to be translated" entries, which when executed
- // will read the instruction from memory, attempt to translate it, and
- // then execute it.
-- void (*f)(CPUDyntransComponent*, DyntransIC*) =
GetDyntransToBeTranslated();
-+ DyntransIC_t f = GetDyntransToBeTranslated();
-
- for (int i=0; ix11_display,
-- fb_window->x11_fb_window, name, "GXemul "VERSION,
-+ fb_window->x11_fb_window, name, "GXemul " VERSION,
- None, NULL, 0, NULL);
- }
-
Index: patches/patch-src_cpus_cpu_alpha_cc
===
RCS file: patches/patch-src_cpus_cpu_alpha_cc
diff -N patches/patch-src_cpus_cpu_alpha_cc
--- patches/patch-src_cpus_cpu_alpha_cc 7 Apr 2018 10:55:54 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,58 +0,0 @@
-$OpenBSD: patch-src_cpus_cpu_alpha_cc,v 1.1 2018/04/07 10:55:54 espie Exp $
-
-Index: src/cpus/cpu_alpha.cc
src/cpus/cpu_alpha.cc.orig
-+++ src/cpus/cpu_alpha.cc
-@@ -181,14 +181,14 @@ void alpha_cpu_register_dump(struct cpu *cpu, int gprs
- if (gprs) {
- symbol = get_symbol_name(>machine->symbol_context,
- cpu->pc, );
-- debug("cpu%i:\t pc = 0x%016"PRIx64, x, (uint64_t) cpu->pc);
-+ debug("cpu%i:\t pc = 0x%016" PRIx64, x, (uint64_t) cpu->pc);
- debug(" <%s>\n", symbol != NULL? symbol : " no symbol ");
- for (i=0; i> 1) + ((i & 1) << 4);
- if ((i % 2) == 0)
- debug("cpu%i:\t", x);
- if (r != ALPHA_ZERO)
-- debug("%3s = 0x%016"PRIx64, alpha_regname[r],
-+ debug("%3s = 0x%016" PRIx64, alpha_regname[r],
- (uint64_t) cpu->cd.alpha.r[r]);
- if ((i % 2) == 1)
- debug("\n");
-@@ -283,7 +283,7 @@ int alpha_cpu_disassemble_instr(struct cpu *cpu, unsig
- if (cpu->machine->ncpus > 1 && running)
- debug("cpu%i:\t", cpu->cpu_id);
-
-- debug("%016"PRIx64": ", (uint64_t) dumpaddr);
-+ debug("%016" PRIx64": ", (uint64_t) dumpaddr);
-
- iw = ib[0] + (ib[1]<<8) + (ib[2]<<16) + (ib[3]<<24);
-