On 2025/12/31 09:49, Stuart Henderson wrote:
> On 2025/12/31 10:48, Timo Myyrä wrote:
> > Hi,
> >
> > Seems that the portroach did not catch pekwm updates so missed some
> > releases.
>
> for portroach, avoid DIST_TUPLE (at least for the main distfile; you can
> for still use it supplementary files if a port uses them).
>
> since pekwm still provides proper uploaded distfiles, it's probably best
> to go back to using them rather than any autogenerated ones, i.e.
> SITES= https://github.com/pekdon/pekwm/releases/download/release-${V}
> like you had before 0.3.2.
ah I see, they didn't provide them for 0.3.2, but are doing so again
if you do need to use autogenerated tars, use GH_TAGNAME rather than
DIST_TUPLE, which mostly works with portroach
>
> > Here is update to bring pekwm up-to-date.
> >
> > timo
> >
> > diff /usr/ports
> > path + /usr/ports
> > commit - c98a9a3a9f4237da4347e345f5c2861c44d9bdc5
> > blob - 48e5672bac93961fcc3cf6ec57b76ec9921976d8
> > file + x11/pekwm/Makefile
> > --- x11/pekwm/Makefile
> > +++ x11/pekwm/Makefile
> > @@ -1,6 +1,6 @@
> > COMMENT= aewm++ based pretty themable window manager
> >
> > -V= 0.3.2
> > +V= 0.4.1
> > PKGNAME= pekwm-${V}
> > DISTNAME= pekwm-release-${V}
> >
> > @@ -16,15 +16,17 @@ PERMIT_PACKAGE= Yes
> >
> > # uses pledge()
> > WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xext Xft Xinerama Xpm
> > -WANTLIB += Xrandr c cairo fontconfig freetype glib-2.0 gobject-2.0
> > -WANTLIB += harfbuzz intl jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
> > -WANTLIB += pangoxft-1.0 png
> > +WANTLIB += Xrandr c cairo curl fontconfig freetype glib-2.0
> > +WANTLIB += gobject-2.0 harfbuzz intl jpeg m pango-1.0 pangocairo-1.0
> > +WANTLIB += pangoft2-1.0 pangoxft-1.0 png udev
> >
> > COMPILER = base-clang ports-gcc base-gcc
> >
> > LIB_DEPENDS= devel/pango \
> > graphics/jpeg \
> > - graphics/png
> > + graphics/png \
> > + net/curl \
> > + sysutils/libudev-openbsd
> >
> > MODULES= devel/cmake
> >
> > commit - fb6bc587604a21ddf62621505b421210f7b1cf7d
> > blob - 46244416f761855e20e2efde89f3a4966efa0687
> > file + x11/pekwm/distinfo
> > --- x11/pekwm/distinfo
> > +++ x11/pekwm/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (pekwm-pekwm-release-0.3.2.tar.gz) =
> > z15hp1PxoSWHfGVHf/2bdrGqbOwPJB8f1q+RWd0jv98=
> > -SIZE (pekwm-pekwm-release-0.3.2.tar.gz) = 1213773
> > +SHA256 (pekwm-pekwm-release-0.4.1.tar.gz) =
> > c4J+JUf6DzgYXpHJ5pz4FyMAF9ZgXspIjqAZkzds254=
> > +SIZE (pekwm-pekwm-release-0.4.1.tar.gz) = 543881
> > commit - fb6bc587604a21ddf62621505b421210f7b1cf7d
> > blob - 36fc98bb84228f0b7541980d3f013b963e5dc679
> > file + /dev/null
> > --- x11/pekwm/patches/patch-CMakeLists_txt
> > +++ /dev/null
> > @@ -1,11 +0,0 @@
> > -Index: CMakeLists.txt
> > ---- CMakeLists.txt.orig
> > -+++ CMakeLists.txt
> > -@@ -81,6 +81,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)
> > commit - fb6bc587604a21ddf62621505b421210f7b1cf7d
> > blob - 0d4a9f9003d5e8e612d341c179b17f334f27c532
> > file + /dev/null
> > --- x11/pekwm/patches/patch-src_pekwm_wm_cc
> > +++ /dev/null
> > @@ -1,18 +0,0 @@
> > -Index: src/pekwm_wm.cc
> > ---- src/pekwm_wm.cc.orig
> > -+++ src/pekwm_wm.cc
> > -@@ -181,6 +181,14 @@ main(int argc, char **argv)
> > - WindowManager::start(config_file, replace, synchronous);
> > - if (wm) {
> > - try {
> > -+
> > -+#if PEKWM_HAVE_PLEDGE
> > -+ if (pledge("stdio rpath wpath cpath proc exec", NULL)
> > == -1) {
> > -+ std::cerr << "failed to pledge" << std::endl;
> > -+ return 1;
> > -+ }
> > -+#endif
> > -+
> > - P_TRACE("Enter event loop.");
> > -
> > - wm->doEventLoop();
> > commit - fb6bc587604a21ddf62621505b421210f7b1cf7d
> > blob - 5423a20c87c3fbf9f223fa781658a007dd445f8e
> > file + x11/pekwm/pkg/PLIST
> > --- x11/pekwm/pkg/PLIST
> > +++ x11/pekwm/pkg/PLIST
> > @@ -4,6 +4,7 @@
> > @bin bin/pekwm_dialog
> > @bin bin/pekwm_panel
> > @bin bin/pekwm_screenshot
> > +@bin bin/pekwm_sys
> > bin/pekwm_theme
> > @bin bin/pekwm_wm
> > @man man/man1/pekwm.1
> > @@ -16,6 +17,8 @@ share/examples/pekwm/
> > @sample ${SYSCONFDIR}/pekwm/
> > share/examples/pekwm/autoproperties
> > @sample ${SYSCONFDIR}/pekwm/autoproperties
> > +share/examples/pekwm/autoproperties_clientrules
> > +@sample ${SYSCONFDIR}/pekwm/autoproperties_clientrules
> > share/examples/pekwm/autoproperties_typerules
> > @sample ${SYSCONFDIR}/pekwm/autoproperties_typerules
> > share/examples/pekwm/config
> > @@ -24,8 +27,16 @@ share/examples/pekwm/config_system
> > @sample ${SYSCONFDIR}/pekwm/config_system
> > share/examples/pekwm/keys
> > @sample ${SYSCONFDIR}/pekwm/keys
> > +share/examples/pekwm/keys_inputdialog
> > +@sample ${SYSCONFDIR}/pekwm/keys_inputdialog
> > +share/examples/pekwm/keys_menu
> > +@sample ${SYSCONFDIR}/pekwm/keys_menu
> > +share/examples/pekwm/keys_moveresize
> > +@sample ${SYSCONFDIR}/pekwm/keys_moveresize
> > share/examples/pekwm/menu
> > @sample ${SYSCONFDIR}/pekwm/menu
> > +share/examples/pekwm/menu_windowmenu
> > +@sample ${SYSCONFDIR}/pekwm/menu_windowmenu
> > share/examples/pekwm/mouse
> > @sample ${SYSCONFDIR}/pekwm/mouse
> > share/examples/pekwm/mouse_click
> > @@ -41,82 +52,35 @@ share/examples/pekwm/start
> > share/examples/pekwm/vars
> > @sample ${SYSCONFDIR}/pekwm/vars
> > share/pekwm/
> > +share/pekwm/icons/
> > +share/pekwm/icons/battery-ac.png
> > +share/pekwm/icons/battery-battery.png
> > +share/pekwm/icons/battery.png
> > +share/pekwm/icons/flag-de.png
> > +share/pekwm/icons/flag-dk.png
> > +share/pekwm/icons/flag-fi.png
> > +share/pekwm/icons/flag-fr.png
> > +share/pekwm/icons/flag-hu.png
> > +share/pekwm/icons/flag-is.png
> > +share/pekwm/icons/flag-no.png
> > +share/pekwm/icons/flag-pl.png
> > +share/pekwm/icons/flag-pt.png
> > +share/pekwm/icons/flag-se.png
> > +share/pekwm/icons/flag-us.png
> > +share/pekwm/icons/flag.png
> > share/pekwm/scripts/
> > +share/pekwm/scripts/pekwm_audio_ctrl.sh
> > +share/pekwm/scripts/pekwm_lock.sh
> > +share/pekwm/scripts/pekwm_panel_battery.sh
> > +@bin share/pekwm/scripts/pekwm_panel_sysinfo
> > share/pekwm/scripts/pekwm_themeset.sh
> > +share/pekwm/scripts/pekwm_toggle_kbd_layout.sh
> > share/pekwm/scripts/pekwm_ws_menu.sh
> > share/pekwm/themes/
> > share/pekwm/themes/default/
> > -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
> > -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
> > -share/pekwm/themes/default/button_unfocus.png
> > -share/pekwm/themes/default/item.png
> > -share/pekwm/themes/default/item_focus.png
> > -share/pekwm/themes/default/left-border.png
> > -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
> > -share/pekwm/themes/default/tab-separator_unfocus.png
> > +share/pekwm/themes/default/template
> > share/pekwm/themes/default/theme
> > -share/pekwm/themes/default/title.png
> > -share/pekwm/themes/default/title_unfocus.png
> > -share/pekwm/themes/default/top-border.png
> > -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/winter/
> > -share/pekwm/themes/winter/backgrounds/
> > -share/pekwm/themes/winter/backgrounds/background-2560x1440.jpg
> > -share/pekwm/themes/winter/bd-b-un.png
> > -share/pekwm/themes/winter/bd-b.png
> > -share/pekwm/themes/winter/bd-bl-un.png
> > -share/pekwm/themes/winter/bd-bl.png
> > -share/pekwm/themes/winter/bd-br-un.png
> > -share/pekwm/themes/winter/bd-br.png
> > -share/pekwm/themes/winter/bd-lr-un.png
> > -share/pekwm/themes/winter/bd-lr.png
> > -share/pekwm/themes/winter/bd-t-un.png
> > -share/pekwm/themes/winter/bd-t.png
> > -share/pekwm/themes/winter/bd-tl-un.png
> > -share/pekwm/themes/winter/bd-tl.png
> > -share/pekwm/themes/winter/bd-tr-un.png
> > -share/pekwm/themes/winter/bd-tr.png
> > -share/pekwm/themes/winter/panel-sep.png
> > -share/pekwm/themes/winter/panel.png
> > -share/pekwm/themes/winter/sep-un.png
> > -share/pekwm/themes/winter/sep.png
> > -share/pekwm/themes/winter/theme
> > -share/pekwm/themes/winter/title-fo.png
> > -share/pekwm/themes/winter/title-sel-un.png
> > -share/pekwm/themes/winter/title-sel.png
> > -share/pekwm/themes/winter/title-un.png
> > +share/pekwm/themes/default/theme-dark
> > +share/pekwm/themes/default/theme-dawn
> > +share/pekwm/themes/default/theme-dusk
> > +share/pekwm/themes/default/theme-light
> >
>
