Buildlinkify. Use appropriate INCOMPAT_CURSES for setscrreg().

3 files changed, 29 insertions, 13 deletions

diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 14f5ceead7a..a3c0224f2e6 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/12/08 22:08:51 kristerw Exp $
+# $NetBSD: Makefile,v 1.7 2001/12/25 17:30:39 wiz Exp $
 #
 
 DISTNAME=	frotz-2.41
@@ -14,8 +14,10 @@ MAINTAINER=	seebs@plethora.net
 HOMEPAGE=	http://www.cs.csubak.edu/~dgriffi/proj/frotz/
 COMMENT=	Curses-based interpreter for Infocom-compatible games
 
-# uses setscrreg, which is missing from our curses
-DEPENDS+=	ncurses>=4.2:../../devel/ncurses
+USE_BUILDLINK_ONLY=	yes
+
+# setscrreg()
+INCOMPAT_CURSES=	1.5 1.5.* 1.5[A-V]
 
 SAMPLEDIR=	${PREFIX}/share/examples/frotz
 DOCDIR=		${PREFIX}/share/doc/frotz
@@ -28,4 +30,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL HOW_TO_PLAY ${DOCDIR}
 
+.include "../../devel/ncurses/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/frotz/distinfo b/games/frotz/distinfo
index 5d2b7469450..bea86ca00d4 100644
--- a/games/frotz/distinfo
+++ b/games/frotz/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/05/23 13:35:10 dillo Exp $
+$NetBSD: distinfo,v 1.4 2001/12/25 17:30:40 wiz Exp $
 
 SHA1 (frotz-2.41.tar.gz) = 635f3ff0195ca3e429ba1582a90e00ef4403851a
 Size (frotz-2.41.tar.gz) = 137210 bytes
-SHA1 (patch-aa) = 4e520e2cbea3c617cf3e8a2042d26839cf9415c5
+SHA1 (patch-aa) = 96a116747a54713bac53c599072dcf64b950b289
diff --git a/games/frotz/patches/patch-aa b/games/frotz/patches/patch-aa
index 653086a52f2..be460ff6627 100644
--- a/games/frotz/patches/patch-aa
+++ b/games/frotz/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/05/23 13:35:10 dillo Exp $
+$NetBSD: patch-aa,v 1.3 2001/12/25 17:30:40 wiz Exp $
 
 --- Makefile.orig	Sun May 20 23:16:39 2001
 +++ Makefile
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2001/05/23 13:35:10 dillo 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,42 +10,42 @@
+@@ -10,46 +10,46 @@
  #-malign-jumps=2
  
  # Define where you want Frotz to be installed.  Usually this is /usr/local
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.2 2001/05/23 13:35:10 dillo Exp $
  #INCL = -I/usr/freeware/include
  #INCL = -I/5usr/include
 -#INCL =
-+INCL = -I${PREFIX}/include
++INCL = -I${BUILDLINK_DIR}/include
  
  # This should define the location and name of whatever curses library you're
  # linking with.  Usually, this isn't necessary if /etc/ld.so.conf is set
@@ -59,15 +59,28 @@ $NetBSD: patch-aa,v 1.2 2001/05/23 13:35:10 dillo Exp $
  #LIB = -L/usr/freeware/lib
  #LIB = -L/5usr/lib
 -#LIB =
-+LIB = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib
++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.
-@@ -87,6 +87,7 @@
+-CURSES = -lncurses	# Linux always uses ncurses.
+-#CURSES = -lcurses
++#CURSES = -lncurses	# Linux always uses ncurses.
++CURSES = -lcurses
  
- CFLAGS = $(OPTS) $(COMP_DEFS) $(INCL)
+ # Comment this out if you're not using ncurses.
+ CURSES_DEF = -DUSE_NCURSES_H
+@@ -85,11 +85,12 @@
+ COMP_DEFS = $(OPT_DEFS) $(COLOR_DEFS) $(SOUND_DEFS) $(SOUNDCARD) \
+ 	$(MEMMOVE_DEF)
+ 
+-CFLAGS = $(OPTS) $(COMP_DEFS) $(INCL)
++CFLAGS += $(OPTS) $(COMP_DEFS)
  
 +all: frotz
  
  $(BINNAME): soundcard.h $(OBJECTS)
- 	$(CC) -o $(BINNAME)$(EXTENSION) $(OBJECTS) $(LIB) $(CURSES) $(SOUND_LIB)
+-	$(CC) -o $(BINNAME)$(EXTENSION) $(OBJECTS) $(LIB) $(CURSES) $(SOUND_LIB)
++	$(CC) -o $(BINNAME)$(EXTENSION) $(LDFLAGS) $(OBJECTS) $(LIB) $(CURSES) $(SOUND_LIB)
+ 
+ all: $(BINNAME)
+