From 8a0a45f2be02bd65a2c3447a2b71afc327419de2 Mon Sep 17 00:00:00 2001 From: hubertf Date: Tue, 22 Jan 2002 02:13:02 +0000 Subject: Fix compilation on 1.5.3_ALPHA - the ncurses buildlink framework will always setup a proper libncurses, either real ncurses or the system's libcurses, so just link in libncurses ((from the buildlink area!) --- games/frotz/distinfo | 4 ++-- games/frotz/patches/patch-aa | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/games/frotz/distinfo b/games/frotz/distinfo index bea86ca00d4..7aacf014ff3 100644 --- a/games/frotz/distinfo +++ b/games/frotz/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2001/12/25 17:30:40 wiz Exp $ +$NetBSD: distinfo,v 1.5 2002/01/22 02:13:02 hubertf Exp $ SHA1 (frotz-2.41.tar.gz) = 635f3ff0195ca3e429ba1582a90e00ef4403851a Size (frotz-2.41.tar.gz) = 137210 bytes -SHA1 (patch-aa) = 96a116747a54713bac53c599072dcf64b950b289 +SHA1 (patch-aa) = b471efa7cc92d3debd6a82ce9cb39935bcbc80d8 diff --git a/games/frotz/patches/patch-aa b/games/frotz/patches/patch-aa index be460ff6627..f294b6fe8b5 100644 --- a/games/frotz/patches/patch-aa +++ b/games/frotz/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/12/25 17:30:40 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2002/01/22 02:13:02 hubertf Exp $ --- Makefile.orig Sun May 20 23:16:39 2001 +++ Makefile @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2001/12/25 17:30:40 wiz Exp $ # Define your optimization flags. Most compilers understand -O and -O2, # Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.) -@@ -10,46 +10,46 @@ +@@ -10,42 +10,42 @@ #-malign-jumps=2 # Define where you want Frotz to be installed. Usually this is /usr/local @@ -62,13 +62,7 @@ $NetBSD: patch-aa,v 1.3 2001/12/25 17:30:40 wiz Exp $ +LIB = -L${BUILDLINK_DIR}/lib -Wl,-R${PREFIX}/lib # One of these must be uncommented, use ncurses if you have it. --CURSES = -lncurses # Linux always uses ncurses. --#CURSES = -lcurses -+#CURSES = -lncurses # Linux always uses ncurses. -+CURSES = -lcurses - - # Comment this out if you're not using ncurses. - CURSES_DEF = -DUSE_NCURSES_H + CURSES = -lncurses # Linux always uses ncurses. @@ -85,11 +85,12 @@ COMP_DEFS = $(OPT_DEFS) $(COLOR_DEFS) $(SOUND_DEFS) $(SOUNDCARD) \ $(MEMMOVE_DEF) -- cgit v1.2.3