CVS commit: pkgsrc/pkgtools

["Julio Merino" <jmmv%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmmv
Date:           Fri Feb 17 21:25:46 UTC 2017

Modified Files:
        pkgsrc/pkgtools: Makefile
Added Files:
        pkgsrc/pkgtools/pkg_comp: DESCR Makefile PLIST distinfo

Log Message:
Readd pkg_comp, now at version 2.0:

**Released on 2017-02-17.**

This is the first release of the pkg_comp project as a standalone
package.  This new release shares no code with previous versions and is
not compatible with them.

The following are the major differences between pkg_comp 2.0 and all
previous releases, which incidentally are the reasons that triggered
this rewrite:

* Support for multiple platforms.

* Use of pbulk to (re)build packages within the sandbox.  This results
  in more reliable incremental builds after pkgsrc updates.

* Support for bootstrap, generating binary kits as part of the builds.

* Better scriptability to allow running from cron(8) trivially.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/pkgtools/Makefile
cvs rdiff -u -r0 -r1.4 pkgsrc/pkgtools/pkg_comp/DESCR
cvs rdiff -u -r0 -r1.57 pkgsrc/pkgtools/pkg_comp/Makefile
cvs rdiff -u -r0 -r1.3 pkgsrc/pkgtools/pkg_comp/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/pkg_comp/distinfo

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

Modified files:

Index: pkgsrc/pkgtools/Makefile
diff -u pkgsrc/pkgtools/Makefile:1.115 pkgsrc/pkgtools/Makefile:1.116
--- pkgsrc/pkgtools/Makefile:1.115      Sun Feb 12 10:48:55 2017
+++ pkgsrc/pkgtools/Makefile    Fri Feb 17 21:25:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2017/02/12 10:48:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.116 2017/02/17 21:25:46 jmmv Exp $
 #
 
 COMMENT=       Tools for use in the packages collection
@@ -34,6 +34,7 @@ SUBDIR+=      pbulk-base
 SUBDIR+=       pkg
 SUBDIR+=       pkg_alternatives
 SUBDIR+=       pkg_chk
+SUBDIR+=       pkg_comp
 SUBDIR+=       pkg_comp1
 SUBDIR+=       pkg_distinst
 SUBDIR+=       pkg_filecheck

Added files:

Index: pkgsrc/pkgtools/pkg_comp/DESCR
diff -u /dev/null pkgsrc/pkgtools/pkg_comp/DESCR:1.4
--- /dev/null   Fri Feb 17 21:25:46 2017
+++ pkgsrc/pkgtools/pkg_comp/DESCR      Fri Feb 17 21:25:46 2017
@@ -0,0 +1,6 @@
+pkg_comp is a tool to automate the maintenance of pkgsrc binary packages
+and the pkgsrc source tree by means of a single command and a configuration
+file that tells pkg_comp what to do.
+
+Make sure to check the pgbuild-user package for a way to trivially set
+up periodic package rebuilds.

Index: pkgsrc/pkgtools/pkg_comp/Makefile
diff -u /dev/null pkgsrc/pkgtools/pkg_comp/Makefile:1.57
--- /dev/null   Fri Feb 17 21:25:46 2017
+++ pkgsrc/pkgtools/pkg_comp/Makefile   Fri Feb 17 21:25:46 2017
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile,v 1.57 2017/02/17 21:25:46 jmmv Exp $
+
+DISTNAME=      pkg_comp-2.0
+CATEGORIES=    sysutils
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=jmmv/}pkg_comp/releases/download/pkg_comp-2.0/
+
+MAINTAINER=    jmmv%NetBSD.org@localhost
+COMMENT=       Automates builds of packages and manages pkgsrc trees
+LICENSE=       modified-bsd
+
+DEPENDS=       sandboxctl>=1.0:../../sysutils/sandboxctl
+
+GNU_CONFIGURE=         yes
+TEST_TARGET=           check
+USE_LANGUAGES=         # empty
+USE_TOOLS=             pkg-config
+
+PKG_SYSCONFSUBDIR=     pkg_comp
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       PKG_COMP_CONFSUBDIR=
+INSTALL_MAKE_FLAGS+=   pkg_comp_confdir=${EGDIR}
+EGDIR=                 ${PREFIX}/share/examples/pkg_comp
+CONF_FILES+=           ${EGDIR}/default.conf ${PKG_SYSCONFDIR}/default.conf
+CONF_FILES+=           ${EGDIR}/extra.mk.conf ${PKG_SYSCONFDIR}/extra.mk.conf
+CONF_FILES+=           ${EGDIR}/sandbox.conf ${PKG_SYSCONFDIR}/sandbox.conf
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.pkg_comp
+PKG_SUPPORTED_OPTIONS= tests
+PKG_SUGGESTED_OPTIONS= tests
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mtests)
+.  include "../../devel/atf/buildlink3.mk"
+PLIST_SUBST+=          TESTS=
+.else
+CONFIGURE_ARGS+=       --with-atf=no
+PLIST_SUBST+=          TESTS=@comment
+
+post-install:
+       rm -rf "${PREFIX}/share/tests/pkg_comp"
+.endif
+
+BUILDLINK_API_DEPENDS.shtk+=   shtk>=1.7
+.include "../../devel/shtk/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/pkgtools/pkg_comp/PLIST
diff -u /dev/null pkgsrc/pkgtools/pkg_comp/PLIST:1.3
--- /dev/null   Fri Feb 17 21:25:46 2017
+++ pkgsrc/pkgtools/pkg_comp/PLIST      Fri Feb 17 21:25:46 2017
@@ -0,0 +1,24 @@
+@comment $NetBSD: PLIST,v 1.3 2017/02/17 21:25:46 jmmv Exp $
+man/man5/pkg_comp.conf.5
+man/man8/pkg_comp.8
+man/man8/pkg_comp4cron.8
+sbin/pkg_comp
+sbin/pkg_comp4cron
+share/doc/pkg_comp/AUTHORS
+share/doc/pkg_comp/CONTRIBUTING.md
+share/doc/pkg_comp/CONTRIBUTORS
+share/doc/pkg_comp/COPYING
+share/doc/pkg_comp/NEWS
+share/examples/pkg_comp/default.conf
+share/examples/pkg_comp/extra.mk.conf
+share/examples/pkg_comp/sandbox.conf
+share/pkg_comp/sandbox.conf.post
+share/pkg_comp/sandbox.conf.pre
+share/shtk/pkg_comp_git.subr
+share/shtk/pkg_comp_pkgsrc.subr
+${TESTS}tests/pkg_comp/Kyuafile
+${TESTS}tests/pkg_comp/pkg_comp_git_test
+${TESTS}tests/pkg_comp/pkg_comp_inttest
+${TESTS}tests/pkg_comp/pkg_comp_pkgsrc_test
+${TESTS}tests/pkg_comp/pkg_comp_test
+${TESTS}tests/pkg_comp/pkg_comp4cron_test

Index: pkgsrc/pkgtools/pkg_comp/distinfo
diff -u /dev/null pkgsrc/pkgtools/pkg_comp/distinfo:1.1
--- /dev/null   Fri Feb 17 21:25:46 2017
+++ pkgsrc/pkgtools/pkg_comp/distinfo   Fri Feb 17 21:25:46 2017
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2017/02/17 21:25:46 jmmv Exp $
+
+SHA1 (pkg_comp-2.0.tar.gz) = fe91c1d3f42a30ccaed2da7ca4fcb68a8ce78d3f
+RMD160 (pkg_comp-2.0.tar.gz) = 8b41936bf8c28b0a9cc711aa566b947b57d8fdfa
+SHA512 (pkg_comp-2.0.tar.gz) = dd7d96e36e05a5c4bb3dc0bda6c27a574f86e4b279e4ab3a97d156959d5bf7a9d12bd4d029ddfcef7a368f15d1891eb17ccd9b428000cfca2d41ce2073d587a7
+Size (pkg_comp-2.0.tar.gz) = 92496 bytes