emulators/yaze-ag: update to version 2.51.0

4 files changed, 36 insertions, 86 deletions

diff --git a/emulators/yaze-ag/Makefile b/emulators/yaze-ag/Makefile
index 502555227d8d..3ace3558505e 100644
--- a/emulators/yaze-ag/Makefile
+++ b/emulators/yaze-ag/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	yaze-ag
-DISTVERSION=	2.51.0-rc1
+DISTVERSION=	2.51.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.mathematik.uni-ulm.de/users/ag/yaze-ag/devel/
 
@@ -15,13 +15,14 @@ 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}" \
-		STAGEDIR="${STAGEDIR}"
+		OPTIMIZE="${CFLAGS}"
 
 OPTIONS_DEFINE=	DOCS
 
@@ -31,7 +32,4 @@ post-build:
 				 -e 's:%%LIBEXECDIR%%:${PREFIX}/libexec:' \
 							${WRKSRC}/yaze.sh
 
-do-install-DOCS-on:
-		${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} -f ${MAKEFILE} install-doc
-
 .include <bsd.port.mk>
diff --git a/emulators/yaze-ag/distinfo b/emulators/yaze-ag/distinfo
index 9aadd03a3aec..6bed5f8e4ebd 100644
--- a/emulators/yaze-ag/distinfo
+++ b/emulators/yaze-ag/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618258783
-SHA256 (yaze-ag-2.51.0-rc1.tar.gz) = 9e2688672acad53a973a8521278d6ec91ebe3b24c665d729801d59b9a7b256b2
-SIZE (yaze-ag-2.51.0-rc1.tar.gz) = 3671660
+TIMESTAMP = 1626685765
+SHA256 (yaze-ag-2.51.0.tar.gz) = c660ffe0cda738fd31d038a38cf5e479a6b0ba0681a6526517122bb6eb4509b2
+SIZE (yaze-ag-2.51.0.tar.gz) = 3841744
diff --git a/emulators/yaze-ag/files/patch-Makefile__freebsd b/emulators/yaze-ag/files/patch-Makefile__freebsd
index ee55f0b1655d..bc31e1ce3328 100644
--- a/emulators/yaze-ag/files/patch-Makefile__freebsd
+++ b/emulators/yaze-ag/files/patch-Makefile__freebsd
@@ -1,13 +1,7 @@
---- Makefile_freebsd.orig	2020-09-18 14:28:23 UTC
+--- Makefile_freebsd.orig	2021-05-11 19:11:02 UTC
 +++ Makefile_freebsd
-@@ -1,17 +1,16 @@
- # Makefile for yaze-ag
--
- BUILD = " (build for INTEL x86_32Bit)"
- 
- # CC must be an ANSI-C compiler
--CC            =	gcc
-+#CC            =	gcc
+@@ -6,12 +6,12 @@ BUILD = " (build for AMD (barcelona, 64Bit))"
+ CC            =	clang
  
  #where you want the binaries and manual page
 -BINDIR	      = /usr/local/bin
@@ -25,49 +19,7 @@
  
  #OPTIMIZE	= -g -m486
  #OPTIMIZE	= -g -save-temps -m486
-@@ -58,7 +57,7 @@ DOCHTMLDIR    = $(LIBDIR)/doc_html
- #OPTIMIZE	= -O3 -march=athlon-mp
- #OPTIMIZE	= -O3 -march=athlon64	# 64 Bit AMD
- #OPTIMIZE	= -O3 -march=athlon64-sse3
--OPTIMIZE	= -O3 -march=barcelona
-+#OPTIMIZE	= -O3 -march=barcelona
- 
- # -DUSE_GNU_READLINE for command recall/editing and filename completion
- # -DBGii_BUG works around a problem in Backgrounder II
-@@ -106,7 +105,7 @@ OPTIMIZE	= -O3 -march=barcelona
- # solaris2, freebsd and cygwin needs -D__EXTENSIONS__
- # linux needs -D_BSD_SOURCE
- #
--OPTIONS	= -DBIOS -D__EXTENSIONS__ -DMMU -DBOOTSYS -DMULTIO # -DSHOWDRV
-+OPTIONS	= -DBIOS -D__EXTENSIONS__ -DMMU -DBOOTSYS -DMULTIO -DUSE_GNU_READLINE # -DSHOWDRV
- 
- # Link with CP/M BIOS support,
- YAZE_OBJS     = yaze.o mem_mmu.o simz80.o simz80_wts.o ytimer.o ybios.o \
-@@ -121,7 +120,7 @@ KT_OBJS       = keytest.o conin.o keytran.o nulrq.o
- #  (you don't need -liberty on linux or BSD systems)
- #
- #LIBS	      = -lreadline -lncurses
--LIBS	      =
-+LIBS	      = -L$(PREFIX)/lib -lreadline
- 
- # a bsd-like install program (/usr/ucb/install on Solaris2)
- INSTALL	      = install
-@@ -130,12 +129,12 @@ INSTALL	      = install
- ###### you should not need to change anything below this line ######
- # CWARN	      = -ansi -pedantic -Wall -Wshadow \
- #		-Wpointer-arith -Wnested-externs -Winline
--CWARN	      = -ansi -pedantic -Wall -Wshadow \
-+CWARN	      = -pedantic -Wall -Wshadow \
- 		-Wpointer-arith -Wnested-externs -Winline \
- 		-Wno-attributes -Wno-char-subscripts -Wno-unused-variable
- # CWARN	      = -ansi -Wall 
- CFLAGS        =	$(CWARN) $(OPTIMIZE) $(OPTIONS) -DLIBDIR=\"$(LIBDIR)/\" \
--		-DBUILD=\"$(BUILD)\"
-+		-DBUILD=\"$(BUILD)\" -I$(PREFIX)/include
- 
- SRCS	      = yaze.c mem_mmu.c simz80.c simz80_wts.c ytimer.c io.c ybios.c monitor.c cdm.c \
- 		conin.c keytest.c keytran.c nulrq.c \
-@@ -209,30 +208,28 @@ cdm:		cdm.o
+@@ -210,29 +210,29 @@ cdm:		cdm.o
  		$(CC) $(CFLAGS) cdm.o $(LIBS) -o $@
  
  install:	all
@@ -92,31 +44,30 @@
 -		/bin/sh install_doc.sh $(DOCDIR)
 -		/bin/sh install_doc_html.sh $(DOCHTMLDIR)
 -		(cd $(LIBDIR); \
--		rm -f md5 /tmp/md5.yaze-ag; \
++		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 \; ; \
--		mv /tmp/md5.yaze-ag md5)
-+		rm -rf $(STAGEDIR)$(LIBDIR)
-+		mkdir -p $(STAGEDIR)$(LIBDIR)
-+		mkdir -p $(STAGEDIR)$(MANDIR)
-+		$(INSTALL) -s -c -m 755 yaze_bin $(STAGEDIR)$(PREFIX)/libexec
-+		$(INSTALL) -s -c -m 755 cdm $(STAGEDIR)$(BINDIR)
-+		$(INSTALL) -c -m 755 yaze $(STAGEDIR)$(BINDIR)
-+		ln -f -s yaze $(STAGEDIR)$(BINDIR)/cpm
-+		ln -f -s yaze $(STAGEDIR)$(BINDIR)/z80
-+		$(INSTALL) -c -m 644 yaze-cpm3.boot $(STAGEDIR)$(LIBDIR)
-+		$(INSTALL) -c -m 644 yaze.boot $(STAGEDIR)$(LIBDIR)
-+		$(INSTALL) -c -m 644 m2.ktt $(STAGEDIR)$(LIBDIR)
-+		$(INSTALL) -c -m 644 sample.ktt $(STAGEDIR)$(LIBDIR)
-+		$(INSTALL) -c -m 644 yaze.ktt $(STAGEDIR)$(LIBDIR)
-+		$(INSTALL) -c -m 644 yaze.1 $(STAGEDIR)$(MANDIR)
-+		$(INSTALL) -c -m 644 cdm.1 $(STAGEDIR)$(MANDIR)
-+		$(INSTALL) -c -m 644 cpm.1 $(STAGEDIR)$(MANDIR)
-+		$(INSTALL) -c -m 644 z80.1 $(STAGEDIR)$(MANDIR)
-+		/bin/sh install_disks.sh $(STAGEDIR)$(DSKDIR)
-+
-+install-doc:
-+		/bin/sh install_doc.sh $(STAGEDIR)$(DOCDIR)
-+		/bin/sh install_doc_html.sh $(STAGEDIR)$(DOCHTMLDIR)
++		find * -type f -exec md5 -r {} >>/tmp/md5.yaze-ag \; ; \
+ 		mv /tmp/md5.yaze-ag md5)
  
  md5:		$(DISTRIB)
- 		(P=`pwd`; D=`basename $$P`; \
diff --git a/emulators/yaze-ag/pkg-plist b/emulators/yaze-ag/pkg-plist
index fe82d4a72676..07e806db549d 100644
--- a/emulators/yaze-ag/pkg-plist
+++ b/emulators/yaze-ag/pkg-plist
@@ -148,6 +148,7 @@ man/man1/z80.1.gz
 %%DATADIR%%/disks/yazerc
 %%DATADIR%%/disks/zinc.ydsk.gz
 %%DATADIR%%/m2.ktt
+%%DATADIR%%/md5
 %%DATADIR%%/sample.ktt
 %%DATADIR%%/yaze-cpm3.boot
 %%DATADIR%%/yaze.boot