From fe34893c966eb9aa69e7d991fc5984f80a88f073 Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Wed, 20 May 2020 20:09:55 +0000
Subject: [PATCH] x11-wm/pekwm: unexpire, change MASTER_SITE

Also, add USES=autoreconf and add missing USE_XORG=xinerama xrandr

PR:		245185
Submitted by:	lbartoletti
Approved by:	maintainer
MFH:		2020Q2
---
 x11-wm/pekwm/Makefile                          | 18 ++++++++----------
 x11-wm/pekwm/distinfo                          |  5 +++--
 .../patch-data__scripts__pekwm_screenshot.sh   | 10 +++++-----
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index dd168eb6c410..b857d4d80a54 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -2,27 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	pekwm
-PORTVERSION=	0.1.17
-PORTREVISION=	4
+DISTVERSIONPREFIX=	release-
+DISTVERSION=	0.1.17
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	https://pekwm.org/projects/3/files/
 
 MAINTAINER=	natbsd@instinctive.eu
 COMMENT=	Light, Unobtrusive, and configurable windowmanager
 
-BROKEN=		unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2020-05-05
-
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		compiler gmake iconv:wchar_t jpeg localbase pkgconfig \
-		tar:bzip2 xorg
-USE_XORG=	xft xpm x11 sm ice xext
+USES=		autoreconf compiler gmake iconv:wchar_t jpeg \
+		localbase pkgconfig tar:bzip2 xorg
+USE_XORG=	xft xpm x11 sm ice xext xinerama xrandr
+USE_GITHUB=	yes
+GH_ACCOUNT=	pekdon
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shape --enable-xinerama --enable-xrandr \
 		--enable-xft --enable-image-xpm --enable-image-jpeg \
diff --git a/x11-wm/pekwm/distinfo b/x11-wm/pekwm/distinfo
index 93141a469759..c0dd1618f913 100644
--- a/x11-wm/pekwm/distinfo
+++ b/x11-wm/pekwm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pekwm-0.1.17.tar.bz2) = 8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00
-SIZE (pekwm-0.1.17.tar.bz2) = 405742
+TIMESTAMP = 1585563189
+SHA256 (pekdon-pekwm-release-0.1.17_GH0.tar.gz) = 7b5a07a377494588e95d68b87a3f4d823f813cb29053618bfad691a00cd8afb6
+SIZE (pekdon-pekwm-release-0.1.17_GH0.tar.gz) = 429100
diff --git a/x11-wm/pekwm/files/patch-data__scripts__pekwm_screenshot.sh b/x11-wm/pekwm/files/patch-data__scripts__pekwm_screenshot.sh
index af97b527dc84..7e4d4a0838ae 100644
--- a/x11-wm/pekwm/files/patch-data__scripts__pekwm_screenshot.sh
+++ b/x11-wm/pekwm/files/patch-data__scripts__pekwm_screenshot.sh
@@ -1,5 +1,5 @@
---- ./data/scripts/pekwm_screenshot.sh.orig	2013-05-26 14:01:18.000000000 +0200
-+++ ./data/scripts/pekwm_screenshot.sh	2013-06-25 13:38:36.617834517 +0200
+--- data/scripts/pekwm_screenshot.sh.orig	2013-05-24 19:24:23 UTC
++++ data/scripts/pekwm_screenshot.sh
 @@ -1,30 +1,30 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -37,7 +37,7 @@
  {
      is_in_path "scrot"
      if test $? -eq 0; then
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ function detect_command
      fi
  }
  
@@ -46,7 +46,7 @@
  {
      echo "usage: pekwm_screenshot.sh [-c scrot|netpbm|magick] [-d delay] [-o output.png]"
      echo ""
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ function usage
      exit 0
  }
  
@@ -55,7 +55,7 @@
  {
      echo "Unable to find any supported commands for taking screenshots"
      echo ""
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ function usage_command
      exit 1
  }