Hi,

Here is an update to pekwm. This was previously attempted a while ago:
http://marc.info/?t=142221717100001&r=1&w=2

Previous attempt got stuck on distfile issue as pekwm's site used untrusted SSL
CA. Currently it seems to use Let's Encrypt for SSL so fetching distfiles is no
longer an issue.

Other changes, I switched the port to use GNU Make as otherwise all the scripts
weren't generated by the build. This could probably worked around with bit of
patching.

Thanks to Antoine and Stuart on their help on fixing the PLIST file.

Timo

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile    28 Aug 2016 11:07:14 -0000      1.27
+++ Makefile    30 Oct 2016 06:42:43 -0000
@@ -2,13 +2,12 @@
 
 COMMENT=       aewm++ based pretty themable window manager
 
-DISTNAME=      pekwm-0.1.15
-REVISION=      1
+DISTNAME=      pekwm-0.1.17
 CATEGORIES=    x11
 
-HOMEPAGE=      http://pekwm.org/
+HOMEPAGE=      https://www.pekwm.org/
 
-MAINTAINER=    Nicholas Marriott <[email protected]>
+MAINTAINER=    Timo Myyra <[email protected]>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
@@ -16,13 +15,15 @@ PERMIT_PACKAGE_CDROM=       Yes
 WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv jpeg m png
 WANTLIB += stdc++
 
-MASTER_SITES=  ${HOMEPAGE}projects/pekwm/files/
+MASTER_SITES=  ${HOMEPAGE}/files/
 EXTRACT_SUFX=  .tar.bz2
 LIB_DEPENDS=   converters/libiconv \
                graphics/jpeg \
                graphics/png
 
 NO_TEST=       Yes
+
+USE_GMAKE=     Yes
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo    12 Nov 2012 10:03:21 -0000      1.10
+++ distinfo    30 Oct 2016 06:42:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.1.15.tar.bz2) = VtQFuH89hY68U6In5N4juScwZ3ByURRckK8I01vHWC8=
-SIZE (pekwm-0.1.15.tar.bz2) = 395557
+SHA256 (pekwm-0.1.17.tar.bz2) = ih/Tv5846Me7KyhkwJD5hrYM7CKB7PG7pGLRIPsyfQA=
+SIZE (pekwm-0.1.17.tar.bz2) = 405742
Index: patches/patch-data_scripts_pekwm_screenshot_sh
===================================================================
RCS file: patches/patch-data_scripts_pekwm_screenshot_sh
diff -N patches/patch-data_scripts_pekwm_screenshot_sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-data_scripts_pekwm_screenshot_sh      30 Oct 2016 06:42:43 
-0000
@@ -0,0 +1,76 @@
+$OpenBSD$
+No need for bash here, use /bin/sh
+--- data/scripts/pekwm_screenshot.sh.orig      Sun May 26 15:01:18 2013
++++ data/scripts/pekwm_screenshot.sh   Tue Mar 22 09:16:26 2016
+@@ -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=""
+@@ -146,6 +146,6 @@ function main
+     exit 0
+ }
+ 
+-OPTIONS=$(getopt -o c:d:ho: -n 'pekwm_screenshot.sh' -- "$@")
++OPTIONS=$(getopt c:d:ho: $*)
+ main
+ 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/pekwm/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   12 Nov 2012 10:03:21 -0000      1.7
+++ pkg/PLIST   30 Oct 2016 06:42:43 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2012/11/12 10:03:21 jasper Exp $
+@comment $OpenBSD$
 @bin bin/pekwm
 @man man/man1/pekwm.1
 share/examples/pekwm/
@@ -6,11 +6,11 @@ share/examples/pekwm/
 share/examples/pekwm/autoproperties
 @sample ${SYSCONFDIR}/pekwm/autoproperties
 share/examples/pekwm/autoproperties_typerules
-@sample ${SYSCONFDIR}/autoproperties_typerules
+@sample ${SYSCONFDIR}/pekwm/autoproperties_typerules
 share/examples/pekwm/config
 @sample ${SYSCONFDIR}/pekwm/config
 share/examples/pekwm/config_system
-@sample ${SYSCONFDIR}/config_system
+@sample ${SYSCONFDIR}/pekwm/config_system
 share/examples/pekwm/keys
 @sample ${SYSCONFDIR}/pekwm/keys
 share/examples/pekwm/menu
@@ -18,17 +18,18 @@ share/examples/pekwm/menu
 share/examples/pekwm/mouse
 @sample ${SYSCONFDIR}/pekwm/mouse
 share/examples/pekwm/mouse_click
-@sample ${SYSCONFDIR}/mouse_click
+@sample ${SYSCONFDIR}/pekwm/mouse_click
 share/examples/pekwm/mouse_sloppy
-@sample ${SYSCONFDIR}/mouse_sloppy
+@sample ${SYSCONFDIR}/pekwm/mouse_sloppy
 share/examples/pekwm/mouse_system
-@sample ${SYSCONFDIR}/mouse_system
+@sample ${SYSCONFDIR}/pekwm/mouse_system
 share/examples/pekwm/start
 @sample ${SYSCONFDIR}/pekwm/start
 share/examples/pekwm/vars
 @sample ${SYSCONFDIR}/pekwm/vars
 share/pekwm/
 share/pekwm/scripts/
+share/pekwm/scripts/pekwm_screenshot.sh
 share/pekwm/scripts/pekwm_themeset.sh
 share/pekwm/scripts/pekwm_ws_menu.sh
 share/pekwm/themes/

Reply via email to