pekwm: update to 0.1.18

Maintenance release of pekwm with a bunch of bug fixes since 0.1.17. Notable changes include an updated default theme, CMake build system support and build fixes for more recent compilers.

6 files changed, 38 insertions, 99 deletions

diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index 4fd15d905af..64090d7d246 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2021/03/15 11:42:13 nia Exp $
+# $NetBSD: Makefile,v 1.59 2021/03/15 11:51:00 nia Exp $
 
-DISTNAME=	pekwm-0.1.17
-PKGREVISION=	2
+DISTNAME=	pekwm-0.1.18
 CATEGORIES=	wm
-MASTER_SITES=	http://www.pekwm.org/projects/pekwm/files/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=pekdon/}
+GITHUB_RELEASE=	release-${PKGVERSION_NOREV}
 
 MAINTAINER=	gls@NetBSD.org
 HOMEPAGE=	https://www.pekwm.se/
@@ -13,7 +12,7 @@ LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake pkg-config
-USE_LANGUAGES=	c c++03
+USE_LANGUAGES=	c c++
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 
diff --git a/wm/pekwm/PLIST b/wm/pekwm/PLIST
index a6a40a65d7e..949cc163126 100644
--- a/wm/pekwm/PLIST
+++ b/wm/pekwm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/07/02 20:33:37 gls Exp $
+@comment $NetBSD: PLIST,v 1.12 2021/03/15 11:51:00 nia Exp $
 bin/pekwm
 man/man1/pekwm.1
 share/examples/pekwm/autoproperties
@@ -25,6 +25,15 @@ share/pekwm/themes/default/bottom-left.png
 share/pekwm/themes/default/bottom-left_unfocus.png
 share/pekwm/themes/default/bottom-right.png
 share/pekwm/themes/default/bottom-right_unfocus.png
+share/pekwm/themes/default/button-close.png
+share/pekwm/themes/default/button-close_hover.png
+share/pekwm/themes/default/button-close_press.png
+share/pekwm/themes/default/button-max.png
+share/pekwm/themes/default/button-max_hover.png
+share/pekwm/themes/default/button-max_press.png
+share/pekwm/themes/default/button-min.png
+share/pekwm/themes/default/button-min_hover.png
+share/pekwm/themes/default/button-min_press.png
 share/pekwm/themes/default/button.png
 share/pekwm/themes/default/button_hover.png
 share/pekwm/themes/default/button_press.png
@@ -47,5 +56,7 @@ share/pekwm/themes/default/top-border.png
 share/pekwm/themes/default/top-border_unfocus.png
 share/pekwm/themes/default/top-left.png
 share/pekwm/themes/default/top-left_unfocus.png
+share/pekwm/themes/default/top-right-no-buttons.png
 share/pekwm/themes/default/top-right.png
 share/pekwm/themes/default/top-right_unfocus.png
+share/pekwm/themes/pion/theme
diff --git a/wm/pekwm/distinfo b/wm/pekwm/distinfo
index 50258b6b26b..c4c3b340598 100644
--- a/wm/pekwm/distinfo
+++ b/wm/pekwm/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.18 2015/11/02 23:42:54 agc Exp $
+$NetBSD: distinfo,v 1.19 2021/03/15 11:51:00 nia Exp $
 
-SHA1 (pekwm-0.1.17.tar.bz2) = d1434a1fa44edbf98dcd690f579461ddb1a63b1f
-RMD160 (pekwm-0.1.17.tar.bz2) = 760c145ac137ae9efcdbf138589554f19dc8332c
-SHA512 (pekwm-0.1.17.tar.bz2) = fa4c95ddc7e17f737b4e90f32258a79bf2a0abe96a2ab1a4166b1aa6832ff7a978116d224c98c31a4b33444b3c59e9ecd6095ca062d8a65f0f6174803f5b0811
-Size (pekwm-0.1.17.tar.bz2) = 405742 bytes
-SHA1 (patch-aa) = 5540f05c9b753a26bad03a8a90f1a5b5946a9801
-SHA1 (patch-data_scripts_pekwm__screenshot.sh) = 454047e3ceb4ee71c92a65c57677b2a994d49b7c
+SHA1 (pekwm-0.1.18.tar.gz) = d5ef62ffc3728a84dc98aebbb4fca9873d13ab0e
+RMD160 (pekwm-0.1.18.tar.gz) = 7ce46804b83e239dc3b4abb4851f85d12a70e2ed
+SHA512 (pekwm-0.1.18.tar.gz) = 7fe04c04089d3375d1f64d456a7a582e88fd1f442c1c710bdef71309c7fe5aab234026ba381eb9a49b3d459b759924b577ba9597156e46e60147a9d845c27e89
+Size (pekwm-0.1.18.tar.gz) = 531611 bytes
+SHA1 (patch-data_Makefile.in) = c746c899463621167afbee0e770f934bb68a92d2
diff --git a/wm/pekwm/patches/patch-aa b/wm/pekwm/patches/patch-aa
deleted file mode 100644
index afc24eebb8f..00000000000
--- a/wm/pekwm/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2013/07/02 20:33:37 gls Exp $
-
-Fix installation dirs
-
---- data/Makefile.in.orig	2013-05-26 12:01:43.000000000 +0000
-+++ data/Makefile.in
-@@ -263,7 +263,7 @@ EXTRA_DIST = autoproperties autoproperti
- 	mouse mouse_system mouse_click mouse_sloppy \
- 	start vars
- 
--cfgdatadir = $(sysconfdir)/pekwm
-+cfgdatadir = $(prefix)/share/examples/@PACKAGE@
- cfgdata_DATA = autoproperties autoproperties_typerules \
- 	config config_system \
- 	keys menu \
diff --git a/wm/pekwm/patches/patch-data_Makefile.in b/wm/pekwm/patches/patch-data_Makefile.in
new file mode 100644
index 00000000000..7d2686c2585
--- /dev/null
+++ b/wm/pekwm/patches/patch-data_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-data_Makefile.in,v 1.1 2021/03/15 11:51:00 nia Exp $
+
+Install config files to examples.
+
+--- data/Makefile.in.orig	2020-11-01 17:07:43.000000000 +0000
++++ data/Makefile.in
+@@ -339,7 +339,7 @@ EXTRA_DIST = autoproperties autoproperti
+ 	start vars \
+ 	CMakeLists.txt
+ 
+-cfgdatadir = $(sysconfdir)/pekwm
++cfgdatadir = @datadir@/examples/@PACKAGE@
+ cfgdata_DATA = autoproperties autoproperties_typerules \
+ 	config config_system \
+ 	keys menu \
diff --git a/wm/pekwm/patches/patch-data_scripts_pekwm__screenshot.sh b/wm/pekwm/patches/patch-data_scripts_pekwm__screenshot.sh
deleted file mode 100644
index 7ed7ad608ff..00000000000
--- a/wm/pekwm/patches/patch-data_scripts_pekwm__screenshot.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-data_scripts_pekwm__screenshot.sh,v 1.1 2013/07/02 20:33:37 gls Exp $
-
-patch to prevent pekwm_screenshot.sh script to depend on bash
-
---- data/scripts/pekwm_screenshot.sh.orig	2013-05-26 12:01:18.000000000 +0000
-+++ data/scripts/pekwm_screenshot.sh
-@@ -1,30 +1,30 @@
--#!/usr/bin/env bash
-+#!/bin/sh
- #
- # Copyright © 2013 the pekwm development team
- #
- 
--function screenshot_scrot
-+screenshot_scrot
- {
-     scrot -z "$1"
- }
- 
--function screenshot_xwd_netpbm
-+screenshot_xwd_netpbm
- {
-     xwd -root | xwdtopnm 2>/dev/null | pnmtopng > "$1"
- }
- 
--function screenshot_imagemagick
-+screenshot_imagemagick
- {
-     import -window root "$1"
- }
- 
--function is_in_path
-+is_in_path
- {
-     which $1 >/dev/null 2>&1
-     return $?
- }
- 
--function detect_command
-+detect_command
- {
-     is_in_path "scrot"
-     if test $? -eq 0; then
-@@ -45,7 +45,7 @@ function detect_command
-     fi
- }
- 
--function usage
-+usage
- {
-     echo "usage: pekwm_screenshot.sh [-c scrot|netpbm|magick] [-d delay] [-o output.png]"
-     echo ""
-@@ -61,7 +61,7 @@ function usage
-     exit 0
- }
- 
--function usage_command
-+usage_command
- {
-     echo "Unable to find any supported commands for taking screenshots"
-     echo ""
-@@ -74,7 +74,7 @@ function usage_command
-     exit 1
- }
- 
--function main
-+main
- {
-     # Initialize for strict mode
-     command=""