Merge of revisions 42022 from trunk to fixes_3_2

------------------------------------------------------------------------
r42022 | pierre | 2019-05-08 11:38:43 +0200 (Wed, 08 May 2019) | 1 line

 Do not use BSD system tar option -I if TARPROG is gtar for OpenBSD
------------------------------------------------------------------------
--- Merging r42022 into '.':
U    tests/Makefile
U    tests/Makefile.fpc
--- Recording mergeinfo for merge of r42022 into '.':
 U   .

git-svn-id: branches/fixes_3_2@42023 -

tests/Makefile

@@ -2525,6 +2525,11 @@ ifneq ($(SVNVERSION),)
 	$(ECHOREDIR) svnpackagesrevision=$(SVN_PACKAGES_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 endif
 ifeq ($(OS_SOURCE),openbsd)
+ifeq ($(TARPROG),$(subst gtar,,$(TARPROG)))
+  BSD_SYSTEM_TAR=1
+endif
+endif
+ifdef BSD_SYSTEM_TAR
 TARFROM=-I tar.lst
 else
 TARFROM=--files-from=tar.lst

tests/Makefile.fpc

@@ -644,6 +644,12 @@ endif
 # OpenBSD system tar executable doesn't know
 # about --files-from option, but supports -I
 ifeq ($(OS_SOURCE),openbsd)
+ifeq ($(TARPROG),$(subst gtar,,$(TARPROG)))
+  BSD_SYSTEM_TAR=1
+endif
+endif
+
+ifdef BSD_SYSTEM_TAR
 TARFROM=-I tar.lst
 else
 TARFROM=--files-from=tar.lst