Date: Fri, 29 Oct 2021 17:04:57 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: de8f3c74fa48 - main - x11-wm/nscde: Update to 1.3 Message-ID: <202110291704.19TH4vbP056847@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=de8f3c74fa485e5fbb5e8098970c04b5867f75cc commit de8f3c74fa485e5fbb5e8098970c04b5867f75cc Author: Chris Moerz <freebsd@ny-central.org> AuthorDate: 2021-10-29 17:04:30 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2021-10-29 17:04:30 +0000 x11-wm/nscde: Update to 1.3 PR: 259328 --- x11-wm/nscde/Makefile | 47 +- x11-wm/nscde/distinfo | 6 +- .../files/patch-NsCDE_config_NsCDE-Functions.conf | 11 + .../files/patch-NsCDE_libexec_generate__subpanels | 13 + .../nscde/files/patch-NsCDE_libexec_nscde__setup | 81 ++-- ...E_share_config__templates_NsCDE-Functions.local | 4 +- .../files/patch-NsCDE_share_doc_examples_doas.conf | 8 + ...NsCDE_share_doc_examples_sudo_006__PowerManager | 12 +- .../patch-NsCDE_share_doc_examples_sudo_README | 6 + x11-wm/nscde/files/patch-docbook_NsCDE.xml | 485 ++++++++++----------- .../files/patch-src_XOverrideFontCursor_Makefile | 13 +- x11-wm/nscde/files/patch-src_colorpicker_Makefile | 10 +- .../files/patch-src_pclock-0.13.1_src_Makefile | 10 +- x11-wm/nscde/pkg-message | 1 + x11-wm/nscde/pkg-plist | 168 ++++++- 15 files changed, 543 insertions(+), 332 deletions(-) diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile index 614c8aad22e3..98870538fe76 100644 --- a/x11-wm/nscde/Makefile +++ b/x11-wm/nscde/Makefile @@ -1,5 +1,5 @@ PORTNAME= nscde -DISTVERSION= 1.2 +DISTVERSION= 1.3 CATEGORIES= x11-wm MAINTAINER= freebsd@ny-central.org @@ -19,12 +19,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR fvwm2:x11-wm/fvwm2 \ gsed:textproc/gsed \ ksh93:shells/ast-ksh \ - magick:graphics/ImageMagick7 \ pyuic5:devel/py-qt5@${PY_FLAVOR} \ qt5-style-plugins>=5.0.0:x11-themes/qt5-style-plugins \ roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \ stalonetray:x11/stalonetray \ - sudo:security/sudo \ xdotool:x11/xdotool \ xdpyinfo:x11/xdpyinfo \ xrdb:x11/xrdb \ @@ -53,18 +51,34 @@ SHEBANG_FILES= Installer.ksh NsCDE/bin/confget.py NsCDE/bin/confset.py \ DOCSDIR= ${PREFIX}/share/doc/nscde OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_DEFAULT= DOCS EXAMPLES +OPTIONS_DEFAULT= DOCS EXAMPLES SUDO IMGV6 +OPTIONS_SINGLE= ROOTAUTH IMGMAG +OPTIONS_SINGLE_IMGMAG= IMGV6 IMGV7 +OPTIONS_SINGLE_ROOTAUTH= SUDO DOAS +DOAS_DESC= Use doas to elevate privileges +IMGMAG_DESC= ImageMagick release +IMGV6_DESC= ImageMagick version 6 +IMGV7_DESC= ImageMagick version 7 +ROOTAUTH_DESC= Root authorization +SUDO_DESC= Use sudo to elevate privileges + +DOAS_RUN_DEPENDS= doas:security/doas +IMGV6_RUN_DEPENDS= convert:graphics/ImageMagick6 +IMGV7_RUN_DEPENDS= magick:graphics/ImageMagick7 +SUDO_RUN_DEPENDS= sudo:security/sudo _NSCDE_HELPERS= Notifier.sh Splash.sh appfinder backdropmgr colorconv.py \ colormgr fontmgr fp_manage_subpanel fpexec fpseticon \ generate_app_menus generate_subpanels geticon.py getla1.py \ keymenu nscde-acpi nscde_get_logical_screens \ nscde_palette_colorgen.py nscde_setup strip_icon_path \ - style_managers.shlib subpanel_menuitem_props themegen.py + style_managers.shlib subpanel_menuitem_props themegen.py \ + xrandr_backer GWM.sh _PREFIX_FILES= NsCDE/bin/fpclock NsCDE/bin/get_fvwm_infostore \ NsCDE/bin/getfont NsCDE/bin/mkpagemenu NsCDE/bin/nscde \ NsCDE/bin/nscde_colorpicker NsCDE/bin/xdowrapper \ + NsCDE/config/NsCDE-Functions.conf.sample \ NsCDE/config/NsCDE-Main.conf.sample NsCDE/libexec/Splash.sh \ NsCDE/libexec/fp_manage_subpanel \ NsCDE/libexec/fvwm-modules/FvwmScript NsCDE/libexec/nscde_setup \ @@ -76,7 +90,6 @@ _PREFIX_FILES= NsCDE/bin/fpclock NsCDE/bin/get_fvwm_infostore \ docbook/NsCDE.xml docbook/NsCDE.xsl _SHAREDOC= NsCDE/config/FrontPanel.actions \ - NsCDE/config/NsCDE-Functions.conf \ NsCDE/config/NsCDE-Keybindings.conf \ NsCDE/config/NsCDE-Menus.conf NsCDE/config/NsCDE-Subpanels.conf \ NsCDE/config/Subpanels.actions NsCDE/lib/scripts/BackdropMgr \ @@ -94,9 +107,8 @@ _SHAREDOC= NsCDE/config/FrontPanel.actions \ NsCDE/lib/scripts/WSM NsCDE/lib/scripts/WSM-2 \ NsCDE/lib/scripts/WSM-4 NsCDE/lib/scripts/WSM-6 \ NsCDE/lib/scripts/WSM-8 NsCDE/lib/scripts/WindowMgr \ - NsCDE/lib/scripts/WsPgMgr - -_SHAREICONS= NsCDE/config/NsCDE-Functions.conf + NsCDE/lib/scripts/WsPgMgr \ + NsCDE/libexec/GWM.sh _CURLYICONS= NsCDE/config/NsCDE-Functions.conf NsCDE/libexec/colormgr \ NsCDE/libexec/subpanel_menuitem_props @@ -124,6 +136,7 @@ _BSHARESLASH= NsCDE/config/NsCDE-Functions.conf NsCDE/lib/scripts/BackdropMgr \ NsCDE/libexec/appfinder NsCDE/libexec/fontmgr \ NsCDE/libexec/strip_icon_path \ NsCDE/libexec/subpanel_menuitem_props \ + NsCDE/libexec/GWM.sh \ NsCDE/share/config_templates/colormgr.local \ NsCDE/share/doc/NsCDE.txt README.localization @@ -182,6 +195,7 @@ _BBINS= NsCDE/config/FrontPanel.actions \ NsCDE/libexec/colormgr NsCDE/libexec/fontmgr \ NsCDE/libexec/fp_manage_subpanel NsCDE/libexec/strip_icon_path \ NsCDE/libexec/subpanel_menuitem_props \ + NsCDE/libexec/GWM.sh \ NsCDE/share/applications/NsCDE-Exec.desktop \ NsCDE/share/applications/NsCDE-FvwmConsole.desktop \ NsCDE/share/applications/NsCDE-NProcMgr.desktop \ @@ -202,9 +216,7 @@ _CONFREF= NsCDE/config/NsCDE-Main.conf _CCONFIGS= NsCDE/libexec/colormgr _CONFIGS= NsCDE/lib/scripts/SubpanelMgr \ - NsCDE/lib/scripts/SubpanelSettings NsCDE/lib/scripts/WSM \ - NsCDE/lib/scripts/WSM-2 NsCDE/lib/scripts/WSM-4 \ - NsCDE/lib/scripts/WSM-6 NsCDE/lib/scripts/WSM-8 \ + NsCDE/lib/scripts/SubpanelSettings \ NsCDE/lib/scripts/WindowMgr NsCDE/lib/scripts/WsPgMgr \ NsCDE/libexec/fp_manage_subpanel NsCDE/libexec/fpexec \ NsCDE/libexec/fpseticon NsCDE/libexec/generate_app_menus \ @@ -217,6 +229,7 @@ _KSHFIX= NsCDE/bin/fpclock NsCDE/bin/get_fvwm_infostore NsCDE/bin/getdpi \ NsCDE/bin/nscde NsCDE/bin/nscde_colorpicker \ NsCDE/bin/nscde_fvwmclnt NsCDE/bin/nscde_var_append \ NsCDE/bin/xdowrapper NsCDE/libexec/Notifier.sh \ + NsCDE/libexec/GWM.sh \ NsCDE/libexec/Splash.sh NsCDE/libexec/appfinder \ NsCDE/libexec/backdropmgr NsCDE/libexec/colormgr \ NsCDE/libexec/fontmgr NsCDE/libexec/fp_manage_subpanel \ @@ -238,7 +251,7 @@ post-patch: ${CP} ${WRKSRC}/NsCDE/libexec/generate_subpanels ${WRKSRC}/generate_subpanels ${REINPLACE_CMD} -e 's@config/@etc/nscde/@g' ${WRKSRC}/generate_subpanels ( for SDOC in ${_SHAREDOC}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/share/doc/@'${PREFIX}'/share/doc/nscde/@g' ${WRKSRC}/$${SDOC}; done ) - ( for IDOC in ${_SHAREICONS}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/share/icons/@'${PREFIX}'/share/icons/@g' ${WRKSRC}/$${IDOC}; done ) + ${REINPLACE_CMD} -e 's@\\/@/@g' ${WRKSRC}/NsCDE/libexec/GWM.sh ( for SDOC in ${_SHARESLASH}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/share/@'${DATADIR}'/@g' ${WRKSRC}/$${SDOC}; done ) ( for SDOC in ${_SHARENSLASH}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/share@'${DATADIR}'@g' ${WRKSRC}/$${SDOC}; done ) ( for SCR in ${_LIBEXEC_SCRIPTS}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/libexec/@'${PREFIX}'/libexec/nscde/@g' ${WRKSRC}/$${SCR}; done ) @@ -249,6 +262,7 @@ post-patch: ( for SDOC in ${_CSHARESLASH}; do ${REINPLACE_CMD} -e 's@$${NSCDE_ROOT}/share/@'${DATADIR}'/@g' ${WRKSRC}/$${SDOC}; done ) ( for SDOC in ${_BSHARESLASH}; do ${REINPLACE_CMD} -e 's@$$NSCDE_ROOT/share/@'${DATADIR}'/@g' ${WRKSRC}/$${SDOC}; done ) ${FIND} ${WRKSRC}/NsCDE/config -type f -name '*.conf' -exec ${MV} {} {}.sample \; + ${FIND} ${WRKSRC}/NsCDE/config -type f -name '*.menu' -exec ${MV} {} {}.sample \; ( for BBIN in ${_BBINS}; do ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/bin@'${PREFIX}'/sbin@g' ${WRKSRC}/$${BBIN}; done ) ( for CFG in ${_CONFIGS}; do ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/config@'${ETCDIR}'@g' ${WRKSRC}/$${CFG}; done ) ( for SCR in ${_BLIBEXEC_SCRIPTS}; do ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/libexec@'${PREFIX}'/libexec/nscde@g' ${WRKSRC}/$${SCR}; done ) @@ -261,6 +275,12 @@ post-patch: ( for HLP in ${_PREFIX_FILES}; do ${REINPLACE_CMD} -e 's@$${PREFIX}@'${PREFIX}'@g' ${WRKSRC}/$${HLP}; done ) ${FIND} ${WRKSRC}/NsCDE -type f -name '*.bak' -delete +post-patch-DOAS-on: + ${REINPLACE_CMD} -e 's@sudo@doas@g' ${WRKSRC}/NsCDE/lib/scripts/SysActionDialog + ${REINPLACE_CMD} -e 's@sudo@doas@g' ${WRKSRC}/NsCDE/config/NsCDE-Functions.conf.sample + ${REINPLACE_CMD} -e 's@$${PREFIX}@'${PREFIX}'@g' ${WRKSRC}/NsCDE/share/doc/examples/doas.conf + ${FIND} ${WRKSRC}/NsCDE -type f -name '*.bak' -delete + do-build: ${RM} ${WRKSRC}/NsCDE/share/doc/html/* (cd ${WRKSRC}/docbook && ${PREFIX}/bin/xsltproc -o ${WRKSRC}/NsCDE/share/doc/html/NsCDE.html NsCDE.xsl NsCDE.xml) @@ -301,6 +321,7 @@ do-install-DOCS-on: ${MKDIR} ${STAGEDIR}/${PREFIX}/share/examples/nscde (cd ${WRKSRC}/NsCDE/share/doc/examples && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/share/examples/nscde) (cd ${WRKSRC}/NsCDE/share/doc && ${COPYTREE_SHARE} html ${STAGEDIR}/${PREFIX}/share/doc/nscde) + (cd ${WRKSRC}/NsCDE/share/doc && ${COPYTREE_SHARE} help ${STAGEDIR}/${PREFIX}/share/doc/nscde) ${INSTALL_DATA} ${WRKSRC}/NsCDE/share/doc/NsCDE.* ${STAGEDIR}/${PREFIX}/share/doc/nscde .include <bsd.port.mk> diff --git a/x11-wm/nscde/distinfo b/x11-wm/nscde/distinfo index 55e940fe655f..cb165fce0361 100644 --- a/x11-wm/nscde/distinfo +++ b/x11-wm/nscde/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619881563 -SHA256 (nscde-nscde-1.2_GH0.tar.gz) = 86b3e9ca84814ded9aed3d4044716b46229b69e47e55b76d2526aa6185fc20ce -SIZE (nscde-nscde-1.2_GH0.tar.gz) = 31421032 +TIMESTAMP = 1634580730 +SHA256 (nscde-nscde-1.3_GH0.tar.gz) = 9867f3511dca6f89c03ac253643de6d942975ddc7892921e6e5b3137fad22a6b +SIZE (nscde-nscde-1.3_GH0.tar.gz) = 31935416 diff --git a/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Functions.conf b/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Functions.conf new file mode 100644 index 000000000000..427d5a87eb65 --- /dev/null +++ b/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Functions.conf @@ -0,0 +1,11 @@ +--- NsCDE/config/NsCDE-Functions.conf.orig 2021-10-18 18:47:50 UTC ++++ NsCDE/config/NsCDE-Functions.conf +@@ -963,7 +963,7 @@ AddToFunc f_ShowGlobalPager + + I All (GWM, CirculateHit) Break 1 + + I All (CurrentPage, LocalPager, CirculateHit, !Iconic) Iconify True + + I All (WspLocPager, CirculateHit) KillModule FvwmPager WspLocPager +-+ I PipeRead "/opt/NsCDE/libexec/GWM.sh -w 1920 -h 1200 -f 16 -d 4 -c -" +++ I PipeRead "${PREFIX}/libexec/nscde/GWM.sh -w 1920 -h 1200 -f 16 -d 4 -c -" + + I Wait GWMPager + + I All ("GWMPager", CirculateHit, !Transient) $[0-] + + I All ("GWMPager", CirculateHit, !Transient) f_OverScreen GWMPager PlaceAgain diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_generate__subpanels b/x11-wm/nscde/files/patch-NsCDE_libexec_generate__subpanels new file mode 100644 index 000000000000..b9105df4a8ff --- /dev/null +++ b/x11-wm/nscde/files/patch-NsCDE_libexec_generate__subpanels @@ -0,0 +1,13 @@ +--- NsCDE/libexec/generate_subpanels.orig 2021-10-16 22:57:06 UTC ++++ NsCDE/libexec/generate_subpanels +@@ -6,9 +6,7 @@ + # Licence: GPLv3 + # + +-if [ -z $HAS_WINDOWNAME ]; then +- HAS_WINDOWNAME=0 +-fi ++HAS_WINDOWNAME=0 + + if [ -z $FVWM_USERDIR ]; then + if [[ -z $SYSMODE ]]; then diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_nscde__setup b/x11-wm/nscde/files/patch-NsCDE_libexec_nscde__setup index 22d640fbc737..ceb3d5ecc611 100644 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_nscde__setup +++ b/x11-wm/nscde/files/patch-NsCDE_libexec_nscde__setup @@ -1,11 +1,5 @@ ---- NsCDE/libexec/nscde_setup.orig 2021-04-24 03:10:51 UTC +--- NsCDE/libexec/nscde_setup.orig 2021-10-08 08:21:08 UTC +++ NsCDE/libexec/nscde_setup -@@ -1,4 +1,4 @@ --#!/usr/bin/env ksh93 -+#!${PREFIX}/bin/ksh93 - - # - # This file is a part of the NsCDE - Not so Common Desktop Environment @@ -7,7 +7,7 @@ # @@ -142,15 +136,14 @@ locale_setting_default_cursor_theme=$(gettext -s "Setting default cursor theme") echo "${HOME}/.icons/default/index.theme ${already_exists}. ${locale_setting_default_cursor_theme}." - $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.icons/default/index.theme" -s "Icon Theme" -k Inherits -v dmz-aa -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.icons/default/index.theme" -s "Icon Theme" -k Inherits -v dmz-aa ++ $PEFIX/sbin/confset.py -t ini -c "$HOME/.icons/default/index.theme" -s "Icon Theme" -k Inherits -v dmz-aa fi fi -@@ -260,14 +250,14 @@ function setup_nscde +@@ -244,13 +234,13 @@ function setup_nscde if (($VERBOSE == 1)); then echo -ne "${HOME}/.gtkrc-2.0 ${already_exists}. " gettext -s "Setting NsCDE theme options." -- $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-key-theme-name -v '"Emacs"' - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-theme-name -v '"NsCDE"' - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-font-name -v '"DejaVu Serif Book 10"' - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-application-prefer-dark-theme -v 1 @@ -158,7 +151,6 @@ - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-button-images -v 0 - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-menu-images -v 0 - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-cursor-blink -v 0 -+ ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-key-theme-name -v '"Emacs"' + ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-theme-name -v '"NsCDE"' + ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-font-name -v '"DejaVu Serif Book 10"' + ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-application-prefer-dark-theme -v 1 @@ -169,7 +161,7 @@ fi fi -@@ -284,14 +274,14 @@ function setup_nscde +@@ -267,14 +257,14 @@ function setup_nscde if (($VERBOSE == 1)); then echo -ne "${HOME}/.config/gtk-3.0/settings.ini already exists. " gettext -s "Setting NsCDE theme options." @@ -192,7 +184,7 @@ fi fi -@@ -302,7 +292,7 @@ function setup_nscde +@@ -285,7 +275,7 @@ function setup_nscde echo "$locale_generating_default_theme_for_gtk2_gtk3_in $HOME/.themes/NsCDE ..." fi mkdir -p "$HOME/.themes" @@ -201,7 +193,7 @@ else if (($VERBOSE == 1)); then echo "${HOME}/.themes/NsCDE ${already_exists}." -@@ -320,7 +310,7 @@ function setup_nscde +@@ -303,7 +293,7 @@ function setup_nscde if (($VERBOSE == 1)); then echo -ne "${HOME}/.config/Trolltech.conf ${already_exists}. " gettext -s "Setting NsCDE style." @@ -210,7 +202,7 @@ fi fi -@@ -334,9 +324,9 @@ function setup_nscde +@@ -317,9 +307,9 @@ function setup_nscde if (($VERBOSE == 1)); then echo "${HOME}/.config/qt5ct/qt5ct.conf ${already_exists}." gettext -s "Setting NsCDE style." @@ -223,7 +215,7 @@ fi fi -@@ -347,7 +337,7 @@ function setup_nscde +@@ -330,7 +320,7 @@ function setup_nscde echo "$setting_default ${FVWM_USERDIR}/libexec/colormgr.local ..." fi mkdir -p "${FVWM_USERDIR}/libexec" @@ -232,7 +224,7 @@ chmod +x "${FVWM_USERDIR}/libexec/colormgr.local" else if (($VERBOSE == 1)); then -@@ -368,7 +358,7 @@ function setup_nscde +@@ -351,7 +341,7 @@ function setup_nscde fi if [ "x$ans" == "xy" ]; then echo "${locale_enabling}: pageshowrootpager --> 1" @@ -241,7 +233,7 @@ elif [ "x$ans" == "xn" ]; then echo "${locale_not_enabling} pageshowrootpager --> 0" else -@@ -390,7 +380,7 @@ function setup_nscde +@@ -380,7 +370,7 @@ function setup_nscde echo "$locale_enabled_by_default nscde_use_xscreensaver --> 1" elif [ "x$ans" == "xn" ]; then echo "$locale_disabling nscde_use_xscreensaver --> 0" @@ -250,7 +242,7 @@ else gettext -s "Answer not understood." echo "$locale_enabled_by_default nscde_use_xscreensaver --> 1" -@@ -401,7 +391,7 @@ function setup_nscde +@@ -391,7 +381,7 @@ function setup_nscde if (($VERBOSE == 1)); then echo "$setting_default ${FVWM_USERDIR}/Stalonetray.conf ..." fi @@ -259,7 +251,7 @@ else if (($VERBOSE == 1)); then locale_already_in_place=$(gettext -s "already in place") -@@ -419,7 +409,7 @@ function setup_nscde +@@ -409,7 +399,7 @@ function setup_nscde echo "$locale_enabled_by_default nscde_use_stalonetray --> 1" elif [ "x$ans" == "xn" ]; then echo "$locale_disabling nscde_use_stalonetray --> 0" @@ -268,7 +260,7 @@ else gettext -s "Answer not understood." echo "$locale_enabled_by_default nscde_use_stalonetray --> 1" -@@ -435,7 +425,7 @@ function setup_nscde +@@ -425,7 +415,7 @@ function setup_nscde fi if [ "x$ans" == "xy" ]; then echo "$locale_enabling nscde_use_xsettingsd --> 1" @@ -277,7 +269,7 @@ elif [ "x$ans" == "xn" ]; then echo "$locale_not_enabling nscde_use_xsettingsd --> 0" else -@@ -454,8 +444,8 @@ function setup_nscde +@@ -444,8 +434,8 @@ function setup_nscde fi if [ "x$ans" == "xy" ]; then echo "$locale_enabling nscde_use_dunst --> 1" @@ -288,7 +280,7 @@ elif [ "x$ans" == "xn" ]; then echo "$locale_not_enabling nscde_use_dunst --> 0" else -@@ -474,7 +464,7 @@ function setup_nscde +@@ -464,7 +454,7 @@ function setup_nscde fi if [ "x$ans" == "xy" ]; then echo "$locale_enabling nscde_use_rofi --> 1" @@ -297,7 +289,7 @@ elif [ "x$ans" == "xn" ]; then echo "$locale_not_enabling nscde_use_rofi --> 0" else -@@ -491,14 +481,14 @@ function setup_nscde +@@ -481,14 +471,14 @@ function setup_nscde fi if [ "x$ans" == "xy" ]; then echo "$locale_enabling desklastpage --> 1" @@ -314,36 +306,53 @@ + ${PREFIX}/sbin/ised -c 's/InfoStoreAdd desklastpage 1/InfoStoreAdd desklastpage 0/g' -f "$FVWM_USERDIR/NsCDE.conf" fi - for filemgr in pcmanfm-qt pcmanfm krusader caja nemo thunar dolphin nautilus -@@ -518,10 +508,10 @@ function setup_nscde + if [ "x$FVWM_IS_FVWM3" == "x1" ]; then +@@ -500,7 +490,7 @@ function setup_nscde + fi + if [ "x$ans" == "xy" ]; then + echo "${locale_enabling}: fvwm3_default_logging --> 1" +- $NSCDE_ROOT/bin/ised -c 's/# InfoStoreAdd fvwm3_default_logging 1/InfoStoreAdd fvwm3_default_logging 1/g' -f "$FVWM_USERDIR/NsCDE.conf" ++ ${PREFIX}/sbin/ised -c 's/# InfoStoreAdd fvwm3_default_logging 1/InfoStoreAdd fvwm3_default_logging 1/g' -f "$FVWM_USERDIR/NsCDE.conf" + elif [ "x$ans" == "xn" ]; then + echo "${locale_not_enabling} fvwm3_default_logging --> 0" + else +@@ -526,7 +516,7 @@ function setup_nscde read ans if [ "x$ans" != "x" ]; then echo "$locale_setting_filemgr filemgr --> ${ans}" - $NSCDE_ROOT/bin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd filemgr ${ans}/g" -f "$FVWM_USERDIR/NsCDE.conf" + ${PREFIX}/sbin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd filemgr ${ans}/g" -f "$FVWM_USERDIR/NsCDE.conf" + + # Insanely retarded xdg utils. No exit status, no error, no listings of desktop files. + whence -q xdg-mime +@@ -544,7 +534,7 @@ function setup_nscde + elif [ "x${fmsugestion}" != "x" ]; then echo "$locale_setting_proposed_filemgr filemgr --> ${fmsugestion}" - $NSCDE_ROOT/bin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd filemgr ${fmsugestion}/g" -f "$FVWM_USERDIR/NsCDE.conf" + ${PREFIX}/sbin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd filemgr ${fmsugestion}/g" -f "$FVWM_USERDIR/NsCDE.conf" - else - echo "$locale_skipping_fm_set_later $FVWM_USERDIR/NsCDE.conf." - fi -@@ -544,12 +534,12 @@ function setup_nscde + + # Insanely retarded xdg utils. No exit status, no error, no listings of desktop files. + whence -q xdg-mime +@@ -582,7 +572,7 @@ function setup_nscde if [ "x$ans" != "x" ]; then echo "$locale_setting_editor xeditor --> ${ans}" if [ "x$ans" != "gvim" ]; then - $NSCDE_ROOT/bin/ised -c "s/InfoStoreAdd xeditor gvim/InfoStoreAdd xeditor ${ans}/g" -f "$FVWM_USERDIR/NsCDE.conf" + ${PREFIX}/sbin/ised -c "s/InfoStoreAdd xeditor gvim/InfoStoreAdd xeditor ${ans}/g" -f "$FVWM_USERDIR/NsCDE.conf" - fi + + # Insanely retarded xdg utils. No exit status, no error, no listings of desktop files. + txtmimes="application/x-shellscript text/english text/plain text/x-c text/x-c++ text/x-c++hdr text/x-c++src text/x-chdr text/x-csrc text/x-java text/x-makefile text/x-readme text/x-tcl" +@@ -620,7 +610,7 @@ function setup_nscde elif [ "x${xedit_suggest}" != "x" ]; then echo "$locale_setting_proposed_editor xeditor --> ${xedit_suggest}" if [ "x$ans" != "gvim" ]; then - $NSCDE_ROOT/bin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd xeditor ${xedit_suggest}/g" -f "$FVWM_USERDIR/NsCDE.conf" + ${PREFIX}/sbin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd xeditor ${xedit_suggest}/g" -f "$FVWM_USERDIR/NsCDE.conf" - fi - else - echo "$locale_setting_proposed_editor $FVWM_USERDIR/NsCDE.conf." -@@ -568,13 +558,13 @@ function setup_nscde + + # Insanely retarded xdg utils. No exit status, no error, no listings of desktop files. + txtmimes="application/x-shellscript text/english text/plain text/x-c text/x-c++ text/x-c++hdr text/x-c++src text/x-chdr text/x-csrc text/x-java text/x-makefile text/x-readme text/x-tcl" +@@ -672,13 +662,13 @@ function setup_nscde gettext -s "that you want to apply and confirm with OK in Color Style Manager" sleep 2 echo "" @@ -359,7 +368,7 @@ gettext -s "other integration options you may want to apply." sleep 1 echo "" -@@ -583,8 +573,8 @@ function setup_nscde +@@ -687,8 +677,8 @@ function setup_nscde if (($INTERACTIVE == 1)); then gettext -s "Press RETURN to finish setup and start Color Style Manager." read RET diff --git a/x11-wm/nscde/files/patch-NsCDE_share_config__templates_NsCDE-Functions.local b/x11-wm/nscde/files/patch-NsCDE_share_config__templates_NsCDE-Functions.local index ba7792476fc3..aa675b985a2a 100644 --- a/x11-wm/nscde/files/patch-NsCDE_share_config__templates_NsCDE-Functions.local +++ b/x11-wm/nscde/files/patch-NsCDE_share_config__templates_NsCDE-Functions.local @@ -1,6 +1,6 @@ ---- NsCDE/share/config_templates/NsCDE-Functions.local.orig 2021-05-01 22:22:02 UTC +--- NsCDE/share/config_templates/NsCDE-Functions.local.orig 2021-10-08 08:21:08 UTC +++ NsCDE/share/config_templates/NsCDE-Functions.local -@@ -66,14 +66,14 @@ +@@ -69,14 +69,14 @@ # Hook of the f_SysConfigureWindowEvent called from # FvwmEvent on configure_window event. See # FvwmEvent(1) and f_SysConfigureWindowEvent in diff --git a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_doas.conf b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_doas.conf new file mode 100644 index 000000000000..164fd891c231 --- /dev/null +++ b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_doas.conf @@ -0,0 +1,8 @@ +--- NsCDE/share/doc/examples/doas.conf.orig 2021-10-17 10:41:55 UTC ++++ NsCDE/share/doc/examples/doas.conf +@@ -0,0 +1,5 @@ ++permit nopass :wheel as root cmd ${PREFIX}/libexec/nscde/nscde-acpi args suspend ++permit nopass :wheel as root cmd ${PREFIX}/libexec/nscde/nscde-acpi args hibernate ++permit nopass :wheel as root cmd ${PREFIX}/libexec/nscde/nscde-acpi args hybrid-suspend ++permit nopass :wheel as root cmd ${PREFIX}/libexec/nscde/nscde-acpi args poweroff ++permit nopass :wheel as root cmd ${PREFIX}/libexec/nscde/nscde-acpi args reboot diff --git a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_006__PowerManager b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_006__PowerManager index 91923f0e699e..1e9f4c00d48c 100644 --- a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_006__PowerManager +++ b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_006__PowerManager @@ -1,4 +1,4 @@ ---- NsCDE/share/doc/examples/sudo/006_PowerManager.orig 2021-05-01 21:44:54 UTC +--- NsCDE/share/doc/examples/sudo/006_PowerManager.orig 2021-10-08 08:21:08 UTC +++ NsCDE/share/doc/examples/sudo/006_PowerManager @@ -8,11 +8,11 @@ @@ -9,11 +9,11 @@ - /opt/NsCDE/libexec/nscde-acpi hybrid-suspend, \ - /opt/NsCDE/libexec/nscde-acpi poweroff, \ - /opt/NsCDE/libexec/nscde-acpi reboot -+Cmnd_Alias NSCDE_ACPI = ${PREFIX}/libexec/nscde-acpi suspend, \ -+ ${PREFIX}/libexec/nscde-acpi hibernate, \ -+ ${PREFIX}/libexec/nscde-acpi hybrid-suspend, \ -+ ${PREFIX}/libexec/nscde-acpi poweroff, \ -+ ${PREFIX}/libexec/nscde-acpi reboot ++Cmnd_Alias NSCDE_ACPI = ${PREFIX}/libexec/nscde/nscde-acpi suspend, \ ++ ${PREFIX}/libexec/nscde/nscde-acpi hibernate, \ ++ ${PREFIX}/libexec/nscde/nscde-acpi hybrid-suspend, \ ++ ${PREFIX}/libexec/nscde/nscde-acpi poweroff, \ ++ ${PREFIX}/libexec/nscde/nscde-acpi reboot user1 ALL = (TOOR) NOPASSWD: NSCDE_ACPI user2 ALL = (TOOR) NOPASSWD: NSCDE_ACPI diff --git a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_README b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_README new file mode 100644 index 000000000000..15e520701ff2 --- /dev/null +++ b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_README @@ -0,0 +1,6 @@ +--- NsCDE/share/doc/examples/sudo/README.orig 2021-10-16 23:05:58 UTC ++++ NsCDE/share/doc/examples/sudo/README +@@ -1,2 +1,2 @@ + For SysActionDialog to work for certain actions, this sudoers configuration +-has to be put in /etc/sudoers or as a file in /etc/sudoers.d ++has to be put in /usr/local/etc/sudoers or as a file in /usr/local/etc/sudoers.d diff --git a/x11-wm/nscde/files/patch-docbook_NsCDE.xml b/x11-wm/nscde/files/patch-docbook_NsCDE.xml index 8b9d912be191..d3f0371fff5e 100644 --- a/x11-wm/nscde/files/patch-docbook_NsCDE.xml +++ b/x11-wm/nscde/files/patch-docbook_NsCDE.xml @@ -1,32 +1,24 @@ ---- docbook/NsCDE.xml.orig 2021-04-24 03:10:51 UTC +--- docbook/NsCDE.xml.orig 2021-10-08 08:21:08 UTC +++ docbook/NsCDE.xml -@@ -144,25 +144,26 @@ decade from the mainstream desktop players. +@@ -144,15 +144,13 @@ decade from the mainstream desktop players. </para> <para> -NsCDE is by default rooted in <filename class="directory">/opt/NsCDE</filename> ($NSCDE_ROOT), -but it can be relocated with only one variable changed in main -wrapper <filename class="directory">bin/nscde</filename> and <filename>NsCDE-Main.conf</filename>. -+NsCDE is by default rooted in <filename class="directory">${PREFIX}/libexec/nscde</filename>, -+with several binaries in <filename class="directory">${PREFIX}/sbin</filename> and -+<filename class="directory">${PREFIX}/bin</filename>. ++NsCDE is by default rooted in <filename class="directory">${PREFIX}/libexec/nscde</filename>. </para> <para> It is not using your existing <filename class="directory">$HOME/.fvwm</filename> --but sets <varname>$FVWM_USERDIR</varname> to <filename class="directory">$HOME/.NsCDE</filename>, + but sets <varname>$FVWM_USERDIR</varname> to <filename class="directory">$HOME/.NsCDE</filename>, -and uses <filename class="directory">/opt/NsCDE/config</filename> as a sources of configuration. -+but sets <varname>$FVWM_USERDIR</varname> to <filename class="directory">$HOME/.NsCDE</filename>; -+unless any configuration data is put in this user-specific directory, data is instead read from -+<filename class="directory">${PREFIX}/etc/nscde</filename>. ++and uses <filename class="directory">${PREFIX}/etc/nscde</filename> as a sources of configuration. </para> <para> --Configuration model is a bit complex, but very flexible: configuration options --are grouped in logical order. Configuration files are names -+The configuration model is a bit complex, but very flexible: configuration options -+are grouped in logical order. Configuration files are named - <filename>NsCDE-<group>.conf</filename>. For example, <filename>NsCDE-Functions.conf</filename> +@@ -162,7 +160,7 @@ are grouped in logical order. Configuration files are for FVWM functions. Each configuration file can have two exclusive sources, and one additional. For example, if user doesn't have <filename>$FVWM_USERDIR/NsCDE-Functions.conf</filename>, then @@ -35,7 +27,7 @@ <filename>$FVWM_USERDIR/NsCDE-Functions.local</filename> exists, it will be read in addition to conf file, from wherever it was read. This is intended as a primary mechanism for customization: If user doesn't need to override and change a lot of -@@ -174,12 +175,12 @@ configuration can be overridden or destroyed and recre +@@ -174,12 +172,12 @@ configuration can be overridden or destroyed and recre One notable addon to this system of configuration is the way FVWM Styles are read. In addition to reading <filename>$FVWM_USERDIR/NsCDE-Style.local</filename> "early" configuration in <filename>$FVWM_USERDIR/NsCDE-Style.override</filename> will be read from @@ -50,7 +42,7 @@ can nullify overrides for that particular applications, this is why this mechanism is provided. This file is not created in <varname>$FVWM_USERDIR</varname> by setup procedure or Style Managers, but it will be read if created manually. -@@ -298,7 +299,7 @@ differences are: +@@ -301,7 +299,7 @@ differences are: instead of static icons, because this cannot be done with gui menu actions. See <link linkend="FrontPanel_actions">FrontPanel.actions</link> for examples. The other way (full control) is by copying <filename>FrontPanel.actions</filename> @@ -59,7 +51,7 @@ to <varname>$FVWM_USERDIR</varname>. </para></listitem> -@@ -323,7 +324,7 @@ differences are: +@@ -326,7 +324,7 @@ differences are: main application as if icon has been clicked with the 1st mouse button, b) "reset this button" which will remove user's customizations for that launcher button from the <filename>$FVWM_USERDIR/FrontPanel.actions</filename> and load default from @@ -68,7 +60,7 @@ will reset upper subpanel to it's default value (remove definition of the numbered subpanel from the <filename>$FVWM_USERDIR/Subpanels.actions</filename>), d) "Delete Subpanel" will disable subpanel for above this icon (without resetting -@@ -605,13 +606,13 @@ necessary, and to enable or disable that particular Su +@@ -605,13 +603,13 @@ necessary, and to enable or disable that particular Su On the first change with <emphasis>Install Icon</emphasis> or <emphasis>Subpanel Settings</emphasis>, non-FVWM configuration file <emphasis>Subpanels.actions</emphasis> will be created in the <varname>$FVWM_USERDIR</varname>, from where all subpanels changed from default will be read @@ -85,16 +77,16 @@ Syntax of the Subpanels.actions is explained in the <link linkend="NsCDE-Configuration-Files">Configuration files explained</link> section. </para> -@@ -687,7 +688,7 @@ same function. +@@ -687,7 +685,7 @@ same function. then in 2 or 4 desks/buttons - mode a small current page indicator is show on the right side of the button. + mode a small current page indicator is shown on the right side of the button. In addition to Page Manager Icon southwest of the WSM. Disabled (0) by default. - <filename>WSM.conf</filename> (system wide: <filename>$NSCDE_ROOT/config/WSM.conf</filename>) is -+ <filename>WSM.conf</filename> (system wide: <filename>${PREFIX}/etc/nscde/WSM.conf</filename>) is ++ <filename>WSM.conf</filename> (system wide: <filename>${PREFIX}/nscde/WSM.conf</filename>) is a separate configuration file read by WSM, WsPgMgr and such. Not a FVWM configuration file. </para></listitem> -@@ -773,16 +774,12 @@ It supports XPM skins and displays hours, minutes and +@@ -773,16 +771,13 @@ It supports XPM skins and displays hours, minutes and suited for window manager docks like FvwmButtons(1). In NsCDE it is applied with a skin similar to original one, but slightly bigger and with more clear edges and colors. Default can be used from @@ -107,24 +99,22 @@ -Pclock C source is provided for user's convenience if it -needs to be recompiled on another system or architecture. Source is in -<filename class="directory">$NSCDE_ROOT/src/pclock-0.13.1</filename>. --With NsCDE binary for Linux is provided by + With NsCDE binary for Linux is provided by -default in <filename class="directory">$NSCDE_ROOT/bin</filename>. -+pclock is found in <filename class="directory">${PREFIX}/bin</filename>. ++default in <filename class="directory">${PREFIX}/bin</filename>. </para> </sect2> -@@ -833,8 +830,8 @@ what is going on if FpLite is all red. - <para> +@@ -834,7 +829,7 @@ what is going on if FpLite is all red. If clicked, it will call a function <function>f_FpLiteClickAction</function> which is by default set to safe defaults (<emphasis>[default terminal app]</emphasis> <command>-e top</command>). --FpLite FvwmScript app uses little portable python script <emphasis>getla1.py</emphasis> from the + FpLite FvwmScript app uses little portable python script <emphasis>getla1.py</emphasis> from the -<filename class="directory">$NSCDE_ROOT/libexec</filename> to obtain 1-minute load data. -+FpLite FvwmScript app uses a little portable python script <emphasis>getla1.py</emphasis> from +<filename class="directory">${PREFIX}/libexec/nscde</filename> to obtain 1-minute load data. </para> <para> Key <keysym>F1</keysym> will bring this help text in browser. -@@ -937,7 +934,7 @@ Key Bindings: +@@ -942,7 +937,7 @@ Key Bindings: <para> Part of the Style Managers which can be called from the main Style Manager (7th button on the Front Panel). This is the clone of the same-named CDE tool. It loads backdrops from the @@ -133,7 +123,7 @@ <filename class="directory">$FVWM_USERDIR/backdrops</filename> (if any). From XPM backdrop templates with symbol names (with .pm extension) it will generate previews in user's <filename class="directory">$FVWM_USERDIR/tmp</filename> and if -@@ -978,7 +975,7 @@ more than CDE original: +@@ -990,7 +985,7 @@ more than CDE original: Instead of backdrops, user can opt for a background image. If option "Use photo or picture" is selected, list of backdrops will dissapear and image backgrounds (so called "wallpapers") of PNG and XPM type will be loaded from @@ -142,7 +132,7 @@ <filename class="directory">$FVWM_USERDIR/photos</filename> (if any). Option to use one photo for all workspaces exists too. In this mode, backdrop-specific options will be hidden until <guilabel>Use photo or picture</guilabel> is not deselected. -@@ -1047,7 +1044,7 @@ Key Bindings: +@@ -1059,7 +1054,7 @@ Key Bindings: With Backdrop Style Manager, this is probably the most important theme tool in (Ns)CDE. This tool applies colors to the widgets, menus, applications and backdrops. As in CDE, it reads color information from the palette files in @@ -151,7 +141,7 @@ <filename class="directory">$FVWM_USERDIR/palettes</filename>. Palettes are the 16bpp color definitions (8 of them). This colors and border bg/fg/sel colors calculated from them are the base of the look of pretty much all of the things -@@ -1078,7 +1075,7 @@ will present editor with controls for Red, Green and B +@@ -1090,7 +1085,7 @@ will present editor with controls for Red, Green and B and Value. On the top left corner are preview squares with names "Old" and "New". When changing color with RGB and/or HSV controls, this "New" square button will change it's colorset. Color can also be picked with <guibutton>Grab Color</guibutton> button if a small binary "colorpicker" is @@ -160,7 +150,7 @@ If action is not <guibutton>Cancel</guibutton> but <guibutton>OK</guibutton>, selected color will be modified and new palette with generic name "Custom" created immediately. When finishing theme selection in Color Style Manager with modified colors, Color Style Manager will ask for a name -@@ -1302,10 +1299,10 @@ Monospaced Bold Large +@@ -1319,10 +1314,10 @@ Monospaced Bold Large </para> <para> This fonts are defined as FVWM <emphasis>infostore</emphasis> variables in the file @@ -173,7 +163,7 @@ <filename>$FVWM_USERDIR/fontsets/SomeName.fontset</filename>. Further, they are defined as CPP macros in <filename>$FVWM_USERDIR/Xdefaults.fontdefs</filename> which is included in -@@ -1319,7 +1316,7 @@ if some of this widget integrations is not desirable b +@@ -1336,7 +1331,7 @@ if some of this widget integrations is not desirable b <para> The Font Style Manager itself consists of fontsets and fonts. Fontsets are named complete sets of five groups of three members of fonts defined above. @@ -182,7 +172,7 @@ <filename>$FVWM_USERDIR/fontsets</filename>. If font set is selected in Font Style Manager, 15 fonts from the set are loaded into preview lists of the application and can be immediately applied or further customized by leaving <guilabel>Use Predefined Font Set</guilabel> mode -@@ -1367,7 +1364,7 @@ to manual font selection for customizations into the n +@@ -1384,7 +1379,7 @@ to manual font selection for customizations into the n </para> <para> Button <guibutton>Default</guibutton> loads default @@ -191,7 +181,7 @@ then be saved as a choice or further customized into the new fontset. Bottom half of the Font Style Manager contains preview for all fonts from the one of the three selected size sets. </para> -@@ -1562,8 +1559,8 @@ to save size and position of the non-transient window. +@@ -1754,8 +1749,8 @@ to save size and position of the non-transient window. the same application window on FVWM page where it is not already present that window will cause window to be resized to that exact width, height, X position and Y position X11 coordinates as stored in the <filename>$FVWM_USERDIR/GeoDB.ini</filename>. This ini-style file is managed by this application, as @@ -202,7 +192,7 @@ Resource names on contextual call, as well as geometry parameters. Before applying this settings, user has a chance to fine tune this parameters in text fields and confirm (or cancel) the action on the end. Using <guibutton>Clear</guibutton> all geometry values, as well as those which may be -@@ -1784,7 +1781,7 @@ button does this and also quits Subpanel Manager. +@@ -1976,7 +1971,7 @@ button does this and also quits Subpanel Manager. <para> Subpanels configuration file <filename>Subpanels.actions</filename>, can be edited by hand in <varname>$FVWM_USERDIR</varname> if something needs to be changed on existing @@ -211,7 +201,7 @@ must be used to generate FVWM configuration output which must be redirected into <filename>$FVWM_USERDIR/NsCDE-Subpanels.conf</filename>. </para> -@@ -1854,11 +1851,11 @@ and hibernation of the system. Of course, <command>reb +@@ -2046,10 +2041,10 @@ and hibernation of the system. Of course, <command>reb <command>sudo(8)</command> entries are configured properly. While System Action Dialog is active, root cursor changes to line-crossed cursor which is dismissed after the action is performed or dialog action dismissed. Not all of this actions are possible on all systems, but with the @@ -220,13 +210,11 @@ pm-utils but with systemd(1) and FreeBSD with acpiconf(8) are supported in this moment. -In <filename class="directory">$NSCDE_ROOT/share/doc/examples/sudo</filename>, one can find example --which can be put in <filename class="directory">/etc/sudoers.d</filename> with little changes. +In <filename class="directory">${PREFIX}/share/examples/nscde/sudo</filename>, one can find example -+which can be put in <filename class="directory">${PREFIX}/etc/sudoers.d</filename> with little changes. + which can be put in <filename class="directory">/etc/sudoers.d</filename> with little changes. <guibutton>Confirm</guibutton> button applies, <guibutton>Dismiss</guibutton> cancels and closes the dialog. - -@@ -2463,7 +2460,7 @@ same line is set. +@@ -2678,7 +2673,7 @@ same line is set. </para> <para> Default backdrops are set from the @@ -235,42 +223,42 @@ user does not redefine/set his own with <link linkend="NsCDE-BackdropMgr">Backdrop Style Manager</link>. Default palette is <emphasis>Broica</emphasis> in 8 colors variant. -@@ -2478,9 +2475,9 @@ This file is read by FvwmBacker(1) FVWM module. It is +@@ -2693,9 +2688,9 @@ This file is read by FvwmBacker(1) FVWM module. It is first change with <link linkend="NsCDE-BackdropMgr">Backdrop Style Manager</link>. </para> <para> -Until then, file <filename>$NSCDE_ROOT/config/NsCDE-Backdrops.conf</filename> is read, which -+Until then, file <filename>${PREFIX}/etc/NsCDE-Backdrops.conf</filename> is read, which ++Until then, file <filename>${PREFIX}/etc/nscde/NsCDE-Backdrops.conf</filename> is read, which itself reads pre-generated and pre-defined backdrops from the -<filename class="directory">$NSCDE_ROOT/share/defaults/backer</filename> directory. +<filename class="directory">${PREFIX}/share/nscde/defaults/backer</filename> directory. </para> <para> We can conclude that backdrops are source form or template file, and when processed -@@ -2506,7 +2503,7 @@ and safe defaults, and reads the rest of the configura +@@ -2732,7 +2727,7 @@ and safe defaults, and reads the rest of the configura which are included there. It defines StartFunction which starts all additional modules and calls important things during start or restart of the Window Manager. System Wide configuration files -are located in $NSCDE_ROOT/config, while user local hooks or -+are located in <filename class="directory">${PREFIX}/etc/nscde</filename>, while user local hooks or ++are located in ${PREFIX}/etc/nscde, while user local hooks or user complete overrides are in $FVWM_USERDIR. </para> </abstract> -@@ -2595,11 +2592,11 @@ slightly different options: +@@ -2821,11 +2816,11 @@ slightly different options: <![CDATA[ Btn1,__APPLET__,M1,"Swallow (Respawn) \\"pclock\\" - \\"Exec exec $NSCDE_ROOT/bin/fpclock-$(uname -s)_$(uname -m) -+ \\"Exec exec ${PREFIX}/bin/fpclock-$(uname -s)_$(uname -m) ++ \\"Exec exec ${PREFIX}/bin/fpclock -H red -S white --hands-width=4 --hour-hand-length=15 --minute-hand-length=20 --second-hand-length=22 -w - -B $NSCDE_ROOT/share/icons/NsCDE/SDtEarth.l.xpm\\",Exec exec firefox -+ -B ${PREFIX}/share/icons/NsCDE/SDtEarth.l.xpm\\",Exec exec firefox ++ -B ${PREFIX}/share/nscde/icons/NsCDE/SDtEarth.l.xpm\\",Exec exec firefox Btn1,,M2,FVWM,Nop -@@ -2640,7 +2637,7 @@ comma separated values (syntax): +@@ -2866,7 +2861,7 @@ comma separated values (syntax): </itemizedlist> </para> <para> @@ -279,16 +267,16 @@ extended by creating and writing <filename>$FVWM_USERDIR/AppMenus.conf</filename> file. </para> -@@ -3192,7 +3189,7 @@ mouse focus to free space on the screen. +@@ -3426,7 +3421,7 @@ after losing mouse focus to free up space on the scree </para></listitem> <listitem><para> - <keysym>XF86AudioLowerVolume</keysym> and <keysym>XF86AudioRaiseVolume</keysym> on Sun type 6 or 7 keyboards will lower and raise sound volume by 1 percent, or by 10 percent if combined with Ctrl modifier. This works by default on systems on which pactl(1) PulseAudio tool is installed. On other systems, f_Mixer function has to be redefined. See <filename>$NSCDE_ROOT/config/NsCDE-Keybindings.conf</filename> for f_Mixer options and interaction. -+ <keysym>XF86AudioLowerVolume</keysym> and <keysym>XF86AudioRaiseVolume</keysym> on Sun type 6 or 7 keyboards will lower and raise sound volume by 1 percent, or by 10 percent if combined with Ctrl modifier. This works by default on systems on which pactl(1) PulseAudio tool is installed. On other systems, f_Mixer function has to be redefined. See <filename>${PREFIX}/etc/nscde/NsCDE-Keybindings.conf</filename> for f_Mixer options and interaction. ++ <keysym>XF86AudioLowerVolume</keysym> and <keysym>XF86AudioRaiseVolume</keysym> on Sun type 6 or 7 keyboards will lower and raise sound volume by 1 percent, or by 10 percent if combined with Ctrl modifier. This works by default on systems on which pactl(1) PulseAudio tool is installed. On other systems, f_Mixer function has to be redefined. See <filename>${PREFIX}/nscde/NsCDE-Keybindings.conf</filename> for f_Mixer options and interaction. </para></listitem> <listitem><para> -@@ -3210,7 +3207,7 @@ Pressend second time just once, it will dismiss Local +@@ -3444,7 +3439,7 @@ Pressend second time just once, it will dismiss Local Occupy Workspace dialog for window moving between the desks. </para> <para> @@ -297,7 +285,7 @@ for automatic description on menus. </para></listitem> -@@ -3220,7 +3217,7 @@ Pressend second time just once, it will dismiss Local +@@ -3454,7 +3449,7 @@ Pressend second time just once, it will dismiss Local Occupy Page dialog for window moving between the desks. </para> <para> @@ -306,7 +294,16 @@ for automatic description on menus. </para></listitem> -@@ -3228,7 +3225,7 @@ Pressend second time just once, it will dismiss Local +@@ -3465,7 +3460,7 @@ Pressend second time just once, it will dismiss Local + only when multiple monitors are detected by NsCDE and FVWM. + </para> + <para> +- Dynamic: defined in <filename>$NSCDE_ROOT/config/Keymenu.actions</filename> ++ Dynamic: defined in <filename>${PREFIX}/etc/nscde/Keymenu.actions</filename> + for automatic description on menus. + </para></listitem> + +@@ -3473,7 +3468,7 @@ Pressend second time just once, it will dismiss Local <keysym>Alt+F1</keysym> regenerates and refreshes the window </para> <para> @@ -315,7 +312,7 @@ for automatic description on menus. </para></listitem> -@@ -3236,7 +3233,7 @@ Pressend second time just once, it will dismiss Local +@@ -3481,7 +3476,7 @@ Pressend second time just once, it will dismiss Local <keysym>Meta+F1</keysym> Calls xrefresh(1) command to refresh the X11 display </para> <para> @@ -324,7 +321,7 @@ for automatic description on menus. </para></listitem> -@@ -3244,7 +3241,7 @@ Pressend second time just once, it will dismiss Local +@@ -3489,7 +3484,7 @@ Pressend second time just once, it will dismiss Local <keysym>Alt+F2</keysym> iconifies (deiconifies if in icon context) </para> <para> @@ -333,7 +330,7 @@ for automatic description on menus. </para></listitem> -@@ -3252,7 +3249,7 @@ Pressend second time just once, it will dismiss Local +@@ -3497,7 +3492,7 @@ Pressend second time just once, it will dismiss Local <keysym>Meta+F2</keysym> "shades" or rolls up the window to titlebar only view </para> <para> @@ -342,7 +339,7 @@ for automatic description on menus. </para></listitem> -@@ -3263,7 +3260,7 @@ Pressend second time just once, it will dismiss Local +@@ -3508,7 +3503,7 @@ Pressend second time just once, it will dismiss Local window with FVWM <command>PlaceAgain</command> command </para> <para> @@ -351,7 +348,7 @@ for automatic description on menus. </para></listitem> -@@ -3272,7 +3269,7 @@ Pressend second time just once, it will dismiss Local +@@ -3517,7 +3512,7 @@ Pressend second time just once, it will dismiss Local mouse pointer currently resides, together with frame </para> <para> @@ -360,7 +357,7 @@ for automatic description on menus. </para></listitem> -@@ -3281,7 +3278,7 @@ Pressend second time just once, it will dismiss Local +@@ -3526,7 +3521,7 @@ Pressend second time just once, it will dismiss Local and enter </para> <para> @@ -369,7 +366,7 @@ for automatic description on menus. </para></listitem> -@@ -3290,7 +3287,7 @@ Pressend second time just once, it will dismiss Local +@@ -3535,7 +3530,7 @@ Pressend second time just once, it will dismiss Local directions and place it again on page </para> <para> @@ -378,7 +375,7 @@ for automatic description on menus. </para></listitem> -@@ -3299,7 +3296,7 @@ directions and place it again on page +@@ -3544,7 +3539,7 @@ directions and place it again on page directions and place it again on page </para> <para> @@ -387,7 +384,7 @@ for automatic description on menus. </para></listitem> -@@ -3308,7 +3305,7 @@ directions and place it again on page +@@ -3553,7 +3548,7 @@ directions and place it again on page and enter </para> <para> @@ -396,7 +393,7 @@ for automatic description on menus. </para></listitem> -@@ -3319,7 +3316,7 @@ directions and place it again on page +@@ -3564,7 +3559,7 @@ directions and place it again on page <keysym>Meta+Shift+F5</keysym> combinations will put window back from sticky state </para> <para> @@ -405,7 +402,7 @@ for automatic description on menus. </para></listitem> -@@ -3329,7 +3326,7 @@ directions and place it again on page +@@ -3574,7 +3569,7 @@ directions and place it again on page Pressing again the same combination toggles this state back </para> <para> @@ -414,7 +411,7 @@ for automatic description on menus. </para></listitem> -@@ -3339,7 +3336,7 @@ directions and place it again on page +@@ -3584,7 +3579,7 @@ directions and place it again on page Pressing again the same combination toggles this state back </para> <para> @@ -423,7 +420,7 @@ for automatic description on menus. </para></listitem> -@@ -3347,7 +3344,7 @@ directions and place it again on page +@@ -3592,7 +3587,7 @@ directions and place it again on page <keysym>Alt+F6</keysym> raises or lowers the window </para> <para> @@ -432,7 +429,7 @@ for automatic description on menus. </para></listitem> -@@ -3359,7 +3356,7 @@ directions and place it again on page +@@ -3604,7 +3599,7 @@ directions and place it again on page grow and maximized states. This is a cyclic keybinding in a "shrink" direction. </para> <para> @@ -441,7 +438,7 @@ for automatic description on menus. </para></listitem> *** 1336 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110291704.19TH4vbP056847>