golly: nb1: use x11/wxGTK30; pkglint.

[Olaf Seibert <rhialto%falu.nl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sat May 12 19:10:31 2018 +0200
Changeset:	bd3fc6ffe76d01720f65ccbb3c5d4526459527ea

Modified Files:
	golly/Makefile
	golly/distinfo
	golly/patches/patch-configure

Log Message:
golly: nb1: use x11/wxGTK30; pkglint.

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

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

diffstat:
 golly/Makefile                | 18 +++++++++---------
 golly/distinfo                |  2 +-
 golly/patches/patch-configure |  3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diffs:
diff --git a/golly/Makefile b/golly/Makefile
index 3220bcdd61..a151c294fa 100644
--- a/golly/Makefile
+++ b/golly/Makefile
@@ -1,13 +1,13 @@
 # $NetBSD$
 
-PKGVERSION=	3.1
-PKGNAME=	golly-${PKGVERSION}
-DISTNAME=	${PKGNAME}-src
-#PKGREVISION=	0
+VERSION=	3.1
+PKGNAME=	golly-${VERSION}
+DISTNAME=	${PKGNAME_NOREV}-src
+PKGREVISION=	1
 CATEGORIES=	x11
-# MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=golly/} results in http://downloads.sourceforge.net/sourceforge/golly/golly-3.0.tar.gz
-# we want https://sourceforge.net/projects/golly/files/golly/golly-3.0/golly-3.0-src.tar.gz
-MASTER_SITES=	https://sourceforge.net/projects/golly/files/golly/${PKGNAME}/
+# MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=golly/} results in http://downloads.sourceforge.net/sourceforge/golly/golly-3.1.tar.gz
+# we want https://sourceforge.net/projects/golly/files/golly/golly-3.1/golly-3.1-src.tar.gz
+MASTER_SITES=	https://sourceforge.net/projects/golly/files/golly/${PKGNAME_NOREV}/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://golly.sourceforge.net/
@@ -15,7 +15,7 @@ COMMENT=	Fast Game-Of-Life (and similar automata) visualizer
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
-USE_TOOLS=	make
+USE_TOOLS+=	make
 CONFIGURE_DIRS=	gui-wx/configure
 GNU_CONFIGURE=	YES
 
@@ -25,5 +25,5 @@ CONFIGURE_ARGS+=	"--with-python-shlib=libpython2.7.so"
 .include "../../graphics/MesaLib/buildlink3.mk"
 #.include "../../lang/lua/buildlink3.mk" # uses its own built-in version 5.2
 .include "../../lang/python27/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/golly/distinfo b/golly/distinfo
index f3f6251a6b..e76ad19909 100644
--- a/golly/distinfo
+++ b/golly/distinfo
@@ -5,4 +5,4 @@ RMD160 (golly-3.1-src.tar.gz) = 9d7e1673804b63a77ffda34bba2df27f8dc04a6a
 SHA512 (golly-3.1-src.tar.gz) = 123248bc6dadd9df779556b6dca4a8b07683be0c50869077df85fe6e3fdfc6d032e1649e1c68ba23981fa27e3e15c774678e4a67bf3a01cdc5cd9cdc3c1ae4cd
 Size (golly-3.1-src.tar.gz) = 4958094 bytes
 SHA1 (patch-cmdline_bgolly.cpp) = 15dda14dabffe6e79c125f439c01022257b532ab
-SHA1 (patch-configure) = a64315cb7ef25790efe7628f486d63e5f978e730
+SHA1 (patch-configure) = b57f3815708a8456367ad9fd2c93f64d507ad37f
diff --git a/golly/patches/patch-configure b/golly/patches/patch-configure
index 0cca764156..759b853d0f 100644
--- a/golly/patches/patch-configure
+++ b/golly/patches/patch-configure
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Our python version 2.7 isn't called pyton2 but python2.7.
+
 --- gui-wx/configure/configure.orig     2017-08-29 07:30:19.000000000 +0000
 +++ gui-wx/configure/configure
 @@ -6600,7 +6600,7 @@ _ACEOF
@@ -11,4 +13,3 @@ $NetBSD$
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-