svn commit: r46699 - head/en_US.ISO8859-1/books/handbook/ports

Brad Davis brd at
Sat May 16 21:32:52 UTC 2015

Author: brd
Date: Sat May 16 21:32:51 2015
New Revision: 46699

  Note that pkg(8) uses the official mirrors by default and link to the Poudriere section for more information about building a custom repository.
  Clean up some man page links.
  Add a section about configuring Poudriere repositories and configuring pkg(8) to use them.


Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat May 16 16:56:01 2015	(r46698)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat May 16 21:32:51 2015	(r46699)
@@ -698,18 +698,15 @@ docbook                     =
       <programlisting>WITH_PKGNG=	yes</programlisting>
-      <para>The <application>pkg</application> package management
-	system uses a package repository for most operations.  The
-	default package repository location is defined in
-	<filename>/usr/local/etc/pkg.conf</filename> or by the
-	<envar>PACKAGESITE</envar> environment variable, which
-	overrides the configuration file.</para>
+      <para>By default <application>pkg</application> uses the &os;
+	package mirrors.  For information about building a custom
+	package repository, see <xref linkend="ports-poudriere"/></para>
       <para>Additional <application>pkg</application>
-	configuration options are described in pkg.conf(5).</para>
+	configuration options are described in &man.pkg.conf.5;.</para>
       <para>Usage information for <application>pkg</application> is
-	available in pkg(8) or by running
+	available in the &man.pkg.8; manpage or by running
 	<command>pkg</command> without additional arguments.</para>
       <para>Each <application>pkg</application> command argument is
@@ -1319,7 +1316,7 @@ Deinstalling ca_root_nss-3.15.1_1... don
       <para>Installed ports can be uninstalled using <command>pkg
 	  delete</command>.  Examples for using this command can be
-	found in <xref linkend="pkgng-intro"/>.</para>
+	found in the &man.pkg-delete.8; manpage.</para>
       <para>Alternately, <command>make deinstall</command> can be
 	run in the port's directory:</para>
@@ -1764,6 +1761,40 @@ ports-mgmt/pkg
 	and the main web site, <link
+    <sect2>
+      <title>Configuring pkg clients to use a Poudriere repository</title>
+      <para>While it is possible to use both a custom repository along
+	side of the official repository.  Sometimes it is useful to
+	disable the official repository.  This is done by creating a
+	configuration file that overrides and disables the official
+	configuration file.  Create
+	<filename>/usr/local/etc/pkg/repos/FreeBSD.conf</filename>
+	that contains the following:</para>
+      <screen>FreeBSD: {
+	enabled: no
+      <para>Usually it is easiest to serve a poudriere repository to the
+	client machines via HTTP.  Setup a webserver to serve up the
+	package directory, usually something like:
+	<filename>/usr/local/poudriere/data/packages/<replaceable>10amd64</replaceable></filename>.
+	Where <filename>10amd64</filename> is the name of the build.
+      </para>
+      <para>If the URL to the package repository is:
+	<literal></literal>, then the
+	repository configuration file in
+	<filename>/usr/local/etc/pkg/repos/custom.conf</filename> would
+	look like:</para>
+      <screen>custom: {
+	url: "<replaceable></replaceable>",
+	mirror_type: "http",
+	enabled: yes,
+    </sect2>
   <sect1 xml:id="ports-nextsteps">

More information about the svn-doc-all mailing list