From e801373222037c0b5b8fde642ffd0cdc2a0e74f2 Mon Sep 17 00:00:00 2001
From: Larry Masinter <lmm@acm.org>
Date: Wed, 23 Dec 2020 11:01:10 -0800
Subject: [PATCH] X11 definitions moved for MacPorts X11

---
 .gitignore                    | 5 ++++-
 bin/makefile-darwin.aarch64-x | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 40a4e4d..5458a32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 # Editor backups and recovery files
 *~
 \#*#
+.DS_Store
 # build directories
 *.386-x/**
 *.386/**
@@ -12,7 +13,9 @@
 *.x86_64/**
 *.armv7l-x/**
 *.armv7l/**
+*.aarch64-x/**
+*.aarch64/**
 init.386/**
 # core files
 core
-*.core
\ No newline at end of file
+*.core
diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x
index b0a097a..dfe3208 100644
--- a/bin/makefile-darwin.aarch64-x
+++ b/bin/makefile-darwin.aarch64-x
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT
+XFLAGS = -I/opt/local/include -DXWINDOW -DNOPIXRECT
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O1 -g
@@ -25,8 +25,8 @@ DFLAGS = $(DEBUGFLAGS) -DNEW_STORAGE -DMACOSX -DOLD_CURSOR \
 	-DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351
 
-LDFLAGS = -L/opt/X11/lib -lX11 -lm
-LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm
+LDFLAGS = -L/opt/local/lib -lX11 -lm
+LDELDFLAGS =  -L/opt/local/lib -lX11 -lm
 
 INLINE = # $(SRCDIR)dspSPARC.il
 BITBLTFILE = # $(OBJECTDIR)bbtSPARC.o