diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile index da8702883e1a..c4a068b2433e 100644 --- a/x11-wm/pekwm/Makefile +++ b/x11-wm/pekwm/Makefile @@ -1,43 +1,41 @@ PORTNAME= pekwm -DISTVERSIONPREFIX= release- -DISTVERSION= 0.3.0 -PORTREVISION= 2 +DISTVERSION= 0.4.3 PORTEPOCH= 1 CATEGORIES= x11-wm +MASTER_SITES= https://www.pekwm.se/pekwm/uv/ MAINTAINER= natbsd@instinctive.eu COMMENT= Light, Unobtrusive, and configurable windowmanager WWW= https://www.pekwm.se/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libpng.so:graphics/png \ - libfreetype.so:print/freetype2 +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libpng.so:graphics/png RUN_DEPENDS= gsed:textproc/gsed \ xprop:x11/xprop -USES= cmake compiler jpeg \ - localbase pkgconfig tar:bzip2 xorg -USE_XORG= xft xpm x11 sm ice xext xinerama xrandr -USE_GITHUB= yes -GH_ACCOUNT= pekwm +USES= cmake compiler jpeg localbase pkgconfig xorg +USE_XORG= ice sm x11 xext xft xinerama xpm xrandr -OPTIONS_DEFINE= PANGO -OPTIONS_DEFAULT=PANGO +SUB_FILES= pekwm.desktop -PANGO_DESC= Use Pango font support (both Cairo and Xft) - -PANGO_LIB_DEPENDS= libpangocairo-1.0.so:x11-toolkits/pango \ - libfontconfig.so:x11-fonts/fontconfig \ - libharfbuzz.so:print/harfbuzz -PANGO_USES= gnome gettext-runtime -PANGO_CMAKE_BOOL=ENABLE_PANGO +OPTIONS_DEFINE= PANGO +OPTIONS_DEFAULT= PANGO -.include +PANGO_DESC= Use Pango font support (both Cairo and Xft) -.if ${PORT_OPTIONS:MPANGO} -USE_GNOME= glib20 cairo -.endif +PANGO_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libharfbuzz.so:print/harfbuzz \ + libpangocairo-1.0.so:x11-toolkits/pango +PANGO_USES= gettext-runtime gnome +PANGO_USE= GNOME=cairo,glib20 +PANGO_CMAKE_BOOL= ENABLE_PANGO + +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions + ${INSTALL_DATA} ${WRKDIR}/pekwm.desktop \ + ${STAGEDIR}${PREFIX}/share/xsessions/ .include diff --git a/x11-wm/pekwm/distinfo b/x11-wm/pekwm/distinfo index 707ef96863c7..902d830274a4 100644 --- a/x11-wm/pekwm/distinfo +++ b/x11-wm/pekwm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675191806 -SHA256 (pekwm-pekwm-release-0.3.0_GH0.tar.gz) = 8c501dba954395b558afb6776cbda7732da023d75ca18f4b04c22cf49a2e7507 -SIZE (pekwm-pekwm-release-0.3.0_GH0.tar.gz) = 1210392 +TIMESTAMP = 1771662722 +SHA256 (pekwm-0.4.3.tar.gz) = ebe552cd28da888918fa19831a7dfb01cdb19479ee74e5e4c21ea33a8a5f1e16 +SIZE (pekwm-0.4.3.tar.gz) = 812905 diff --git a/x11-wm/pekwm/files/patch-src__CfgParserSource.cc b/x11-wm/pekwm/files/patch-src__CfgParserSource.cc deleted file mode 100644 index 0914232c870a..000000000000 --- a/x11-wm/pekwm/files/patch-src__CfgParserSource.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/CfgParserSource.cc.orig 2023-01-31 19:52:25.779184000 +0100 -+++ ./src/CfgParserSource.cc 2023-01-31 19:53:09.043407000 +0100 -@@ -144,7 +144,7 @@ - std::string path(Util::getEnv("PATH")); - path = _command_path + ":" + path; - env.override("PATH", path); -- execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), nullptr, -+ execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), NULL, - env.getCEnv()); - - ::close (STDOUT_FILENO); diff --git a/x11-wm/pekwm/files/pekwm.desktop.in b/x11-wm/pekwm/files/pekwm.desktop.in new file mode 100644 index 000000000000..4300ae20e520 --- /dev/null +++ b/x11-wm/pekwm/files/pekwm.desktop.in @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=PekWM +Comment=Lightweight and highly configurable window manager +Exec=%%PREFIX%%/bin/pekwm +TryExec=%%PREFIX%%/bin/pekwm +Type=Application +DesktopNames=PekWM diff --git a/x11-wm/pekwm/pkg-plist b/x11-wm/pekwm/pkg-plist index 7743aa195fee..5269d9d89804 100644 --- a/x11-wm/pekwm/pkg-plist +++ b/x11-wm/pekwm/pkg-plist @@ -1,99 +1,62 @@ -%%DATADIR%%/scripts/pekwm_themeset.sh -%%DATADIR%%/scripts/pekwm_ws_menu.sh -%%DATADIR%%/themes/default-plain/theme -%%DATADIR%%/themes/default/arrow.png -%%DATADIR%%/themes/default/arrow_focus.png -%%DATADIR%%/themes/default/backgrounds/pekwm_generated-1920x1080.png -%%DATADIR%%/themes/default/backgrounds/pekwm_generated-2560x1440.png -%%DATADIR%%/themes/default/bottom-border.png -%%DATADIR%%/themes/default/bottom-border_unfocus.png -%%DATADIR%%/themes/default/bottom-left.png -%%DATADIR%%/themes/default/bottom-left_unfocus.png -%%DATADIR%%/themes/default/bottom-right.png -%%DATADIR%%/themes/default/bottom-right_unfocus.png -%%DATADIR%%/themes/default/button-close.png -%%DATADIR%%/themes/default/button-close_hover.png -%%DATADIR%%/themes/default/button-close_press.png -%%DATADIR%%/themes/default/button-max.png -%%DATADIR%%/themes/default/button-max_hover.png -%%DATADIR%%/themes/default/button-max_press.png -%%DATADIR%%/themes/default/button-min.png -%%DATADIR%%/themes/default/button-min_hover.png -%%DATADIR%%/themes/default/button-min_press.png -%%DATADIR%%/themes/default/button.png -%%DATADIR%%/themes/default/button_hover.png -%%DATADIR%%/themes/default/button_press.png -%%DATADIR%%/themes/default/button_unfocus.png -%%DATADIR%%/themes/default/item.png -%%DATADIR%%/themes/default/item_focus.png -%%DATADIR%%/themes/default/left-border.png -%%DATADIR%%/themes/default/left-border_unfocus.png -%%DATADIR%%/themes/default/menu-bottom.png -%%DATADIR%%/themes/default/menu-bottom_unfocus.png -%%DATADIR%%/themes/default/menuline.png -%%DATADIR%%/themes/default/panel.png -%%DATADIR%%/themes/default/right-border.png -%%DATADIR%%/themes/default/right-border_unfocus.png -%%DATADIR%%/themes/default/tab-separator.png -%%DATADIR%%/themes/default/tab-separator_unfocus.png -%%DATADIR%%/themes/default/theme -%%DATADIR%%/themes/default/title.png -%%DATADIR%%/themes/default/title_unfocus.png -%%DATADIR%%/themes/default/top-border.png -%%DATADIR%%/themes/default/top-border_unfocus.png -%%DATADIR%%/themes/default/top-left.png -%%DATADIR%%/themes/default/top-left_unfocus.png -%%DATADIR%%/themes/default/top-right-no-buttons.png -%%DATADIR%%/themes/default/top-right.png -%%DATADIR%%/themes/default/top-right_unfocus.png -%%DATADIR%%/themes/winter/backgrounds/background-2560x1440.jpg -%%DATADIR%%/themes/winter/bd-b-un.png -%%DATADIR%%/themes/winter/bd-b.png -%%DATADIR%%/themes/winter/bd-bl-un.png -%%DATADIR%%/themes/winter/bd-bl.png -%%DATADIR%%/themes/winter/bd-br-un.png -%%DATADIR%%/themes/winter/bd-br.png -%%DATADIR%%/themes/winter/bd-lr-un.png -%%DATADIR%%/themes/winter/bd-lr.png -%%DATADIR%%/themes/winter/bd-t-un.png -%%DATADIR%%/themes/winter/bd-t.png -%%DATADIR%%/themes/winter/bd-tl-un.png -%%DATADIR%%/themes/winter/bd-tl.png -%%DATADIR%%/themes/winter/bd-tr-un.png -%%DATADIR%%/themes/winter/bd-tr.png -%%DATADIR%%/themes/winter/panel-sep.png -%%DATADIR%%/themes/winter/panel.png -%%DATADIR%%/themes/winter/sep-un.png -%%DATADIR%%/themes/winter/sep.png -%%DATADIR%%/themes/winter/theme -%%DATADIR%%/themes/winter/title-fo.png -%%DATADIR%%/themes/winter/title-sel-un.png -%%DATADIR%%/themes/winter/title-sel.png -%%DATADIR%%/themes/winter/title-un.png bin/pekwm bin/pekwm_bg bin/pekwm_ctrl bin/pekwm_dialog bin/pekwm_panel bin/pekwm_screenshot +bin/pekwm_sys bin/pekwm_theme bin/pekwm_wm %%ETCDIR%%/autoproperties +%%ETCDIR%%/autoproperties_clientrules %%ETCDIR%%/autoproperties_typerules %%ETCDIR%%/config %%ETCDIR%%/config_system %%ETCDIR%%/keys +%%ETCDIR%%/keys_inputdialog +%%ETCDIR%%/keys_menu +%%ETCDIR%%/keys_moveresize %%ETCDIR%%/menu +%%ETCDIR%%/menu_windowmenu %%ETCDIR%%/mouse %%ETCDIR%%/mouse_click %%ETCDIR%%/mouse_sloppy %%ETCDIR%%/mouse_system %%ETCDIR%%/panel %%ETCDIR%%/start %%ETCDIR%%/vars share/man/man1/pekwm.1.gz share/man/man1/pekwm_bg.1.gz share/man/man1/pekwm_dialog.1.gz share/man/man1/pekwm_panel.1.gz share/man/man1/pekwm_screenshot.1.gz share/man/man1/pekwm_theme.1.gz +share/xsessions/pekwm.desktop +%%DATADIR%%/icons/battery-ac.png +%%DATADIR%%/icons/battery-battery.png +%%DATADIR%%/icons/battery.png +%%DATADIR%%/icons/flag-de.png +%%DATADIR%%/icons/flag-dk.png +%%DATADIR%%/icons/flag-fi.png +%%DATADIR%%/icons/flag-fr.png +%%DATADIR%%/icons/flag-hu.png +%%DATADIR%%/icons/flag-is.png +%%DATADIR%%/icons/flag-no.png +%%DATADIR%%/icons/flag-pl.png +%%DATADIR%%/icons/flag-pt.png +%%DATADIR%%/icons/flag-se.png +%%DATADIR%%/icons/flag-us.png +%%DATADIR%%/icons/flag.png +%%DATADIR%%/scripts/pekwm_audio_ctrl.sh +%%DATADIR%%/scripts/pekwm_lock.sh +%%DATADIR%%/scripts/pekwm_panel_battery.sh +%%DATADIR%%/scripts/pekwm_panel_sysinfo +%%DATADIR%%/scripts/pekwm_themeset.sh +%%DATADIR%%/scripts/pekwm_toggle_kbd_layout.sh +%%DATADIR%%/scripts/pekwm_ws_menu.sh +%%DATADIR%%/themes/default/template +%%DATADIR%%/themes/default/theme +%%DATADIR%%/themes/default/theme-dark +%%DATADIR%%/themes/default/theme-dawn +%%DATADIR%%/themes/default/theme-dusk +%%DATADIR%%/themes/default/theme-light