From ataraxia@cox.net  Sat Nov  9 07:59:08 2002
Return-Path: <ataraxia@cox.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A5B7637B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  9 Nov 2002 07:59:08 -0800 (PST)
Received: from lakemtao02.cox.net (lakemtao02.cox.net [68.1.17.243])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E836743E42
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  9 Nov 2002 07:59:07 -0800 (PST)
	(envelope-from ataraxia@cox.net)
Received: from arkadia.nv.cox.net ([68.98.181.29]) by lakemtao02.cox.net
          (InterMail vM.5.01.04.05 201-253-122-122-105-20011231) with ESMTP
          id <20021109155907.ZOHO12192.lakemtao02.cox.net@arkadia.nv.cox.net>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Sat, 9 Nov 2002 10:59:07 -0500
Received: from arkadia.nv.cox.net (localhost [127.0.0.1])
	by arkadia.nv.cox.net (8.12.6/8.12.6) with ESMTP id gA9Fx6Ge070321
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 9 Nov 2002 10:59:07 -0500 (EST)
	(envelope-from ataraxia@arkadia.nv.cox.net)
Received: (from ataraxia@localhost)
	by arkadia.nv.cox.net (8.12.6/8.12.6/Submit) id gA9Fx6ZX070320;
	Sat, 9 Nov 2002 10:59:06 -0500 (EST)
	(envelope-from ataraxia)
Message-Id: <200211091559.gA9Fx6ZX070320@arkadia.nv.cox.net>
Date: Sat, 9 Nov 2002 10:59:06 -0500 (EST)
From: Ray Kohler <>
Reply-To: Ray Kohler <ataraxia@cox.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] updating 320.whatis and 330.catman in -current
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         45159
>Category:       misc
>Synopsis:       [patch] updating 320.whatis and 330.catman in -current
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    ru
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 09 08:00:04 PST 2002
>Closed-Date:    Tue Nov 19 02:07:05 PST 2002
>Last-Modified:  Tue Nov 19 02:07:05 PST 2002
>Originator:     Ray Kohler
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD arkadia.nv.cox.net 5.0-CURRENT FreeBSD 5.0-CURRENT #6: Fri Nov 8 20:05:46 EST 2002 root@arkadia.nv.cox.net:/usr/obj/usr/src/sys/ARKADIA i386


	
>Description:

	makewhatis.local and catman.local no longer exist in -current.
	That means 320.whatis and 330.catman fail when run. The following
	patches fix them, although I'm not sure whether the functionality
	is identical to the old versions.
	
>How-To-Repeat:
	Run 320.whatis and 330.catman.
	
>Fix:

--- 320.whatis.orig	Tue Oct 29 19:42:53 2002
+++ 320.whatis	Sat Nov  9 10:41:44 2002
@@ -29,14 +29,14 @@
 
 	        # Build whatis(1) database(s) for original, non-localized
 		#  manpages.
-		/usr/libexec/makewhatis.local "${MANPATH}" || rc=3
+		/usr/bin/makewhatis "${MANPATH}" || rc=3
 
 	        # Build whatis(1) database(s) for localized manpages.
 		if [ X"${man_locales}" != X ]
 		then
 		    for i in ${man_locales}
 		    do
-			LC_ALL=$i /usr/libexec/makewhatis.local -a \
+			LC_ALL=$i /usr/bin/makewhatis -a \
 			    -L "${MANPATH}" || rc=3
 		    done
 		fi

--- 330.catman.orig	Tue Oct 29 19:42:53 2002
+++ 330.catman	Sat Nov  9 10:43:11 2002
@@ -34,7 +34,7 @@
 		    rc=0
          
 		    # Preformat original, non-localized manpages  
-		    echo /usr/libexec/catman.local "$MANPATH" |
+		    echo /usr/bin/catman "$MANPATH" |
 			su -fm man || rc=3
 
 		    # Preformat localized manpages.
@@ -42,7 +42,7 @@
 		    then
 			for i in $man_locales
 			do
-			    echo /usr/libexec/catman.local -L \
+			    echo /usr/bin/catman -L \
 				"$MANPATH" | LC_ALL=$i su -fm man || rc=3
 			done
 		    fi
	


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->ru 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Mon Nov 18 23:52:31 PST 2002 
Responsible-Changed-Why:  

Ruslan (re-?)enabled some whatis stuff today 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45159 
State-Changed-From-To: open->closed 
State-Changed-By: ru 
State-Changed-When: Tue Nov 19 02:06:29 PST 2002 
State-Changed-Why:  
makewhatis.local and catman.local have been restored. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45159 
>Unformatted:
