CVS commit: pkgsrc

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Jan  9 23:42:03 UTC 2022

Modified Files:
        pkgsrc/inputmethod/uim: Makefile.common
        pkgsrc/lang/wasi-libc: Makefile
        pkgsrc/security/pam_ssh_agent_auth: Makefile
        pkgsrc/sysutils/m1n1: Makefile
        pkgsrc/x11/cool-retro-term: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/inputmethod/uim/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/wasi-libc/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/pam_ssh_agent_auth/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/m1n1/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/cool-retro-term/Makefile

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

Modified files:

Index: pkgsrc/inputmethod/uim/Makefile.common
diff -u pkgsrc/inputmethod/uim/Makefile.common:1.17 pkgsrc/inputmethod/uim/Makefile.common:1.18
--- pkgsrc/inputmethod/uim/Makefile.common:1.17 Tue Mar 30 17:01:49 2021
+++ pkgsrc/inputmethod/uim/Makefile.common      Sun Jan  9 23:42:02 2022
@@ -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/wik
 
 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

Index: pkgsrc/lang/wasi-libc/Makefile
diff -u pkgsrc/lang/wasi-libc/Makefile:1.5 pkgsrc/lang/wasi-libc/Makefile:1.6
--- pkgsrc/lang/wasi-libc/Makefile:1.5  Fri Jan  7 15:49:53 2022
+++ pkgsrc/lang/wasi-libc/Makefile      Sun Jan  9 23:42:03 2022
@@ -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@localhost
 HOMEPAGE=      https://github.com/WebAssembly/wasi-libc/

Index: pkgsrc/security/pam_ssh_agent_auth/Makefile
diff -u pkgsrc/security/pam_ssh_agent_auth/Makefile:1.11 pkgsrc/security/pam_ssh_agent_auth/Makefile:1.12
--- pkgsrc/security/pam_ssh_agent_auth/Makefile:1.11    Fri May 14 11:52:15 2021
+++ pkgsrc/security/pam_ssh_agent_auth/Makefile Sun Jan  9 23:42:03 2022
@@ -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
 

Index: pkgsrc/sysutils/m1n1/Makefile
diff -u pkgsrc/sysutils/m1n1/Makefile:1.2 pkgsrc/sysutils/m1n1/Makefile:1.3
--- pkgsrc/sysutils/m1n1/Makefile:1.2   Fri Oct  1 12:40:52 2021
+++ pkgsrc/sysutils/m1n1/Makefile       Sun Jan  9 23:42:03 2022
@@ -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@localhost
 HOMEPAGE=      https://github.com/AsahiLinux/m1n1/

Index: pkgsrc/x11/cool-retro-term/Makefile
diff -u pkgsrc/x11/cool-retro-term/Makefile:1.3 pkgsrc/x11/cool-retro-term/Makefile:1.4
--- pkgsrc/x11/cool-retro-term/Makefile:1.3     Wed Dec  8 16:07:03 2021
+++ pkgsrc/x11/cool-retro-term/Makefile Sun Jan  9 23:42:03 2022
@@ -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 \