diff --git a/emulators/yaze-ag/Makefile b/emulators/yaze-ag/Makefile index 41a1cf73be90..bb24da393c9f 100644 --- a/emulators/yaze-ag/Makefile +++ b/emulators/yaze-ag/Makefile @@ -1,39 +1,38 @@ PORTNAME= yaze-ag -DISTVERSION= 2.51.0 -PORTREVISION= 1 +DISTVERSION= 2.51.3 CATEGORIES= emulators MASTER_SITES= http://www.mathematik.uni-ulm.de/users/ag/yaze-ag/devel/ MAINTAINER= se@FreeBSD.org COMMENT= Z80 and CP/M-80 emulator WWW= http://yaze-ag.de/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libreadline.so:devel/readline USES= compiler:c11 MAKEFILE= Makefile_freebsd MAKE_ENV= BINDIR=${PREFIX}/bin \ DESTDIR="${STAGEDIR}" \ DOCDIR=${DOCSDIR} \ DOCHTMLDIR=${DOCSDIR}/html \ DSKDIR=${DATADIR}/disks \ LIBDIR=${DATADIR} \ LIBEXECDIR=${PREFIX}/libexec \ MANDIR=${MAN1PREFIX}/man/man1 \ OPTIMIZE="${CFLAGS}" CONFLICTS_INSTALL= cpmtools OPTIONS_DEFINE= DOCS post-build: ${REINPLACE_CMD} -e 's:%%DATADIR%%:${DATADIR}:' \ -e 's:%%DOCSDIR%%:${DOCSDIR}:' \ -e 's:%%LIBEXECDIR%%:${PREFIX}/libexec:' \ ${WRKSRC}/yaze.sh .include diff --git a/emulators/yaze-ag/distinfo b/emulators/yaze-ag/distinfo index 6bed5f8e4ebd..2aa3d898d516 100644 --- a/emulators/yaze-ag/distinfo +++ b/emulators/yaze-ag/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626685765 -SHA256 (yaze-ag-2.51.0.tar.gz) = c660ffe0cda738fd31d038a38cf5e479a6b0ba0681a6526517122bb6eb4509b2 -SIZE (yaze-ag-2.51.0.tar.gz) = 3841744 +TIMESTAMP = 1662755401 +SHA256 (yaze-ag-2.51.3.tar.gz) = 2b0a90c3bf3a27574b0427cf4579dc2347b371bec3fea5739e1527edf74b2809 +SIZE (yaze-ag-2.51.3.tar.gz) = 4025502 diff --git a/emulators/yaze-ag/files/patch-Makefile__freebsd b/emulators/yaze-ag/files/patch-Makefile__freebsd index b70057f7bc78..fb7d73b1ca31 100644 --- a/emulators/yaze-ag/files/patch-Makefile__freebsd +++ b/emulators/yaze-ag/files/patch-Makefile__freebsd @@ -1,83 +1,83 @@ ---- Makefile_freebsd.orig 2021-05-11 19:11:02 UTC +--- Makefile_freebsd.orig 2021-12-20 20:32:05 UTC +++ Makefile_freebsd -@@ -6,12 +6,12 @@ BUILD = " (build for AMD (barcelona, 64Bit))" +@@ -6,12 +6,12 @@ CC = clang CC = clang #where you want the binaries and manual page -BINDIR = /usr/local/bin -MANDIR = /usr/local/man/man1 -LIBDIR = /usr/local/lib/yaze -DSKDIR = $(LIBDIR)/disks -DOCDIR = $(LIBDIR)/doc -DOCHTMLDIR = $(LIBDIR)/doc_html +#BINDIR = $(PREFIX)/bin +#MANDIR = $(PREFIX)/man/man1 +#LIBDIR = $(PREFIX)/share/yaze-ag +#DSKDIR = $(LIBDIR)/disks +#DOCDIR = $(PREFIX)/share/doc/yaze-ag +#DOCHTMLDIR = $(DOCDIR)/html #OPTIMIZE = -g -m486 #OPTIMIZE = -g -save-temps -m486 @@ -59,7 +59,8 @@ DOCHTMLDIR = $(LIBDIR)/doc_html #OPTIMIZE = -O3 -march=athlon64 # 64 Bit AMD #OPTIMIZE = -O3 -march=athlon64-sse3 #OPTIMIZE = -O3 -march=barcelona -OPTIMIZE = -O3 -march=x86-64 +#OPTIMIZE = -O3 -march=x86-64 +OPTIMIZE = -O3 # -DUSE_GNU_READLINE for command recall/editing and filename completion # -DBGii_BUG works around a problem in Backgrounder II -@@ -210,29 +211,29 @@ install: all +@@ -215,29 +216,29 @@ install: all $(CC) $(CFLAGS) cdm.o $(LIBS) -o $@ install: all - rm -rf $(LIBDIR) - mkdir -p $(LIBDIR) - mkdir -p $(MANDIR) - $(INSTALL) -s -c -m 755 yaze_bin $(BINDIR) - $(INSTALL) -s -c -m 755 cdm $(BINDIR) - $(INSTALL) -c -m 755 yaze $(BINDIR) - ln -f -s $(BINDIR)/yaze $(BINDIR)/cpm - ln -f -s $(BINDIR)/yaze $(BINDIR)/z80 - $(INSTALL) -c -m 644 yaze-cpm3.boot $(LIBDIR) - $(INSTALL) -c -m 644 yaze.boot $(LIBDIR) - $(INSTALL) -c -m 644 m2.ktt $(LIBDIR) - $(INSTALL) -c -m 644 sample.ktt $(LIBDIR) - $(INSTALL) -c -m 644 yaze.ktt $(LIBDIR) - $(INSTALL) -c -m 644 yaze.1 $(MANDIR) - $(INSTALL) -c -m 644 cdm.1 $(MANDIR) - $(INSTALL) -c -m 644 cpm.1 $(MANDIR) - $(INSTALL) -c -m 644 z80.1 $(MANDIR) - /bin/sh install_disks.sh $(DSKDIR) - /bin/sh install_doc.sh $(DOCDIR) - /bin/sh install_doc_html.sh $(DOCHTMLDIR) - (cd $(LIBDIR); \ + rm -rf $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(MANDIR) + $(INSTALL) -s -c -m 755 yaze_bin $(DESTDIR)$(LIBEXECDIR) + $(INSTALL) -s -c -m 755 cdm $(DESTDIR)$(BINDIR) + $(INSTALL) -c -m 755 yaze $(DESTDIR)$(BINDIR) + ln -f -s yaze $(DESTDIR)$(BINDIR)/cpm + ln -f -s yaze $(DESTDIR)$(BINDIR)/z80 + $(INSTALL) -c -m 644 yaze-cpm3.boot $(DESTDIR)$(LIBDIR) + $(INSTALL) -c -m 644 yaze.boot $(DESTDIR)$(LIBDIR) + $(INSTALL) -c -m 644 m2.ktt $(DESTDIR)$(LIBDIR) + $(INSTALL) -c -m 644 sample.ktt $(DESTDIR)$(LIBDIR) + $(INSTALL) -c -m 644 yaze.ktt $(DESTDIR)$(LIBDIR) + $(INSTALL) -c -m 644 yaze.1 $(DESTDIR)$(MANDIR) + $(INSTALL) -c -m 644 cdm.1 $(DESTDIR)$(MANDIR) + $(INSTALL) -c -m 644 cpm.1 $(DESTDIR)$(MANDIR) + $(INSTALL) -c -m 644 z80.1 $(DESTDIR)$(MANDIR) + /bin/sh install_disks.sh $(DESTDIR)$(DSKDIR) + /bin/sh install_doc.sh $(DESTDIR)$(DOCDIR) + /bin/sh install_doc_html.sh $(DESTDIR)$(DOCHTMLDIR) + (cd $(DESTDIR)$(LIBDIR); \ rm -f md5 /tmp/md5.yaze-ag; \ - find . -type f -exec md5sum -b {} >>/tmp/md5.yaze-ag \; ; \ + find * -type f -exec md5 -r {} >>/tmp/md5.yaze-ag \; ; \ mv /tmp/md5.yaze-ag md5) md5: $(DISTRIB) diff --git a/emulators/yaze-ag/files/patch-doc__ydskfiles.txt b/emulators/yaze-ag/files/patch-doc__ydskfiles.txt new file mode 100644 index 000000000000..635e57d619f9 --- /dev/null +++ b/emulators/yaze-ag/files/patch-doc__ydskfiles.txt @@ -0,0 +1,7 @@ +--- doc_ydskfiles.txt.orig 2022-09-09 21:56:29 UTC ++++ doc_ydskfiles.txt +@@ -1,3 +1,4 @@ ++bios3.ydsk + bios3-zsm4.ydsk + BOOT_UTILS.ydsk + CPM3_SYS.ydsk diff --git a/emulators/yaze-ag/files/patch-docfiles__html.txt b/emulators/yaze-ag/files/patch-docfiles__html.txt new file mode 100644 index 000000000000..f13b6f3c9e94 --- /dev/null +++ b/emulators/yaze-ag/files/patch-docfiles__html.txt @@ -0,0 +1,13 @@ +--- docfiles_html.txt.orig 2022-09-09 21:20:05 UTC ++++ docfiles_html.txt +@@ -1,8 +1,8 @@ doc_html/How_to_read.txt + doc_html/BOOTSYS.Z80.html + doc_html/How_to_read.txt +-doc_html/INSTALL-2.51.2.html ++doc_html/INSTALL-2.51.3.html + doc_html/README-1.10.html +-doc_html/README-2.51.2.html ++doc_html/README-2.51.3.html + doc_html/README_BIOS3_Z80.html + doc_html/README_BOOTSYS.html + doc_html/cdm.1.html diff --git a/emulators/yaze-ag/files/patch-yaze.sh b/emulators/yaze-ag/files/patch-yaze.sh index a392f9f55c22..a3cc6b7cb9d5 100644 --- a/emulators/yaze-ag/files/patch-yaze.sh +++ b/emulators/yaze-ag/files/patch-yaze.sh @@ -1,31 +1,31 @@ --- yaze.sh.orig 2015-04-26 14:15:29 UTC +++ yaze.sh @@ -1,9 +1,10 @@ #!/bin/sh -S_YAZEFILES=/usr/local/lib/yaze -S_CPMDSKS=/usr/local/lib/yaze/disks -S_DOCFILES=/usr/local/lib/yaze/doc -S_DOCFILES_html=/usr/local/lib/yaze/doc_html -+S_YAZEEXECDIR=%%LIBEXECDIR%% -+S_YAZEFILES=%%DATADIR%% -+S_CPMDSKS=%%DATADIR%%/disks -+S_DOCFILES=%%DOCSDIR%% -+S_DOCFILES_html=%%DOCSDIR%%/html ++S_YAZEEXECDIR=/usr/local/libexec ++S_YAZEFILES=/usr/local/share/yaze-ag ++S_CPMDSKS=/usr/local/share/yaze-ag/disks ++S_DOCFILES=/usr/local/share/doc/yaze-ag ++S_DOCFILES_html=/usr/local/share/doc/yaze-ag/html if [ ! -f .yazerc ] then -@@ -80,10 +81,10 @@ fi +@@ -80,10 +81,10 @@ echo pwd=`pwd` echo echo pwd=`pwd` -if [ -f yaze_bin ] +if [ -f $S_YAZEEXECDIR/yaze_bin ] then - echo "starting ./yaze_bin $*" - exec ./yaze_bin $* + echo "starting $S_YAZEEXECDIR/yaze_bin $*" + exec $S_YAZEEXECDIR/yaze_bin $* else echo "starting yaze_bin $*" exec yaze_bin $* diff --git a/emulators/yaze-ag/pkg-plist b/emulators/yaze-ag/pkg-plist index 07e806db549d..023841e25c63 100644 --- a/emulators/yaze-ag/pkg-plist +++ b/emulators/yaze-ag/pkg-plist @@ -1,155 +1,156 @@ bin/cdm bin/cpm bin/yaze bin/z80 libexec/yaze_bin man/man1/cdm.1.gz man/man1/cpm.1.gz man/man1/yaze.1.gz man/man1/z80.1.gz %%PORTDOCS%%%%DOCSDIR%%/00-INDEX.doc %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/INSTALL-2.20 %%PORTDOCS%%%%DOCSDIR%%/README-1.10 %%PORTDOCS%%%%DOCSDIR%%/README-2.20 %%PORTDOCS%%%%DOCSDIR%%/README_BIOS3_Z80 %%PORTDOCS%%%%DOCSDIR%%/README_BOOTSYS %%PORTDOCS%%%%DOCSDIR%%/html/BOOTSYS.Z80.html %%PORTDOCS%%%%DOCSDIR%%/html/How_to_read.txt -%%PORTDOCS%%%%DOCSDIR%%/html/INSTALL-2.51.0.html +%%PORTDOCS%%%%DOCSDIR%%/html/INSTALL-2.51.3.html %%PORTDOCS%%%%DOCSDIR%%/html/README-1.10.html -%%PORTDOCS%%%%DOCSDIR%%/html/README-2.51.0.html +%%PORTDOCS%%%%DOCSDIR%%/html/README-2.51.3.html %%PORTDOCS%%%%DOCSDIR%%/html/README_BIOS3_Z80.html %%PORTDOCS%%%%DOCSDIR%%/html/README_BOOTSYS.html %%PORTDOCS%%%%DOCSDIR%%/html/cdm.1.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/000.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/001.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/002.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/003.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/004.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/005.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/006.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/007.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/008.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/009.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/010.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/011.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/012.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/013.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/014.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/015.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/016.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/017.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/018.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/019.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/020.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/021.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/022.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/023.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/024.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/025.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/026.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/027.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/028.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/029.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/030.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/031.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/032.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/033.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/034.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/035.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/036.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/037.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/038.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/039.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/040.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/041.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/042.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/043.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/044.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/045.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/046.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/047.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/048.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/049.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/050.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/051.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/052.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/053.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/054.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/055.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/056.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/057.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/058.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/059.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/060.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/061.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/062.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/063.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/064.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/065.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/066.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/067.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/068.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/069.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/070.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/071.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/072.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/073.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/074.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/075.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/076.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/077.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/078.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/079.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/080.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/081.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/082.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/083.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/084.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/085.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/086.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/087.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/088.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/089.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/090.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/091.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/092.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/093.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/094.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/095.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/096.html -%%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/097.html %%PORTDOCS%%%%DOCSDIR%%/html/cpmhelp/index.html %%PORTDOCS%%%%DOCSDIR%%/html/e_mail_yaze-ag.png %%PORTDOCS%%%%DOCSDIR%%/html/happy.gif %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/mintty.pdf %%PORTDOCS%%%%DOCSDIR%%/html/yaze-ag_doc.html %%PORTDOCS%%%%DOCSDIR%%/html/yaze-keys.odt %%PORTDOCS%%%%DOCSDIR%%/html/yaze-keys.pdf %%PORTDOCS%%%%DOCSDIR%%/html/yaze.1.html %%PORTDOCS%%%%DOCSDIR%%/html/yaze_doc.html %%PORTDOCS%%%%DOCSDIR%%/yaze-ag.doc %%PORTDOCS%%%%DOCSDIR%%/yaze.doc %%DATADIR%%/disks/BOOT_UTILS.ydsk.gz %%DATADIR%%/disks/CPM3_SYS.ydsk.gz +%%DATADIR%%/disks/bios3-zsm4.ydsk.gz %%DATADIR%%/disks/bios3.ydsk.gz %%DATADIR%%/disks/disksort.tar.gz %%DATADIR%%/disks/disksort.ydsk.gz %%DATADIR%%/disks/hi-c-z280-compiler.ydsk.gz %%DATADIR%%/disks/kermit_szrz.ydsk.gz %%DATADIR%%/disks/mmu-utils.ydsk.gz %%DATADIR%%/disks/spl.ydsk.gz %%DATADIR%%/disks/test-utils-1.10.ydsk.gz %%DATADIR%%/disks/testdsk.ydsk.gz %%DATADIR%%/disks/turbo-modula-2.ydsk.gz %%DATADIR%%/disks/unixlike.ydsk.gz %%DATADIR%%/disks/yazerc %%DATADIR%%/disks/zinc.ydsk.gz +%%DATADIR%%/disks/zsm4-source.ydsk.gz %%DATADIR%%/m2.ktt %%DATADIR%%/md5 %%DATADIR%%/sample.ktt %%DATADIR%%/yaze-cpm3.boot %%DATADIR%%/yaze.boot %%DATADIR%%/yaze.ktt