From owner-svn-src-projects@FreeBSD.ORG  Sun Nov 30 08:34:47 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D12A47F8;
 Sun, 30 Nov 2014 08:34:47 +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 BD2A7883;
 Sun, 30 Nov 2014 08:34:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU8YlRe033516;
 Sun, 30 Nov 2014 08:34:47 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU8YlMQ033514;
 Sun, 30 Nov 2014 08:34:47 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411300834.sAU8YlMQ033514@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 08:34:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275304 - in projects/building-blocks: sbin tools/build/mk
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 &quot; projects&quot;
 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 08:34:47 -0000

Author: ngie
Date: Sun Nov 30 08:34:46 2014
New Revision: 275304
URL: https://svnweb.freebsd.org/changeset/base/275304

Log:
  Build spppcontrol if MK_PPP != no

Modified:
  projects/building-blocks/sbin/Makefile
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc

Modified: projects/building-blocks/sbin/Makefile
==============================================================================
--- projects/building-blocks/sbin/Makefile	Sun Nov 30 06:48:37 2014	(r275303)
+++ projects/building-blocks/sbin/Makefile	Sun Nov 30 08:34:46 2014	(r275304)
@@ -65,7 +65,6 @@ SUBDIR=adjkerntz \
 	savecore \
 	setkey \
 	shutdown \
-	spppcontrol \
 	swapon \
 	sysctl \
 	tunefs \
@@ -111,6 +110,10 @@ SUBDIR+=	pfctl
 SUBDIR+=	pflogd
 .endif
 
+.if ${MK_PPP} != "no"
+SUBDIR+=	spppcontrol
+.endif
+
 .if ${MK_INET6} != "no"
 SUBDIR+=	ping6
 SUBDIR+=	rtsol

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Sun Nov 30 06:48:37 2014	(r275303)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Sun Nov 30 08:34:46 2014	(r275304)
@@ -4682,10 +4682,12 @@ OLD_DIRS+=etc/ppp
 OLD_FILES+=etc/rc.d/ppp
 OLD_FILES+=etc/rc.d/pppoed
 OLD_FILES+=etc/rc.d/sppp
+OLD_FILES+=sbin/spppcontrol
 OLD_FILES+=usr/sbin/ppp
 OLD_FILES+=usr/sbin/pppctl
 OLD_FILES+=usr/share/man/man8/ppp.8.gz
 OLD_FILES+=usr/share/man/man8/pppctl.8.gz
+OLD_FILES+=usr/share/man/man8/spppcontrol.8.gz
 .endif
 
 .if ${MK_PROFILE} == no