From owner-svn-src-all@freebsd.org Tue Sep 18 20:50:08 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B3C610A8C2E; Tue, 18 Sep 2018 20:50:08 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 440DC831B3; Tue, 18 Sep 2018 20:50:08 +0000 (UTC) (envelope-from brd@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AD1E2514A; Tue, 18 Sep 2018 20:50:08 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8IKo80t055869; Tue, 18 Sep 2018 20:50:08 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8IKo7KS055867; Tue, 18 Sep 2018 20:50:07 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201809182050.w8IKo7KS055867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Tue, 18 Sep 2018 20:50:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338758 - in head: etc usr.bin/locate/locate X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head: etc usr.bin/locate/locate X-SVN-Commit-Revision: 338758 X-SVN-Commit-Repository: base 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.27 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: Tue, 18 Sep 2018 20:50:08 -0000 Author: brd Date: Tue Sep 18 20:50:07 2018 New Revision: 338758 URL: https://svnweb.freebsd.org/changeset/base/338758 Log: Move install of locate.rc to usr.bin/locate/locate/ This leverages CONFS to handle the install and purges an old comment. Approved by: re (blanket, pkgbase), bapt (mentor) Differential Revision: https://reviews.freebsd.org/D17215 Modified: head/etc/Makefile head/usr.bin/locate/locate/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Tue Sep 18 20:47:06 2018 (r338757) +++ head/etc/Makefile Tue Sep 18 20:50:07 2018 (r338758) @@ -26,10 +26,6 @@ BIN1= \ # NB: keep these sorted by MK_* knobs -.if ${MK_LOCATE} != "no" -BIN1+= ${SRCTOP}/usr.bin/locate/locate/locate.rc -.endif - .if ${MK_LPR} != "no" BIN1+= hosts.lpd printcap .endif Modified: head/usr.bin/locate/locate/Makefile ============================================================================== --- head/usr.bin/locate/locate/Makefile Tue Sep 18 20:47:06 2018 (r338757) +++ head/usr.bin/locate/locate/Makefile Tue Sep 18 20:50:07 2018 (r338758) @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +CONFS= locate.rc PROG= locate SRCS= util.c locate.c CFLAGS+= -I${.CURDIR} -DMMAP # -DDEBUG (print time) -O2 (10% faster) @@ -14,10 +15,6 @@ SCRIPTSDIR= ${LIBEXECDIR} SCRIPTSNAME_${script}= locate.${script:R} .endfor MLINKS+= locate.updatedb.8 updatedb.8 - -# only /usr/src/etc/Makefile install files in /etc -# ${INSTALL} -o root -g wheel -m 644 \ -# ${.CURDIR}/locate.rc ${DESTDIR}/etc .include "../../Makefile.inc" .include