diff options
author | marino <marino> | 2012-08-12 02:03:15 +0000 |
---|---|---|
committer | marino <marino> | 2012-08-12 02:03:15 +0000 |
commit | c50dc2d49d310d9f1918bc0f7836f3ceb79af005 (patch) | |
tree | 7b0b80a5c10991c01c6dfa53cf7276bd7d0bfad7 /emulators | |
parent | acc57de58972dc5c2243df53f84c961a37bd5ba3 (diff) | |
download | pkgsrc-c50dc2d49d310d9f1918bc0f7836f3ceb79af005.tar.gz |
emulators/b-em: Upgrade from version 2.1a to 2.2 (Fixes zlib 1.27)
Version 2.1a is not compatible with zlib 1.26+. Luckily this problem
was fixed in version 2.2. Three patches were removed, and a few were
tweaked.
src/linux.c and src/win.c now have dos line endings. I used the
technique seen in textproc/FlightCrew to convert these to unix
endings after extraction. That should allow this package to build
on all platforms where zip handling of line ending differs.
Also defined GPLv3 license.
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/b-em/Makefile | 15 | ||||
-rw-r--r-- | emulators/b-em/PLIST | 29 | ||||
-rw-r--r-- | emulators/b-em/distinfo | 19 | ||||
-rw-r--r-- | emulators/b-em/patches/patch-src-b-em.h | 15 | ||||
-rw-r--r-- | emulators/b-em/patches/patch-src-cmos.c | 13 | ||||
-rw-r--r-- | emulators/b-em/patches/patch-src-linux.c | 22 | ||||
-rw-r--r-- | emulators/b-em/patches/patch-src-makefile.in | 6 | ||||
-rw-r--r-- | emulators/b-em/patches/patch-src-resources.h | 6 | ||||
-rw-r--r-- | emulators/b-em/patches/patch-src-tapenoise.c | 12 | ||||
-rw-r--r-- | emulators/b-em/patches/patch-src-win.c | 20 |
10 files changed, 59 insertions, 98 deletions
diff --git a/emulators/b-em/Makefile b/emulators/b-em/Makefile index 5099f3b2357..ff6980fe840 100644 --- a/emulators/b-em/Makefile +++ b/emulators/b-em/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2012/07/27 16:08:52 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2012/08/12 02:03:15 marino Exp $ # -DISTNAME= B-emv2.1aLinux -PKGNAME= b-em-2.1a -PKGREVISION= 1 +DISTNAME= B-emv2.2Linux +PKGNAME= b-em-2.2 CATEGORIES= emulators MASTER_SITES= http://b-em.bbcmicro.com/ MAINTAINER= reinoud@NetBSD.org HOMEPAGE= http://b-em.bbcmicro.com/ COMMENT= Freeware Acorn BBC Micro Emulator with 2nd processors +LICENSE= gnu-gpl-v3 PKG_DESTDIR_SUPPORT= user-destdir @@ -21,12 +21,17 @@ USE_LANGUAGES= c c++ BEMDATADIR= ${PREFIX}/share/b-em/ -SUBST_CLASSES+= paths +SUBST_CLASSES+= paths d2u SUBST_MESSAGE.paths= Fixing non-existing paths. SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= src/linux.c src/win.c SUBST_SED.paths= -e 's,@BEMDATADIR@,${BEMDATADIR},g' +SUBST_MESSAGE.d2u= Removing CR end-of-line markers +SUBST_STAGE.d2u= post-extract +SUBST_FILES.d2u= src/win.c src/linux.c +SUBST_FILTER_CMD.d2u= ${TR} -d '\r' + do-install: ${INSTALL} -d ${DESTDIR}${PREFIX}/bin ${INSTALL} -d ${DESTDIR}${BEMDATADIR}/roms diff --git a/emulators/b-em/PLIST b/emulators/b-em/PLIST index 86c85986d6c..96302e0c39e 100644 --- a/emulators/b-em/PLIST +++ b/emulators/b-em/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2012/02/20 15:45:19 reinoud Exp $ +@comment $NetBSD: PLIST,v 1.2 2012/08/12 02:03:15 marino Exp $ bin/b-em share/b-em/cmos.bin +share/b-em/cmos350.bin share/b-em/cmosa.bin share/b-em/cmosc.bin share/b-em/ddnoise/35/motor.wav @@ -42,26 +43,24 @@ share/b-em/discs/cpm4.dsd share/b-em/discs/cpm5.dsd share/b-em/discs/cpm6.dsd share/b-em/discs/cpm7.dsd -share/b-em/roms/ADFS1-53.rom -share/b-em/roms/a/BASIC.ROM -share/b-em/roms/a01/BASIC1.rom -share/b-em/roms/b/BASIC.ROM +share/b-em/roms/a/basic.rom +share/b-em/roms/a01/basic1.rom share/b-em/roms/b/DFS-0.9.rom -share/b-em/roms/b1770/BASIC.ROM +share/b-em/roms/b/basic.rom +share/b-em/roms/b1770/basic.rom share/b-em/roms/b1770/dfs1770.rom -share/b-em/roms/b1770/zADFS.ROM -share/b-em/roms/bp/BASIC.ROM +share/b-em/roms/b1770/zadfs.rom +share/b-em/roms/bp/basic.rom share/b-em/roms/bp/dfs.rom -share/b-em/roms/bp/zADFS.ROM +share/b-em/roms/bp/zadfs.rom share/b-em/roms/bpos -share/b-em/roms/compact/adfs210.rom -share/b-em/roms/compact/basic48.rom -share/b-em/roms/compact/basic486.rom -share/b-em/roms/compact/os51.rom -share/b-em/roms/compact/utils.rom +share/b-em/roms/compact/adfs210 +share/b-em/roms/compact/basic48 +share/b-em/roms/compact/os51 +share/b-em/roms/compact/utils share/b-em/roms/deos -share/b-em/roms/master/mos.txt share/b-em/roms/master/mos3.20 +share/b-em/roms/master/mos3.50 share/b-em/roms/os share/b-em/roms/os01 share/b-em/roms/tube/6502Tube.rom diff --git a/emulators/b-em/distinfo b/emulators/b-em/distinfo index e4ce2c263bd..345fd42f7cc 100644 --- a/emulators/b-em/distinfo +++ b/emulators/b-em/distinfo @@ -1,13 +1,10 @@ -$NetBSD: distinfo,v 1.2 2012/03/26 03:28:11 dholland Exp $ +$NetBSD: distinfo,v 1.3 2012/08/12 02:03:15 marino Exp $ -SHA1 (B-emv2.1aLinux.tar.gz) = a5e674009eaeab5aeb9b50f3c699c6d0ea110c38 -RMD160 (B-emv2.1aLinux.tar.gz) = b31a4812fabad9d6d67372361955b3de3686943b -Size (B-emv2.1aLinux.tar.gz) = 5226120 bytes -SHA1 (patch-src-b-em.h) = d450f335c15f539cf3f81a800dec87472c134cab -SHA1 (patch-src-cmos.c) = dfddf6a6bc4b494e11b7882363a6e79280480b20 +SHA1 (B-emv2.2Linux.tar.gz) = 648eb122bba6d7701b341b5af214e4fce1012686 +RMD160 (B-emv2.2Linux.tar.gz) = b6aa6e3e5ba8b24207278211ce17f19b182f93f5 +Size (B-emv2.2Linux.tar.gz) = 4855775 bytes SHA1 (patch-src-fdi2raw.c) = 98a00eb3059c92b0c2e8009275e5b4a7dfee9b0c -SHA1 (patch-src-linux.c) = b36cf4f3c957cab24bf67cd34688231e3b292d02 -SHA1 (patch-src-makefile.in) = 0de839eb598b06dec2db57558f9909568988f3d9 -SHA1 (patch-src-resources.h) = 6f62502882e82e56f8bd606dd8618e3eccb7b786 -SHA1 (patch-src-tapenoise.c) = b279aabb6eec7a816a8fe2178e44d326e5ebdbe1 -SHA1 (patch-src-win.c) = 119f41dc2c80a53f5edbeb7e42d85238d1d21b82 +SHA1 (patch-src-linux.c) = c0188ea8d3bb466dcbaf7a6929577f249e6ef0f1 +SHA1 (patch-src-makefile.in) = 2b3cb4d2b7d41dd534e625fcfb573e2108062ea7 +SHA1 (patch-src-resources.h) = f719dc8cb308b7d79f1cd381bf1d2ba0cf5b8a5f +SHA1 (patch-src-win.c) = b3d6a6a7071ef25decc2c7874f120966ffc4be57 diff --git a/emulators/b-em/patches/patch-src-b-em.h b/emulators/b-em/patches/patch-src-b-em.h deleted file mode 100644 index 96d98eac255..00000000000 --- a/emulators/b-em/patches/patch-src-b-em.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src-b-em.h,v 1.1 2012/02/20 15:45:19 reinoud Exp $ - ---- src/b-em.h.orig 2010-10-25 13:51:30.000000000 +0000 -+++ src/b-em.h -@@ -1,7 +1,10 @@ - /*B-em v2.1 by Tom Walker
- Main header file*/
-
-+#include <stdio.h>
- #include <stdint.h>
-+#include <stdlib.h>
-+#include <string.h>
- //#define printf rpclog
-
- extern uint8_t *ram,*rom,*os;
diff --git a/emulators/b-em/patches/patch-src-cmos.c b/emulators/b-em/patches/patch-src-cmos.c deleted file mode 100644 index 43c8e9bd58d..00000000000 --- a/emulators/b-em/patches/patch-src-cmos.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src-cmos.c,v 1.1 2012/02/20 15:45:19 reinoud Exp $ - ---- src/cmos.c.orig 2010-10-25 13:51:42.000000000 +0000 -+++ src/cmos.c -@@ -5,7 +5,7 @@ -
- uint8_t cmos[64];
-
--int cmosrw,cmosstrobe,cmosold,cmosaddr,cmosena;
-+uint8_t cmosrw,cmosstrobe,cmosold,cmosaddr,cmosena;
-
- void cmosupdate(uint8_t IC32, uint8_t sdbval)
- {
diff --git a/emulators/b-em/patches/patch-src-linux.c b/emulators/b-em/patches/patch-src-linux.c index 392a7b52599..74155afdd75 100644 --- a/emulators/b-em/patches/patch-src-linux.c +++ b/emulators/b-em/patches/patch-src-linux.c @@ -1,13 +1,13 @@ -$NetBSD: patch-src-linux.c,v 1.1 2012/02/20 15:45:19 reinoud Exp $ +$NetBSD: patch-src-linux.c,v 1.2 2012/08/12 02:03:15 marino Exp $ ---- src/linux.c.orig 2011-02-12 15:52:50.000000000 +0000 +--- src/linux.c.orig 2012-04-16 15:37:00.000000000 +0000 +++ src/linux.c -@@ -62,6 +62,8 @@ int main(int argc, char *argv[])
- get_executable_name(exedir,511);
- p=get_filename(exedir);
- p[0]=0;
-+ /* data was referred relative to the executable; fix: */
-+ strcpy(exedir, "@BEMDATADIR@");
- loadconfig();
- // printf("Main\n");
- initbbc(argc,argv);
+@@ -63,6 +63,8 @@ int main(int argc, char *argv[]) + get_executable_name(exedir, 511); + p = get_filename(exedir); + p[0] = 0; ++ /* data was referred relative to the executable; fix: */ ++ strcpy(exedir, "@BEMDATADIR@"); + config_load(); + // printf("Main\n"); + main_init(argc, argv); diff --git a/emulators/b-em/patches/patch-src-makefile.in b/emulators/b-em/patches/patch-src-makefile.in index 533f287065d..f2ec2f77db0 100644 --- a/emulators/b-em/patches/patch-src-makefile.in +++ b/emulators/b-em/patches/patch-src-makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-src-makefile.in,v 1.2 2012/03/26 03:28:12 dholland Exp $ +$NetBSD: patch-src-makefile.in,v 1.3 2012/08/12 02:03:15 marino Exp $ ---- src/Makefile.in.orig 2010-10-17 16:02:04.000000000 +0000 +--- src/Makefile.in.orig 2012-04-16 16:11:55.000000000 +0000 +++ src/Makefile.in -@@ -1277,7 +1278,7 @@ install-exec: install-exec-am +@@ -1356,7 +1356,7 @@ install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am diff --git a/emulators/b-em/patches/patch-src-resources.h b/emulators/b-em/patches/patch-src-resources.h index 543f59390b5..5ffdba45b24 100644 --- a/emulators/b-em/patches/patch-src-resources.h +++ b/emulators/b-em/patches/patch-src-resources.h @@ -1,8 +1,8 @@ -$NetBSD: patch-src-resources.h,v 1.1 2012/02/20 15:45:19 reinoud Exp $ +$NetBSD: patch-src-resources.h,v 1.2 2012/08/12 02:03:15 marino Exp $ ---- src/resources.h.orig 2010-10-16 21:03:30.000000000 +0000 +--- src/resources.h.orig 2012-04-15 20:46:50.000000000 +0000 +++ src/resources.h -@@ -83,5 +83,7 @@ +@@ -87,5 +87,7 @@ #define IDM_SID_INTERP 41200
#define IDM_SID_RESAMP 41201
diff --git a/emulators/b-em/patches/patch-src-tapenoise.c b/emulators/b-em/patches/patch-src-tapenoise.c deleted file mode 100644 index 0daa4d540f9..00000000000 --- a/emulators/b-em/patches/patch-src-tapenoise.c +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src-tapenoise.c,v 1.1 2012/02/20 15:45:19 reinoud Exp $ - ---- src/tapenoise.c.orig 2010-10-25 13:53:16.000000000 +0000 -+++ src/tapenoise.c -@@ -2,6 +2,7 @@ - Tape noise (not very good)*/
-
- #include <stdio.h>
-+#include <math.h>
- #include <allegro.h>
- #include "b-em.h"
-
diff --git a/emulators/b-em/patches/patch-src-win.c b/emulators/b-em/patches/patch-src-win.c index 863446b5bc7..8eac2e9a446 100644 --- a/emulators/b-em/patches/patch-src-win.c +++ b/emulators/b-em/patches/patch-src-win.c @@ -1,12 +1,12 @@ -$NetBSD: patch-src-win.c,v 1.1 2012/02/20 15:45:19 reinoud Exp $ +$NetBSD: patch-src-win.c,v 1.2 2012/08/12 02:03:15 marino Exp $ ---- src/win.c.orig 2011-02-12 17:34:10.000000000 +0000 +--- src/win.c.orig 2012-05-22 11:39:06.000000000 +0000 +++ src/win.c -@@ -346,6 +346,7 @@ int WINAPI WinMain (HINSTANCE hThisInsta - get_executable_name(exedir,511);
- p=get_filename(exedir);
- p[0]=0;
-+ strcpy(exedir, "@BEMDATADIR@");
-
- loadconfig();
-
+@@ -345,6 +345,7 @@ int WINAPI WinMain (HINSTANCE hThisInsta + get_executable_name(exedir, 511); + p = get_filename(exedir); + p[0] = 0; ++ strcpy(exedir, "@BEMDATADIR@"); + + config_load(); + |