1
0
mirror of https://git.freebsd.org/ports.git synced 2026-06-02 11:08:52 +00:00

emulators/z80pack: upgrade to release 1.38

This version is a major upgrade offering lots of improvements, see

     https://github.com/udo-munk/z80pack/releases/tag/1.38

for a list of changes.
This commit is contained in:
Stefan Eßer
2025-10-05 17:11:11 +02:00
parent d3ee94fadc
commit c92b7a6b93
7 changed files with 93 additions and 92 deletions
+7 -16
View File
@@ -1,33 +1,24 @@
PORTNAME= z80pack
DISTVERSION= 1.37
DISTVERSION= 1.38
CATEGORIES= emulators
MASTER_SITES= https://www.autometer.de/unix4fun/z80pack/ftp/
MAINTAINER= se@FreeBSD.org
COMMENT= Complete CP/M-80 emulator
WWW= https://www.autometer.de/unix4fun/z80pack/
WWW= https://www.icl1900.co.uk/unix4fun/z80pack/
CONFLICTS_INSTALL= hextools
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= tar:tgz
USES= gl gmake jpeg
USE_GL= gl glu
USE_GITHUB= yes
GH_ACCOUNT= udo-munk
OPTIONS_DEFINE= DOCS
do-build:
${MAKE} -C ${WRKSRC}/cpmsim/srcsim -f Makefile.bsd OPTFLAGS="${CFLAGS}" PREFIX=${PREFIX} all clean
${MAKE} -C ${WRKSRC}/cpmsim/srctools CC="${CC}" CFLAGS="${CFLAGS}"
do-install:
.for file in mkdskimg bin2hex send receive ptp2bin
${INSTALL_PROGRAM} ${WRKSRC}/cpmsim/srctools/${file} ${STAGEDIR}${PREFIX}/bin
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/cpmsim/cpmsim ${STAGEDIR}${PREFIX}/bin
cd ${WRKSRC}/cpmsim/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
cd ${WRKSRC}/cpmsim/disks/library && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/disks
do-install-DOCS-on:
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1748766343
SHA256 (z80pack-1.37.tgz) = 0a4d199c822546e28fb9d8e055b4bf7ca4c1b984b2f707f99d39f00b80c59d2a
SIZE (z80pack-1.37.tgz) = 15674455
TIMESTAMP = 1756888492
SHA256 (udo-munk-z80pack-1.38_GH0.tar.gz) = dfed4f0c7721fb16f077aa33001962dde91548ae7ed56b1667218ec4baf5a6fc
SIZE (udo-munk-z80pack-1.38_GH0.tar.gz) = 33151943
+30
View File
@@ -0,0 +1,30 @@
--- Makefile.orig 2024-06-01 14:02:02 UTC
+++ Makefile
@@ -1,6 +1,6 @@ PACKAGE = z80pack
PACKAGE = z80pack
-PREFIX = $(HOME)
-#PREFIX = /usr/local
+#PREFIX = $(HOME)
+PREFIX = /usr/local
EXEC_PREFIX = $(PREFIX)
BINDIR = $(EXEC_PREFIX)/bin
DATAROOTDIR = $(PREFIX)/share
@@ -109,12 +109,12 @@ install:
FORCE:
install:
-# @set -e; for subdir in $(TOOLS) $(LIBS) $(BIOSES) $(MISC); do \
-# $(MAKE) -C $$subdir "PREFIX=$(PREFIX)" install; \
-# done
-# @set -e; for subdir in $(MACHINES); do \
-# $(MAKE) -C $$subdir/srcsim "PREFIX=$(PREFIX)" install; \
-# done
+ @set -e; for subdir in $(TOOLS) $(LIBS) $(BIOSES) $(MISC); do \
+ $(MAKE) -C $$subdir "PREFIX=$(PREFIX)" install; \
+ done
+ @set -e; for subdir in $(MACHINES); do \
+ $(MAKE) -C $$subdir/srcsim "PREFIX=$(PREFIX)" install; \
+ done
uninstall:
# @set -e; for subdir in $(TOOLS) $(LIBS) $(BIOSES) $(MISC); do \
@@ -0,0 +1,24 @@
--- cpmsim/srcsim/Makefile.orig 2024-06-01 14:02:02 UTC
+++ cpmsim/srcsim/Makefile
@@ -13,7 +13,7 @@ CPROG = $(MACHINE)sim
# http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
PACKAGE = z80pack
CPROG = $(MACHINE)sim
-PREFIX ?= /usr/local
+PREFIX = /usr/local
EXEC_PREFIX = $(PREFIX)
BINDIR = $(EXEC_PREFIX)/bin
DATAROOTDIR = $(PREFIX)/share
@@ -103,8 +103,10 @@ install: $(SIM)
build: _rm_obj all
install: $(SIM)
-# $(INSTALL) -d $(DESTDIR)$(BINDIR)
-# $(INSTALL_PROGRAM) -s $(SIM) $(DESTDIR)$(BINDIR)
+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
+ $(INSTALL_PROGRAM) -s $(SIM) $(DESTDIR)$(BINDIR)
+ $(INSTALL) -d $(DESTDIR)$(DISKS_DIR)
+ $(INSTALL_PROGRAM) ../disks/library/*.dsk $(DESTDIR)$(DISKS_DIR)
uninstall:
# rm -f $(DESTDIR)$(BINDIR)/$(CPROG)
@@ -1,23 +0,0 @@
--- cpmsim/srcsim/Makefile.bsd.orig 2021-01-06 16:07:39 UTC
+++ cpmsim/srcsim/Makefile.bsd
@@ -1,8 +1,8 @@
# system wide location for machines configuration files
-CONF=/usr/local/share/cpmsim/conf
+CONF=${PREFIX}/share/z80pack/conf
# system wide location for disk images
-DISKS=/usr/local/share/cpmsim/disks
+DISKS=${PREFIX}/share/z80pack/disks
CC = cc
@@ -10,7 +10,8 @@ CC = cc
#CFLAGS = -O3 -c -Wall -Wextra -Wno-self-assign -fstack-protector-all -D_FORTIFY_SOURCE=2 -DCONFDIR=\"${CONF}\" -DDISKSDIR=\"${DISKS}\"
# Production
-CFLAGS = -O3 -c -Wall -Wextra -Wno-self-assign -U_FORTIFY_SOURCE -DCONFDIR=\"${CONF}\" -DDISKSDIR=\"${DISKS}\"
+#CFLAGS = -O3 -c -Wall -Wextra -Wno-self-assign -U_FORTIFY_SOURCE -DCONFDIR=\"${CONF}\" -DDISKSDIR=\"${DISKS}\"
+CFLAGS = ${OPTFLAGS} -c -Wall -Wextra -Wno-self-assign -U_FORTIFY_SOURCE -DCONFDIR=\"${CONF}\" -DDISKSDIR=\"${DISKS}\"
LFLAGS =
@@ -1,30 +0,0 @@
--- cpmsim/srctools/Makefile.orig 2021-01-06 16:07:39 UTC
+++ cpmsim/srctools/Makefile
@@ -1,19 +1,19 @@
#
# some places where the tools usually are installed
#
-INSTALLDIR=${HOME}/bin
+#INSTALLDIR=${HOME}/bin
#INSTALLDIR=/usr/local/bin
#CC = cc
-CC = gcc
+#CC = gcc
-CFLAGS= -O3 -Wall
+#CFLAGS= -O3 -Wall
-all: test mkdskimg bin2hex send receive ptp2bin
- @echo
- @echo "Done."
- @echo "Now run make install"
- @echo
+all: mkdskimg bin2hex send receive ptp2bin
+# @echo
+# @echo "Done."
+# @echo "Now run make install"
+# @echo
test:
@test -d ${INSTALLDIR} || (echo "${INSTALLDIR} doesn't exist, fix INSTALLDIR"; exit 1)
+29 -20
View File
@@ -1,30 +1,39 @@
bin/bin2hex
bin/cpmrecv
bin/cpmsend
bin/cpmsim
bin/mkdskimg
bin/ptp2bin
bin/receive
bin/send
bin/z80asm
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/FrontPanel_User_Manual_2.0.pdf
%%PORTDOCS%%%%DOCSDIR%%/README-asm.txt
%%PORTDOCS%%%%DOCSDIR%%/README-cpm.txt
%%PORTDOCS%%%%DOCSDIR%%/README-frontpanel.txt
%%PORTDOCS%%%%DOCSDIR%%/README-ice.txt
%%PORTDOCS%%%%DOCSDIR%%/README-osx.txt
%%PORTDOCS%%%%DOCSDIR%%/README-pico.txt
%%PORTDOCS%%%%DOCSDIR%%/README-wsl.txt
%%PORTDOCS%%%%DOCSDIR%%/picoboard1.jpg
%%PORTDOCS%%%%DOCSDIR%%/picoboard2.jpg
%%PORTDOCS%%%%DOCSDIR%%/picoboard3.jpg
%%PORTDOCS%%%%DOCSDIR%%/z80-documented.pdf
%%DATADIR%%/disks/cpm13.dsk
%%DATADIR%%/disks/cpm14.dsk
%%DATADIR%%/disks/cpm1975.dsk
%%DATADIR%%/disks/cpm2-1.dsk
%%DATADIR%%/disks/cpm2-2.dsk
%%DATADIR%%/disks/cpm2-62khd.dsk
%%DATADIR%%/disks/cpm3-1.dsk
%%DATADIR%%/disks/cpm3-2.dsk
%%DATADIR%%/disks/cpm3-8080-1.dsk
%%DATADIR%%/disks/cpm3-8080-2.dsk
%%DATADIR%%/disks/hd-tools.dsk
%%DATADIR%%/disks/hd-toolsrc.dsk
%%DATADIR%%/disks/i8080tests.dsk
%%DATADIR%%/disks/mpm-1.dsk
%%DATADIR%%/disks/mpm-2.dsk
%%DATADIR%%/disks/z80tests.dsk
%%DATADIR%%/net_client.conf.example
%%DATADIR%%/net_server.conf.example
%%DATADIR%%/cpmsim/disks/cpm13.dsk
%%DATADIR%%/cpmsim/disks/cpm14.dsk
%%DATADIR%%/cpmsim/disks/cpm1975.dsk
%%DATADIR%%/cpmsim/disks/cpm22-1.dsk
%%DATADIR%%/cpmsim/disks/cpm22-2.dsk
%%DATADIR%%/cpmsim/disks/cpm22-62khd.dsk
%%DATADIR%%/cpmsim/disks/cpm3-1.dsk
%%DATADIR%%/cpmsim/disks/cpm3-2.dsk
%%DATADIR%%/cpmsim/disks/cpm3-8080-1.dsk
%%DATADIR%%/cpmsim/disks/cpm3-8080-2.dsk
%%DATADIR%%/cpmsim/disks/hd-tools.dsk
%%DATADIR%%/cpmsim/disks/hd-toolsrc.dsk
%%DATADIR%%/cpmsim/disks/i8080tests.dsk
%%DATADIR%%/cpmsim/disks/mpm-1.dsk
%%DATADIR%%/cpmsim/disks/mpm-2.dsk
%%DATADIR%%/cpmsim/disks/ucsd-iv-1.dsk
%%DATADIR%%/cpmsim/disks/ucsd-iv-2.dsk
%%DATADIR%%/cpmsim/disks/ucsd-iv-interp.dsk
%%DATADIR%%/cpmsim/disks/z80tests.dsk