6 files changed, 84 insertions, 42 deletions
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index 94ae92115fd..354a8d5f7c2 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2013/06/06 12:55:09 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2013/07/02 20:33:37 gls Exp $
 #
 
-DISTNAME=	pekwm-0.1.16
-PKGREVISION=	4
+DISTNAME=	pekwm-0.1.17
 CATEGORIES=	wm
 MASTER_SITES=	http://www.pekwm.org/projects/pekwm/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +11,7 @@ HOMEPAGE=	http://www.pekwm.org/
 COMMENT=	Window manager based on aewm++
 LICENSE=	gnu-gpl-v2
 
+FETCH_USING=	curl
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake pkg-config
 USE_LANGUAGES=	c c++
diff --git a/wm/pekwm/PLIST b/wm/pekwm/PLIST
index 0d40502fe20..a6a40a65d7e 100644
--- a/wm/pekwm/PLIST
+++ b/wm/pekwm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/09/10 17:38:45 gls Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/07/02 20:33:37 gls Exp $
 bin/pekwm
 man/man1/pekwm.1
 share/examples/pekwm/autoproperties
@@ -13,6 +13,7 @@ share/examples/pekwm/mouse_sloppy
 share/examples/pekwm/mouse_system
 share/examples/pekwm/start
 share/examples/pekwm/vars
+share/pekwm/scripts/pekwm_screenshot.sh
 share/pekwm/scripts/pekwm_themeset.sh
 share/pekwm/scripts/pekwm_ws_menu.sh
 share/pekwm/themes/default-plain/theme
diff --git a/wm/pekwm/distinfo b/wm/pekwm/distinfo
index b5734710017..8c0d7c2c377 100644
--- a/wm/pekwm/distinfo
+++ b/wm/pekwm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2012/12/12 21:06:20 gls Exp $
+$NetBSD: distinfo,v 1.17 2013/07/02 20:33:37 gls Exp $
 
-SHA1 (pekwm-0.1.16.tar.bz2) = d066b87e8a5d5209763ec1f20e01a9fd6df9370b
-RMD160 (pekwm-0.1.16.tar.bz2) = 078bde89f47dc4c168236dcf5e66c3e294724630
-Size (pekwm-0.1.16.tar.bz2) = 401550 bytes
-SHA1 (patch-aa) = b45b1649b558b3c136aeff44ef013af3b208247d
-SHA1 (patch-src_x11.cc) = 2e9977dee9ff09da190e81c30f5441b607b31d9e
+SHA1 (pekwm-0.1.17.tar.bz2) = d1434a1fa44edbf98dcd690f579461ddb1a63b1f
+RMD160 (pekwm-0.1.17.tar.bz2) = 760c145ac137ae9efcdbf138589554f19dc8332c
+Size (pekwm-0.1.17.tar.bz2) = 405742 bytes
+SHA1 (patch-aa) = 5540f05c9b753a26bad03a8a90f1a5b5946a9801
+SHA1 (patch-data_scripts_pekwm__screenshot.sh) = 454047e3ceb4ee71c92a65c57677b2a994d49b7c
diff --git a/wm/pekwm/patches/patch-aa b/wm/pekwm/patches/patch-aa
index 01cac6b2712..afc24eebb8f 100644
--- a/wm/pekwm/patches/patch-aa
+++ b/wm/pekwm/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2012/09/10 17:38:45 gls Exp $
+$NetBSD: patch-aa,v 1.9 2013/07/02 20:33:37 gls Exp $
 
 Fix installation dirs
 
---- data/Makefile.in.orig	2012-08-03 14:16:42.000000000 +0000
+--- data/Makefile.in.orig	2013-05-26 12:01:43.000000000 +0000
 +++ data/Makefile.in
-@@ -236,7 +236,7 @@ EXTRA_DIST = autoproperties autoproperti
+@@ -263,7 +263,7 @@ EXTRA_DIST = autoproperties autoproperti
  	mouse mouse_system mouse_click mouse_sloppy \
  	start vars
  
diff --git a/wm/pekwm/patches/patch-data_scripts_pekwm__screenshot.sh b/wm/pekwm/patches/patch-data_scripts_pekwm__screenshot.sh
new file mode 100644
index 00000000000..7ed7ad608ff
--- /dev/null
+++ b/wm/pekwm/patches/patch-data_scripts_pekwm__screenshot.sh
@@ -0,0 +1,70 @@
+$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=""
diff --git a/wm/pekwm/patches/patch-src_x11.cc b/wm/pekwm/patches/patch-src_x11.cc
deleted file mode 100644
index 1cae9e6b68c..00000000000
--- a/wm/pekwm/patches/patch-src_x11.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_x11.cc,v 1.1 2012/12/03 21:46:48 gls Exp $
-
-#pragma GCC diagnostic inside function is a GCC 4.6+ fetaure.
-https://www.pekwm.org/projects/pekwm/tasks/318
-
---- src/x11.cc.orig	2012-11-17 18:42:40.000000000 +0000
-+++ src/x11.cc
-@@ -993,6 +993,8 @@ X11::getKeycodeFromMask(uint mask)
- /**
-  * Wrapper for XKeycodeToKeysym and XkbKeycodeToKeysym depending on which one is available.
-  */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- KeySym
- X11::getKeysymFromKeycode(KeyCode keycode)
- {
-@@ -1002,11 +1004,9 @@ X11::getKeysymFromKeycode(KeyCode keycod
-     else
- #endif
- 
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-         return XKeycodeToKeysym(_dpy, keycode, 0);
--#pragma GCC diagnostic pop
- }
-+#pragma GCC diagnostic pop
- 
- Display *X11::_dpy;
- bool X11::_honour_randr = false;