On 2024/08/07 04:11, Jag Talon wrote:
> Here's a new diff without the -plus favor! Makes sense that the
> Macintosh Plus is the default unflavored version.
>
> Does this look good?
>
> --
> he/him
> jagtalon.net
> weirder.earth/@jag
One comment inline
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/minivmac/Makefile,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 Makefile
> --- Makefile 24 Jul 2024 01:02:27 -0000 1.2
> +++ Makefile 7 Aug 2024 08:10:50 -0000
> @@ -1,14 +1,15 @@
> ONLY_FOR_ARCHS = i386 amd64 powerpc
>
> COMMENT = early macintosh emulator
> +
> V = 36.04
> -REVISION = 0
> +REVISION = 1
> +
> DISTNAME = minivmac-${V}
>
> CATEGORIES = emulators
>
> HOMEPAGE = https://gryphel.com/c/minivmac/
> -
> MAINTAINER = Jag Talon <[email protected]>
>
> WANTLIB = X11 c sndio
> @@ -33,24 +34,36 @@ SETUP_FLAGS-amd64 = -t ob64
> SETUP_FLAGS-i386 = -t obsd
> SETUP_FLAGS-powerpc = -t obsd -cpu ppc
>
> +FLAVORS = ii
> +FLAVOR ?=
> +
> +MODEL = -m Plus
> +.if ${FLAVOR:Mii}
> +MODEL = -m II
> +SUFFIX = -${FLAVOR}
> +.endif
> +
> +FULLPKGNAME = minivmac${SUFFIX}-${V}
> +SUBST_VARS = SUFFIX
> +
> post-extract:
> cp ${FILESDIR}/SGLUSNIO.h ${WRKSRC}/src
>
> do-gen:
> cd ${WRKSRC}; cc setup/tool.c -o setup_t && \
> - ./setup_t ${SETUP_FLAGS-${MACHINE_ARCH}} > gen && \
> + ./setup_t ${SETUP_FLAGS-${MACHINE_ARCH}} ${MODEL} > gen && \
> sh ./gen
>
> do-install:
> - ${INSTALL_SCRIPT} ${WRKSRC}/minivmac ${PREFIX}/bin/minivmac
> + ${INSTALL_SCRIPT} ${WRKSRC}/minivmac ${PREFIX}/bin/minivmac${SUFFIX}
>
> post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
> - ${INSTALL_DATA} ${FILESDIR}/minivmac.png \
> - ${PREFIX}/share/pixmaps/
> + ${INSTALL_DATA} ${WRKSRC}/src/ICONAPPW.ico \
> + ${PREFIX}/share/pixmaps/minivmac${SUFFIX}.ico
>
> ${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
> - ${INSTALL_DATA} ${FILESDIR}/minivmac.desktop \
> - ${PREFIX}/share/applications/
> + ${INSTALL_DATA} ${FILESDIR}/minivmac${SUFFIX}.desktop \
> + ${PREFIX}/share/applications/minivmac${SUFFIX}.desktop
>
> .include <bsd.port.mk>
> Index: files/minivmac-ii.desktop
> ===================================================================
> RCS file: files/minivmac-ii.desktop
> diff -N files/minivmac-ii.desktop
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ files/minivmac-ii.desktop 7 Aug 2024 08:10:50 -0000
> @@ -0,0 +1,9 @@
> +[Desktop Entry]
> +GenericName=Macintosh Emulator
> +Name=Mini vMac (II)
> +Comment=Early Macintosh emulator
> +Exec=minivmac-ii
> +Terminal=false
> +Type=Application
> +Categories=Emulator;Graphics;
> +Icon=/usr/local/share/pixmaps/minivmac-ii.ico
> Index: files/minivmac.desktop
> ===================================================================
> RCS file: /cvs/ports/emulators/minivmac/files/minivmac.desktop,v
> retrieving revision 1.1.1.1
> diff -u -p -u -r1.1.1.1 minivmac.desktop
> --- files/minivmac.desktop 18 Jul 2024 01:58:15 -0000 1.1.1.1
> +++ files/minivmac.desktop 7 Aug 2024 08:10:50 -0000
> @@ -1,9 +1,9 @@
> [Desktop Entry]
> GenericName=Macintosh Emulator
> -Name=Mini vMac
> +Name=Mini vMac (Plus)
> Comment=Early Macintosh emulator
> Exec=minivmac
> Terminal=false
> Type=Application
> Categories=Emulator;Graphics;
> -Icon=minivmac
> +Icon=/usr/local/share/pixmaps/minivmac.ico
> Index: files/minivmac.png
> ===================================================================
> RCS file: files/minivmac.png
> diff -N files/minivmac.png
> Binary files /tmp/cvsYjzrf7 and /dev/null differ
> Index: pkg/DESCR
> ===================================================================
> RCS file: /cvs/ports/emulators/minivmac/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -u -r1.1.1.1 DESCR
> --- pkg/DESCR 18 Jul 2024 01:58:15 -0000 1.1.1.1
> +++ pkg/DESCR 7 Aug 2024 08:10:50 -0000
> @@ -1 +1,6 @@
> -Macintosh Plus emulator.
> +Mini vMac is an emulator for computers that Apple sold from 1984 to 1996
> +based on Motorola's 680x0 microprocessors. The default emulates the
> +Macintosh Plus.
> +
> +Flavors:
> + ii - Emulate the Macintosh II
As this is slightly different to normal flavours (which append the
flavour name after the version number) I would go with this which is
slightly non standard but I think makes it easier to see how to install
the Mac II version:
---
Mini vMac is an emulator for computers that Apple sold from 1984 to 1996
based on Motorola's 680x0 microprocessors.
Flavors:
default - Emulate the Macintosh Plus ("minivmac" package)
ii - Emulate the Macintosh II ("minivmac-ii" package)
---
With that or similar, ok sthen
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/emulators/minivmac/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -r1.1.1.1 PLIST
> --- pkg/PLIST 18 Jul 2024 01:58:15 -0000 1.1.1.1
> +++ pkg/PLIST 7 Aug 2024 08:10:50 -0000
> @@ -1,6 +1,6 @@
> -@bin bin/minivmac
> -share/applications/minivmac.desktop
> +@bin bin/minivmac${SUFFIX}
> +share/applications/minivmac${SUFFIX}.desktop
> share/doc/pkg-readmes/${PKGSTEM}
> share/pixmaps/
> @tag update-desktop-database
> -share/pixmaps/minivmac.png
> +share/pixmaps/minivmac${SUFFIX}.ico
> Index: pkg/README
> ===================================================================
> RCS file: /cvs/ports/emulators/minivmac/pkg/README,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 README
> --- pkg/README 24 Jul 2024 01:02:27 -0000 1.2
> +++ pkg/README 7 Aug 2024 08:10:50 -0000
> @@ -2,11 +2,12 @@
> | Running ${PKGSTEM} on OpenBSD
> +-----------------------------------------------------------------------
>
> -Mini vMac can emulate the Macintosh Plus.
> +Mini vMac can emulate early Macintoshes. The Macintosh Plus (minivmac)
> +and the Macintosh II (minivmac-ii) are supported on OpenBSD.
>
> -Mini vMac requires a correct ROM for the Mac model to emulate, named
> -"vMac.ROM". This can be in the current directory before executing the
> -"minivmac" command.
> +Mini vMac requires a correct ROM for the Mac model to emulate, named either
> +"vMac.ROM" or "MacII.ROM". This can be in the current directory before
> +executing the "minivmac" command.
>
> Mini vMac can boot an image file (such as an OS). This can be named
> "disk1.dsk" and if placed in the current directory before executing
