svn commit: r270887 - in stable/8: share/mk tools/build/mk tools/build/options usr.sbin

[Peter Wemm]

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?