diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2012-05-23 02:01:33 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2012-05-23 02:01:33 +0000 |
| commit | 52ed16480b573938b4f55ae3ef211731d7e13161 (patch) | |
| tree | a491f1082f60778d39d2650d413b9618a332691d /emulators/simh/files | |
| parent | 480584eda912ce05837e77123a1987966f021ec0 (diff) | |
- Update to 3.9.0
PR: 168031
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=297241
Diffstat (limited to 'emulators/simh/files')
| -rw-r--r-- | emulators/simh/files/patch-VAX-vax_sysdev.c | 17 | ||||
| -rw-r--r-- | emulators/simh/files/patch-makefile | 19 | ||||
| -rw-r--r-- | emulators/simh/files/pkg-message.in | 2 |
3 files changed, 9 insertions, 29 deletions
diff --git a/emulators/simh/files/patch-VAX-vax_sysdev.c b/emulators/simh/files/patch-VAX-vax_sysdev.c index 84fc18d8e6ca..e4c27e87c492 100644 --- a/emulators/simh/files/patch-VAX-vax_sysdev.c +++ b/emulators/simh/files/patch-VAX-vax_sysdev.c @@ -1,20 +1,19 @@ ---- VAX/vax_sysdev.c.orig 2008-11-23 11:57:54.000000000 +0100 -+++ VAX/vax_sysdev.c 2009-02-12 06:24:49.000000000 +0100 -@@ -1553,9 +1553,15 @@ +--- VAX/vax_sysdev.c.orig 2012-05-05 22:40:08.000000000 +0900 ++++ VAX/vax_sysdev.c 2012-05-05 22:43:28.000000000 +0900 +@@ -1556,8 +1556,14 @@ if (sim_log) fprintf (sim_log, "Loading boot code from ka655x.bin\n"); r = load_cmd (0, "-R ka655x.bin"); - if (r != SCPE_OK) - return r; + if (r != SCPE_OK) { -+ printf ("Loading boot code from /usr/local/share/simh/ka655x.bin\n"); ++ printf ("Loading boot code from %%DATADIR%%/ka655x.bin\n"); + if (sim_log) -+ fprintf (sim_log, "Loading boot code from /usr/local/share/simh/ka655x.bin\n"); -+ r = load_cmd (0, "-R /usr/local/share/simh/ka655x.bin"); ++ fprintf (sim_log, "Loading boot code from %%DATADIR%%/ka655x.bin\n"); ++ r = load_cmd (0, "-R %%DATADIR%%/ka655x.bin"); + if (r != SCPE_OK) + return r; ++ } } -+} + sysd_powerup (); return SCPE_OK; - } - diff --git a/emulators/simh/files/patch-makefile b/emulators/simh/files/patch-makefile deleted file mode 100644 index cf2ad70c1a2e..000000000000 --- a/emulators/simh/files/patch-makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- makefile.orig 2008-06-06 15:00:46.000000000 +0200 -+++ makefile 2009-01-12 21:12:48.000000000 +0100 -@@ -9,13 +9,13 @@ - ifneq (,$(findstring darwin,$(OSTYPE))) - OS_CCDEFS = -D_GNU_SOURCE - else -- OS_CCDEFS = -lrt -lm -D_GNU_SOURCE -+ OS_CCDEFS = -lm -D_GNU_SOURCE - endif - endif -- CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I . -+ CC += ${CFLAGS} $(OS_CCDEFS) -I . - ifeq ($(USE_NETWORK),) - else -- NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a -+ NETWORK_OPT = -DUSE_NETWORK -lpcap - endif - else - #Win32 Environments diff --git a/emulators/simh/files/pkg-message.in b/emulators/simh/files/pkg-message.in index 8095ddd6520a..ed8820bf1020 100644 --- a/emulators/simh/files/pkg-message.in +++ b/emulators/simh/files/pkg-message.in @@ -1,5 +1,5 @@ ********************************************************************* -The file needed by the VAX emulator is located in %%PREFIX%%/share/simh +The file needed by the VAX emulator is located in %%DATADIR%% ********************************************************************* |