pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/emulators/b-em



Module Name:    pkgsrc
Committed By:   reinoud
Date:           Fri Sep 15 16:11:13 UTC 2023

Modified Files:
        pkgsrc/emulators/b-em: DESCR Makefile PLIST distinfo

Log Message:
Update emulators/b-em to a snapshot taken on 20230915. There hasn't been a
formal release for around 10 years.

Greatly improves b-em with new co-processors, enhanced machine emulation,
GUI overhaul and extended debugging facilities.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/b-em/DESCR
cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/b-em/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/b-em/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/b-em/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/b-em/DESCR
diff -u pkgsrc/emulators/b-em/DESCR:1.1 pkgsrc/emulators/b-em/DESCR:1.2
--- pkgsrc/emulators/b-em/DESCR:1.1     Mon Feb 20 15:45:19 2012
+++ pkgsrc/emulators/b-em/DESCR Fri Sep 15 16:11:13 2023
@@ -1,12 +1,20 @@
 B-em: A Freeware BBC Micro Emulator
 
-Emulating Acorn BBC-A, BBC-B and the BBC Master series including discdrives,
+Emulating Acorn BBC-A, BBC-B and the BBC Master series including disc drives,
 tape and the tube!
 
 Tube processors supported:
    6502
-  65810
+  65816
+   6809
+  80186
+   ARM1 (!)
     Z80
-   ARM1        (!)
+  PDP11
+
+ROMS, fonts, tapes and example discs are provided.
+
+Originally the homepage was https://github.com/stardot/b-em, its currently on
+github at https://github.com/stardot/b-em
+
 
-ROMS, tapes and example discs are provided.

Index: pkgsrc/emulators/b-em/Makefile
diff -u pkgsrc/emulators/b-em/Makefile:1.10 pkgsrc/emulators/b-em/Makefile:1.11
--- pkgsrc/emulators/b-em/Makefile:1.10 Tue Jul  2 06:06:48 2019
+++ pkgsrc/emulators/b-em/Makefile      Fri Sep 15 16:11:13 2023
@@ -1,54 +1,48 @@
-# $NetBSD: Makefile,v 1.10 2019/07/02 06:06:48 nia Exp $
+# $NetBSD: Makefile,v 1.11 2023/09/15 16:11:13 reinoud Exp $
 
-DISTNAME=      B-emv2.2Linux
-PKGNAME=       b-em-2.2
-PKGREVISION=   2
+DISTNAME=      b-em-2.2
+PKGNAME=       b-em-20230915
+PKGREVISION=   3
 CATEGORIES=    emulators
-MASTER_SITES=  http://b-em.bbcmicro.com/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=stardot/}
+GITHUB_TAG=    464bb82239e31862e87b39b257d63086861b99e5
+EXTRACT_SUFX=  .zip
 
 MAINTAINER=    reinoud%NetBSD.org@localhost
-HOMEPAGE=      http://b-em.bbcmicro.com/
+HOMEPAGE=      https://github.com/stardot/b-em
 COMMENT=       Freeware Acorn BBC Micro Emulator with 2nd processors
 LICENSE=       gnu-gpl-v3
 
-USE_TOOLS+=    gmake aclocal automake
+USE_TOOLS+=    gmake aclocal automake autoconf
 
-WRKSRC=                ${WRKDIR}
+WRKSRC=                ${WRKDIR}/b-em-${GITHUB_TAG}/
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
 
 BEMDATADIR=    ${PREFIX}/share/b-em/
 
-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_VARS.paths=      BEMDATADIR
-
-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'
-
 post-extract:
-       cd ${WRKSRC} && aclocal && automake -acf
+       cd ${WRKSRC} && mkdir etc && aclocal && autoconf && automake -acf
 
 do-install:
        ${INSTALL} -d ${DESTDIR}${PREFIX}/bin
        ${INSTALL} -d ${DESTDIR}${BEMDATADIR}/roms
+       ${INSTALL} -d ${DESTDIR}${BEMDATADIR}/fonts
        ${INSTALL} -d ${DESTDIR}${BEMDATADIR}/discs
        ${INSTALL} -d ${DESTDIR}${BEMDATADIR}/tapes
        ${INSTALL} -d ${DESTDIR}${BEMDATADIR}/ddnoise
        ${INSTALL_PROGRAM} ${WRKSRC}/b-em ${DESTDIR}${PREFIX}/bin/b-em
        ${CP}    ${WRKSRC}/cmos*.bin ${DESTDIR}${BEMDATADIR}/
+       ${CP}    ${WRKSRC}/b-em.cfg ${DESTDIR}${BEMDATADIR}/
        ${CP} -R ${WRKSRC}/roms/*    ${DESTDIR}${BEMDATADIR}/roms
+       ${CP} -R ${WRKSRC}/fonts/*    ${DESTDIR}${BEMDATADIR}/fonts
        ${CP} -R ${WRKSRC}/discs/*   ${DESTDIR}${BEMDATADIR}/discs
        ${CP} -R ${WRKSRC}/tapes/*   ${DESTDIR}${BEMDATADIR}/tapes
        ${CP} -R ${WRKSRC}/ddnoise/* ${DESTDIR}${BEMDATADIR}/ddnoise
        ${FIND} ${DESTDIR}${BEMDATADIR} -type f -exec chmod 644 {} \;
 
 BUILDLINK_API_DEPENDS.allegro+=        allegro>=4.4.2nb2
-.include "../../devel/allegro/buildlink3.mk"
+.include "../../devel/allegro5/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../audio/freealut/buildlink3.mk"

Index: pkgsrc/emulators/b-em/PLIST
diff -u pkgsrc/emulators/b-em/PLIST:1.2 pkgsrc/emulators/b-em/PLIST:1.3
--- pkgsrc/emulators/b-em/PLIST:1.2     Sun Aug 12 02:03:15 2012
+++ pkgsrc/emulators/b-em/PLIST Fri Sep 15 16:11:13 2023
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2012/08/12 02:03:15 marino Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/09/15 16:11:13 reinoud Exp $
 bin/b-em
+share/b-em/b-em.cfg
 share/b-em/cmos.bin
 share/b-em/cmos350.bin
 share/b-em/cmosa.bin
@@ -30,11 +31,22 @@ share/b-em/discs/ARMEvaluationSystem-Dis
 share/b-em/discs/ARMEvaluationSystem-Disc4.adl
 share/b-em/discs/ARMEvaluationSystem-Disc5.adl
 share/b-em/discs/B-em Demo Disc.ssd
+share/b-em/discs/HDInit.ssd
+share/b-em/discs/LogoExtensionsAndExamples.ssd
 share/b-em/discs/Master 512 Disc 1 (DOS Plus Boot).img
 share/b-em/discs/Master 512 Disc 2 (GEM).img
 share/b-em/discs/Master 512 Disc 3 (GEM data).img
 share/b-em/discs/Master 512 Disc 4 (Miscellaneous).img
 share/b-em/discs/MasterWelcome.adl
+share/b-em/discs/Music500.ssd
+share/b-em/discs/Music5plus3000.ssd
+share/b-em/discs/Pan141.dsd
+share/b-em/discs/Pan142.dsd
+share/b-em/discs/Pan143.dsd
+share/b-em/discs/Pan144.dsd
+share/b-em/discs/Pan145.dsd
+share/b-em/discs/Pan146.dsd
+share/b-em/discs/Pan147.dsd
 share/b-em/discs/Welcome.ssd
 share/b-em/discs/cpm1.dsd
 share/b-em/discs/cpm2.dsd
@@ -43,34 +55,61 @@ 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/a/basic.rom
-share/b-em/roms/a01/basic1.rom
-share/b-em/roms/b/DFS-0.9.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/bp/dfs.rom
-share/b-em/roms/bp/zadfs.rom
-share/b-em/roms/bpos
-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/mos3.20
-share/b-em/roms/master/mos3.50
-share/b-em/roms/os
-share/b-em/roms/os01
+share/b-em/fonts/README.md
+share/b-em/fonts/basicsdl.fnt
+share/b-em/fonts/brandy.fnt
+share/b-em/fonts/original.fnt
+share/b-em/fonts/saa5050.fnt
+share/b-em/roms/README.md
+share/b-em/roms/general/adfs130.rom
+share/b-em/roms/general/adfs210.rom
+share/b-em/roms/general/basic1.rom
+share/b-em/roms/general/basic2.rom
+share/b-em/roms/general/basic4.rom
+share/b-em/roms/general/basic48.rom
+share/b-em/roms/general/dfs09.rom
+share/b-em/roms/general/dfs226.rom
+share/b-em/roms/general/integra120.rom
+share/b-em/roms/general/integra12p.rom
+share/b-em/roms/general/logo1.rom
+share/b-em/roms/general/logo2.rom
+share/b-em/roms/general/oddos345.rom
+share/b-em/roms/general/pdp11basic.rom
+share/b-em/roms/general/stladfs21.rom
+share/b-em/roms/general/stldfs21.rom
+share/b-em/roms/general/usbasic.rom
+share/b-em/roms/general/usdnfs.rom
+share/b-em/roms/general/utils.rom
+share/b-em/roms/general/vdfs.rom
+share/b-em/roms/general/vnula.rom
+share/b-em/roms/general/wddfs153.rom
+share/b-em/roms/general/wordwiseplus14f.rom
+share/b-em/roms/os/bpos.rom
+share/b-em/roms/os/deos.rom
+share/b-em/roms/os/mos320.rom
+share/b-em/roms/os/mos320p.rom
+share/b-em/roms/os/mos323.rom
+share/b-em/roms/os/mos350.rom
+share/b-em/roms/os/mos350p.rom
+share/b-em/roms/os/mos353.rom
+share/b-em/roms/os/os01.rom
+share/b-em/roms/os/os12.rom
+share/b-em/roms/os/os51.rom
+share/b-em/roms/os/usmos.rom
+share/b-em/roms/tube/6502Intern.rom
 share/b-em/roms/tube/6502Tube.rom
+share/b-em/roms/tube/6502Turbo.rom
+share/b-em/roms/tube/6809Tube.rom
 share/b-em/roms/tube/ARMeval_100.rom
-share/b-em/roms/tube/BIOS.ROM
-share/b-em/roms/tube/ReCo6502ROM_816
+share/b-em/roms/tube/BIOS.rom
+share/b-em/roms/tube/CiscOS.rom
+share/b-em/roms/tube/Dossy_816.rom
+share/b-em/roms/tube/PDP11Tube.rom
+share/b-em/roms/tube/ReCo6502ROM_816.rom
+share/b-em/roms/tube/Sprow_ARM.rom
 share/b-em/roms/tube/Z80_120.rom
-share/b-em/roms/us/USBASIC.rom
-share/b-em/roms/us/USDNFS.rom
-share/b-em/roms/usmos
+share/b-em/roms/tube/Z80_122.rom
+share/b-em/roms/tube/Z80_200.rom
 share/b-em/tapes/Welcome-BBCMaster-Side1_BM.uef
 share/b-em/tapes/Welcome-BBCMaster-Side2_BM.uef
 share/b-em/tapes/Welcome_B.uef

Index: pkgsrc/emulators/b-em/distinfo
diff -u pkgsrc/emulators/b-em/distinfo:1.6 pkgsrc/emulators/b-em/distinfo:1.7
--- pkgsrc/emulators/b-em/distinfo:1.6  Tue Oct 26 10:23:47 2021
+++ pkgsrc/emulators/b-em/distinfo      Fri Sep 15 16:11:13 2023
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:23:47 nia Exp $
+$NetBSD: distinfo,v 1.7 2023/09/15 16:11:13 reinoud Exp $
 
-BLAKE2s (B-emv2.2Linux.tar.gz) = 1c30c7302c813fd3f240cb2269d89cbad839e1e3d3c78b21db17abe851211d91
-SHA512 (B-emv2.2Linux.tar.gz) = 44a9e63906e890ff6c3b9356218be42866d18f435a8772213f384b9dc8b8212bb05638ca4bfd64e07c07b126102bc13036749abb64faf136734acb20a15d96e0
-Size (B-emv2.2Linux.tar.gz) = 4855775 bytes
-SHA1 (patch-src-fdi2raw.c) = 98a00eb3059c92b0c2e8009275e5b4a7dfee9b0c
-SHA1 (patch-src-linux.c) = c0188ea8d3bb466dcbaf7a6929577f249e6ef0f1
-SHA1 (patch-src-makefile.in) = 2b3cb4d2b7d41dd534e625fcfb573e2108062ea7
-SHA1 (patch-src-resources.h) = f719dc8cb308b7d79f1cd381bf1d2ba0cf5b8a5f
-SHA1 (patch-src-win.c) = b3d6a6a7071ef25decc2c7874f120966ffc4be57
+BLAKE2s (b-em-2.2-464bb82239e31862e87b39b257d63086861b99e5.zip) = 162cfd95df8caf633f38915e227ce69909d4fbf8e97cca9d4acbac893c88429a
+SHA512 (b-em-2.2-464bb82239e31862e87b39b257d63086861b99e5.zip) = 358450f2447f8160db12f0792362fa4980d5cfed6255c0db932923689dd296cb96babd6c32ebe7925e98138658758a118981e7d3b61ca4c700df5629b8419b09
+Size (b-em-2.2-464bb82239e31862e87b39b257d63086861b99e5.zip) = 7449861 bytes
+SHA1 (patch-src-b-em.h) = a14fca14e4b04b4e926ff5bde82e62396ff96b5f



Home | Main Index | Thread Index | Old Index