 @@ -1,14 +1,14 @@
-.\" $NetBSD: pkg_comp.8,v 1.1 2017/02/12 10:48:55 jmmv Exp $
+.\" $NetBSD: pkg_comp.8,v 1.2 2020/04/23 11:28:09 sborrill Exp $
 .\"
 .\" pkg_comp - Build packages inside a clean chroot environment
 .\" Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
 .\"
 .\" 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
 @@ -203,30 +203,36 @@ all configuration files (not directories
 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
 .Nb
 binary sets and X sets.
 Its structure is the same as official release
-distributions, that is, tgz files must reside inside
+distributions, that is, tarball files must reside inside
 .Pa $DISTRIBDIR/binary/sets .
 Defaults to
 .Pa /var/pub/NetBSD .
 .It DISTRIB_EXT
 This is the file extension for the tarballs in
 .Pa $DISTRIBDIR .
 Recent NetBSD releases use tar.xz instead of tgz.
 Defaults to
 .Pa tgz
 .It EXTRAMK
 Specifies a whitespace-separated list of files that must be appended to
 .Pa $DESTDIR/etc/mk.conf .
 This is useful to add special items to this configuration file.
 Defaults to nothing.
 .It INSTALL_PACKAGES
 A list of packages to automatically install after the
 .Sy makeroot
 and before installing
 .Sy BUILD_PACKAGES .
 These are also installed within the sandbox created by the
 .Sy auto
 target, but before anything is built.

 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: pkg_comp.sh,v 1.1 2017/02/12 10:48:55 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.2 2020/04/23 11:28:09 sborrill Exp $
+#
 # pkg_comp - Build packages inside a clean chroot environment
 # Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
+#
 # 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. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
 @@ -91,34 +91,35 @@ env_setdefaults()
     : ${CLEANDEPENDS:=yes}
     : ${LOCALBASE:=/usr/pkg}
     : ${PKG_SYSCONFBASE:=/usr/pkg/etc}
     : ${CFLAGS:=}
     : ${CPPFLAGS:=}
     : ${CXXFLAGS:=}
     : ${USE_GCC3:=no}
     : ${USE_AUDIT_PACKAGES:=yes}
     : ${PKGVULNDIR:=/usr/pkg/share}
     : ${PKGSRC_COMPILER:=gcc}
     : ${PKG_DBDIR:=/var/db/pkg}
     # Default values for global variables used in the script.
     : ${DISTRIB_EXT:=tgz}
     : ${DESTDIR:=/var/chroot/pkg_comp/default}
     : ${ROOTSHELL:=/bin/ksh}
     : ${COPYROOTCFG:=no}
     : ${AUTO_TARGET:=package}
     : ${BUILD_PKG_COMP_TARGET:=package}
     : ${DISTRIBDIR:=/var/pub/NetBSD}
-    : ${SETS:=base.tgz comp.tgz etc.tgz kern-GENERIC.tgz text.tgz}
+    : ${SETS:=base.${DISTRIB_EXT} comp.${DISTRIB_EXT} etc.${DISTRIB_EXT} kern-GENERIC.${DISTRIB_EXT} text.${DISTRIB_EXT}}
-    : ${SETS_X11:=xbase.tgz xcomp.tgz xetc.tgz xfont.tgz xserver.tgz}
+    : ${SETS_X11:=xbase.${DISTRIB_EXT} xcomp.${DISTRIB_EXT} xetc.${DISTRIB_EXT} xfont.${DISTRIB_EXT} xserver.${DISTRIB_EXT}}
     : ${REAL_SRC:=/usr/src}
     : ${REAL_SRC_OPTS:=-t null -o ro}
     : ${REAL_PKGSRC:=/usr/pkgsrc}
     : ${REAL_PKGSRC_OPTS:=-t null -o ro}
     : ${REAL_DISTFILES:=/usr/pkgsrc/distfiles}
     : ${REAL_DISTFILES_OPTS:=-t null -o rw}
     : ${REAL_PACKAGES:=/usr/pkgsrc/packages}
     : ${REAL_PACKAGES_OPTS:=-t null -o rw}
     : ${REAL_PKGVULNDIR:=/usr/pkgsrc/distfiles}
     : ${NETBSD_RELEASE:=no}
     : ${LIBKVER_STANDALONE_PREFIX:=/libkver}
     : ${MAKEROOT_HOOKS:=}
     : ${MOUNT_HOOKS:=}

 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.1 2017/02/12 10:48:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2020/04/23 11:28:08 sborrill Exp $
-PKGNAME=	pkg_comp1-1.38
+PKGNAME=	pkg_comp1-1.39
 PKGREVISION=	1
 CATEGORIES=	pkgtools
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Build packages inside a chroot jail
 LICENSE=	modified-bsd
 CONFLICTS=	pkg_comp-[0-9]*
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	YES
 NO_BUILD=	YES