Change all references to LIBTERM and -ltermlib to LIBTERMCAP and -ltermcap

20 files changed, 29 insertions, 29 deletions

diff --git a/games/atc/Makefile b/games/atc/Makefile
index a4e1e23..4df0b3f 100644
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -5,7 +5,7 @@ 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
 MAN6=	atc.6
-DPADD=	${usr/lib/libl.a ${LIBM} ${LIBTERM} ${LIBCURSES} ${LIBCOMPAT}
+DPADD=	${usr/lib/libl.a ${LIBM} ${LIBTERMCAP} ${LIBCURSES} ${LIBCOMPAT}
 LDADD=	-ll -lm -lcurses -ltermcap -lcompat
 GAMES=	ATC_scores Game_List Killer crossover default easy game_2
 CLEANFILES=grammar.c y.tab.h lex.c
diff --git a/games/backgammon/backgammon/Makefile b/games/backgammon/backgammon/Makefile
index cdc60e9..a0fb4fb 100644
--- a/games/backgammon/backgammon/Makefile
+++ b/games/backgammon/backgammon/Makefile
@@ -5,7 +5,7 @@ CFLAGS+=-DV7 -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 version.c
 MAN6=	backgammon.6
-DPADD=	${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
 .PATH:	${.CURDIR}/../common_source
 HIDEGAME=hidegame
diff --git a/games/backgammon/teachgammon/Makefile b/games/backgammon/teachgammon/Makefile
index b5e3638..56ceb88 100644
--- a/games/backgammon/teachgammon/Makefile
+++ b/games/backgammon/teachgammon/Makefile
@@ -4,7 +4,7 @@ PROG=	teachgammon
 CFLAGS+=-DV7 -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=	${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
 HIDEGAME=hidegame
 NOMAN=	noman
diff --git a/games/battlestar/Makefile b/games/battlestar/Makefile
index 23b3a95..c6bef1f 100644
--- a/games/battlestar/Makefile
+++ b/games/battlestar/Makefile
@@ -6,7 +6,7 @@ SRCS=	battlestar.c com1.c com2.c com3.c com4.c com5.c com6.c com7.c \
 	globals.c dayfile.c nightfile.c dayobjs.c nightobjs.c words.c
 MAN6=	battlestar.6
 DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
-LDADD=	-lcurses -ltermlib -lcompat
+LDADD=	-lcurses -ltermcap -lcompat
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/games/canfield/canfield/Makefile b/games/canfield/canfield/Makefile
index e514389..ea50302 100644
--- a/games/canfield/canfield/Makefile
+++ b/games/canfield/canfield/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	canfield
 MAN6=	canfield.6
-DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-lcurses -ltermcap -lcompat
 HIDEGAME=hidegame
 
diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index 83c97d2..9a619b9 100644
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -1,8 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	cribbage
-DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
-LDADD=	-lcurses -ltermlib -lcompat
+DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermcap -lcompat
 SRCS=	extern.c crib.c cards.c instr.c io.c score.c support.c
 MAN6=	cribbage.6
 HIDEGAME=hidegame
diff --git a/games/hack/Makefile b/games/hack/Makefile
index 84ebbb1..94f0a91 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -13,7 +13,7 @@ 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
 MAN6=	hack.6
-DPADD=	${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
 HIDEGAME=hidegame
 
diff --git a/games/hangman/Makefile b/games/hangman/Makefile
index a546fa4..f1254b7 100644
--- a/games/hangman/Makefile
+++ b/games/hangman/Makefile
@@ -4,8 +4,8 @@ PROG=	hangman
 SRCS=	endgame.c extern.c getguess.c getword.c main.c playgame.c \
 	prdata.c prman.c prword.c setup.c
 MAN6=	hangman.6
-DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
-LDADD=	-lcurses -ltermlib -lcompat
+DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermcap -lcompat
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/games/larn/Makefile b/games/larn/Makefile
index 3522a51..78d3e10 100644
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -57,7 +57,7 @@ CFLAGS+=-DBSD -DVER=12 -DSUBVER=0 -DNONAP -DUIDSCORE -fwritable-strings
 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=	${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
 HIDEGAME=hidegame
 
diff --git a/games/mille/Makefile b/games/mille/Makefile
index 9a6292f..92017cf 100644
--- a/games/mille/Makefile
+++ b/games/mille/Makefile
@@ -3,8 +3,8 @@
 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} ${LIBTERM} ${LIBCOMPAT}
-LDADD=	-lcurses -ltermlib -lcompat
+DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermcap -lcompat
 MAN6=	mille.6
 HIDEGAME=hidegame
 
diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile
index abc955b..06a6671 100644
--- a/games/phantasia/Makefile
+++ b/games/phantasia/Makefile
@@ -2,8 +2,8 @@
 
 PROG=	phantasia
 SRCS=	main.c fight.c io.c interplayer.c gamesupport.c misc.c phantglobs.c
-DPADD=	${LIBM} ${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
-LDADD=	-lm -lcurses -ltermlib -lcompat
+DPADD=	${LIBM} ${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
+LDADD=	-lm -lcurses -ltermcap -lcompat
 HIDEGAME=hidegame
 MAN6=	phantasia.6
 CLEANFILES+=map setup setup.o
diff --git a/games/rain/Makefile b/games/rain/Makefile
index 60dcefce..fb3be9d 100644
--- a/games/rain/Makefile
+++ b/games/rain/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	rain
 MAN6=	rain.6
-DPADD=	${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
 
 .include <bsd.prog.mk>
diff --git a/games/robots/Makefile b/games/robots/Makefile
index df80d77..7e9af46 100644
--- a/games/robots/Makefile
+++ b/games/robots/Makefile
@@ -5,8 +5,8 @@ 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
 MAN6=	robots.6
-DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
-LDADD=	-lcurses -ltermlib -lcompat
+DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermcap -lcompat
 HIDEGAME=hidegame
 
 beforeinstall:
diff --git a/games/rogue/Makefile b/games/rogue/Makefile
index 1f40cb9..f901289 100644
--- a/games/rogue/Makefile
+++ b/games/rogue/Makefile
@@ -5,8 +5,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} ${LIBTERM} ${LIBCOMPAT}
-LDADD=	-lcurses -ltermlib -lcompat
+DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermcap -lcompat
 HIDEGAME=hidegame
 MAN6=	rogue.6
 
diff --git a/games/sail/Makefile b/games/sail/Makefile
index 722190b..d2536e0 100644
--- a/games/sail/Makefile
+++ b/games/sail/Makefile
@@ -5,8 +5,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
 MAN6=	sail.6
-DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
-LDADD=	-lcurses -ltermlib -lcompat
+DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermcap -lcompat
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/games/snake/snake/Makefile b/games/snake/snake/Makefile
index c8b677b..7d79adf 100644
--- a/games/snake/snake/Makefile
+++ b/games/snake/snake/Makefile
@@ -3,7 +3,7 @@
 PROG=	snake
 SRCS=	snake.c move.c
 MAN6=	snake.6
-DPADD=	${LIBM} ${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBM} ${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-lm -ltermcap -lcompat
 HIDEGAME=hidegame
 
diff --git a/games/worm/Makefile b/games/worm/Makefile
index d0d4da9..a50c5ba 100644
--- a/games/worm/Makefile
+++ b/games/worm/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	worm
 MAN6=	worm.6
-DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-lcurses -ltermcap -lcompat
 HIDEGAME=hidegame
 
diff --git a/games/worms/Makefile b/games/worms/Makefile
index 7b30870..a51c1bb 100644
--- a/games/worms/Makefile
+++ b/games/worms/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	worms
 MAN6=	worms.6
-DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-lcurses -ltermcap -lcompat
 
 .include <bsd.prog.mk>
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 6f513d8..f56234a 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -217,7 +217,7 @@ DPADD		Additional dependencies for the program.  Usually used for
 			LIBPC		/usr/lib/libpc.a
 			LIBPLOT		/usr/lib/libplot.a
 			LIBRPC		/usr/lib/sunrpc.a
-			LIBTERM		/usr/lib/libtermcap.a (sic)
+			LIBTERMCAP	/usr/lib/libtermcap.a
 			LIBUTIL		/usr/lib/libutil.a
 
 SHAREDSTRINGS	If defined, a new .c.o rule is used that results in shared
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index d17181b..9d6c6573 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.prog.mk,v 1.3 1994/08/10 02:48:08 wollman Exp $
+#	$Id: bsd.prog.mk,v 1.4 1994/08/28 15:32:10 bde Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -42,7 +42,7 @@ LIBRESOLV?=	/usr/lib/libresolv.a
 LIBRPCSVC?=	/usr/lib/librpcsvc.a
 LIBSKEY?=	/usr/lib/libskey.a
 LIBTELNET?=	/usr/lib/libtelnet.a
-LIBTERM?=       /usr/lib/libtermcap.a
+LIBTERMCAP?=	/usr/lib/libtermcap.a
 LIBUTIL?=	/usr/lib/libutil.a
 .else
 LIBCRT0?=	${DESTDIR}/usr/lib/crt0.o
@@ -66,7 +66,7 @@ LIBRESOLV?=	${DESTDIR}/usr/lib/libresolv.a
 LIBRPCSVC?=	${DESTDIR}/usr/lib/librpcsvc.a
 LIBSKEY?=	${DESTDIR}/usr/lib/libskey.a
 LIBTELNET?=	${DESTDIR}/usr/lib/libtelnet.a
-LIBTERM?=       ${DESTDIR}/usr/lib/libtermcap.a
+LIBTERMCAP?=	${DESTDIR}/usr/lib/libtermcap.a
 LIBUTIL?=	${DESTDIR}/usr/lib/libutil.a
 .endif
 .if defined(NOSHARED)