Sebastien Marie wrote: > Here an update for x11/pekwm. > > Please note that www.pekwm.org is subtily squatted: see > https://pekdon.pekwm.se/posts/pekwm-development-reboot/
Wow, that's really bad. Sad, that such things happen. > This update has been only build tested: someone told me the version we > had is old and HOMEPAGE was wrong. Some real test would be appreciate. > > Comments or OK ? Pekwm still works fine after this update. My own config works as well as with no config (creates default config in ~/.pekwm). The diff applied cleanly, but the port patch stage failed. Your diff left patch-src_ActionHandler_cc untouched, which didn't apply on the updated version. Did you forget to add removed files to the diff? I attached a modified diff that I think is correct with some changes. Chanced patch-data_scripts_pekwm_screenshot_sh It converted a perfectly fine shell script to a bash script. The only issue I could see was getopt -n, which we don't support. So I took the fix for this and dropped the bashism part. Removed patch-src_ActionHandler_cc The upstream version looks fine now. This patch doesn't apply on the updated version. With or without the patch-data_scripts_pekwm_screenshot_sh changes but with patch-src_ActionHandler_cc removed: LGTM. portcheck, lib-depends-check are happy. Best regards, Stefan Index: x11/pekwm/Makefile =================================================================== RCS file: /cvs/ports/x11/pekwm/Makefile,v retrieving revision 1.36 diff -u -p -u -p -r1.36 Makefile --- x11/pekwm/Makefile 12 Jul 2019 20:51:19 -0000 1.36 +++ x11/pekwm/Makefile 25 Aug 2021 14:45:55 -0000 @@ -2,11 +2,11 @@ COMMENT= aewm++ based pretty themable window manager -DISTNAME= pekwm-0.1.17 -REVISION= 4 +DISTNAME= pekwm-${V} +V= 0.1.18 CATEGORIES= x11 -HOMEPAGE= https://www.pekwm.org/ +HOMEPAGE= https://www.pekwm.se/ MAINTAINER= Timo Myyra <timo.my...@bittivirhe.fi> @@ -19,8 +19,7 @@ WANTLIB += ${COMPILER_LIBCXX} COMPILER = base-clang ports-gcc base-gcc -MASTER_SITES= ${HOMEPAGE}/files/ -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= https://github.com/pekdon/pekwm/releases/download/release-${V}/ LIB_DEPENDS= converters/libiconv \ graphics/jpeg \ graphics/png Index: x11/pekwm/distinfo =================================================================== RCS file: /cvs/ports/x11/pekwm/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- x11/pekwm/distinfo 31 Oct 2016 17:07:30 -0000 1.11 +++ x11/pekwm/distinfo 25 Aug 2021 14:45:55 -0000 @@ -1,2 +1,2 @@ -SHA256 (pekwm-0.1.17.tar.bz2) = ih/Tv5846Me7KyhkwJD5hrYM7CKB7PG7pGLRIPsyfQA= -SIZE (pekwm-0.1.17.tar.bz2) = 405742 +SHA256 (pekwm-0.1.18.tar.gz) = e+zEO3nqsP91RXKFLjhUNSIkIDhRB8iBqTrE3ErpYGU= +SIZE (pekwm-0.1.18.tar.gz) = 531611 Index: x11/pekwm/patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/x11/pekwm/patches/patch-configure_ac,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-configure_ac --- x11/pekwm/patches/patch-configure_ac 20 Dec 2017 17:22:37 -0000 1.1 +++ x11/pekwm/patches/patch-configure_ac 25 Aug 2021 14:45:55 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2017/ Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -31,6 +31,9 @@ CXXFLAGS="$CXXFLAGS $INCICONV" +@@ -32,6 +32,9 @@ CXXFLAGS="$CXXFLAGS $INCICONV" dnl Check for iconvctl AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you the iconvctl call])], ) Index: x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh =================================================================== RCS file: /cvs/ports/x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-data_scripts_pekwm_screenshot_sh --- x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh 31 Oct 2016 17:07:30 -0000 1.1 +++ x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh 25 Aug 2021 14:45:55 -0000 @@ -1,72 +1,11 @@ -$OpenBSD: patch-data_scripts_pekwm_screenshot_sh,v 1.1 2016/10/31 17:07:30 ajacoutot Exp $ -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 +$OpenBSD$ + +Fix getopt: unknown option -- n + +Index: data/scripts/pekwm_screenshot.sh +--- data/scripts/pekwm_screenshot.sh.orig ++++ data/scripts/pekwm_screenshot.sh +@@ -151,6 +151,6 @@ main() exit 0 } Index: x11/pekwm/patches/patch-src_ActionHandler_cc =================================================================== RCS file: x11/pekwm/patches/patch-src_ActionHandler_cc diff -N x11/pekwm/patches/patch-src_ActionHandler_cc --- x11/pekwm/patches/patch-src_ActionHandler_cc 8 Apr 2018 07:05:26 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_ActionHandler_cc,v 1.1 2018/04/08 07:05:26 rsadowski Exp $ - -Index: src/ActionHandler.cc ---- src/ActionHandler.cc.orig -+++ src/ActionHandler.cc -@@ -582,7 +582,7 @@ ActionHandler::actionSendToWorkspace(PDecor *decor, in - row_min = Workspaces::getRowMin(), - row_max = Workspaces::getRowMax(); - -- switch (direction) { -+ switch (static_cast<unsigned int>(direction)) { - case WORKSPACE_LEFT: - case WORKSPACE_PREV: - if (cur_act > row_min) { Index: x11/pekwm/patches/patch-src_main_cc =================================================================== RCS file: /cvs/ports/x11/pekwm/patches/patch-src_main_cc,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_main_cc --- x11/pekwm/patches/patch-src_main_cc 20 Dec 2017 17:22:37 -0000 1.1 +++ x11/pekwm/patches/patch-src_main_cc 25 Aug 2021 14:45:55 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_main_cc,v 1.1 2017/12/20 17:22:37 jca Exp $ +$OpenBSD$ Index: src/main.cc --- src/main.cc.orig +++ src/main.cc -@@ -124,6 +124,12 @@ main(int argc, char **argv) +@@ -127,6 +127,12 @@ main(int argc, char **argv) #endif // DEBUG - WindowManager *wm = WindowManager::start(command_line, config_file, replace); + WindowManager *wm = WindowManager::start(config_file, replace); +#if HAVE_PLEDGE + if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) { + cerr << "failed to pledge" << endl; Index: x11/pekwm/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/pekwm/pkg/PLIST,v retrieving revision 1.8 diff -u -p -u -p -r1.8 PLIST --- x11/pekwm/pkg/PLIST 31 Oct 2016 17:07:30 -0000 1.8 +++ x11/pekwm/pkg/PLIST 25 Aug 2021 14:45:55 -0000 @@ -44,6 +44,15 @@ share/pekwm/themes/default/bottom-left.p 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 @@ -66,5 +75,8 @@ share/pekwm/themes/default/top-border.pn 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/ +share/pekwm/themes/pion/theme