svn commit: r257573 - in stable/10: tools/build/mk tools/build/options usr.sbin/pkg

[Bryan Drewery]

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 <pkg.txz> xxxxxxx" -compact
+.Bl -tag -width "pkg add <pkg.txz> 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