libxlsxwriter: More upstreamable Makefile patch

[Sijmen J. Mulder <ik%sjmulder.nl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <ik%sjmulder.nl@localhost>
Pushed By:	sjmulder
Date:		Tue Dec 11 10:44:27 2018 +0100
Changeset:	2f0dbd530469293de3b4ee31c341ca9b2b1f6b55

Modified Files:
	libxlsxwriter/Makefile
	libxlsxwriter/distinfo
	libxlsxwriter/patches/patch-Makefile

Log Message:
libxlsxwriter: More upstreamable Makefile patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2f0dbd530469293de3b4ee31c341ca9b2b1f6b55

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

diffstat:
 libxlsxwriter/Makefile               |  2 +-
 libxlsxwriter/distinfo               |  2 +-
 libxlsxwriter/patches/patch-Makefile | 19 ++++++++++++++-----
 3 files changed, 16 insertions(+), 7 deletions(-)

diffs:
diff --git a/libxlsxwriter/Makefile b/libxlsxwriter/Makefile
index 5eeb3aba83..55d689a886 100644
--- a/libxlsxwriter/Makefile
+++ b/libxlsxwriter/Makefile
@@ -22,7 +22,7 @@ USE_LANGUAGES+=	c c++
 
 # more verbose output
 MAKE_ENV+=	V=1
-MAKE_ENV+=	PYSUFFIX=-${PYVERSSUFFIX}
+MAKE_ENV+=	PYTEST=py.test-${PYVERSSUFFIX}
 MAKE_ENV+=	INSTALL_DIR=${DESTDIR}${PREFIX}
 # minizip/ioapi.c has broken logic for checking for fopen64 etc
 CFLAGS+=	-DIOAPI_NO_64 -D_FILE_OFFSET_BITS=64
diff --git a/libxlsxwriter/distinfo b/libxlsxwriter/distinfo
index 4e27aecef6..34dd72d673 100644
--- a/libxlsxwriter/distinfo
+++ b/libxlsxwriter/distinfo
@@ -4,4 +4,4 @@ SHA1 (libxlsxwriter-0.8.4.tar.gz) = 130b8e79abd826c2b58cbde076aadb20bfe7abc1
 RMD160 (libxlsxwriter-0.8.4.tar.gz) = b3153e947cc9736e2fb5be053c660940fcc31449
 SHA512 (libxlsxwriter-0.8.4.tar.gz) = b4de99605c9f3b8d7038e7ac49979bdb1998016e04e474008a4f086f5f42e072ab977a70f408b0a348f1ae1ce999a3d9d415961288797ab6ae56d84767f2c5c4
 Size (libxlsxwriter-0.8.4.tar.gz) = 13981205 bytes
-SHA1 (patch-Makefile) = 481a01a81d95237546d06a8088dc3d01de09af49
+SHA1 (patch-Makefile) = 7d80fb5513022f1d2c07e4a4e623092272984241
diff --git a/libxlsxwriter/patches/patch-Makefile b/libxlsxwriter/patches/patch-Makefile
index 618bbb9938..e4bb471f9d 100644
--- a/libxlsxwriter/patches/patch-Makefile
+++ b/libxlsxwriter/patches/patch-Makefile
@@ -1,15 +1,24 @@
 # $NetBSD$
 
-Have the Makefile use our suffixed py.test.
+Make the py.test name configurable
 
---- Makefile.orig	2018-12-11 09:27:13.020452878 +0100
-+++ Makefile	2018-12-11 09:28:13.394456837 +0100
-@@ -58,7 +58,7 @@
+--- Makefile.orig	2018-12-11 10:35:42.411978337 +0100
++++ Makefile	2018-12-11 10:36:14.841058290 +0100
+@@ -11,6 +11,8 @@
+ Q=
+ endif
+ 
++PYTEST ?= py.test
++
+ INSTALL_DIR ?= /usr/local
+ 
+ .PHONY: docs tags examples
+@@ -58,7 +60,7 @@
  # Run the functional tests.
  test_functional : all
  	$(Q)$(MAKE) -C test/functional/src
 -	$(Q)py.test test/functional -v
-+	$(Q)py.test$(PYSUFFIX) test/functional -v
++	$(Q)$(PYTEST) test/functional -v
  
  # Run all tests.
  test_unit :