summaryrefslogtreecommitdiff
path: root/games/angband-x11
diff options
context:
space:
mode:
authorcjep <cjep@pkgsrc.org>2002-04-20 15:04:47 +0000
committercjep <cjep@pkgsrc.org>2002-04-20 15:04:47 +0000
commit5eec73ce2eeea5c5756d5bbb487d834fdf159bba (patch)
tree3bba873d69a6b118b042f3cc7fb1d9d1b97e4025 /games/angband-x11
parent6d6a0d02bc538ba32ddf0b74a1ad061e888d4398 (diff)
downloadpkgsrc-5eec73ce2eeea5c5756d5bbb487d834fdf159bba.tar.gz
Backout previous arm32 change and redo somewhat more elegantly...
Diffstat (limited to 'games/angband-x11')
-rw-r--r--games/angband-x11/Makefile4
-rw-r--r--games/angband-x11/distinfo4
-rw-r--r--games/angband-x11/patches/patch-aa16
3 files changed, 8 insertions, 16 deletions
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index d06355a88c9..fa80b889194 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/04/20 13:08:41 cjep Exp $
+# $NetBSD: Makefile,v 1.12 2002/04/20 15:04:47 cjep Exp $
#
DISTNAME= angband-283
@@ -17,7 +17,6 @@ CONFLICTS= angband-tty-[0-9]*
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/${DISTNAME}/src
MAKEFILE= Makefile.std
-MAKE_ENV+= CC=${CC}
ALL_TARGET= angband
USE_X11= yes
@@ -25,6 +24,7 @@ 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-x11/distinfo b/games/angband-x11/distinfo
index 563000c9d2d..13c651acc4a 100644
--- a/games/angband-x11/distinfo
+++ b/games/angband-x11/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2002/04/20 13:08:41 cjep Exp $
+$NetBSD: distinfo,v 1.5 2002/04/20 15:04:47 cjep Exp $
SHA1 (angband-283.tar.gz) = 1dc4a2786c31c2336daf57f76f4fa762f7d84cf3
Size (angband-283.tar.gz) = 822762 bytes
SHA1 (angband-spoilers.tar.gz) = 6f5db28f686be3f41df6c22990c53f9e46a1c7cd
Size (angband-spoilers.tar.gz) = 234909 bytes
-SHA1 (patch-aa) = 8b0b9f98669a6ec96232f868a59d84044b927166
+SHA1 (patch-aa) = 4ac1892fd94ef97431a5860caacdb6394b01bd5b
SHA1 (patch-ab) = 6abaa44ac3131720855950598e4bfa18fc0c595a
SHA1 (patch-ac) = 845a47bec2b5eb3abf10d2f7f244041d8167fba6
SHA1 (patch-ad) = ea446d8d7f79a35f0d70aa8bf03a18dcf87f908b
diff --git a/games/angband-x11/patches/patch-aa b/games/angband-x11/patches/patch-aa
index 14d72a671fa..38f8d494a60 100644
--- a/games/angband-x11/patches/patch-aa
+++ b/games/angband-x11/patches/patch-aa
@@ -1,15 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2002/04/20 13:08:41 cjep Exp $
---- Makefile.std.orig Wed Feb 11 11:30:28 1998
-+++ Makefile.std Sat Apr 20 14:08:18 2002
-@@ -94,7 +94,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+#CC = gcc
-
-
- #
+$NetBSD: patch-aa,v 1.4 2002/04/20 15:04:48 cjep Exp $
+
+--- Makefile.std.orig Wed Feb 11 12:30:28 1998
++++ Makefile.std
@@ -115,8 +115,9 @@
# including "USE_GETCH" and "USE_CURS_SET". Note that "config.h" will
# attempt to "guess" at many of these flags based on your system.