Re: cvs commit: src/usr.sbin Makefile src/usr.sbin/makewhatis Makefile makewhatis.8 makewhatis.c src/usr.bin Makefile src/usr.bin/catman Makefile catman.1 catman.c src/libexec Makefile src/libexec/getNAME getNAME.1 src/libexec/makewhatis.local ...

[Chris Pressey <cpressey@xxxxxxxxxxxxxxx>]

On Thu, 25 Mar 2004 10:05:50 -0800 (PST)
Joerg Sonnenberger <joerg@xxxxxxxxxxxxxxxxxxxxxxx> wrote:

> joerg       2004/03/25 10:05:49 PST
> 
> DragonFly src repository
> 
>   Modified files:
>     usr.sbin             Makefile 
>     usr.bin              Makefile 
>     libexec              Makefile 
>     libexec/getNAME      getNAME.1 
>     gnu/usr.bin/man      Makefile 
>     share/man/man5       rc.conf.5 
>   Added files:
>     usr.sbin/makewhatis  Makefile makewhatis.8 makewhatis.c 
>     usr.bin/catman       Makefile catman.1 catman.c 
>     libexec/makewhatis.local Makefile makewhatis.local.8 
>                              makewhatis.local.sh 
>   Removed files:
>     gnu/usr.bin/man/catman Makefile catman.1 catman.perl 
>     gnu/usr.bin/man/makewhatis Makefile makewhatis.1 
>                                makewhatis.local.8 
>                                makewhatis.local.sh makewhatis.perl 
>   Log:
>   Replace the Perl scripts makewhatis(1), makewhatis.local(8) and
>   catman(1) by C programs.

FYI, this appears to break buildwolrd for me, as src/Makefile.inc1 still
refers to the makewhatis in gnu/usr.bin rather than the new one in
usr.bin.

Attached is a patch I'm presently trying out to fix it.

-Chris

Index: Makefile.inc1
===================================================================
RCS file: /home/dcvs/src/Makefile.inc1,v
retrieving revision 1.25
diff -u -r1.25 Makefile.inc1
--- Makefile.inc1	23 Mar 2004 17:21:09 -0000	1.25
+++ Makefile.inc1	25 Mar 2004 11:44:38 -0000
@@ -641,10 +641,10 @@
     usr.bin/vi usr.bin/cap_mkdb usr.bin/vgrind usr.bin/true usr.bin/false \
     usr.bin/cmp usr.bin/xargs usr.bin/id usr.bin/env usr.bin/dirname \
     usr.sbin/chown usr.sbin/mtree usr.sbin/config \
-    usr.sbin/btxld usr.sbin/pwd_mkdb usr.sbin/zic \
+    usr.sbin/btxld usr.sbin/pwd_mkdb usr.sbin/zic usr.sbin/makewhatis \
     gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo \
     gnu/usr.bin/grep gnu/usr.bin/sort gnu/usr.bin/patch \
-    gnu/usr.bin/gzip gnu/usr.bin/perl gnu/usr.bin/man/makewhatis
+    gnu/usr.bin/gzip gnu/usr.bin/perl
 	${ECHODIR} "===> ${_tool} (bootstrap-tools)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \