From 8c81fa4e980452ea5bc009ba32ce29022c21992d Mon Sep 17 00:00:00 2001
From: cjep <cjep>
Date: Sat, 20 Apr 2002 15:04:19 +0000
Subject: Backout previous and do somewhat more elegantly...

---
 games/angband-tty/Makefile         |  4 ++--
 games/angband-tty/distinfo         |  4 ++--
 games/angband-tty/patches/patch-ac | 21 ++++-----------------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile
index 3667636c949..4a6b73cf1b2 100644
--- a/games/angband-tty/Makefile
+++ b/games/angband-tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/04/20 12:54:08 cjep Exp $
+# $NetBSD: Makefile,v 1.10 2002/04/20 15:04:19 cjep Exp $
 #
 
 DISTNAME=		angband-283
@@ -17,13 +17,13 @@ CONFLICTS=		angband-x11-[0-9]*
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 MAKEFILE=		Makefile.std
-MAKE_ENV+= 		CC=${CC}
 ALL_TARGET=		angband
 
 SPOILERFILE=		angband-spoilers.tar.gz
 
 .if (${MACHINE_ARCH} == arm32)
 . include "../../lang/gcc/Makefile.gcc"
+MAKE_FLAGS+= 		CC=${CC}
 .endif
 
 do-install:
diff --git a/games/angband-tty/distinfo b/games/angband-tty/distinfo
index 5b6c7c016aa..f5b4f574b90 100644
--- a/games/angband-tty/distinfo
+++ b/games/angband-tty/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/04/20 12:54:08 cjep Exp $
+$NetBSD: distinfo,v 1.4 2002/04/20 15:04:19 cjep Exp $
 
 SHA1 (angband-283.tar.gz) = 1dc4a2786c31c2336daf57f76f4fa762f7d84cf3
 Size (angband-283.tar.gz) = 822762 bytes
@@ -6,5 +6,5 @@ SHA1 (angband-spoilers.tar.gz) = 6f5db28f686be3f41df6c22990c53f9e46a1c7cd
 Size (angband-spoilers.tar.gz) = 234909 bytes
 SHA1 (patch-aa) = f24d8a1f03c98ae09ecb75d5225f77eac138cdaf
 SHA1 (patch-ab) = fd39a2a851add826bf072b6f5097e1d9d7e010a7
-SHA1 (patch-ac) = fa8e3148ad7c7bd1e00cc7348340c6e012d6631d
+SHA1 (patch-ac) = 2ed519e243da2e4e6ee1494b32c4b68ebeec7b34
 SHA1 (patch-ad) = 8aac7e60e59d77577dffe6c6fd13cd13aac62cea
diff --git a/games/angband-tty/patches/patch-ac b/games/angband-tty/patches/patch-ac
index d00fe6e6bda..e2862a87d9a 100644
--- a/games/angband-tty/patches/patch-ac
+++ b/games/angband-tty/patches/patch-ac
@@ -1,23 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2002/04/20 12:54:09 cjep Exp $
---- Makefile.std.orig	Wed Feb 11 11:30:28 1998
-+++ Makefile.std	Sat Apr 20 13:41:52 2002
-@@ -94,7 +94,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+#CC = gcc
- 
- 
- #
-@@ -115,8 +115,8 @@
- # including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
- # attempt to "guess" at many of these flags based on your system.
+$NetBSD: patch-ac,v 1.3 2002/04/20 15:04:20 cjep Exp $
+--- Makefile.std.orig	Wed Feb 11 04:30:28 1998
++++ Makefile.std	Sun Aug  9 01:46:05 1998
+@@ -117,4 +117,4 @@
  #
 -CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU"
 -LIBS = -lX11 -lcurses -ltermcap
 +CFLAGS = -Wall -O -D"USE_GCU" -DDEFAULT_PATH=\"$(PREFIX)/share/angband/\"
 +LIBS = -lcurses -ltermcap
  
- 
- ##
-- 
cgit v1.2.3