chocolate-doom: override autoconf search for python

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sat Apr 13 21:00:31 2019 +0200
Changeset:	c0f64243ccc2c68dcfe5813029363f5faad3227d

Modified Files:
	chocolate-doom/Makefile
	chocolate-doom/distinfo
Removed Files:
	chocolate-doom/patches/patch-configure
	chocolate-doom/patches/patch-configure.ac

Log Message:
chocolate-doom: override autoconf search for python

Remove patches to search for python2.7. Instead, override
the configure script's search result for python.

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

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

diffstat:
 chocolate-doom/Makefile                   |  2 +-
 chocolate-doom/distinfo                   |  2 --
 chocolate-doom/patches/patch-configure    | 15 ---------------
 chocolate-doom/patches/patch-configure.ac | 15 ---------------
 4 files changed, 1 insertion(+), 33 deletions(-)

diffs:
diff --git a/chocolate-doom/Makefile b/chocolate-doom/Makefile
index 79cec714fa..a5f5b93d28 100644
--- a/chocolate-doom/Makefile
+++ b/chocolate-doom/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ENV+=	ac_cv_lib_amd64_amd64_iopl=no
 .endif
 
 PYTHON_FOR_BUILD_ONLY=		yes
-PYTHON_VERSIONS_ACCEPTED=	27
+CONFIGURE_ENV+=			ac_cv_prog_HAVE_PYTHON=python${PYVERSSUFFIX}
 REPLACE_PYTHON+=		data/convert-icon
 REPLACE_PYTHON+=		man/docgen
 REPLACE_PYTHON+=		man/simplecpp
diff --git a/chocolate-doom/distinfo b/chocolate-doom/distinfo
index e887c47c58..be63cbc9aa 100644
--- a/chocolate-doom/distinfo
+++ b/chocolate-doom/distinfo
@@ -4,5 +4,3 @@ SHA1 (chocolate-doom-3.0.0.tar.gz) = ab06bafe0d5236fd7af3849ea89136b26730097c
 RMD160 (chocolate-doom-3.0.0.tar.gz) = 0ee203fd33ad02aa48150e343a4dcb9c5b095fcf
 SHA512 (chocolate-doom-3.0.0.tar.gz) = 41f235c0d84ef21070636ad0610e97898dfd366fae7f9244bd2aebf8974db98dcf55f70bcab2f93589b9bf31dd421db32e8af88e0f8e0a655d2b9f1d4ead2afd
 Size (chocolate-doom-3.0.0.tar.gz) = 2495591 bytes
-SHA1 (patch-configure) = 9b16bdbb8d146b45b482eee09f4b26299cb46fcf
-SHA1 (patch-configure.ac) = ce81387252f78556170aa42be8d4a11f5d2c48e6
diff --git a/chocolate-doom/patches/patch-configure b/chocolate-doom/patches/patch-configure
deleted file mode 100644
index aec922546d..0000000000
--- a/chocolate-doom/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2015/08/17 20:38:55 yhardy Exp $
-
-Use python 2.7.
-
---- configure.orig	2013-12-09 05:43:10.000000000 +0000
-+++ configure
-@@ -3091,7 +3091,7 @@ else
- fi
- 
- # Extract the first word of "python", so it can be a program name with args.
--set dummy python; ac_word=$2
-+set dummy python2.7; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_HAVE_PYTHON+:} false; then :
diff --git a/chocolate-doom/patches/patch-configure.ac b/chocolate-doom/patches/patch-configure.ac
deleted file mode 100644
index 56a4bb178f..0000000000
--- a/chocolate-doom/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2015/08/17 20:38:55 yhardy Exp $
-
-Use python 2.7.
-
---- configure.ac.orig	2013-12-09 05:40:53.000000000 +0000
-+++ configure.ac
-@@ -12,7 +12,7 @@ orig_CFLAGS="$CFLAGS"
- 
- AC_PROG_CC
- AC_PROG_RANLIB
--AC_CHECK_PROG(HAVE_PYTHON, python, true, false)
-+AC_CHECK_PROG(HAVE_PYTHON, python2.7, true, false)
- 
- OPT_LEVEL=2
-