Merge head from 7/28

7 files changed, 11 insertions, 11 deletions

diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes
index 790c39e..d7fecf4 100644
--- a/games/fortune/datfiles/fortunes
+++ b/games/fortune/datfiles/fortunes
@@ -570,7 +570,7 @@ writing.  Always pick on the correct idiom.  The adverb always follows
 the verb.  Last but not least, avoid cliches like the plague; seek
 viable alternatives.
 %
-	      1/2
+	      1/3
 	 /\(3)
 	 |     2			  1/3
 	 |    z dz cos(3 * PI / 9) = ln (e   )
@@ -578,7 +578,7 @@ viable alternatives.
 	\/ 1
 
 The integral of z squared, dz
-From 1 to the square root of 3
+From 1 to the cube root of 3
 	Times the cosine
 	Of 3 PI over nine
 Is the log of the cube root of e
diff --git a/games/fortune/datfiles/freebsd-tips b/games/fortune/datfiles/freebsd-tips
index 5f9dd49..b984d10 100644
--- a/games/fortune/datfiles/freebsd-tips
+++ b/games/fortune/datfiles/freebsd-tips
@@ -231,10 +231,10 @@ is running FreeBSD at the time) to quickly find files based on name only.
 To erase a line you've written at the command prompt, use "Ctrl-U".
 		-- Dru <genesis@istar.ca>
 %
-To find out the hostname associated with an IP address, use
+To find the hostname associated with an IP address, use
 
-	dig -x IP_address
-		-- Dru <genesis@istar.ca>
+	drill -x IP_address
+		-- Allan Jude <allanjude@freebsd.org>
 %
 To obtain a neat PostScript rendering of a manual page, use ``-t'' switch
 of the man(1) utility: ``man -t <topic>''.  For example:
diff --git a/games/fortune/fortune/pathnames.h b/games/fortune/fortune/pathnames.h
index d777c6d..149b3e8 100644
--- a/games/fortune/fortune/pathnames.h
+++ b/games/fortune/fortune/pathnames.h
@@ -30,4 +30,5 @@
  *	$FreeBSD$
  */
 
-#define	FORTDIR		"/usr/share/games/fortune"
+#define	FORTDIR		"/usr/share/games/fortune:" \
+			"/usr/local/share/games/fortune"
diff --git a/games/grdc/Makefile b/games/grdc/Makefile
index 6b1d6ee..73d395a 100644
--- a/games/grdc/Makefile
+++ b/games/grdc/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	grdc
 MAN=	grdc.6
-DPADD=	${LIBNCURSES}
-LDADD=	-lncurses
+DPADD=	${LIBNCURSESW}
+LDADD=	-lncursesw
 
 .include <bsd.prog.mk>
diff --git a/games/grdc/Makefile.depend b/games/grdc/Makefile.depend
index 4f4df65..a25f5f6 100644
--- a/games/grdc/Makefile.depend
+++ b/games/grdc/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/ncurses/ncurses \
 	lib/ncurses/ncursesw \
 
 
diff --git a/games/morse/morse.6 b/games/morse/morse.6
index f0d30d7..94645bb 100644
--- a/games/morse/morse.6
+++ b/games/morse/morse.6
@@ -177,7 +177,7 @@ device file
 Sound support for
 .Nm
 added by
-.An Lyndon Nerenberg (VE6BBM) Aq lyndon@orthanc.ca .
+.An Lyndon Nerenberg (VE6BBM) Aq Mt lyndon@orthanc.ca .
 .Pp
 Ability to key an external device added by
 .An J\(:org Wunsch
diff --git a/games/random/random.6 b/games/random/random.6
index 5481576..bd38ba6 100644
--- a/games/random/random.6
+++ b/games/random/random.6
@@ -117,7 +117,7 @@ instead of newlines.
 .Sh HISTORY
 The
 functionality to randomizing lines and words was added in 2003 by
-.An "Sean Chittenden" Aq seanc@FreeBSD.org .
+.An Sean Chittenden Aq Mt seanc@FreeBSD.org .
 .Sh BUGS
 No index is used when printing out tokens from the list which
 makes it rather slow for large files (10MB+).