Use gtar instead of the base tar(1) in the xemacs* top-level Makefile

because of a problem with NetBSD-current libarchive-as-tar, see bin/56080.

Note this depencency is not a burden, since xemacs-packages requires
gtar, anyway.

10 files changed, 45 insertions, 19 deletions

diff --git a/editors/xemacs-current-nox11/Makefile b/editors/xemacs-current-nox11/Makefile
index 5c639839fbf..a96875fc028 100644
--- a/editors/xemacs-current-nox11/Makefile
+++ b/editors/xemacs-current-nox11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2020/10/02 11:31:14 hauke Exp $
+# $NetBSD: Makefile,v 1.13 2021/03/28 10:36:33 hauke Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nox11-/}
-PKGREVISION=	8
+PKGREVISION=	9
 COMMENT=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support)
 
 .include "../../editors/xemacs-current/options.mk"
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 5f077c64340..c525ed3303d 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2020/10/02 11:31:14 hauke Exp $
+# $NetBSD: Makefile,v 1.108 2021/03/28 10:36:33 hauke Exp $
 
 PKGNAME=	${DISTNAME}
-PKGREVISION=	15
+PKGREVISION=	16
 COMMENT=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11
diff --git a/editors/xemacs-current/Makefile.common b/editors/xemacs-current/Makefile.common
index 121d5ce8adf..f875527c5c2 100644
--- a/editors/xemacs-current/Makefile.common
+++ b/editors/xemacs-current/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2020/09/24 11:51:48 hauke Exp $
+# $NetBSD: Makefile.common,v 1.17 2021/03/28 10:36:33 hauke Exp $
 #
 # used by editors/xemacs-current/Makefile
 # used by editors/xemacs-current-nox11/Makefile
@@ -19,7 +19,7 @@ PATCHDIR=	${.CURDIR}/../../editors/xemacs-current/patches
 DISTINFO_FILE=	${.CURDIR}/../../editors/xemacs-current/distinfo
 PLIST_SRC=	${.CURDIR}/../../editors/xemacs-current/PLIST
 
-USE_TOOLS+=		makeinfo perl
+USE_TOOLS+=		gtar makeinfo perl
 
 # The portable dumper creates a dump file with a build ID in its name
 GENERATE_PLIST+=	${ECHO} bin/${EMACS_DISTNAME}-`${WRKSRC}/src/xemacs -sd`.dmp ;
@@ -51,6 +51,8 @@ CONFIGURE_ARGS+=	--with-postgresql=no
 
 CFLAGS+=		-Dunix
 
+INSTALL_MAKE_FLAGS+=	TAR=${TOOLS_PATH.gtar}
+
 # Use terminfo on NetBSD-6 and newer.
 # We cannot use terminfo.*.mk as XEmacs enforces a link to termcap,
 # but this is fine for us.
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index 706bf5a2af1..8ccd817b6ca 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.38 2020/10/02 11:31:14 hauke Exp $
+$NetBSD: distinfo,v 1.39 2021/03/28 10:36:33 hauke Exp $
 
 SHA1 (xemacs-21.5.34.tar.gz) = ed1fe3ff6ce6eeb9ff75ac0ee34c6530e1c355ce
 RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf
 SHA512 (xemacs-21.5.34.tar.gz) = b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 Size (xemacs-21.5.34.tar.gz) = 15816932 bytes
-SHA1 (patch-Makefile.in.in) = e1e18f8555195a53fee44cbbb33a6d1a49fd368b
+SHA1 (patch-Makefile.in.in) = 0c2365f6fc01aeb2dd2c5176b00e617724a4eccc
 SHA1 (patch-configure) = c6e3ea408afb8a38f62055cba3ca412b41e09c9d
 SHA1 (patch-lib-src_Makefile.in.in) = 6e9c2b9e4cd9e63fbdc88ff4792e74a57ed925ae
 SHA1 (patch-lib-src_fakemail.c) = e62f75055b80f207696cfd77cd7b55fd46e8249b
diff --git a/editors/xemacs-current/patches/patch-Makefile.in.in b/editors/xemacs-current/patches/patch-Makefile.in.in
index 7d27c537fed..22fe6e66bae 100644
--- a/editors/xemacs-current/patches/patch-Makefile.in.in
+++ b/editors/xemacs-current/patches/patch-Makefile.in.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in.in,v 1.2 2017/11/17 13:06:03 hauke Exp $
+$NetBSD: patch-Makefile.in.in,v 1.3 2021/03/28 10:36:33 hauke Exp $
 
 Sprinkle DESTDIR dust.
 
@@ -9,10 +9,21 @@ devel/autoconf, which is probably newer.
 
 Prefix {c,e}tags to avoid conflicts.
 
+Make TAR settable, to work around shortcomings in base tar(1)
+
 was patch-aa
 
 --- Makefile.in.in.orig	2013-08-21 17:45:17.000000000 +0000
 +++ Makefile.in.in
+@@ -67,7 +67,7 @@ LC_ALL = C
+ RM = rm -f
+ MAKEPATH=./lib-src/make-path
+ pwd = /bin/pwd
+-TAR = tar
++TAR ?= tar
+ 
+ ## ==================== Things `configure' Might Edit ====================
+ 
 @@ -407,7 +407,7 @@ install-arch-dep: mkdir
  	   fi; \
  	   ${INSTALL_DATA} lib-src/config.values $(DESTDIR)${docdir}/config.values; \
diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile
index 8737b21ad4f..c224f426c89 100644
--- a/editors/xemacs-nox11/Makefile
+++ b/editors/xemacs-nox11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2020/10/02 11:31:14 hauke Exp $
+# $NetBSD: Makefile,v 1.37 2021/03/28 10:36:33 hauke Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nox11-/}
-PKGREVISION=	14
+PKGREVISION=	15
 COMMENT=	XEmacs text editor version 21 (no x11 support)
 
 .include "../../editors/xemacs/options.mk"
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index c8644e788f3..961f029ae97 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.133 2020/10/02 11:31:14 hauke Exp $
+# $NetBSD: Makefile,v 1.134 2021/03/28 10:36:33 hauke Exp $
 
 PKGNAME=	${DISTNAME}
-PKGREVISION=	15
+PKGREVISION=	16
 COMMENT=	XEmacs text editor version 21.4
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11
diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common
index 746ec3c77ba..a3f21563a58 100644
--- a/editors/xemacs/Makefile.common
+++ b/editors/xemacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2020/09/24 11:51:47 hauke Exp $
+# $NetBSD: Makefile.common,v 1.36 2021/03/28 10:36:33 hauke Exp $
 #
 # used by editors/xemacs-nox11/Makefile
 # used by editors/xemacs/Makefile
@@ -18,7 +18,7 @@ PATCHDIR=		${.CURDIR}/../../editors/xemacs/patches
 DISTINFO_FILE=		${.CURDIR}/../../editors/xemacs/distinfo
 PLIST_SRC=		${.CURDIR}/../../editors/xemacs/PLIST
 
-USE_TOOLS+=		patch makeinfo perl
+USE_TOOLS+=		patch gtar makeinfo perl
 
 HAS_CONFIGURE=		yes
 
@@ -93,6 +93,8 @@ INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
 INSTALL_MAKE_FLAGS+=	sitelispdir=${DESTDIR}${PREFIX}/lib/xemacs/site-lisp
 INSTALL_MAKE_FLAGS+=	sitemoduledir=${DESTDIR}${PREFIX}/lib/xemacs/site-modules
 
+INSTALL_MAKE_FLAGS+=	TAR=${TOOLS_PATH.gtar}
+
 post-extract:
 	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/
 .if !empty(PKG_OPTIONS:Mx11)
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index 2ffc77197bf..e9f6d750baf 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.32 2020/10/02 11:31:14 hauke Exp $
+$NetBSD: distinfo,v 1.33 2021/03/28 10:36:33 hauke Exp $
 
 SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
 RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
 SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes
-SHA1 (patch-Makefile.in.in) = a65cf383a343bb582f6950a28c4e7219e3dd22e7
+SHA1 (patch-Makefile.in.in) = 80e2a4b696312fa49792410d89aff48addae5436
 SHA1 (patch-configure) = 1f2e71ddd1e061111d48cc11d42b892189d208b8
 SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd
 SHA1 (patch-lisp_gui.el) = 686bc5a7c4bf6e3c4f010dba22aee109d94f6cb3
diff --git a/editors/xemacs/patches/patch-Makefile.in.in b/editors/xemacs/patches/patch-Makefile.in.in
index 9564d295ee1..6d244424128 100644
--- a/editors/xemacs/patches/patch-Makefile.in.in
+++ b/editors/xemacs/patches/patch-Makefile.in.in
@@ -1,11 +1,22 @@
-$NetBSD: patch-Makefile.in.in,v 1.3 2016/04/23 09:34:18 hauke Exp $
+$NetBSD: patch-Makefile.in.in,v 1.4 2021/03/28 10:36:33 hauke Exp $
 
 Avoid picking up local config when checking features
 
 Install {c,e}tags man pages with xemacs prefix
 
---- Makefile.in.in.orig	2015-01-29 15:04:29.000000000 +0000
+Make TAR settable, to work around shortcomings in base tar(1)
+
+--- Makefile.in.in.orig	2015-03-25 11:25:33.000000000 +0000
 +++ Makefile.in.in
+@@ -65,7 +65,7 @@ LC_ALL = C
+ RM = rm -f
+ MAKEPATH=./lib-src/make-path
+ pwd = /bin/pwd
+-TAR = tar
++TAR ?= tar
+ 
+ ## ==================== Things `configure' Might Edit ====================
+ 
 @@ -407,7 +407,7 @@ lwlib/config.h: ${srcdir}/lwlib/config.h
  ## all.  --cet