From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 11:59:20 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id E6AC1EDD;
Sun, 30 Nov 2014 11:59:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 D3A1BB29;
Sun, 30 Nov 2014 11:59:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUBxK8L028156;
Sun, 30 Nov 2014 11:59:20 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUBxKRs028155;
Sun, 30 Nov 2014 11:59:20 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411301159.sAUBxKRs028155@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 30 Nov 2014 11:59:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275319 - projects/building-blocks/etc
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Nov 2014 11:59:21 -0000
Author: ngie
Date: Sun Nov 30 11:59:20 2014
New Revision: 275319
URL: https://svnweb.freebsd.org/changeset/base/275319
Log:
Honor MK_IPFW with rc.firewall, MK_LOCATE with /var/db/locate.db, and MK_MAN
with creating manpage symlinks
Modified:
projects/building-blocks/etc/Makefile
Modified: projects/building-blocks/etc/Makefile
==============================================================================
--- projects/building-blocks/etc/Makefile Sun Nov 30 11:55:45 2014 (r275318)
+++ projects/building-blocks/etc/Makefile Sun Nov 30 11:59:20 2014 (r275319)
@@ -39,7 +39,6 @@ BIN1= crontab \
protocols \
rc \
rc.bsdextended \
- rc.firewall \
rc.initdiskless \
rc.shutdown \
rc.subr \
@@ -99,6 +98,10 @@ BIN1+= ftpusers
BIN1+= inetd.conf
.endif
+.if ${MK_IPFW} != "no"
+BIN1+= rc.firewall
+.endif
+
.if ${MK_LOCATE} != "no"
BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc
.endif
@@ -322,8 +325,10 @@ distribution:
.endif
${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
${DESTDIR}/etc/dumpdates
+.if ${MK_LOCATE} != "no"
${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/db/locate.database
+.endif
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
${DESTDIR}/var/crash
cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
@@ -389,6 +394,7 @@ distrib-dirs: ${MTREES:N/*}
done; true
.endif
${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
+.if ${MK_MAN} != "no"
cd ${DESTDIR}/usr/share/man; \
for mandir in man*; do \
${INSTALL_SYMLINK} ../$$mandir \
@@ -412,6 +418,7 @@ distrib-dirs: ${MTREES:N/*}
fi; \
shift; shift; \
done
+.endif
.if ${MK_NLS} != "no"
set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
while [ $$# -gt 0 ] ; do \