golly: lintify

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

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sun Jun 13 16:44:48 2021 +0200
Changeset:	12d8fba8f036d4c960eae6ac4696e19e47d7bcb7

Modified Files:
	golly/Makefile
	golly/distinfo
	golly/patches/patch-gui-wx_makefile-gtk
Removed Files:
	golly/patches/patch-configure

Log Message:
golly: lintify

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

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

diffstat:
 golly/Makefile                          | 24 ++++++++++++------------
 golly/distinfo                          |  2 +-
 golly/patches/patch-configure           | 15 ---------------
 golly/patches/patch-gui-wx_makefile-gtk |  2 ++
 4 files changed, 15 insertions(+), 28 deletions(-)

diffs:
diff --git a/golly/Makefile b/golly/Makefile
index b82f76893d..1e6209ee80 100644
--- a/golly/Makefile
+++ b/golly/Makefile
@@ -15,34 +15,34 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
-MAKE_FILE=      makefile-gtk
+MAKE_FILE=	makefile-gtk
 BUILD_DIRS=	gui-wx
 REPLACE_PERL+=	Help/Lexicon/modify.pl
 
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	share/doc/golly
+INSTALLATION_DIRS+=	share/golly
+
 PY3=		8	# Use python 3.8
 
 # The new 4.0 version no longer has a configure script,
 # but you need to edit a file by hand...
 do-configure:
-	( echo "WX_CONFIG = wx-config-3.0"; \
-	  echo "PYTHON = python3.${PY3}"; \
-	  echo "GOLLYDIR = ${PREFIX}/share/golly" \
+	( ${ECHO} "WX_CONFIG = wx-config-3.0"; \
+	  ${ECHO} "PYTHON = python3.${PY3}"; \
+	  ${ECHO} "GOLLYDIR = ${PREFIX}/share/golly" \
 	) >${WRKSRC}/gui-wx/local-gtk.mk
 
 # The new 4.0 version no longer has an install target in its "Makefile".
 do-install:
-	${MKDIR} ${DESTDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/golly  ${DESTDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/bgolly ${DESTDIR}${PREFIX}/bin/
 	#
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/golly
-	cp -p ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/golly
+	cd ${WRKSRC}/docs && pax -wr * ${DESTDIR}${PREFIX}/share/doc/golly
 	#
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/golly
-	cp -pr ${WRKSRC}/Help ${DESTDIR}${PREFIX}/share/golly
-	cp -pr ${WRKSRC}/Patterns ${DESTDIR}${PREFIX}/share/golly
-	cp -pr ${WRKSRC}/Rules ${DESTDIR}${PREFIX}/share/golly
-	cp -pr ${WRKSRC}/Scripts ${DESTDIR}${PREFIX}/share/golly
+.for dir in Help Patterns Rules Scripts
+	cd ${WRKSRC} && pax -wr ${dir} ${DESTDIR}${PREFIX}/share/golly
+.endfor
 	# Remove lots of unneeded x bits
 	find ${DESTDIR}${PREFIX}/share/golly -type f -exec chmod a-x {} +
 
diff --git a/golly/distinfo b/golly/distinfo
index 2ede4029c6..e129ad283c 100644
--- a/golly/distinfo
+++ b/golly/distinfo
@@ -5,4 +5,4 @@ RMD160 (golly-4.0-src.tar.gz) = 08e02803fc6737d3dc38b6319a3993cf0f46fffa
 SHA512 (golly-4.0-src.tar.gz) = 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
 Size (golly-4.0-src.tar.gz) = 5579026 bytes
 SHA1 (patch-cmdline_bgolly.cpp) = 3b1fa67e7fedfcab1e4a4dab8ee1335c2c18458f
-SHA1 (patch-gui-wx_makefile-gtk) = 0387d2ce26fec7fc6089c93eed2b228e21352d32
+SHA1 (patch-gui-wx_makefile-gtk) = 1e31c3c0a9e56bb6246271e5abb8280e06240d94
diff --git a/golly/patches/patch-configure b/golly/patches/patch-configure
deleted file mode 100644
index 759b853d0f..0000000000
--- a/golly/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
- fi
- 
- # Find Python
--for ac_prog in python2 python
-+for ac_prog in python2.8 python2.7 python2 python
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/golly/patches/patch-gui-wx_makefile-gtk b/golly/patches/patch-gui-wx_makefile-gtk
index 2e337f4826..b34a6ec08e 100644
--- a/golly/patches/patch-gui-wx_makefile-gtk
+++ b/golly/patches/patch-gui-wx_makefile-gtk
@@ -1,5 +1,7 @@
 $NetBSD$
 
+We have dl* functions in libc, no need for -ldl.
+
 --- gui-wx/makefile-gtk.orig	2020-10-28 08:05:22.000000000 +0000
 +++ gui-wx/makefile-gtk
 @@ -41,7 +41,7 @@ GUIFILES = makefile-gtk makefile-mac mak