Hi,
Another attempt at updating pekwm.
I noticed the pekwm_theme script picked up wrong copies of sed and awk
commands so pass in configure flags to fix them. The script could be
patched so that can use 'ftp' for fetching themes.
Timo
diff 922bc0dd1b90e02f44c8c00183cad19f3c566aa5 /usr/ports
blob - 13d0876d3be258fe7eae3b4b84e55bd6be3fc822
file + x11/pekwm/Makefile
--- x11/pekwm/Makefile
+++ x11/pekwm/Makefile
@@ -3,7 +3,7 @@
COMMENT= aewm++ based pretty themable window manager
DISTNAME= pekwm-${V}
-V= 0.1.18
+V= 0.2.0
CATEGORIES= x11
HOMEPAGE= https://www.pekwm.se/
@@ -14,27 +14,24 @@ MAINTAINER= Timo Myyra <[email protected]>
PERMIT_PACKAGE= Yes
# uses pledge()
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv jpeg m png z
+WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
WANTLIB += ${COMPILER_LIBCXX}
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES= https://github.com/pekdon/pekwm/releases/download/release-${V}/
-LIB_DEPENDS= converters/libiconv \
- graphics/jpeg \
+LIB_DEPENDS= graphics/jpeg \
graphics/png
NO_TEST= Yes
-USE_GMAKE= Yes
+MODULES= devel/cmake
-CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --enable-xinerama
+CONFIGURE_ARGS= -DCMAKE_INSTALL_SYSCONFDIR=${SYSCONFDIR} \
+ -DAWK=/usr/bin/awk \
+ -DSED=/usr/bin/sed \
+ -DSH=/bin/sh
-AUTOCONF_VERSION= 2.69
-
post-install:
@mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples
blob - 0387b2ddf3443fceafb537b1f05c0cd580d24bf5
file + x11/pekwm/distinfo
--- x11/pekwm/distinfo
+++ x11/pekwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.1.18.tar.gz) = e+zEO3nqsP91RXKFLjhUNSIkIDhRB8iBqTrE3ErpYGU=
-SIZE (pekwm-0.1.18.tar.gz) = 531611
+SHA256 (pekwm-0.2.0.tar.gz) = KFZVUN29JPsrdi8eA+CopGaEPcl6gxBlAYoFHnJAZR4=
+SIZE (pekwm-0.2.0.tar.gz) = 938147
blob - /dev/null
file + x11/pekwm/patches/patch-CMakeLists_txt
--- /dev/null
+++ x11/pekwm/patches/patch-CMakeLists_txt
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -65,6 +65,7 @@ int main() { std::stof(\"42.0\"); }
+ set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
+
+ # Look for platform specific methods
++check_function_exists(pledge PEKWM_HAVE_PLEDGE)
+ check_function_exists(setenv PEKWM_HAVE_SETENV)
+ check_function_exists(unsetenv PEKWM_HAVE_UNSETENV)
+ check_function_exists(daemon PEKWM_HAVE_DAEMON)
blob - 3c0effc1f264b5ebebe13e7699519889cb32d7b4
file + /dev/null
--- x11/pekwm/patches/patch-configure_ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -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])], )
-
-+dnl Check for pledge
-+AC_CHECK_FUNC(pledge, [AC_DEFINE(HAVE_PLEDGE, [1], [Define to 1 if you the
pledge call])], )
-+
- dnl add x11 to the env
- AC_PATH_X
- AC_PATH_XTRA
blob - 981137eb0312d193c741474d6fad409ed1b7aaaf
file + /dev/null
--- x11/pekwm/patches/patch-data_scripts_pekwm_screenshot_sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-data_scripts_pekwm_screenshot_sh,v 1.2 2021/08/26 04:23:03
semarie Exp $
-
-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
- }
-
--OPTIONS=$(getopt -o c:d:ho: -n 'pekwm_screenshot.sh' -- "$@")
-+OPTIONS=$(getopt c:d:ho: $*)
- main
-
blob - /dev/null
file + x11/pekwm/patches/patch-doc_CMakeLists_txt
--- /dev/null
+++ x11/pekwm/patches/patch-doc_CMakeLists_txt
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
++++ doc/CMakeLists.txt
+@@ -13,4 +13,4 @@ endif (ENABLE_IMAGE_PNG AND PNG_FOUND)
+
+ install(FILES
+ ${manpages}
+- DESTINATION share/man/man1)
++ DESTINATION man/man1)
blob - e86f273afc1f6e892ee2d8ef874b51c3a8c4e0be
file + /dev/null
--- x11/pekwm/patches/patch-src_main_cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_main_cc,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: src/main.cc
---- src/main.cc.orig
-+++ src/main.cc
-@@ -127,6 +127,12 @@ main(int argc, char **argv)
- #endif // DEBUG
-
- 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;
-+ return 1;
-+ }
-+#endif
-
- if (wm) {
- try {
blob - /dev/null
file + x11/pekwm/patches/patch-src_pekwm_wm_cc
--- /dev/null
+++ x11/pekwm/patches/patch-src_pekwm_wm_cc
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: src/pekwm_wm.cc
+--- src/pekwm_wm.cc.orig
++++ src/pekwm_wm.cc
+@@ -21,7 +21,7 @@
+
+ extern "C" {
+ #include <errno.h>
+-#include <unistd.h> // execlp
++#include <unistd.h> // execlp,pledge
+ }
+
+ /**
+@@ -141,6 +141,14 @@ main(int argc, char **argv)
+ << "using configuration at " << config_file);
+
+ WindowManager *wm = WindowManager::start(config_file, replace,
synchronous);
++
++#if PEKWM_HAVE_PLEDGE
++ if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) {
++ cerr << "failed to pledge" << endl;
++ return 1;
++ }
++#endif
++
+ if (wm) {
+ try {
+ P_TRACE("Enter event loop.");
blob - 1b6131fa3f8518cc1ac4f4a125b6a866167cc792
file + x11/pekwm/pkg/PLIST
--- x11/pekwm/pkg/PLIST
+++ x11/pekwm/pkg/PLIST
@@ -1,6 +1,18 @@
-@comment $OpenBSD: PLIST,v 1.9 2021/08/26 04:23:03 semarie Exp $
+@comment $OpenBSD: PLIST,v$
@bin bin/pekwm
+@bin bin/pekwm_bg
+@bin bin/pekwm_ctrl
+@bin bin/pekwm_dialog
+@bin bin/pekwm_panel
+@bin bin/pekwm_screenshot
+bin/pekwm_theme
+@bin bin/pekwm_wm
@man man/man1/pekwm.1
+@man man/man1/pekwm_bg.1
+@man man/man1/pekwm_dialog.1
+@man man/man1/pekwm_panel.1
+@man man/man1/pekwm_screenshot.1
+@man man/man1/pekwm_theme.1
share/examples/pekwm/
@sample ${SYSCONFDIR}/pekwm/
share/examples/pekwm/autoproperties
@@ -23,13 +35,14 @@ share/examples/pekwm/mouse_sloppy
@sample ${SYSCONFDIR}/pekwm/mouse_sloppy
share/examples/pekwm/mouse_system
@sample ${SYSCONFDIR}/pekwm/mouse_system
+share/examples/pekwm/panel
+@sample ${SYSCONFDIR}/pekwm/panel
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/
@@ -38,6 +51,9 @@ share/pekwm/themes/default-plain/
share/pekwm/themes/default-plain/theme
share/pekwm/themes/default/arrow.png
share/pekwm/themes/default/arrow_focus.png
+share/pekwm/themes/default/backgrounds/
+share/pekwm/themes/default/backgrounds/pekwm_generated-1920x1080.png
+share/pekwm/themes/default/backgrounds/pekwm_generated-2560x1440.png
share/pekwm/themes/default/bottom-border.png
share/pekwm/themes/default/bottom-border_unfocus.png
share/pekwm/themes/default/bottom-left.png
@@ -64,6 +80,7 @@ share/pekwm/themes/default/left-border_unfocus.png
share/pekwm/themes/default/menu-bottom.png
share/pekwm/themes/default/menu-bottom_unfocus.png
share/pekwm/themes/default/menuline.png
+share/pekwm/themes/default/panel.png
share/pekwm/themes/default/right-border.png
share/pekwm/themes/default/right-border_unfocus.png
share/pekwm/themes/default/tab-separator.png
@@ -78,5 +95,3 @@ 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
