From faf223d8ff53d6c00e68c131d5db42c1af950894 Mon Sep 17 00:00:00 2001
From: jtc <jtc@NetBSD.org>
Date: Wed, 18 Feb 1998 22:37:30 +0000
Subject: Simply include -lcurses instead of -lcurses -ltermcap

---
 atc/Makefile               | 6 +++---
 battlestar/Makefile        | 6 +++---
 boggle/boggle/Makefile     | 6 +++---
 canfield/canfield/Makefile | 6 +++---
 cribbage/Makefile          | 6 +++---
 gomoku/Makefile            | 6 +++---
 hangman/Makefile           | 6 +++---
 hunt/hunt/Makefile         | 6 +++---
 mille/Makefile             | 6 +++---
 phantasia/Makefile         | 6 +++---
 robots/Makefile            | 6 +++---
 rogue/Makefile             | 6 +++---
 sail/Makefile              | 6 +++---
 worm/Makefile              | 6 +++---
 worms/Makefile             | 6 +++---
 15 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/atc/Makefile b/atc/Makefile
index d75b4bf8..7d284963 100644
--- a/atc/Makefile
+++ b/atc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 1997/11/29 19:31:51 veego Exp $
+#	$NetBSD: Makefile,v 1.16 1998/02/18 22:37:30 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	atc
@@ -6,8 +6,8 @@ CPPFLAGS+=-DBSD -I${.CURDIR} -I. -DYY_NO_UNPUT
 SRCS=	extern.c grammar.c graphics.c input.c lex.c list.c log.c \
 	main.c tunable.c update.c
 MAN=	atc.6
-LDADD=	-ll -lm -lcurses -ltermcap
-DPADD=	${LIBL} ${LIBM} ${LIBTERM} ${LIBCURSES}
+LDADD=	-ll -lm -lcurses
+DPADD=	${LIBL} ${LIBM} ${LIBCURSES}
 GAMES=	ATC_scores Game_List Killer crossover default easy game_2 \
 	Atlantis OHare Tic-Tac-Toe airports box crosshatch game_3 \
 	game_4 novice two-corners
diff --git a/battlestar/Makefile b/battlestar/Makefile
index 69b238c6..33c6bc42 100644
--- a/battlestar/Makefile
+++ b/battlestar/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 1998/02/05 12:15:51 christos Exp $
+#	$NetBSD: Makefile,v 1.8 1998/02/18 22:37:30 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	battlestar
@@ -6,8 +6,8 @@ SRCS=	battlestar.c com1.c com2.c com3.c com4.c com5.c com6.c com7.c \
 	init.c cypher.c getcom.c parse.c room.c save.c fly.c misc.c \
 	globals.c dayfile.c nightfile.c dayobjs.c nightobjs.c words.c
 MAN=	battlestar.6
-DPADD=	${LIBCURSES} ${LIBTERMCAP}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 SETGIDGAME=yes
 
diff --git a/boggle/boggle/Makefile b/boggle/boggle/Makefile
index e23b2d8e..932b4400 100644
--- a/boggle/boggle/Makefile
+++ b/boggle/boggle/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.6 1998/02/05 12:19:53 christos Exp $
+#	$NetBSD: Makefile,v 1.7 1998/02/18 22:37:31 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 PROG=	boggle
 SRCS=	bog.c help.c mach.c prtable.c timer.c word.c
-DPADD=	${LIBCURSES} ${LIBTERMCAP}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 MAN=	boggle.6
 FILES=	helpfile
diff --git a/canfield/canfield/Makefile b/canfield/canfield/Makefile
index dd24e132..f9fb8643 100644
--- a/canfield/canfield/Makefile
+++ b/canfield/canfield/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.6 1997/11/20 00:12:33 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 1998/02/18 22:37:31 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	canfield
 MAN=	canfield.6
-DPADD=	${LIBCURSES} ${LIBTERM}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 SETGIDGAME=yes
 
diff --git a/cribbage/Makefile b/cribbage/Makefile
index 1500db4f..8440563a 100644
--- a/cribbage/Makefile
+++ b/cribbage/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.9 1998/02/05 12:21:32 christos Exp $
+#	$NetBSD: Makefile,v 1.10 1998/02/18 22:37:31 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	cribbage
-DPADD=	${LIBCURSES} ${LIBTERMCAP}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 SRCS=	extern.c crib.c cards.c instr.c io.c score.c support.c
 MAN=	cribbage.6
 HIDEGAME=hidegame
diff --git a/gomoku/Makefile b/gomoku/Makefile
index cc8b8d06..9af821e7 100644
--- a/gomoku/Makefile
+++ b/gomoku/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.3 1997/01/03 01:35:23 cgd Exp $
+#	$NetBSD: Makefile,v 1.4 1998/02/18 22:37:31 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 7/24/94
 
 PROG=	gomoku
 SRCS=	bdinit.c bdisp.c main.c makemove.c pickmove.c stoc.c
 MAN=	gomoku.6
-DPADD=	${LIBCURSES} ${LIBTERM}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/hangman/Makefile b/hangman/Makefile
index 68c1e579..ad913a4a 100644
--- a/hangman/Makefile
+++ b/hangman/Makefile
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile,v 1.6 1998/02/05 12:23:04 christos Exp $
+#	$NetBSD: Makefile,v 1.7 1998/02/18 22:37:31 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	hangman
 SRCS=	endgame.c extern.c getguess.c getword.c main.c playgame.c \
 	prdata.c prman.c prword.c setup.c
 MAN=	hangman.6
-DPADD=	${LIBCURSES} ${LIBTERMCAP}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/hunt/hunt/Makefile b/hunt/hunt/Makefile
index 2a27a246..49ea5339 100644
--- a/hunt/hunt/Makefile
+++ b/hunt/hunt/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.4 1997/11/19 07:08:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 1998/02/18 22:37:31 jtc Exp $
 
 PROG=	hunt
 SRCS=	connect.c hunt.c otto.c playit.c pathname.c
 MAN=	hunt.6
-LDADD=	-lcurses -ltermcap
-DPADD=	${LIBTERMCAP} ${LIBCURSES}
+LDADD=	-lcurses
+DPADD=	${LIBTERMCAP}
 HIDEGAME=hidegame
 
 CPPFLAGS+=-I${.CURDIR}/../huntd
diff --git a/mille/Makefile b/mille/Makefile
index befe6754..0aee2419 100644
--- a/mille/Makefile
+++ b/mille/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.8 1998/02/04 10:19:34 christos Exp $
+#	$NetBSD: Makefile,v 1.9 1998/02/18 22:37:31 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	mille
 SRCS=	comp.c end.c extern.c init.c mille.c misc.c move.c print.c \
 	roll.c save.c types.c varpush.c
-DPADD=	${LIBCURSES} ${LIBTERMCAP}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 MAN=	mille.6
 HIDEGAME=hidegame
 
diff --git a/phantasia/Makefile b/phantasia/Makefile
index 799e382c..9f7db6fa 100644
--- a/phantasia/Makefile
+++ b/phantasia/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.15 1998/02/04 10:20:15 christos Exp $
+#	$NetBSD: Makefile,v 1.16 1998/02/18 22:37:32 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	phantasia
 SRCS=	fight.c gamesupport.c interplayer.c io.c main.c misc.c phantglobs.c
 
-DPADD=	${LIBM} ${LIBCURSES} ${LIBTERMCAP}
-LDADD=	-lm -lcurses -ltermcap
+DPADD=	${LIBM} ${LIBCURSES}
+LDADD=	-lm -lcurses
 HIDEGAME=hidegame
 SETGIDGAME=yes
 USETBL=
diff --git a/robots/Makefile b/robots/Makefile
index be3faff8..521b92f1 100644
--- a/robots/Makefile
+++ b/robots/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 1998/02/05 12:26:49 christos Exp $
+#	$NetBSD: Makefile,v 1.14 1998/02/18 22:37:32 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	robots
@@ -6,8 +6,8 @@ CPPFLAGS+=-DMAX_PER_UID=5
 SRCS=	extern.c init_field.c main.c make_level.c move.c move_robs.c \
 	play_level.c query.c rnd_pos.c score.c flush_in.c
 MAN=	robots.6
-DPADD=	${LIBCURSES} ${LIBTERMCAP}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 SETGIDGAME=yes
 
diff --git a/rogue/Makefile b/rogue/Makefile
index 2deba1b5..51397707 100644
--- a/rogue/Makefile
+++ b/rogue/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 1998/02/04 10:21:50 christos Exp $
+#	$NetBSD: Makefile,v 1.12 1998/02/18 22:37:32 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	rogue
@@ -6,8 +6,8 @@ CPPFLAGS+=-DUNIX -fwritable-strings
 SRCS=	curses.c hit.c init.c inventory.c level.c machdep.c main.c \
 	message.c monster.c move.c object.c pack.c play.c random.c ring.c \
 	room.c save.c score.c spec_hit.c throw.c trap.c use.c zap.c
-DPADD=	${LIBCURSES} ${LIBTERMCAP}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 SETUIDGAME=yes
 MAN=	rogue.6
diff --git a/sail/Makefile b/sail/Makefile
index a0191d0e..1ba8f193 100644
--- a/sail/Makefile
+++ b/sail/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 1998/02/05 12:24:31 christos Exp $
+#	$NetBSD: Makefile,v 1.10 1998/02/18 22:37:32 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	sail
@@ -6,8 +6,8 @@ SRCS=	main.c pl_main.c pl_1.c pl_2.c pl_3.c pl_4.c pl_5.c pl_6.c pl_7.c \
 	dr_main.c dr_1.c dr_2.c dr_3.c dr_4.c dr_5.c lo_main.c \
 	assorted.c game.c globals.c misc.c parties.c sync.c version.c
 MAN=	sail.6
-DPADD=	${LIBCURSES} ${LIBTERMCAP}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 SETGIDGAME=yes
 
diff --git a/worm/Makefile b/worm/Makefile
index c79fc0d2..355cde96 100644
--- a/worm/Makefile
+++ b/worm/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.5 1995/04/22 07:56:19 cgd Exp $
+#	$NetBSD: Makefile,v 1.6 1998/02/18 22:37:32 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	worm
 MAN=	worm.6
-DPADD=	${LIBCURSES} ${LIBTERM}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/worms/Makefile b/worms/Makefile
index ea9c3bf2..f7e51fbf 100644
--- a/worms/Makefile
+++ b/worms/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.5 1995/04/22 08:00:54 cgd Exp $
+#	$NetBSD: Makefile,v 1.6 1998/02/18 22:37:32 jtc Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	worms
 MAN=	worms.6
-DPADD=	${LIBCURSES} ${LIBTERM}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 
 .include <bsd.prog.mk>
-- 
cgit v1.2.3-56-ge451