[pkgsrc/trunk]: pkgsrc Move pkgtools/pkg_comp to pkgtools/pkg_comp1.

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a36c537decc
branches:  trunk
changeset: 358424:2a36c537decc
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Feb 12 10:48:55 2017 +0000

description:
Move pkgtools/pkg_comp to pkgtools/pkg_comp1.

This is to make room for pkg_comp 2.0, which is coming soon.  The new release
is significantly different from the 1.x series in features (supports multiple
platforms, bootstrap, and pbulk) but also comes with a different configuration
syntax.

diffstat:

 doc/CHANGES-2017                     |     3 +-
 pkgtools/Makefile                    |     4 +-
 pkgtools/pkg_comp/DESCR              |    14 -
 pkgtools/pkg_comp/Makefile           |    23 -
 pkgtools/pkg_comp/PLIST              |     3 -
 pkgtools/pkg_comp/files/pkg_comp.8   |   543 -----------------
 pkgtools/pkg_comp/files/pkg_comp.sh  |  1060 ----------------------------------
 pkgtools/pkg_comp1/DESCR             |    14 +
 pkgtools/pkg_comp1/Makefile          |    25 +
 pkgtools/pkg_comp1/PLIST             |     3 +
 pkgtools/pkg_comp1/files/pkg_comp.8  |   543 +++++++++++++++++
 pkgtools/pkg_comp1/files/pkg_comp.sh |  1060 ++++++++++++++++++++++++++++++++++
 12 files changed, 1649 insertions(+), 1646 deletions(-)

diffs (truncated from 3360 to 300 lines):

diff -r 2e4b8dc64efb -r 2a36c537decc doc/CHANGES-2017
--- a/doc/CHANGES-2017  Sun Feb 12 10:29:04 2017 +0000
+++ b/doc/CHANGES-2017  Sun Feb 12 10:48:55 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.699 2017/02/12 10:29:04 adam Exp $
+$NetBSD: CHANGES-2017,v 1.700 2017/02/12 10:48:55 jmmv Exp $
 
 Changes to the packages collection and infrastructure in 2017:
 
@@ -866,3 +866,4 @@
        Updated misc/ruby-ohai to 8.23.0 [mef 2017-02-12]
        Updated misc/libreoffice to 5.3.0.3nb4 [ryoon 2017-02-12]
        Updated www/awstats to 7.6 [adam 2017-02-12]
+       Moved pkgtools/pkg_comp to pkgtools/pkg_comp1 [2017-02-12]
diff -r 2e4b8dc64efb -r 2a36c537decc pkgtools/Makefile
--- a/pkgtools/Makefile Sun Feb 12 10:29:04 2017 +0000
+++ b/pkgtools/Makefile Sun Feb 12 10:48:55 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2016/10/01 18:42:53 kamil Exp $
+# $NetBSD: Makefile,v 1.115 2017/02/12 10:48:55 jmmv Exp $
 #
 
 COMMENT=       Tools for use in the packages collection
@@ -34,7 +34,7 @@
 SUBDIR+=       pkg
 SUBDIR+=       pkg_alternatives
 SUBDIR+=       pkg_chk
-SUBDIR+=       pkg_comp
+SUBDIR+=       pkg_comp1
 SUBDIR+=       pkg_distinst
 SUBDIR+=       pkg_filecheck
 SUBDIR+=       pkg_install
diff -r 2e4b8dc64efb -r 2a36c537decc pkgtools/pkg_comp/DESCR
--- a/pkgtools/pkg_comp/DESCR   Sun Feb 12 10:29:04 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-pkg_comp is a small utility designed to build packages inside a
-clean chroot tree.
-
-Some ideas about what to use it for (taken from manpage):
-* Build packages for other system versions. For example, build
-  packages for NetBSD 1.5 while you are running NetBSD current.
-* Build packages using different options than your current system
-  like changing the threading library, COPTS, placement of
-  configuration files, etc.
-* Debug the build process of a package, checking if buildlinks
-  work properly.
-* Avoid autoconf's side effects by keeping a separate chroot for
-  each project, like one for GNOME2 and another one for KDE3.
-* Schedule builds of package sets for several different machines.
diff -r 2e4b8dc64efb -r 2a36c537decc pkgtools/pkg_comp/Makefile
--- a/pkgtools/pkg_comp/Makefile        Sun Feb 12 10:29:04 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.55 2015/11/21 23:10:27 agc Exp $
-
-PKGNAME=       pkg_comp-1.38
-PKGREVISION=   1
-CATEGORIES=    pkgtools
-
-MAINTAINER=    jmmv%NetBSD.org@localhost
-COMMENT=       Build packages inside a chroot jail
-LICENSE=       modified-bsd
-
-ONLY_FOR_PLATFORM=     NetBSD-*-*
-
-WRKSRC=                ${WRKDIR}
-NO_CONFIGURE=  YES
-NO_BUILD=      YES
-
-INSTALLATION_DIRS=     ${PKGMANDIR}/man8 sbin
-
-do-install:
-       ${INSTALL_SCRIPT} ${FILESDIR}/pkg_comp.sh ${DESTDIR}${PREFIX}/sbin/pkg_comp
-       ${INSTALL_MAN} ${FILESDIR}/pkg_comp.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/pkg_comp.8
-
-.include "../../mk/bsd.pkg.mk"
diff -r 2e4b8dc64efb -r 2a36c537decc pkgtools/pkg_comp/PLIST
--- a/pkgtools/pkg_comp/PLIST   Sun Feb 12 10:29:04 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/07 00:08:35 rh Exp $
-sbin/pkg_comp
-man/man8/pkg_comp.8
diff -r 2e4b8dc64efb -r 2a36c537decc pkgtools/pkg_comp/files/pkg_comp.8
--- a/pkgtools/pkg_comp/files/pkg_comp.8        Sun Feb 12 10:29:04 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,543 +0,0 @@
-.\" $NetBSD: pkg_comp.8,v 1.41 2015/11/21 23:10:27 agc Exp $
-.\"
-.\" pkg_comp - Build packages inside a clean chroot environment
-.\" Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv%NetBSD.org@localhost>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\" 3. Neither the name of author nor the names of its contributors may
-.\"    be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (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 August 17, 2015
-.Dt PKG_COMP 8
-.Os
-.Sh NAME
-.Nm pkg_comp
-.Nd build packages inside a sandbox
-.Sh SYNOPSIS
-.Nm
-.Oo Fl Po
-.Cm c Ns \&| Ns Cm C
-.Pc
-.Ar conf_file
-.Oc
-.Op Fl Nn
-.Ar target
-.Op Ar pkg_name ...
-.Sh DESCRIPTION
-.Nm ,
-or
-.Em Package Compiler
-in its full name,
-is a tool that makes easy the compilation of packages inside a clean
-sandbox.
-This allows an easy tracking of exact dependencies
-and the correct behavior of a package in a fresh system installation.
-.Pp
-The behavior of
-.Nm
-is controlled through a small configuration file and a target (keep
-reading to learn more).
-The configuration file tells
-.Nm
-how to configure the new chroot environment, and the target specifies
-which action to take.
-.Pp
-The following options are recognized:
-.Bl -tag -width XcXconf_file
-.It Fl C Ar conf_file
-Use
-.Ar conf_file
-as configuration file (full path expected).
-.It Fl c Ar conf_file
-Use
-.Ar conf_file
-as configuration file (only base name expected).
-.It Fl N
-With the exception of
-.Pa pkgtools/libkver
-(see
-.Va NETBSD_RELEASE )
-avoid installation of default packages as well as
-.Va INSTALL_PACKAGES
-and
-.Va BUILD_PACKAGES
-during the creation of the chroot.
-.It Fl n
-Avoid installation of
-.Va INSTALL_PACKAGES
-and
-.Va BUILD_PACKAGES
-during the creation of the chroot.
-.El
-.Ss What to use it for?
-You can use
-.Nm
-to achieve many goals when building packages.
-Here are some ideas:
-.Bl -bullet
-.It
-Build packages for other system versions.
-For example, build packages for
-.Nx 4.0
-while you are running
-.Nx 5.0 .
-.It
-Build packages using different
-.Pa mk.conf
-options than your current system, like changing the threading library,
-.Sy COPTS ,
-placement of configuration files, etc.
-.It
-Debug the build process of a package, checking if buildlinks work
-properly.
-.It
-Avoid autoconf's side effects by keeping a separate chroot for each
-project, like one for GNOME2 and another one for KDE3.
-.It
-Schedule builds of package sets for several different machines.
-.El
-.Sh CONTROL DIRECTORY
-.Nm
-needs to store several pieces of information when it is running.
-Instead of using normal system trees, it uses a special directory inside the
-chroot to avoid polluting the system.
-It stores there scripts, object files, built packages, etc.
-This directory is
-.Pa $DESTDIR/pkg_comp ;
-the symbolic link
-.Pa $DESTDIR/p
-is automatically created to ease pathnames when working inside the chroot.
-.Sh CONFIGURATION
-With
-.Nm
-you can maintain several configuration files so you can work with
-different chroot jails easily.
-To make this easy, configuration files are stored inside
-.Pa $HOME/pkg_comp ,
-followed by the configuration file name and the .conf suffix.
-The default configuration file is
-.Pa $HOME/pkg_comp/default.conf ,
-and is always used if you do not specify another one.
-The configuration file name is specified by the argument of the
-.Fl c
-option.
-Alternatively you can specify any pathname as a configuration file
-with the argument of the
-.Fl C
-option.
-.Pp
-Configuration files are simple shell scripts that define
-variables.
-The default values shown here are those written in the template when
-issuing a maketemplate.
-.Bl -tag -width indent
-.It AUTO_PACKAGES
-A list of packages to automatically build during the
-.Sy auto
-target.
-A package is in the form
-.Sq section/name ,
-like
-.Sq misc/colorls ,
-or a plain name like
-.Sq colorls .
-Defaults to nothing.
-.It AUTO_TARGET
-The pkgsrc target to use when building packages in an automated fashion
-(using the
-.Ql auto
-target).
-Should be set to
-.Ql package
-or
-.Ql bin-install ,
-as other values are useless.
-Defaults to
-.Ql package .
-.It BUILD_PACKAGES
-A list of packages to automatically build after the
-.Sy makeroot
-target.
-A package is in the form
-.Sq section/name ,
-like
-.Sq misc/colorls ,
-or a plain name like
-.Sq colorls .
-Defaults to nothing.
-.It BUILD_PKG_COMP_TARGET
-The pkgsrc target to use when building packages.
-It can contain any target supported by the pkgsrc system, but
-reasonable values are:
-.Ql install ,
-.Ql package
-and
-.Ql bin-install .
-Defaults to
-.Ql package .
-.It COPYROOTCFG
-If set to
-.Ql yes ,
-all configuration files (not directories) that reside inside
-.Pa /root
-are copied to
-.Sy $DESTDIR/root .
-Defaults to
-.Ql no .
-.It DESTDIR
-The chroot jail directory.
-Defaults to
-.Pa /var/chroot/pkg_comp/default .
-.It DISTRIBDIR
-This is the directory which holds