Fix packages that use GITSUB_MODULES on SunOS and possibly others

This is annoying, but for now we must always explicitly combine
GITHUB_SUBMODULES with EXTRACT_USING+=bsdtar.

This is because mk/fetch/github.mk uses OPTS_TAR=--strip-components=1
and that is not supported by nbtar(pax), which is the default pkgsrc
tar on some platforms. We cannot override EXTRACT_USING in github.mk
because that is too late.

We should switch all platforms to bsdtar and retire pax.

5 files changed, 10 insertions, 5 deletions

diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common
index 0d7a4417472..182c152af74 100644
--- a/inputmethod/uim/Makefile.common
+++ b/inputmethod/uim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2021/03/30 17:01:49 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.18 2022/01/09 23:42:02 tnn Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
@@ -13,6 +13,7 @@ HOMEPAGE=	https://github.com/uim/uim/wiki
 
 GITHUB_SUBMODULES+=	uim sigscheme beb8fbdc69b523d14fc202a4d17375555a74c772 sigscheme
 GITHUB_SUBMODULES+=	uim libgcroots d362356cc4c5f591695d2fbda7746918250c9e99 sigscheme/libgcroots
+EXTRACT_USING=		bsdtar
 
 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/uim/distinfo
 PATCHDIR=	${.CURDIR}/../../inputmethod/uim/patches
diff --git a/lang/wasi-libc/Makefile b/lang/wasi-libc/Makefile
index 7c6a9cb42ce..feced89e639 100644
--- a/lang/wasi-libc/Makefile
+++ b/lang/wasi-libc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/07 15:49:53 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/09 23:42:03 tnn Exp $
 
 GITHUB_PROJECT=	wasi-libc
 GITHUB_TAG=	ad5133410f66b93a2381db5b542aad5e0964db96
@@ -7,6 +7,7 @@ CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=WebAssembly/}
 
 GITHUB_SUBMODULES+=	WebAssembly WASI 3423c9c83c7219095d6e67faaf62598ad370064c wasi/tools/wasi-headers/WASI
+EXTRACT_USING=		bsdtar
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	https://github.com/WebAssembly/wasi-libc/
diff --git a/security/pam_ssh_agent_auth/Makefile b/security/pam_ssh_agent_auth/Makefile
index 743bfd4789b..40e146e733c 100644
--- a/security/pam_ssh_agent_auth/Makefile
+++ b/security/pam_ssh_agent_auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/05/14 11:52:15 nia Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/09 23:42:03 tnn Exp $
 
 DISTNAME=	pam_ssh_agent_auth-0.10.4
 CATEGORIES=	security
@@ -14,6 +14,7 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	pod2man
 
 GITHUB_SUBMODULES+=	floodyberry ed25519-donna 8757bd4cd209cb032853ece0ce413f122eef212c ed25519-donna
+EXTRACT_USING=		bsdtar
 
 CONFIGURE_ARGS+=	--without-openssl-header-check
 
diff --git a/sysutils/m1n1/Makefile b/sysutils/m1n1/Makefile
index 75917c05c0b..8631fab4012 100644
--- a/sysutils/m1n1/Makefile
+++ b/sysutils/m1n1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/10/01 12:40:52 nia Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/09 23:42:03 tnn Exp $
 
 GITHUB_PROJECT=	m1n1
 GITHUB_TAG=	4df78129aac4547231dbac662d28c3b67b13cc79
@@ -11,6 +11,7 @@ DIST_SUBDIR=	${GITHUB_PROJECT}
 
 GITHUB_SUBMODULES=	AsahiLinux artwork \
 			35626c31f5c5a8a884aaff93f864795026495742 artwork
+EXTRACT_USING=		bsdtar
 
 MAINTAINER=	port-arm@NetBSD.org
 HOMEPAGE=	https://github.com/AsahiLinux/m1n1/
diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile
index dd10a4c2b87..ce363b1acdc 100644
--- a/x11/cool-retro-term/Makefile
+++ b/x11/cool-retro-term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/08 16:07:03 adam Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/09 23:42:03 tnn Exp $
 
 DISTNAME=	cool-retro-term-1.1.1
 PKGREVISION=	2
@@ -25,6 +25,7 @@ SUBST_SED.paths=	-e 's,/usr,${PREFIX},g'
 
 GITHUB_SUBMODULES=	Swordfish90 qmltermwidget \
 			5c47d1f49455394226e0e595f79c148f0c098006 qmltermwidget
+EXTRACT_USING=		bsdtar
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTDIR}/bin/qmake \