Module Name:    src
Committed By:   he
Date:           Sat Feb  6 23:45:27 UTC 2010

Modified Files:
        src/bin/sh: Makefile
        src/games/atc: Makefile
        src/games/battlestar: Makefile
        src/games/boggle/boggle: Makefile
        src/games/canfield/canfield: Makefile
        src/games/cribbage: Makefile
        src/games/gomoku: Makefile
        src/games/hangman: Makefile
        src/games/hunt/hunt: Makefile
        src/games/mille: Makefile
        src/games/phantasia: Makefile
        src/games/rain: Makefile
        src/games/robots: Makefile
        src/games/rogue: Makefile
        src/games/sail: Makefile
        src/games/snake/snake: Makefile
        src/games/worm: Makefile
        src/games/worms: Makefile
        src/usr.bin/nvi/build: Makefile
        src/usr.bin/systat: Makefile
        src/usr.bin/talk: Makefile
        src/usr.sbin/altq/altqstat: Makefile
        src/usr.sbin/ipf/ipfstat: Makefile
        src/usr.sbin/isdn/isdnmonitor: Makefile

Log Message:
When using -lcurses, you also need -lterminfo.
This fixes the build for sun2, and also builds with LDSTATIC=-static,
since archive libraries don't record inter-library dependencies.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/bin/sh/Makefile
cvs rdiff -u -r1.28 -r1.29 src/games/atc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/battlestar/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/boggle/boggle/Makefile
cvs rdiff -u -r1.7 -r1.8 src/games/canfield/canfield/Makefile
cvs rdiff -u -r1.12 -r1.13 src/games/cribbage/Makefile
cvs rdiff -u -r1.4 -r1.5 src/games/gomoku/Makefile
cvs rdiff -u -r1.7 -r1.8 src/games/hangman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/games/hunt/hunt/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/mille/Makefile
cvs rdiff -u -r1.33 -r1.34 src/games/phantasia/Makefile
cvs rdiff -u -r1.10 -r1.11 src/games/rain/Makefile
cvs rdiff -u -r1.15 -r1.16 src/games/robots/Makefile
cvs rdiff -u -r1.16 -r1.17 src/games/rogue/Makefile
cvs rdiff -u -r1.16 -r1.17 src/games/sail/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/snake/snake/Makefile
cvs rdiff -u -r1.8 -r1.9 src/games/worm/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/worms/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/nvi/build/Makefile
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/systat/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/talk/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/altq/altqstat/Makefile
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/ipf/ipfstat/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/isdn/isdnmonitor/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/Makefile
diff -u src/bin/sh/Makefile:1.90 src/bin/sh/Makefile:1.91
--- src/bin/sh/Makefile:1.90	Wed Feb  3 15:34:37 2010
+++ src/bin/sh/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.90 2010/02/03 15:34:37 roy Exp $
+#	$NetBSD: Makefile,v 1.91 2010/02/06 23:45:26 he Exp $
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
 
 .include <bsd.own.mk>
@@ -15,8 +15,8 @@
 
 DPSRCS+=${GENHDRS}
 
-LDADD+=	-ll -ledit
-DPADD+=	${LIBL} ${LIBEDIT}
+LDADD+=	-ll -ledit -lterminfo
+DPADD+=	${LIBL} ${LIBEDIT} ${LIBTERMINFO}
 
 LFLAGS=	-8	# 8-bit lex scanner for arithmetic
 

Index: src/games/atc/Makefile
diff -u src/games/atc/Makefile:1.28 src/games/atc/Makefile:1.29
--- src/games/atc/Makefile:1.28	Thu Oct 29 14:27:26 2009
+++ src/games/atc/Makefile	Sat Feb  6 23:45:24 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2009/10/29 14:27:26 christos Exp $
+#	$NetBSD: Makefile,v 1.29 2010/02/06 23:45:24 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>
@@ -9,8 +9,8 @@
 	main.c tunable.c update.c
 YHEADER=1
 MAN=	atc.6
-LDADD=	-ll -lm -lcurses
-DPADD=	${LIBL} ${LIBM} ${LIBCURSES}
+LDADD=	-ll -lm -lcurses -lterminfo
+DPADD=	${LIBL} ${LIBM} ${LIBCURSES} ${LIBTERMINFO}
 GAMES=	Game_List Killer crossover default easy game_2 \
 	Atlantis OHare Tic-Tac-Toe airports box crosshatch game_3 \
 	game_4 novice two-corners

Index: src/games/battlestar/Makefile
diff -u src/games/battlestar/Makefile:1.9 src/games/battlestar/Makefile:1.10
--- src/games/battlestar/Makefile:1.9	Fri Oct 19 03:06:09 2001
+++ src/games/battlestar/Makefile	Sat Feb  6 23:45:24 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2001/10/19 03:06:09 tv Exp $
+#	$NetBSD: Makefile,v 1.10 2010/02/06 23:45:24 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	battlestar
@@ -7,8 +7,8 @@
 	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}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 

Index: src/games/boggle/boggle/Makefile
diff -u src/games/boggle/boggle/Makefile:1.9 src/games/boggle/boggle/Makefile:1.10
--- src/games/boggle/boggle/Makefile:1.9	Sat Feb 13 02:54:20 1999
+++ src/games/boggle/boggle/Makefile	Sat Feb  6 23:45:25 2010
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile,v 1.9 1999/02/13 02:54:20 lukem Exp $
+#	$NetBSD: Makefile,v 1.10 2010/02/06 23:45:25 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 .include <bsd.own.mk>
 
 PROG=	boggle
 SRCS=	bog.c help.c mach.c prtable.c timer.c word.c
-DPADD=	${LIBCURSES}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 HIDEGAME=hidegame
 MAN=	boggle.6
 .if ${MKSHARE} != "no"

Index: src/games/canfield/canfield/Makefile
diff -u src/games/canfield/canfield/Makefile:1.7 src/games/canfield/canfield/Makefile:1.8
--- src/games/canfield/canfield/Makefile:1.7	Wed Feb 18 22:37:31 1998
+++ src/games/canfield/canfield/Makefile	Sat Feb  6 23:45:25 2010
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.7 1998/02/18 22:37:31 jtc Exp $
+#	$NetBSD: Makefile,v 1.8 2010/02/06 23:45:25 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	canfield
 MAN=	canfield.6
-DPADD=	${LIBCURSES}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 

Index: src/games/cribbage/Makefile
diff -u src/games/cribbage/Makefile:1.12 src/games/cribbage/Makefile:1.13
--- src/games/cribbage/Makefile:1.12	Sat Feb 13 02:54:21 1999
+++ src/games/cribbage/Makefile	Sat Feb  6 23:45:25 2010
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.12 1999/02/13 02:54:21 lukem Exp $
+#	$NetBSD: Makefile,v 1.13 2010/02/06 23:45:25 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>
 
 PROG=	cribbage
-DPADD=	${LIBCURSES}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 SRCS=	extern.c crib.c cards.c instr.c io.c score.c support.c
 MAN=	cribbage.6
 HIDEGAME=hidegame

Index: src/games/gomoku/Makefile
diff -u src/games/gomoku/Makefile:1.4 src/games/gomoku/Makefile:1.5
--- src/games/gomoku/Makefile:1.4	Wed Feb 18 22:37:31 1998
+++ src/games/gomoku/Makefile	Sat Feb  6 23:45:25 2010
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.4 1998/02/18 22:37:31 jtc Exp $
+#	$NetBSD: Makefile,v 1.5 2010/02/06 23:45:25 he 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}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>

Index: src/games/hangman/Makefile
diff -u src/games/hangman/Makefile:1.7 src/games/hangman/Makefile:1.8
--- src/games/hangman/Makefile:1.7	Wed Feb 18 22:37:31 1998
+++ src/games/hangman/Makefile	Sat Feb  6 23:45:25 2010
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile,v 1.7 1998/02/18 22:37:31 jtc Exp $
+#	$NetBSD: Makefile,v 1.8 2010/02/06 23:45:25 he 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}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>

Index: src/games/hunt/hunt/Makefile
diff -u src/games/hunt/hunt/Makefile:1.6 src/games/hunt/hunt/Makefile:1.7
--- src/games/hunt/hunt/Makefile:1.6	Wed Feb  3 15:34:39 2010
+++ src/games/hunt/hunt/Makefile	Sat Feb  6 23:45:25 2010
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.6 2010/02/03 15:34:39 roy Exp $
+#	$NetBSD: Makefile,v 1.7 2010/02/06 23:45:25 he Exp $
 
 PROG=	hunt
 SRCS=	connect.c hunt.c otto.c playit.c pathname.c
 MAN=	hunt.6
-LDADD=	-lcurses
-DPADD=	${LIBCURSES}
+LDADD=	-lcurses -lterminfo
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
 HIDEGAME=hidegame
 
 CPPFLAGS+=-I${.CURDIR}/../huntd

Index: src/games/mille/Makefile
diff -u src/games/mille/Makefile:1.9 src/games/mille/Makefile:1.10
--- src/games/mille/Makefile:1.9	Wed Feb 18 22:37:31 1998
+++ src/games/mille/Makefile	Sat Feb  6 23:45:25 2010
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.9 1998/02/18 22:37:31 jtc Exp $
+#	$NetBSD: Makefile,v 1.10 2010/02/06 23:45:25 he 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}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 MAN=	mille.6
 HIDEGAME=hidegame
 

Index: src/games/phantasia/Makefile
diff -u src/games/phantasia/Makefile:1.33 src/games/phantasia/Makefile:1.34
--- src/games/phantasia/Makefile:1.33	Sun Feb  8 22:14:27 2004
+++ src/games/phantasia/Makefile	Sat Feb  6 23:45:25 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2004/02/08 22:14:27 lukem Exp $
+#	$NetBSD: Makefile,v 1.34 2010/02/06 23:45:25 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>
@@ -6,8 +6,8 @@
 PROG=	phantasia
 SRCS=	fight.c gamesupport.c interplayer.c io.c main.c misc.c phantglobs.c
 
-DPADD=	${LIBM} ${LIBCURSES}
-LDADD=	-lm -lcurses
+DPADD=	${LIBM} ${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lm -lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 USETBL=

Index: src/games/rain/Makefile
diff -u src/games/rain/Makefile:1.10 src/games/rain/Makefile:1.11
--- src/games/rain/Makefile:1.10	Mon Jan 28 07:03:59 2008
+++ src/games/rain/Makefile	Sat Feb  6 23:45:25 2010
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.10 2008/01/28 07:03:59 dholland Exp $
+#	$NetBSD: Makefile,v 1.11 2010/02/06 23:45:25 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	rain
 MAN=	rain.6
-DPADD=	${LIBCURSES}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 
 .include <bsd.prog.mk>

Index: src/games/robots/Makefile
diff -u src/games/robots/Makefile:1.15 src/games/robots/Makefile:1.16
--- src/games/robots/Makefile:1.15	Sat May 15 23:56:35 1999
+++ src/games/robots/Makefile	Sat Feb  6 23:45:25 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 1999/05/15 23:56:35 christos Exp $
+#	$NetBSD: Makefile,v 1.16 2010/02/06 23:45:25 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	robots
@@ -6,8 +6,8 @@
 SRCS=	auto.c 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}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 

Index: src/games/rogue/Makefile
diff -u src/games/rogue/Makefile:1.16 src/games/rogue/Makefile:1.17
--- src/games/rogue/Makefile:1.16	Thu Jan  1 16:05:12 2004
+++ src/games/rogue/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2004/01/01 16:05:12 jsm Exp $
+#	$NetBSD: Makefile,v 1.17 2010/02/06 23:45:26 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	rogue
@@ -6,8 +6,8 @@
 SRCS=	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}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 MAN=	rogue.6

Index: src/games/sail/Makefile
diff -u src/games/sail/Makefile:1.16 src/games/sail/Makefile:1.17
--- src/games/sail/Makefile:1.16	Sun Mar 15 03:33:56 2009
+++ src/games/sail/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2009/03/15 03:33:56 dholland Exp $
+#	$NetBSD: Makefile,v 1.17 2010/02/06 23:45:26 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	sail
@@ -6,8 +6,8 @@
 	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 array.c version.c
 MAN=	sail.6
-DPADD=	${LIBCURSES}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 

Index: src/games/snake/snake/Makefile
diff -u src/games/snake/snake/Makefile:1.9 src/games/snake/snake/Makefile:1.10
--- src/games/snake/snake/Makefile:1.9	Tue Sep 14 18:07:21 1999
+++ src/games/snake/snake/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.9 1999/09/14 18:07:21 jsm Exp $
+#	$NetBSD: Makefile,v 1.10 2010/02/06 23:45:26 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	snake
 SRCS=	snake.c
 MAN=	snake.6
-DPADD=	${LIBM} ${LIBCURSES}
-LDADD=	-lm -lcurses
+DPADD=	${LIBM} ${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lm -lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 

Index: src/games/worm/Makefile
diff -u src/games/worm/Makefile:1.8 src/games/worm/Makefile:1.9
--- src/games/worm/Makefile:1.8	Mon Jan 28 07:03:59 2008
+++ src/games/worm/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.8 2008/01/28 07:03:59 dholland Exp $
+#	$NetBSD: Makefile,v 1.9 2010/02/06 23:45:26 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	worm
 MAN=	worm.6
-DPADD=	${LIBCURSES}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>

Index: src/games/worms/Makefile
diff -u src/games/worms/Makefile:1.9 src/games/worms/Makefile:1.10
--- src/games/worms/Makefile:1.9	Mon Jan 28 07:03:59 2008
+++ src/games/worms/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.9 2008/01/28 07:03:59 dholland Exp $
+#	$NetBSD: Makefile,v 1.10 2010/02/06 23:45:26 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	worms
 MAN=	worms.6
-DPADD=	${LIBCURSES}
-LDADD=	-lcurses
+DPADD=	${LIBCURSES} ${LIBTERMINFO}
+LDADD=	-lcurses -lterminfo
 
 .include <bsd.prog.mk>

Index: src/usr.bin/nvi/build/Makefile
diff -u src/usr.bin/nvi/build/Makefile:1.12 src/usr.bin/nvi/build/Makefile:1.13
--- src/usr.bin/nvi/build/Makefile:1.12	Tue Apr 14 22:15:24 2009
+++ src/usr.bin/nvi/build/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2009/04/14 22:15:24 lukem Exp $
+#	$NetBSD: Makefile,v 1.13 2010/02/06 23:45:26 he Exp $
 
 .include <bsd.own.mk>
 
@@ -13,8 +13,8 @@
 #COPTS+=-fno-strict-aliasing
 #.endif
 
-LDADD+=	-lcurses
-DPADD+=	${LIBCURSES}
+LDADD+=	-lcurses -lterminfo
+DPADD+=	${LIBCURSES} ${LIBTERMINFO}
 PROG=	vi
 SRCS=	api.c cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c \
 	conv.c cut.c db.c db1.c delete.c ex.c ex_abbrev.c ex_append.c \

Index: src/usr.bin/systat/Makefile
diff -u src/usr.bin/systat/Makefile:1.35 src/usr.bin/systat/Makefile:1.36
--- src/usr.bin/systat/Makefile:1.35	Tue Apr 14 22:15:27 2009
+++ src/usr.bin/systat/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.35 2009/04/14 22:15:27 lukem Exp $
+#	$NetBSD: Makefile,v 1.36 2010/02/06 23:45:26 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 .include <bsd.own.mk>
@@ -15,8 +15,8 @@
 	globalcmds.c icmp.c iostat.c ip.c keyboard.c main.c mbufs.c \
 	netcmds.c netstat.c pigs.c ps.c swap.c tcp.c vmstat.c utmpentry.c \
 	syscall.c
-DPADD=	${LIBCURSES} ${LIBM} ${LIBKVM}
-LDADD=	-lutil -lcurses -lm -lkvm
+DPADD=	${LIBCURSES} ${LIBTERMINFO} ${LIBM} ${LIBKVM}
+LDADD=	-lutil -lcurses -lterminfo -lm -lkvm
 BINGRP=	kmem
 BINMODE=2555
 LINKS=	${BINDIR}/systat ${BINDIR}/sysstat

Index: src/usr.bin/talk/Makefile
diff -u src/usr.bin/talk/Makefile:1.7 src/usr.bin/talk/Makefile:1.8
--- src/usr.bin/talk/Makefile:1.7	Mon May 28 12:06:32 2007
+++ src/usr.bin/talk/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.7 2007/05/28 12:06:32 tls Exp $
+#	$NetBSD: Makefile,v 1.8 2010/02/06 23:45:26 he Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 USE_FORT?= yes	# network client
 
 PROG=	talk
-DPADD=	${LIBCURSES}
-LDADD=	-lcurses -lutil
+DPADD=	${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
+LDADD=	-lcurses -lterminfo -lutil
 SRCS=	ctl.c ctl_transact.c display.c get_addrs.c get_names.c \
 	init_disp.c invite.c io.c look_up.c msgs.c talk.c
 

Index: src/usr.sbin/altq/altqstat/Makefile
diff -u src/usr.sbin/altq/altqstat/Makefile:1.3 src/usr.sbin/altq/altqstat/Makefile:1.4
--- src/usr.sbin/altq/altqstat/Makefile:1.3	Thu Oct 12 19:59:13 2006
+++ src/usr.sbin/altq/altqstat/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2006/10/12 19:59:13 peter Exp $
+#	$NetBSD: Makefile,v 1.4 2010/02/06 23:45:26 he Exp $
 
 PROG=	altqstat
 SRCS=	altqstat.c quip_client.c qdisc_conf.c qdisc_cbq.c qdisc_hfsc.c \
@@ -7,7 +7,7 @@
 
 CPPFLAGS+= -DALTQ -I${.CURDIR}/../libaltq
 
-DPADD+=	${LIBCURSES} ${LIBMATH}
-LDADD+=	-lcurses -lm
+DPADD+=	${LIBCURSES} ${LIBTERMINFO} ${LIBMATH}
+LDADD+=	-lcurses -lterminfo -lm
 
 .include <bsd.prog.mk>

Index: src/usr.sbin/ipf/ipfstat/Makefile
diff -u src/usr.sbin/ipf/ipfstat/Makefile:1.19 src/usr.sbin/ipf/ipfstat/Makefile:1.20
--- src/usr.sbin/ipf/ipfstat/Makefile:1.19	Sat Jan  1 13:56:21 2005
+++ src/usr.sbin/ipf/ipfstat/Makefile	Sat Feb  6 23:45:26 2010
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.19 2005/01/01 13:56:21 lukem Exp $
+#	$NetBSD: Makefile,v 1.20 2010/02/06 23:45:26 he Exp $
 
 PROG=		ipfstat
 SRCS=		ipfstat.c
 MAN=		ipfstat.8
-DPADD+=  	${LIBCURSES}
-LDADD+=  	-lcurses
+DPADD+=  	${LIBCURSES} ${LIBTERMINFO}
+LDADD+=  	-lcurses -lterminfo
 
 .include <bsd.prog.mk>

Index: src/usr.sbin/isdn/isdnmonitor/Makefile
diff -u src/usr.sbin/isdn/isdnmonitor/Makefile:1.4 src/usr.sbin/isdn/isdnmonitor/Makefile:1.5
--- src/usr.sbin/isdn/isdnmonitor/Makefile:1.4	Fri Aug 29 00:02:25 2008
+++ src/usr.sbin/isdn/isdnmonitor/Makefile	Sat Feb  6 23:45:27 2010
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.4 2008/08/29 00:02:25 gmcgarry Exp $
+#	$NetBSD: Makefile,v 1.5 2010/02/06 23:45:27 he Exp $
 
 PROG	=	isdnmonitor
 SRCS	=	main.c curses.c
 MAN8	=	isdnmonitor.8
 
 CPPFLAGS+=	-DDEBUG	# compile debug support
-LDADD   +=      -lcurses
+LDADD   +=      -lcurses -lterminfo
 MAN	=	isdnmonitor.8
 
 .include <bsd.prog.mk>

Reply via email to