From: espie <espie@openbsd.org>
Date: Thu, 16 Apr 2015 13:40:56 +0000 (+0000)
Subject: document % sequences.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3043f72c90a17f72f7879566a3920e7450a251d6;p=openbsd

document % sequences.
---

diff --git a/usr.sbin/pkg_add/pkg.conf.5 b/usr.sbin/pkg_add/pkg.conf.5
index c25df168d85..92fad96ec77 100644
--- a/usr.sbin/pkg_add/pkg.conf.5
+++ b/usr.sbin/pkg_add/pkg.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg.conf.5,v 1.5 2012/10/11 17:35:45 sthen Exp $
+.\"	$OpenBSD: pkg.conf.5,v 1.6 2015/04/16 13:40:56 espie Exp $
 .\"
 .\" Copyright (c) 2010 Marc Espie
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 11 2012 $
+.Dd $Mdocdate: April 16 2015 $
 .Dt PKG.CONF 5
 .Os
 .Sh NAME
@@ -70,6 +70,22 @@ URL to package repository updated during installation.
 Used for accessing packages if the environment variable
 .Ev PKG_PATH
 is not defined and no further options are defined.
+.Pp
+Special sequences
+.Sq %c ,
+.Sq %v ,
+.Sq %a 
+will be expanded to 
+.Sq OS version or snapshots ,
+.Sq OS version ,
+and
+.Sq package architecture
+respectively, e.g,
+.Bd -literal -offset indent
+installpath = http://somesite/pub/OpenBSD/%c/packages/%a/
+.Ed
+.Pp
+should work.
 .It Ar nochecksum
 Set to
 .Ar yes
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index edc10d4de52..ea1766a98b2 100644
--- a/usr.sbin/pkg_add/pkg_add.1
+++ b/usr.sbin/pkg_add/pkg_add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_add.1,v 1.129 2014/11/17 23:03:37 sthen Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.130 2015/04/16 13:40:56 espie Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -15,7 +15,7 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.Dd $Mdocdate: November 17 2014 $
+.Dd $Mdocdate: April 16 2015 $
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
@@ -758,6 +758,14 @@ The current directory may be indicated
 implicitly by an empty directory name, or explicitly by a single
 period
 .Pq Ql \&./ .
+Special sequences
+.Sq %c ,
+.Sq %v ,
+.Sq %a 
+will be expanded with the same semantics as
+.Ar installpath
+in
+.Xr pkg.conf 5 .
 .It Ev PKG_TMPDIR
 Temporary area where package information files will be extracted, instead of
 .Pa /var/tmp .