CVS commit: pkgsrc/bootstrap

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/bootstrap
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Tue, 15 Nov 2016 11:19:09 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Nov 15 11:19:09 UTC 2016

Modified Files:
        pkgsrc/bootstrap: README README.Bitrig README.FreeBSD README.Interix
            README.MirBSD README.OpenBSD bootstrap

Log Message:
Change the default PKG_DBDIR to be ${LOCALBASE}/pkgdb.  Resolves issues on
other BSDs which already use /var/db/pkg for the native package manager.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/bootstrap/README
cvs rdiff -u -r1.1 -r1.2 pkgsrc/bootstrap/README.Bitrig
cvs rdiff -u -r1.6 -r1.7 pkgsrc/bootstrap/README.FreeBSD
cvs rdiff -u -r1.17 -r1.18 pkgsrc/bootstrap/README.Interix
cvs rdiff -u -r1.2 -r1.3 pkgsrc/bootstrap/README.MirBSD
cvs rdiff -u -r1.4 -r1.5 pkgsrc/bootstrap/README.OpenBSD
cvs rdiff -u -r1.233 -r1.234 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/README
diff -u pkgsrc/bootstrap/README:1.12 pkgsrc/bootstrap/README:1.13
--- pkgsrc/bootstrap/README:1.12        Wed Jan 11 01:15:17 2012
+++ pkgsrc/bootstrap/README     Tue Nov 15 11:19:09 2016
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.12 2012/01/11 01:15:17 riz Exp $
+$NetBSD: README,v 1.13 2016/11/15 11:19:09 jperkin Exp $
 
 To try to get pkgsrc working on your system, please try the following
 as root:
@@ -17,13 +17,11 @@ as root:
 The defaults for the arguments are as follows:
 
        --prefix        /usr/pkg
-       --pkgdbdir      /var/db/pkg
+       --pkgdbdir      /usr/pkg/pkgdb
        --sysconfdir    /usr/pkg/etc
        --varbase       /var
        --workdir       work
 
-It is perfectly acceptable to place 'pkgdbdir' under 'prefix'.
-
 The working directory will be created if it doesn't exist and has to be
 writable by the user executing ./bootstrap.
 

Index: pkgsrc/bootstrap/README.Bitrig
diff -u pkgsrc/bootstrap/README.Bitrig:1.1 pkgsrc/bootstrap/README.Bitrig:1.2
--- pkgsrc/bootstrap/README.Bitrig:1.1  Thu Jun  4 15:48:45 2015
+++ pkgsrc/bootstrap/README.Bitrig      Tue Nov 15 11:19:09 2016
@@ -1,16 +1,11 @@
-$NetBSD: README.Bitrig,v 1.1 2015/06/04 15:48:45 sevan Exp $
+$NetBSD: README.Bitrig,v 1.2 2016/11/15 11:19:09 jperkin Exp $
 
 Please read the general README file as well.
 
 Care should be taken so that the tools that this kit installs do not conflict
 with the Bitrig userland tools. There are several steps:
 
-1. Bitrig stores its ports pkg database in /var/db/pkg. Therefore, you must
-choose a different location (e.g. /var/db/pkgsrc) by using the --pkgdbdir
-option to the bootstrap script. If you don't do this, installing pkgsrc
-packages will result in numerous PLIST errors upon install.
-
-2. If you do not intend to use the Bitrig ports tools, it's probably a
+1. If you do not intend to use the Bitrig ports tools, it's probably a
 good idea to move them out of the way to avoid confusion, e.g.:
        cd /usr/sbin
        mv pkg_add pkg_add.orig
@@ -18,7 +13,7 @@ good idea to move them out of the way to
        mv pkg_delete pkg_delete.orig
        mv pkg_info pkg_info.orig
 
-3. The bootstrap script will create an example mk.conf file located in
+2. The bootstrap script will create an example mk.conf file located in
 pkgsrc/bootstrap/work/mk.conf.example. It contains the settings you provided to 
 bootstrap. Copy it to your $sysconfdir directory. If $sysconfdir/mk.conf doesn't
 exist, the example is copied into place.

Index: pkgsrc/bootstrap/README.FreeBSD
diff -u pkgsrc/bootstrap/README.FreeBSD:1.6 pkgsrc/bootstrap/README.FreeBSD:1.7
--- pkgsrc/bootstrap/README.FreeBSD:1.6 Mon Dec 16 10:43:09 2013
+++ pkgsrc/bootstrap/README.FreeBSD     Tue Nov 15 11:19:09 2016
@@ -1,15 +1,11 @@
-$NetBSD: README.FreeBSD,v 1.6 2013/12/16 10:43:09 asau Exp $
+$NetBSD: README.FreeBSD,v 1.7 2016/11/15 11:19:09 jperkin Exp $
 
 Please read the general README file as well.
 
 Care should be taken so that the tools that this kit installs do not conflict
-with the FreeBSD userland tools. There are several steps:
+with the FreeBSD userland tools.
 
-1. FreeBSD stores its ports pkg database in /var/db/pkg. It is therefore
-recommended that you choose a different location (e.g. /usr/pkg/pkgdb) by
-using the --pkgdbdir option to the bootstrap script.
-
-2. If you do not intend to use the FreeBSD ports tools, it may be a
+If you do not intend to use the FreeBSD ports tools, it may be a
 good idea to move them out of the way to avoid confusion, e.g.:
        cd /usr/sbin
        mv pkg_add pkg_add.orig
@@ -19,6 +15,5 @@ good idea to move them out of the way to
 
 Alternatively, take care to get pkgsrc tools first in PATH.
 
-
 bootstrap-pkgsrc has been tested on FreeBSD 4.x and 5.x (i386).
 pkgsrc works well on FreeBSD 6.2-6.4, 7.1-7.3 (i386), 9.0-9.1 (amd64).

Index: pkgsrc/bootstrap/README.Interix
diff -u pkgsrc/bootstrap/README.Interix:1.17 pkgsrc/bootstrap/README.Interix:1.18
--- pkgsrc/bootstrap/README.Interix:1.17        Sun Jul 10 01:25:16 2016
+++ pkgsrc/bootstrap/README.Interix     Tue Nov 15 11:19:09 2016
@@ -1,4 +1,4 @@
-$NetBSD: README.Interix,v 1.17 2016/07/10 01:25:16 sevan Exp $
+$NetBSD: README.Interix,v 1.18 2016/11/15 11:19:09 jperkin Exp $
 
 Interix is a POSIX-compatible subsystem for the Windows NT kernel, providing a
 Unix-like environment with a tighter kernel integration than available with
@@ -95,7 +95,7 @@ requirement of "root".
 
 The package manager should use a umask of 002. "make install" will automatically
 complain if this is not the case. This ensures that directories written in
-/var/db/pkg are Administrators-group writeable.
+/usr/pkg/pkgdb are Administrators-group writeable.
 
 The popular Interix binary packages from http://www.interopsystems.com/ use an
 older version of pkgsrc's pkg_* tools. Ideally, these should NOT be used in

Index: pkgsrc/bootstrap/README.MirBSD
diff -u pkgsrc/bootstrap/README.MirBSD:1.2 pkgsrc/bootstrap/README.MirBSD:1.3
--- pkgsrc/bootstrap/README.MirBSD:1.2  Sun Jul  3 14:47:05 2016
+++ pkgsrc/bootstrap/README.MirBSD      Tue Nov 15 11:19:09 2016
@@ -1,4 +1,4 @@
-$NetBSD: README.MirBSD,v 1.2 2016/07/03 14:47:05 sevan Exp $
+$NetBSD: README.MirBSD,v 1.3 2016/11/15 11:19:09 jperkin Exp $
 
 Please read the general README file as well.
 
@@ -11,16 +11,12 @@ be used to gain root privileges.
 MirPorts and pkgsrc can be installed in parallel. The MirPorts framework
 uses /usr/mpkg as its default prefix and /usr/mpkg/db/pkg as its package
 database directory. Thus, its paths do not clash with the default
-choices of pkgsrc, which are /usr/pkg and /var/db/pkg respectively. We
-suggest however that you place the package database for pkgsrc below its
-prefix, for example by specifying the
-
-       --pkgdbdir /usr/pkg/db
-
-option to bootstrap. Please note that the package tools from MirPorts
-and pkgsrc have the same names (e.g. pkg_add) but are incompatible. This
-leads to strage behavior when building or installing packages if both
-frameworks are in your PATH.
+choices of pkgsrc, which are /usr/pkg and /usr/pkg/pkgdb respectively.
+
+Please note that the package tools from MirPorts and pkgsrc have the
+same names (e.g. pkg_add) but are incompatible. This leads to strage
+behavior when building or installing packages if both frameworks are in
+your PATH.
 
 Thus, before you start the bootstrap, you must make sure that
 /usr/mpkg/bin and /usr/mpkg/sbin are NOT in your PATH if MirPorts is

Index: pkgsrc/bootstrap/README.OpenBSD
diff -u pkgsrc/bootstrap/README.OpenBSD:1.4 pkgsrc/bootstrap/README.OpenBSD:1.5
--- pkgsrc/bootstrap/README.OpenBSD:1.4 Sun Apr  5 00:40:07 2015
+++ pkgsrc/bootstrap/README.OpenBSD     Tue Nov 15 11:19:09 2016
@@ -1,15 +1,11 @@
-$NetBSD: README.OpenBSD,v 1.4 2015/04/05 00:40:07 rodent Exp $
+$NetBSD: README.OpenBSD,v 1.5 2016/11/15 11:19:09 jperkin Exp $
 
 Please read the general README file as well.
 
 Care should be taken so that the tools that this kit installs do not conflict
 with the OpenBSD userland tools. There are several steps:
 
-1. OpenBSD stores its ports pkg database in /var/db/pkg. It is therefore
-recommended that you choose a different location (e.g. /usr/pkgdb) by
-using the --pkgdbdir option to the bootstrap script.
-
-2. If you do not intend to use the OpenBSD ports tools, it's probably a
+1. If you do not intend to use the OpenBSD ports tools, it's probably a
 good idea to move them out of the way to avoid confusion, e.g.:
        cd /usr/sbin
        mv pkg_add pkg_add.orig
@@ -17,7 +13,7 @@ good idea to move them out of the way to
        mv pkg_delete pkg_delete.orig
        mv pkg_info pkg_info.orig
 
-3. The bootstrap script will create an example mk.conf file located in
+2. The bootstrap script will create an example mk.conf file located in
 pkgsrc/bootstrap/work/mk.conf.example. It contains the settings you provided to 
 bootstrap. Copy it to your $sysconfdir directory. If $sysconfdir/mk.conf doesn't
 exist, the example is copied into place.

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.233 pkgsrc/bootstrap/bootstrap:1.234
--- pkgsrc/bootstrap/bootstrap:1.233    Tue Nov  1 20:44:22 2016
+++ pkgsrc/bootstrap/bootstrap  Tue Nov 15 11:19:09 2016
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.233 2016/11/01 20:44:22 jperkin Exp $
+# $NetBSD: bootstrap,v 1.234 2016/11/15 11:19:09 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -487,7 +487,7 @@ elif [ -z "$prefix" -o "$prefix" = "/usr
 fi
 
 [ -z "$varbase" ] && varbase=${prefix}/var
-[ -z "$pkgdbdir" ] && pkgdbdir=${varbase}/db/pkg
+[ -z "$pkgdbdir" ] && pkgdbdir=${prefix}/pkgdb
 
 if [ "$prefix" = "/usr" ]; then
        [ -z "$pkginfodir" ] && pkginfodir=share/info

Follow-Ups:
- Re: CVS commit: pkgsrc/bootstrap
  - From: Joerg Sonnenberger

Prev by Date: CVS commit: pkgsrc/mail/neomutt
Next by Date: Re: CVS commit: pkgsrc/bootstrap
Previous by Thread: CVS commit: pkgsrc/mail/neomutt
Next by Thread: Re: CVS commit: pkgsrc/bootstrap
Indexes:

Home | Main Index | Thread Index | Old Index