summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcjep <cjep>2002-04-20 13:08:41 +0000
committercjep <cjep>2002-04-20 13:08:41 +0000
commit65dfebc6664bdd5ec7731c533d7ce76800c489ef (patch)
treeafd23151a70aae24dd289b2938800daa0abd6b52
parentdd194cb0666d6fc2d7263438e5bba94fac1fc5d9 (diff)
downloadpkgsrc-65dfebc6664bdd5ec7731c533d7ce76800c489ef.tar.gz
On arm32 use gcc-2.95.3 to avoid internal compiler error.
Pass CC to make in the environment.
-rw-r--r--games/angband-x11/Makefile7
-rw-r--r--games/angband-x11/distinfo4
-rw-r--r--games/angband-x11/patches/patch-aa16
3 files changed, 20 insertions, 7 deletions
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index 30524aeecf2..d06355a88c9 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/03/18 15:30:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/04/20 13:08:41 cjep Exp $
#
DISTNAME= angband-283
@@ -17,11 +17,16 @@ 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
SPOILERFILE= angband-spoilers.tar.gz
+.if (${MACHINE_ARCH} == arm32)
+. include "../../lang/gcc/Makefile.gcc"
+.endif
+
do-install:
${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/angband
${CP} -R ${WRKDIR}/${DISTNAME}/lib/* ${PREFIX}/share/angband
diff --git a/games/angband-x11/distinfo b/games/angband-x11/distinfo
index 111b14bc5bf..563000c9d2d 100644
--- a/games/angband-x11/distinfo
+++ b/games/angband-x11/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2002/03/18 15:30:15 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/04/20 13:08:41 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) = 4ac1892fd94ef97431a5860caacdb6394b01bd5b
+SHA1 (patch-aa) = 8b0b9f98669a6ec96232f868a59d84044b927166
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 d8931ef39fa..14d72a671fa 100644
--- a/games/angband-x11/patches/patch-aa
+++ b/games/angband-x11/patches/patch-aa
@@ -1,7 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2002/03/18 15:30:15 wiz Exp $
-
---- Makefile.std.orig Wed Feb 11 12:30:28 1998
-+++ Makefile.std
+$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
+
+
+ #
@@ -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.