git: 617b984c77b2 - main - emulators/yaze-ag: fix build on arch != amd64

From: Stefan Eßer <se_at_FreeBSD.org>
Date: Sun, 20 Mar 2022 10:23:42 UTC
The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/ports/commit/?id=617b984c77b223ad2ba1d91d4880168fba6f6aff

commit 617b984c77b223ad2ba1d91d4880168fba6f6aff
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-03-20 10:20:22 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-03-20 10:20:22 +0000

    emulators/yaze-ag: fix build on arch != amd64
    
    There was a bogus -march=x86-64 option in Makefile_freebsd which made
    the compiler complain about an unsupported architecture on all other
    architectures.
    
    Reported by:    pkg-fallout
---
 emulators/yaze-ag/Makefile                      |  5 +++--
 emulators/yaze-ag/files/patch-Makefile__freebsd | 12 +++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/emulators/yaze-ag/Makefile b/emulators/yaze-ag/Makefile
index 67489c5ac711..939f861f6490 100644
--- a/emulators/yaze-ag/Makefile
+++ b/emulators/yaze-ag/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	yaze-ag
 DISTVERSION=	2.51.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.mathematik.uni-ulm.de/users/ag/yaze-ag/devel/
 
@@ -13,8 +14,6 @@ LIB_DEPENDS=	libreadline.so:devel/readline
 
 USES=		compiler:c11
 
-CONFLICTS_INSTALL=	cpmtools
-
 MAKEFILE=	Makefile_freebsd
 MAKE_ENV=	BINDIR=${PREFIX}/bin \
 		DESTDIR="${STAGEDIR}" \
@@ -26,6 +25,8 @@ MAKE_ENV=	BINDIR=${PREFIX}/bin \
 		MANDIR=${MAN1PREFIX}/man/man1 \
 		OPTIMIZE="${CFLAGS}"
 
+CONFLICTS_INSTALL=	cpmtools
+
 OPTIONS_DEFINE=	DOCS
 
 post-build:
diff --git a/emulators/yaze-ag/files/patch-Makefile__freebsd b/emulators/yaze-ag/files/patch-Makefile__freebsd
index bc31e1ce3328..b70057f7bc78 100644
--- a/emulators/yaze-ag/files/patch-Makefile__freebsd
+++ b/emulators/yaze-ag/files/patch-Makefile__freebsd
@@ -19,7 +19,17 @@
  
  #OPTIMIZE	= -g -m486
  #OPTIMIZE	= -g -save-temps -m486
-@@ -210,29 +210,29 @@ cdm:		cdm.o
+@@ -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
  		$(CC) $(CFLAGS) cdm.o $(LIBS) -o $@
  
  install:	all