From owner-svn-src-stable@FreeBSD.ORG Sun Nov 3 13:06:45 2013 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 ESMTP id 4E20DF21; Sun, 3 Nov 2013 13:06:45 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 287722D9B; Sun, 3 Nov 2013 13:06:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3D6iHd073929; Sun, 3 Nov 2013 13:06:44 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3D6iPc073921; Sun, 3 Nov 2013 13:06:44 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201311031306.rA3D6iPc073921@svn.freebsd.org> From: Bryan Drewery Date: Sun, 3 Nov 2013 13:06:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r257573 - in stable/10: tools/build/mk tools/build/options usr.sbin/pkg X-SVN-Group: stable-10 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.14 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, 03 Nov 2013 13:06:45 -0000 Author: bdrewery (ports committer) Date: Sun Nov 3 13:06:43 2013 New Revision: 257573 URL: http://svnweb.freebsd.org/changeset/base/257573 Log: MFC r257378,r257400,r257402,r257440: Add a pkg(7) manpage for bootstrap Approved by: bapt Approved by: re (gjb) Added: stable/10/usr.sbin/pkg/pkg.7 - copied, changed from r257378, head/usr.sbin/pkg/pkg.7 Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc stable/10/tools/build/options/WITHOUT_PKGBOOTSTRAP stable/10/usr.sbin/pkg/Makefile Directory Properties: stable/10/tools/build/ (props changed) stable/10/tools/build/options/ (props changed) stable/10/usr.sbin/pkg/ (props changed) Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 3 13:00:12 2013 (r257572) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 3 13:06:43 2013 (r257573) @@ -3659,6 +3659,7 @@ OLD_FILES+=usr/share/man/man8/tftp-proxy .if ${MK_PKGBOOTSTRAP} == no OLD_FILES+=usr/sbin/pkg +OLD_FILES+=usr/share/man/man7/pkg.7.gz .endif .if ${MK_PKGTOOLS} == no Modified: stable/10/tools/build/options/WITHOUT_PKGBOOTSTRAP ============================================================================== --- stable/10/tools/build/options/WITHOUT_PKGBOOTSTRAP Sun Nov 3 13:00:12 2013 (r257572) +++ stable/10/tools/build/options/WITHOUT_PKGBOOTSTRAP Sun Nov 3 13:06:43 2013 (r257573) @@ -1,4 +1,4 @@ .\" $FreeBSD$ Set to not build -.Xr pkg 1 +.Xr pkg 7 bootstrap tool Modified: stable/10/usr.sbin/pkg/Makefile ============================================================================== --- stable/10/usr.sbin/pkg/Makefile Sun Nov 3 13:00:12 2013 (r257572) +++ stable/10/usr.sbin/pkg/Makefile Sun Nov 3 13:06:43 2013 (r257573) @@ -2,8 +2,8 @@ PROG= pkg SRCS= pkg.c dns_utils.c config.c +MAN= pkg.7 -NO_MAN= yes CFLAGS+=-I${.CURDIR}/../../contrib/libyaml/include .PATH: ${.CURDIR}/../../contrib/libyaml/include DPADD= ${LIBARCHIVE} ${LIBELF} ${LIBFETCH} ${LIBYAML} ${LIBSBUF} ${LIBSSL} \ Copied and modified: stable/10/usr.sbin/pkg/pkg.7 (from r257378, head/usr.sbin/pkg/pkg.7) ============================================================================== --- head/usr.sbin/pkg/pkg.7 Wed Oct 30 10:39:14 2013 (r257378, copy source) +++ stable/10/usr.sbin/pkg/pkg.7 Sun Nov 3 13:06:43 2013 (r257573) @@ -29,7 +29,7 @@ .Os .Sh NAME .Nm pkg -.Nd a utility for manipulating packages. +.Nd a utility for manipulating packages .Sh SYNOPSIS .Nm .Ao Ar command Ac @@ -55,8 +55,7 @@ The first time invoked, will bootstrap the real .Xr pkg 8 from a remote repository. -.Pp -.Bl -tag -width "pkg add xxxxxxx" -compact +.Bl -tag -width "pkg add xxxxxxx" .It Nm Ao Ar command Ac If .Xr pkg 8 @@ -142,6 +141,7 @@ SIGNATURE_TYPE: "none", FINGERPRINTS: "/usr/share/keys/pkg", ASSUME_ALWAYS_YES: "yes" .Ed +.Pp Reference .Sx ENVIRONMENT for each variable. @@ -246,8 +246,8 @@ Check installed packages for checksum mi Check for missing dependencies: .Dl # pkg check -d -a .Sh SEE ALSO -.Xr pkg 8 , -.Xr ports 7 +.Xr ports 7 , +.Xr pkg 8 .Sh HISTORY The .Nm