diff options
author | reed <reed@pkgsrc.org> | 2005-02-17 21:05:08 +0000 |
---|---|---|
committer | reed <reed@pkgsrc.org> | 2005-02-17 21:05:08 +0000 |
commit | 15e43161139aa00996e96a60380e7308e99f87cb (patch) | |
tree | 547ed77f4cae4e82d7e93b26e89e66b3ac005005 /games | |
parent | bed724753ed9ef487bf112eb0cedad20a6c5587d (diff) | |
download | pkgsrc-15e43161139aa00996e96a60380e7308e99f87cb.tar.gz |
Add new patch (patch-bk) so YACC and LEX are not forced as yacc and lex.
(Because it could be bison -y and flex.)
The build uses yacc and lex so USE_GNU_TOOLS. (Note that
USE_GNU_TOOLS is broken, so now on NetBSD this will use bison -y instead
of native yacc.)
Also set YACC in MAKE_ENV.
This is partial fix for PR #pkg/29388. (The remaining problem
is that mk/tools.mk assumes that yacc is already installed
so YACC is never set to "bison -y" as needed.)
Diffstat (limited to 'games')
-rw-r--r-- | games/falcons-eye/Makefile | 4 | ||||
-rw-r--r-- | games/falcons-eye/distinfo | 3 | ||||
-rw-r--r-- | games/falcons-eye/patches/patch-bk | 15 |
3 files changed, 20 insertions, 2 deletions
diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile index 4b8a0895ad4..302de32d817 100644 --- a/games/falcons-eye/Makefile +++ b/games/falcons-eye/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/02/16 18:56:22 ben Exp $ +# $NetBSD: Makefile,v 1.20 2005/02/17 21:05:08 reed Exp $ # DISTNAME= nethack_source_331_jtp_193 @@ -19,6 +19,8 @@ DIST_SUBDIR= ${PKGNAME}-20050216-2 WRKSRC= ${WRKDIR} USE_BUILDLINK3= yes +USE_GNU_TOOLS+= lex yacc +MAKE_ENV+= YACC="${YACC}" USE_X11= yes LIBS.SunOS+= -lm diff --git a/games/falcons-eye/distinfo b/games/falcons-eye/distinfo index dcfa9ecd59f..f387d4a3d51 100644 --- a/games/falcons-eye/distinfo +++ b/games/falcons-eye/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2005/02/16 18:56:22 ben Exp $ +$NetBSD: distinfo,v 1.8 2005/02/17 21:05:08 reed Exp $ SHA1 (falcons-eye-1.9.3nb4-20050216-2/nethack_source_331_jtp_193.zip) = f25a3b77925d247762d18b6f022500aac7c42b29 Size (falcons-eye-1.9.3nb4-20050216-2/nethack_source_331_jtp_193.zip) = 8349587 bytes @@ -17,3 +17,4 @@ SHA1 (patch-bf) = b58009fe635389483c34b50afca6aba9cb75fc72 SHA1 (patch-bh) = 65bf424d1e60b0ee9b9acc8b04359f2f4621e605 SHA1 (patch-bi) = 6b3d0d1eca3a23c3086155c1da3c2965d7092d5f SHA1 (patch-bj) = 281f1d3b8d9eafe7fbe7ca729861d4bdccea5a41 +SHA1 (patch-bk) = f234c26a95d179c4723676c180db95f26c84bb49 diff --git a/games/falcons-eye/patches/patch-bk b/games/falcons-eye/patches/patch-bk new file mode 100644 index 00000000000..ef4de65e244 --- /dev/null +++ b/games/falcons-eye/patches/patch-bk @@ -0,0 +1,15 @@ +$NetBSD: patch-bk,v 1.1 2005/02/17 21:05:08 reed Exp $ + +--- sys/unix/Makefile.utl.orig 2001-06-24 18:57:24.000000000 -0700 ++++ sys/unix/Makefile.utl +@@ -97,8 +97,8 @@ LIBS = + + # yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c. + # if, instead of yacc/lex you have bison/flex, comment/uncomment the following. +-YACC = yacc +-LEX = lex ++#YACC = yacc ++#LEX = lex + # YACC = bison -y + # YACC = byacc + # LEX = flex |