From owner-svn-src-stable@FreeBSD.ORG Sun Aug 31 20:14:23 2014 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC979752; Sun, 31 Aug 2014 20:14:23 +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 BE42613CF; Sun, 31 Aug 2014 20:14:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7VKENvi043467; Sun, 31 Aug 2014 20:14:23 GMT (envelope-from peter@FreeBSD.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7VKEMXE043461; Sun, 31 Aug 2014 20:14:22 GMT (envelope-from peter@FreeBSD.org) Message-Id: <201408312014.s7VKEMXE043461@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: peter set sender to peter@FreeBSD.org using -f From: Peter Wemm Date: Sun, 31 Aug 2014 20:14:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r270887 - in stable/8: share/mk tools/build/mk tools/build/options usr.sbin X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2014 20:14:24 -0000 Author: peter Date: Sun Aug 31 20:14:22 2014 New Revision: 270887 URL: http://svnweb.freebsd.org/changeset/base/270887 Log: Backport the separation of the knob that controls the legacy pkg_install tools (ie: WITH/WITHOUT_PKGTOOLS) and the pkg bootstrap tool. Added: stable/8/tools/build/options/WITHOUT_PKGBOOTSTRAP - copied unchanged from r270885, head/tools/build/options/WITHOUT_PKGBOOTSTRAP Modified: stable/8/share/mk/bsd.own.mk stable/8/tools/build/mk/OptionalObsoleteFiles.inc stable/8/usr.sbin/Makefile Modified: stable/8/share/mk/bsd.own.mk ============================================================================== --- stable/8/share/mk/bsd.own.mk Sun Aug 31 20:11:26 2014 (r270886) +++ stable/8/share/mk/bsd.own.mk Sun Aug 31 20:14:22 2014 (r270887) @@ -383,6 +383,7 @@ WITH_IDEA= OPENSSL \ PAM \ PF \ + PKGBOOTSTRAP \ PKGTOOLS \ PMC \ PORTSNAP \ Modified: stable/8/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/8/tools/build/mk/OptionalObsoleteFiles.inc Sun Aug 31 20:11:26 2014 (r270886) +++ stable/8/tools/build/mk/OptionalObsoleteFiles.inc Sun Aug 31 20:14:22 2014 (r270887) @@ -1216,6 +1216,11 @@ OLD_FILES+=usr/share/man/man1/nc.1.gz # to be filled in #.endif +.if ${MK_PKGBOOTSTRAP} == no +OLD_FILES+=usr/sbin/pkg +OLD_FILES+=usr/share/man/man7/pkg.7.gz +.endif + .if ${MK_PKGTOOLS} == no OLD_FILES+=etc/periodic/security/460.chkportsum OLD_FILES+=etc/periodic/weekly/400.status-pkg Copied: stable/8/tools/build/options/WITHOUT_PKGBOOTSTRAP (from r270885, head/tools/build/options/WITHOUT_PKGBOOTSTRAP) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/tools/build/options/WITHOUT_PKGBOOTSTRAP Sun Aug 31 20:14:22 2014 (r270887, copy of r270885, head/tools/build/options/WITHOUT_PKGBOOTSTRAP) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr pkg 7 +bootstrap tool. Modified: stable/8/usr.sbin/Makefile ============================================================================== --- stable/8/usr.sbin/Makefile Sun Aug 31 20:11:26 2014 (r270886) +++ stable/8/usr.sbin/Makefile Sun Aug 31 20:14:22 2014 (r270887) @@ -361,9 +361,12 @@ _keyserv= keyserv _ftp-proxy= ftp-proxy .endif +.if ${MK_PKGBOOTSTRAP} != "no" +SUBDIR+= pkg +.endif + .if ${MK_PKGTOOLS} != "no" _pkg_install= pkg_install -SUBDIR+= pkg .endif # XXX MK_TOOLCHAIN?