Deprecate PLIST_DB. Prefer PLIST_REPOSITORY (same semantics, except that

ARCH gets appended automatically)

1 files changed, 17 insertions, 8 deletions

diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index b520f932636..5b85c235de9 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.435 2016/04/25 19:24:42 tedu Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.436 2016/05/17 13:42:28 espie Exp $
 .\"
 .\" Copyright (c) 2000-2008 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: April 25 2016 $
+.Dd $Mdocdate: May 17 2016 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -152,7 +152,7 @@ Verify from the ports tree, without building anything, that the current
 subpackage will register okay
 .Po
 see
-.Ev PLIST_DB
+.Ev PLIST_REPOSITORY
 .Pc .
 .It Cm check-register-all
 Apply
@@ -476,7 +476,7 @@ for each package in the
 .Ev MULTI_PACKAGES
 list.
 If the repository already contains up-to-date packages, they are not rebuilt.
-If PLIST_DB is set, the resulting packaging information is compared
+If PLIST_REPOSITORY is set, the resulting packaging information is compared
 with existing stuff, and saved if new, with loud complaints if it changed
 without a REVISION bump.
 Arch-independent packages are created in ${PACKAGE_REPOSITORY}/no-arch,
@@ -2380,8 +2380,11 @@ Do not override without very good reasons,
 namely software that coexist as different incompatible versions with the
 same stem, e.g., already a mess.
 .It Ev PLIST_DB
+Deprecated, see
+.Ev PLIST_REPOSITORY .
+.It Ev PLIST_REPOSITORY
 User settings.
-Directory used to save generated packing-lists, as persistent information.
+Base directory used to save generated packing-lists, as persistent information.
 Packing-lists are processed by a script,
 .Xr register-plist 1 ,
 which complains when packing-lists change without a
@@ -2395,7 +2398,11 @@ This directory is never cleaned during normal operation.
 .Ql make clean=plist
 should only ever be used during debugging by port maintainers.
 Defaults to
-.Pa ${PORTSDIR}/plist/${MACHINE_ARCH} .
+.Pa ${PORTSDIR}/plist
+.Po
+plists actually get saved into
+.Pa ${PLIST_REPOSITORY}/${MACHINE_ARCH}
+.Pc .
 If set to empty, will not register anything: very much unsafe.
 .It Ev PORTS_BUILD_XENOCARA_TOO
 EXPERIMENTAL.
@@ -3665,12 +3672,14 @@ The special
 target does a fairly good job of automatically generating the PLIST.
 .Pp
 If
-.Ev PLIST_DB
+.Ev PLIST_REPOSITORY
 points to a directory, all packing-lists from packages generated by
 .Xr pkg_create 1
 during the
 .Cm package
-stage are saved in that location by a script:
+stage are saved in
+.Pa ${PLIST_REPOSITORY}/${MACHINE_ARCH}
+by a script:
 .Pa ${PORTSDIR}/infrastructure/bin/register-plist .
 This script strips some irrelevant information and normalizes the
 packing-list somehow, and compares it to existing information, looking