-lcurses, not termcap/termlib

42 files changed, 114 insertions, 119 deletions

diff --git a/distrib/special/ftp/Makefile b/distrib/special/ftp/Makefile
index 0dcf6cd3c14..68b0483a76a 100644
--- a/distrib/special/ftp/Makefile
+++ b/distrib/special/ftp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 1997/09/17 14:19:49 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 1998/07/24 00:10:13 millert Exp $
 #	$NetBSD: Makefile,v 1.13 1997/08/18 10:20:13 lukem Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/3/94
 
@@ -18,8 +18,8 @@ SRCS=	cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \
 MAN=
 .PATH:	${.CURDIR}/../../../usr.bin/ftp
 
-LDADD+=	-ltermcap
-DPADD+=	${LIBTERMCAP}
+LDADD+=	-lcurses
+DPADD+=	${LIBCURSES}
 
 #COPTS+= -Wall -Wconversion -Wstrict-prototypes -Wmissing-prototypes
 
diff --git a/games/atc/Makefile b/games/atc/Makefile
index 1753ef13608..9145556f0d0 100644
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.7 1997/09/21 11:35:18 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 1998/07/24 00:10:15 millert Exp $
 
 PROG=	atc
 CFLAGS+=-DBSD -I${.CURDIR} -I.
 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 -ltermlib
-DPADD=	${LIBL} ${LIBM} ${LIBTERMLIB} ${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/games/backgammon/backgammon/Makefile b/games/backgammon/backgammon/Makefile
index 39580dba639..ac58d2cbbc3 100644
--- a/games/backgammon/backgammon/Makefile
+++ b/games/backgammon/backgammon/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 1998/04/25 18:09:26 millert Exp $
+#	$OpenBSD: Makefile,v 1.7 1998/07/24 00:10:16 millert Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	backgammon
@@ -6,8 +6,8 @@ CFLAGS+=-I${.CURDIR}/../common_source
 SRCS=	allow.c board.c check.c extra.c fancy.c init.c main.c move.c \
 	odds.c one.c save.c subs.c table.c text.c
 MAN=	backgammon.6
-DPADD=	${LIBTERMLIB
-LDADD=	-ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 .PATH:	${.CURDIR}/../common_source
 HIDEGAME=hidegame
 
diff --git a/games/backgammon/teachgammon/Makefile b/games/backgammon/teachgammon/Makefile
index 59db98d75ba..da5ce31c673 100644
--- a/games/backgammon/teachgammon/Makefile
+++ b/games/backgammon/teachgammon/Makefile
@@ -5,8 +5,8 @@ PROG=	teachgammon
 CFLAGS+=-I${.CURDIR}/../common_source
 SRCS=	allow.c board.c check.c data.c fancy.c init.c odds.c one.c save.c \
 	subs.c table.c teach.c ttext1.c ttext2.c tutor.c
-DPADD=	${LIBTERMLIB}
-LDADD=	-ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 NOMAN=	noman
 
diff --git a/games/battlestar/Makefile b/games/battlestar/Makefile
index 1afd87b630d..2695e235345 100644
--- a/games/battlestar/Makefile
+++ b/games/battlestar/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.5 1997/09/21 11:35:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1998/07/24 00:10:19 millert Exp $
 
 PROG=	battlestar
 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} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 BINGRP=	games
 
diff --git a/games/boggle/boggle/Makefile b/games/boggle/boggle/Makefile
index c41641caac1..fd6f1a91384 100644
--- a/games/boggle/boggle/Makefile
+++ b/games/boggle/boggle/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.3 1996/12/08 15:36:12 downsj Exp $
+#	$OpenBSD: Makefile,v 1.4 1998/07/24 00:10:20 millert Exp $
 #	$NetBSD: Makefile,v 1.3 1995/03/21 12:14:28 cgd 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} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 MAN=	boggle.6
 
diff --git a/games/bs/Makefile b/games/bs/Makefile
index fcc6f3530a4..853b74f6b85 100644
--- a/games/bs/Makefile
+++ b/games/bs/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.4 1998/07/22 18:01:47 millert Exp $
+#	$OpenBSD: Makefile,v 1.5 1998/07/24 00:10:22 millert Exp $
 
 PROG=	bs
 MAN=	bs.6
-DPADD=	${LIBCURSES} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 # XXX - -O2 exposes a gcc optimizer bug
 CFLAGS= -O ${DEBUG}
diff --git a/games/canfield/canfield/Makefile b/games/canfield/canfield/Makefile
index 1b95385566d..2e6506eb130 100644
--- a/games/canfield/canfield/Makefile
+++ b/games/canfield/canfield/Makefile
@@ -3,8 +3,8 @@
 
 PROG=	canfield
 MAN=	canfield.6
-DPADD=	${LIBCURSES} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 
 
diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index e330e7e2403..0752012678f 100644
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.5 1997/09/21 11:35:46 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1998/07/24 00:10:25 millert Exp $
 
 PROG=	cribbage
-DPADD=	${LIBCURSES} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+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/games/gomoku/Makefile b/games/gomoku/Makefile
index 0b64f3d17b3..3e5e2aea00a 100644
--- a/games/gomoku/Makefile
+++ b/games/gomoku/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:36:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1998/07/24 00:10:26 millert Exp $
 
 PROG=	gomoku
 SRCS=	bdinit.c bdisp.c main.c makemove.c pickmove.c stoc.c
 MAN=	gomoku.6
-DPADD=	${LIBCURSES} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/games/grdc/Makefile b/games/grdc/Makefile
index 3bd1aa6efa8..9645e6e8154 100644
--- a/games/grdc/Makefile
+++ b/games/grdc/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 1997/09/21 11:36:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1998/07/24 00:10:28 millert Exp $
 
 PROG=	grdc
 MAN=	grdc.6
-DPADD=	${LIBCURSES} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 
 .include <bsd.prog.mk>
diff --git a/games/hack/Makefile b/games/hack/Makefile
index e2545fb934a..875dd978801 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 1997/09/21 11:36:06 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 1998/07/24 00:10:29 millert Exp $
 
 PROG=	hack
 CFLAGS+=-I.
@@ -15,8 +15,8 @@ SRCS+=	alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
 	hack.u_init.c hack.unix.c hack.vault.c hack.version.c hack.wield.c \
 	hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c
 MAN=	hack.6
-DPADD+=	${LIBTERMCAP} ${LIBCOMPAT}
-LDADD+=	-ltermcap
+DPADD+=	${LIBCURSES} ${LIBCOMPAT}
+LDADD+=	-lcurses
 HIDEGAME=hidegame
 CLEANFILES+=hack.onames.h makedefs
 
diff --git a/games/hack/Makequest b/games/hack/Makequest
index 256d8363155..72b25eb94f0 100644
--- a/games/hack/Makequest
+++ b/games/hack/Makequest
@@ -2,8 +2,8 @@
 #
 # Hack or Quest Makefile.
 
-# on some systems the termcap library is in -ltermcap
-TERMLIB = -ltermlib
+# on some systems the termcap library is in -ltermcap or -lcurses
+TERMLIB = -lcurses
 
 
 # make hack
diff --git a/games/hangman/Makefile b/games/hangman/Makefile
index d5719e2780b..d07b8dd6df5 100644
--- a/games/hangman/Makefile
+++ b/games/hangman/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:36:10 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1998/07/24 00:10:32 millert Exp $
 
 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} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/games/larn/Makefile b/games/larn/Makefile
index 6bd4315e5c1..542b5c89623 100644
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1997/09/21 11:36:13 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1998/07/24 00:10:33 millert Exp $
 
 # EXTRA
 #	Incorporates code to gather additional performance statistics
@@ -57,8 +57,8 @@ CFLAGS+=-DBSD -DVER=12 -DSUBVER=0 -DNONAP -DUIDSCORE
 SRCS=	main.c object.c create.c tok.c display.c global.c data.c io.c \
 	monster.c store.c diag.c help.c config.c nap.c bill.c scores.c \
 	signal.c moreobj.c movem.c regen.c fortune.c savelev.c
-DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
-LDADD=	-ltermcap -lcompat
+DPADD=	${LIBCURSES} ${LIBCOMPAT}
+LDADD=	-lcurses -lcompat
 HIDEGAME=hidegame
 
 beforeinstall:
diff --git a/games/mille/Makefile b/games/mille/Makefile
index 9f7c33abc57..1f04b19993f 100644
--- a/games/mille/Makefile
+++ b/games/mille/Makefile
@@ -1,12 +1,11 @@
-#	$OpenBSD: Makefile,v 1.4 1998/03/19 11:41:53 pjanzen Exp $
+#	$OpenBSD: Makefile,v 1.5 1998/07/24 00:10:34 millert Exp $
 
 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} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 MAN=	mille.6
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
-
diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile
index 06ab1091b01..8e26565e94d 100644
--- a/games/phantasia/Makefile
+++ b/games/phantasia/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.11 1998/07/10 09:46:44 downsj Exp $
+#	$OpenBSD: Makefile,v 1.12 1998/07/24 00:10:36 millert Exp $
 
 PROG=	phantasia
 SRCS=	main.c fight.c io.c interplayer.c gamesupport.c misc.c phantglobs.c
 CFLAGS+=-DTERMIOS
-DPADD=	${LIBM} ${LIBCURSES} ${LIBTERMLIB} ${LIBCOMPAT}
-LDADD=	-lm -lcurses -ltermlib -lcompat
+DPADD=	${LIBM} ${LIBCURSES} ${LIBCOMPAT}
+LDADD=	-lm -lcurses -lcompat
 HIDEGAME=hidegame
 MAN=	phantasia.6
 CLEANFILES+=map setup setup.o phantglobs.o.bld
diff --git a/games/rain/Makefile b/games/rain/Makefile
index 070cedf16ef..9a415bad9eb 100644
--- a/games/rain/Makefile
+++ b/games/rain/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.4 1998/02/22 13:16:40 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 1998/07/24 00:10:37 millert Exp $
 
 PROG=	rain
 MAN=	rain.6
-DPADD=	${LIBTERMLIB}
-LDADD=	-ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 
 .include <bsd.prog.mk>
diff --git a/games/robots/Makefile b/games/robots/Makefile
index b054ea6ef26..11244148285 100644
--- a/games/robots/Makefile
+++ b/games/robots/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.6 1997/09/21 11:36:53 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 1998/07/24 00:10:39 millert Exp $
 
 PROG=	robots
 CFLAGS+=-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} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 
 beforeinstall:
diff --git a/games/rogue/Makefile b/games/rogue/Makefile
index 01ffdc8e588..36a1f52fcd3 100644
--- a/games/rogue/Makefile
+++ b/games/rogue/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:36:56 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1998/07/24 00:10:40 millert Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	rogue
@@ -6,8 +6,8 @@ CFLAGS+=-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} ${LIBTERMLIB} ${LIBCOMPAT}
-LDADD=	-lcurses -ltermlib -lcompat
+DPADD=	${LIBCURSES} ${LIBCOMPAT}
+LDADD=	-lcurses -lcompat
 HIDEGAME=hidegame
 MAN=	rogue.6
 
diff --git a/games/sail/Makefile b/games/sail/Makefile
index 8691526f9c9..d6852c5c846 100644
--- a/games/sail/Makefile
+++ b/games/sail/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:37:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1998/07/24 00:10:41 millert Exp $
 
 PROG=	sail
 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} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/games/snake/snake/Makefile b/games/snake/snake/Makefile
index 1fe449e63d2..1dc9498bd56 100644
--- a/games/snake/snake/Makefile
+++ b/games/snake/snake/Makefile
@@ -4,8 +4,8 @@
 PROG=	snake
 SRCS=	snake.c move.c
 MAN=	snake.6
-DPADD=	${LIBM} ${LIBTERMCAP} ${LIBCOMPAT}
-LDADD=	-lm -ltermcap -lcompat
+DPADD=	${LIBM} ${LIBCURSES} ${LIBCOMPAT}
+LDADD=	-lm -lcurses -lcompat
 HIDEGAME=hidegame
 
 .include "../../Makefile.inc"
diff --git a/games/tetris/Makefile b/games/tetris/Makefile
index 3b4deb7b6fb..5e1f1b71cab 100644
--- a/games/tetris/Makefile
+++ b/games/tetris/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:37:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1998/07/24 00:10:44 millert Exp $
 
 PROG=	tetris
 SRCS=	input.c screen.c shapes.c scores.c tetris.c
 MAN=	tetris.6
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/games/worm/Makefile b/games/worm/Makefile
index f4d6cd8d741..b48080db33f 100644
--- a/games/worm/Makefile
+++ b/games/worm/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:37:15 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1998/07/24 00:10:46 millert Exp $
 
 PROG=	worm
 MAN=	worm.6
-DPADD=	${LIBCURSES} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper b/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
index a1643eff19f..3dd507d5322 100644
--- a/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
+++ b/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.10 1998/03/03 21:40:28 millert Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.11 1998/07/24 00:10:47 millert Exp $
 
 .if defined(OBJMACHINE)
 OBJDIR=	obj.${MACHINE}
@@ -47,10 +47,6 @@ LDFLAGS+=	-L$(STD_OBJDIR) -L$(GXX_OBJDIR)
 # -lg++ to be automatically included.  So add it here, no matter what.
 LDADD+=		-lg++ -lstdc++ -lcurses
 
-.if (${MACHINE_ARCH} == "mips")
-LDADD+=	-ltermlib
-.endif
-
 all:		$(STD_OBJDIR)/libstdc++.a $(GXX_OBJDIR)/libg++.a
 
 $(STD_OBJDIR)/libstdc++.a:
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 800ae586525..79cf0a73d74 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 1997/06/29 23:40:46 millert Exp $
+#	$OpenBSD: Makefile,v 1.7 1998/07/24 00:10:48 millert Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
 
 LIB=	edit
@@ -57,7 +57,7 @@ all: vi.h emacs.h common.h fcns.h help.h help.c
 
 
 test:	libedit.a test.o 
-	${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermcap
+	${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -lcurses
 
 includes:
 	-cd ${.CURDIR}; cmp -s histedit.h ${DESTDIR}/usr/include/histedit.h > \
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index de93599430a..ee23868442d 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1998/05/15 02:22:43 art Exp $
+#	$OpenBSD: Makefile,v 1.6 1998/07/24 00:10:50 millert Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 12/15/93
 #	$NetBSD: Makefile,v 1.6 1996/02/24 01:22:12 jtk Exp $
 
@@ -9,7 +9,7 @@ CFLAGS+=-DOLD_ENVIRON -DENV_HACK -I${.CURDIR} -Wall -Wno-unused
 SRCS=	authenc.c global.c slc.c state.c sys_term.c telnetd.c \
 	termstat.c utility.c
 DPADD=	${LIBUTIL} ${LIBTERM} ${LIBTELNET}
-LDADD+=	-lutil -ltermcap -ltelnet
+LDADD+=	-lutil -lcurses -ltelnet
 MAN=	telnetd.8
 
 .include <bsd.own.mk> # for KERBEROS
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index d6e164fb3ec..185cec3aa50 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1997/09/21 11:36:43 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1998/07/24 00:10:51 millert Exp $
 
 PROG=	fsdb
 MAN=	fsdb.8
@@ -6,7 +6,7 @@ SRCS=	fsdb.c fsdbutil.c fsutil.c \
 	dir.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c
 CFLAGS+= -I${.CURDIR}/../../sbin/fsck -I${.CURDIR}/../../sbin/fsck_ffs
-LDADD+= -ledit -ltermcap
+LDADD+= -ledit -lcurses
 DPADD+=	${LIBEDIT} ${LIBTERMCAP}
 .PATH:	${.CURDIR}/../../sbin/fsck ${.CURDIR}/../../sbin/fsck_ffs ${.CURDIR}/../../sys/ufs/ffs
 
diff --git a/sys/arch/i386/isa/pcvt/Util/fed/Makefile b/sys/arch/i386/isa/pcvt/Util/fed/Makefile
index 195caf54b41..46e1013a32d 100644
--- a/sys/arch/i386/isa/pcvt/Util/fed/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/fed/Makefile
@@ -1,5 +1,5 @@
 PROG=	fed
 SRCS=	fed.c select.c edit.c misc.c
-LDADD=	-lcurses -ltermlib
+LDADD=	-lcurses
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index 813d109deb9..b8917deac29 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 1997/10/02 04:22:39 imp Exp $
+#	$OpenBSD: Makefile,v 1.15 1998/07/24 00:10:54 millert Exp $
 
 # Define SMALL to disable command line editing
 #CFLAGS+=-DSMALL
@@ -15,8 +15,8 @@ PROG=	ftp
 SRCS=	cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \
 	stringlist.c util.c
 
-LDADD+=	-ledit -ltermcap
-DPADD+=	${LIBEDIT} ${LIBTERMCAP}
+LDADD+=	-ledit -lcurses
+DPADD+=	${LIBEDIT} ${LIBCURSES}
 
 #COPTS+= -Wall -Wconversion -Wstrict-prototypes -Wmissing-prototypes
 
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index b7611c240f1..1b4f23429f8 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.8 1997/09/21 11:50:08 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 1998/07/24 00:10:55 millert Exp $
 
 PROG=	more
-DPADD=	${LIBTERM} ${LIBCOMPAT}
-LDADD=	-ltermcap -lcompat
+DPADD=	${LIBCURSES} ${LIBCOMPAT}
+LDADD=	-lcurses -lcompat
 MLINKS=	more.1 page.1
 LINKS=	${BINDIR}/more ${BINDIR}/page
 
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index f73804fb5b0..1c3619a0feb 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.5 1997/09/21 11:50:11 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1998/07/24 00:10:57 millert Exp $
 
 PROG=	msgs
 DPADD=	${LIBTERMLIB}
-LDADD=	-ltermlib
+LDADD=	-lcurses
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 1a9c99db68e..2d7e987d8f1 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 1998/01/05 00:01:55 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 1998/07/24 00:10:58 millert Exp $
 
 PROG=	systat
 
@@ -7,8 +7,8 @@ PROG=	systat
 CFLAGS+=-I${.CURDIR}/../../usr.bin/vmstat
 SRCS=	cmds.c cmdtab.c disks.c dkstats.c fetch.c iostat.c keyboard.c \
 	main.c mbufs.c netcmds.c netstat.c pigs.c swap.c vmstat.c
-DPADD=	${LIBCURSES} ${LIBTERMLIB} ${LIBM} ${LIBKVM}
-LDADD=	-lcurses -ltermlib -lm -lkvm
+DPADD=	${LIBCURSES} ${LIBM} ${LIBKVM}
+LDADD=	-lcurses -lm -lkvm
 BINGRP=	kmem
 BINMODE=2555
 
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 42cc2c0f6d4..b5ddb5c8d44 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.5 1998/04/27 15:45:47 pjanzen Exp $
+#	$OpenBSD: Makefile,v 1.6 1998/07/24 00:11:00 millert Exp $
 
 PROG=	talk
-DPADD=	${LIBCURSES} ${LIBTERMLIB}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 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
 
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index a8db8d78724..229a71b1240 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 1998/03/12 04:57:26 art Exp $
+#	$OpenBSD: Makefile,v 1.7 1998/07/24 00:11:01 millert Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -39,8 +39,8 @@ PROG=	telnet
 CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DSKEY -Dunix
 CFLAGS+=-DENV_HACK 
 CFLAGS+=-I${.CURDIR}/../../lib
-LDADD+=	-ltermcap -ltelnet
-DPADD=	${LIBTERMCAP} ${LIBTELNET}
+LDADD+=	-lcurses -ltelnet
+DPADD=	${LIBCURSES} ${LIBTELNET}
 
 SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
 	terminal.c tn3270.c utilities.c
diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile
index 2fd1fb1232f..2ee34b27e31 100644
--- a/usr.bin/tn3270/tn3270/Makefile
+++ b/usr.bin/tn3270/tn3270/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.11 1998/03/23 21:18:22 pefo Exp $
+#	$OpenBSD: Makefile,v 1.12 1998/07/24 00:11:02 millert Exp $
 
 .include "../../Makefile.inc"
 
 CFLAGS += -I${.CURDIR} -I.
 CFLAGS +=-I${.CURDIR}/../../../lib
 CFLAGS +=-I${.CURDIR}/../../telnet
-LDADD += -locurses -ltermcap -ltelnet
-DPADD += ${LIBOLDCURSES} ${LIBTERMCAP} ${LIBTELNET}
+LDADD += -locurses -ltelnet
+DPADD += ${LIBOLDCURSES} ${LIBTELNET}
 
 SRCS += apilib.c api_bsd.c api_exch.c asc_ebc.c astosc.c dctype.c
 SRCS += disp_asc.c ebc_disp.c
diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile
index cc71f6d7a35..13211746938 100644
--- a/usr.bin/top/Makefile
+++ b/usr.bin/top/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1997/08/17 01:01:59 downsj Exp $
+#	$OpenBSD: Makefile,v 1.3 1998/07/24 00:11:04 millert Exp $
 #
 # Makefile for OpenBSD top-3.4.
 
@@ -7,8 +7,8 @@ PROG=	top
 CFLAGS+=-I. -I${.CURDIR}
 SRCS=	commands.c display.c machine.c screen.c top.c username.c utils.c \
 	version.c
-DPADD=	${LIBTERMLIB} ${LIBM} ${LIBKVM}
-LDADD=	-ltermlib -lm -lkvm
+DPADD=	${LIBCURSES} ${LIBM} ${LIBKVM}
+LDADD=	-lcurses -lm -lkvm
 BINGRP=	kmem
 BINMODE=2555
 
diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile
index 5ad0bfdc0c4..caa7670dea1 100644
--- a/usr.bin/tput/Makefile
+++ b/usr.bin/tput/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.5 1997/09/21 11:51:21 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1998/07/24 00:11:05 millert Exp $
 
 PROG=	tput
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 MLINKS=	tput.1 clear.1
 LINKS= ${BINDIR}/tput ${BINDIR}/clear
 
diff --git a/usr.bin/tset/Makefile b/usr.bin/tset/Makefile
index 1d5849a8b6a..33c4125b150 100644
--- a/usr.bin/tset/Makefile
+++ b/usr.bin/tset/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:51:24 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1998/07/24 00:11:06 millert Exp $
 
 PROG=	tset
 SRCS=	map.c misc.c set.c term.c tset.c wrterm.c
 
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 LINKS=	${BINDIR}/tset ${BINDIR}/reset
 MLINKS=	tset.1 reset.1
 
diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile
index ce63bdc3020..bab290cd8ae 100644
--- a/usr.bin/ul/Makefile
+++ b/usr.bin/ul/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:51:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1998/07/24 00:11:08 millert Exp $
 
 PROG=	ul
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile
index 2dc602fc8bd..9c56e0e50d5 100644
--- a/usr.bin/window/Makefile
+++ b/usr.bin/window/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1997/09/21 11:52:06 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1998/07/24 00:11:09 millert Exp $
 
 PROG=	window
 SRCS=	char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
@@ -15,7 +15,7 @@ SRCS=	char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
 	wwterminfo.c wwtty.c wwunframe.c wwupdate.c wwwrite.c xx.c xxflush.c \
 	compress.c
 MAN=	window.1
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile
index 553c82f749c..feb62d2019a 100644
--- a/usr.sbin/pppctl/Makefile
+++ b/usr.sbin/pppctl/Makefile
@@ -1,10 +1,10 @@
-#	$Id: Makefile,v 1.1.1.1 1997/11/23 20:27:39 brian Exp $
+#	$Id: Makefile,v 1.2 1998/07/24 00:11:11 millert Exp $
 
 PROG=	pppctl
 SRCS=	pppctl.c
 CFLAGS+=-Wall -Wmissing-prototypes
-LDADD+= -ledit -ltermcap
-DPADD+= ${LIBEDIT} ${LIBTERMCAP}
+LDADD+= -ledit -lcurses
+DPADD+= ${LIBEDIT} ${LIBCURSES}
 MAN=	pppctl.8
 
 .include <bsd.prog.mk>