From owner-svn-src-all@freebsd.org Thu Feb 18 00:26:23 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B894AAAB67C; Thu, 18 Feb 2016 00:26:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A0971007; Thu, 18 Feb 2016 00:26:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1I0QMYi028946; Thu, 18 Feb 2016 00:26:22 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1I0QMEa028942; Thu, 18 Feb 2016 00:26:22 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201602180026.u1I0QMEa028942@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 18 Feb 2016 00:26:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295733 - in head: libexec libexec/makewhatis.local usr.bin/makewhatis X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2016 00:26:23 -0000 Author: bdrewery Date: Thu Feb 18 00:26:21 2016 New Revision: 295733 URL: https://svnweb.freebsd.org/changeset/base/295733 Log: Fix installation of makewhatis.local(1) since r283777. The wrapper script has moved to libexec/makewhatis.local since it is not directlry related to the older makewhatis(1) utility that has been replaced by the usr.bin/mandoc version. Reported by: vangyzen Added: head/libexec/makewhatis.local/ - copied from r295732, head/usr.bin/makewhatis/ Deleted: head/libexec/makewhatis.local/makewhatis.1 head/libexec/makewhatis.local/makewhatis.c Modified: head/libexec/Makefile head/libexec/makewhatis.local/Makefile head/libexec/makewhatis.local/Makefile.depend head/usr.bin/makewhatis/Makefile Modified: head/libexec/Makefile ============================================================================== --- head/libexec/Makefile Thu Feb 18 00:00:51 2016 (r295732) +++ head/libexec/Makefile Thu Feb 18 00:26:21 2016 (r295733) @@ -10,6 +10,7 @@ SUBDIR= ${_atf} \ ${_dma} \ getty \ ${_mail.local} \ + ${_makewhatis.local} \ ${_mknetid} \ ${_pppoed} \ revnetgroup \ @@ -88,6 +89,10 @@ _mail.local= mail.local _smrsh= smrsh .endif +.if ${MK_MAN_UTILS} != "no" +_makewhatis.local= makewhatis.local +.endif + .if ${MK_TALK} != "no" SUBDIR+= talkd .endif Modified: head/libexec/makewhatis.local/Makefile ============================================================================== --- head/usr.bin/makewhatis/Makefile Thu Feb 18 00:00:51 2016 (r295732) +++ head/libexec/makewhatis.local/Makefile Thu Feb 18 00:26:21 2016 (r295733) @@ -1,9 +1,7 @@ # $FreeBSD$ -PROG= makewhatis -LIBADD= z SCRIPTS= makewhatis.local.sh -MAN= makewhatis.1 makewhatis.local.8 +MAN= makewhatis.local.8 SCRIPTSDIR= ${LIBEXECDIR} LINKS= ${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local MLINKS= makewhatis.local.8 catman.local.8 Modified: head/libexec/makewhatis.local/Makefile.depend ============================================================================== --- head/usr.bin/makewhatis/Makefile.depend Thu Feb 18 00:00:51 2016 (r295732) +++ head/libexec/makewhatis.local/Makefile.depend Thu Feb 18 00:26:21 2016 (r295733) @@ -2,14 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ - gnu/lib/libgcc \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - lib/libz \ .include Modified: head/usr.bin/makewhatis/Makefile ============================================================================== --- head/usr.bin/makewhatis/Makefile Thu Feb 18 00:00:51 2016 (r295732) +++ head/usr.bin/makewhatis/Makefile Thu Feb 18 00:26:21 2016 (r295733) @@ -2,10 +2,5 @@ PROG= makewhatis LIBADD= z -SCRIPTS= makewhatis.local.sh -MAN= makewhatis.1 makewhatis.local.8 -SCRIPTSDIR= ${LIBEXECDIR} -LINKS= ${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local -MLINKS= makewhatis.local.8 catman.local.8 .include