From c24e5ea4c431d7efae0f7205b830620e576a8101 Mon Sep 17 00:00:00 2001
From: sborrill <sborrill@pkgsrc.org>
Date: Thu, 23 Apr 2020 11:28:08 +0000
Subject: Allow NetBSD distribution tarball file extension to be defined with
 DISTRIB_EXT. Default to tgz. Bump to version 1.39

---
 pkgtools/pkg_comp1/Makefile          |  5 ++---
 pkgtools/pkg_comp1/files/pkg_comp.8  | 10 ++++++++--
 pkgtools/pkg_comp1/files/pkg_comp.sh |  7 ++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pkg_comp1/Makefile b/pkgtools/pkg_comp1/Makefile
index 6a32d1162f1..3a69682af8b 100644
--- a/pkgtools/pkg_comp1/Makefile
+++ b/pkgtools/pkg_comp1/Makefile
@@ -1,7 +1,6 @@
-# $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
-PKGREVISION=	1
+PKGNAME=	pkg_comp1-1.39
 CATEGORIES=	pkgtools
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/pkgtools/pkg_comp1/files/pkg_comp.8 b/pkgtools/pkg_comp1/files/pkg_comp.8
index 957b26ceafe..1a5630957f4 100644
--- a/pkgtools/pkg_comp1/files/pkg_comp.8
+++ b/pkgtools/pkg_comp1/files/pkg_comp.8
@@ -1,4 +1,4 @@
-.\" $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>
@@ -213,10 +213,16 @@ 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 .
diff --git a/pkgtools/pkg_comp1/files/pkg_comp.sh b/pkgtools/pkg_comp1/files/pkg_comp.sh
index fe10a7d1fec..0b59fc935db 100644
--- a/pkgtools/pkg_comp1/files/pkg_comp.sh
+++ b/pkgtools/pkg_comp1/files/pkg_comp.sh
@@ -1,6 +1,6 @@
 #!/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>
@@ -101,14 +101,15 @@ env_setdefaults()
     : ${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_X11:=xbase.tgz xcomp.tgz xetc.tgz xfont.tgz xserver.tgz}
+    : ${SETS:=base.${DISTRIB_EXT} comp.${DISTRIB_EXT} etc.${DISTRIB_EXT} kern-GENERIC.${DISTRIB_EXT} text.${DISTRIB_EXT}}
+    : ${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}
-- 
cgit v1.2.3