diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile index 52d3f92ba..21ac8b456 100644 --- a/x11-wm/nscde/Makefile +++ b/x11-wm/nscde/Makefile @@ -1,6 +1,5 @@ PORTNAME= nscde -DISTVERSION= 1.4 -PORTREVISION= 1 +DISTVERSION= 2.2 CATEGORIES= x11-wm MAINTAINER= freebsd@ny-central.org @@ -8,10 +7,29 @@ COMMENT= Modern CDE clone based on fvwm LICENSE= GPLv3 -PATCH_DEPENDS= gsed:textproc/gsed \ - ksh93:shells/ast-ksh BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \ - xsltproc:textproc/libxslt + xsltproc:textproc/libxslt ksh93:shells/ksh2020 \ + ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ + convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ + dunst:sysutils/dunst \ + font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \ + fvwm2:x11-wm/fvwm2 \ + gsed:textproc/gsed \ + 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 \ + xclip:x11/xclip \ + xdotool:x11/xdotool \ + xdpyinfo:x11/xdpyinfo \ + xrandr:x11/xrandr \ + xrdb:x11/xrdb \ + xrefresh:x11/xrefresh \ + xscreensaver:x11/xscreensaver \ + xsettingsd:x11/xsettingsd \ + xterm:x11/xterm RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ @@ -25,6 +43,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${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 \ + xclip:x11/xclip \ xdotool:x11/xdotool \ xdpyinfo:x11/xdpyinfo \ xrdb:x11/xrdb \ @@ -33,22 +52,15 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR xsettingsd:x11/xsettingsd \ xterm:x11/xterm -USES= gettext magick:run pkgconfig:build python:3.7+ shebangfix xorg +USES= gettext magick:run pkgconfig:build python:3.7+,build,run shebangfix xorg USE_GITHUB= yes GH_ACCOUNT= nscde USE_XORG= x11 xext xpm xrandr -SHEBANG_FILES= Installer.ksh NsCDE/bin/confget.py NsCDE/bin/confset.py \ - NsCDE/bin/nscde_usleep NsCDE/bin/sysinfo.py \ - NsCDE/lib/python/Globals.py NsCDE/lib/python/MiscFun.py \ - NsCDE/lib/python/MotifColors.py NsCDE/lib/python/Opts.py \ - NsCDE/lib/python/SpritesGtk2.py NsCDE/lib/python/Theme.py \ - NsCDE/lib/python/ThemeGtk.py NsCDE/libexec/colorconv.py \ - NsCDE/libexec/geticon.py NsCDE/libexec/getla1.py \ - NsCDE/libexec/nscde_palette_colorgen.py \ - NsCDE/libexec/themegen.py \ - NsCDE/share/config_templates/integration/gtk2_gtk3_qt/gtk-2.0/img/SpritesGtk2.py \ - NsCDE/share/config_templates/integration/gtk2_gtk3_qt/gtk-2.0/img/src/SpritesGtk2.py +SHEBANG_FILES= doc/examples/fvwm3-per-monitor/nitrowrapper + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-python-shebang="${PYTHON_CMD}" DOCSDIR= ${PREFIX}/share/doc/nscde @@ -69,270 +81,23 @@ DOAS_RUN_DEPENDS= doas:security/doas KSH2020_RUN_DEPENDS= ksh93:shells/ksh2020 SUDO_RUN_DEPENDS= sudo:security/sudo -_NSCDE_HELPERS= GWM.sh 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 \ - xrandr_backer - -_PREFIX_FILES= NsCDE/bin/get_fvwm_infostore \ - NsCDE/bin/getfont NsCDE/bin/mkpagemenu NsCDE/bin/nscde \ - NsCDE/bin/nscde_colorpicker NsCDE/bin/xdowrapper \ - NsCDE/config/NsCDE-Main.conf.sample NsCDE/libexec/Splash.sh \ - NsCDE/libexec/fp_manage_subpanel \ - NsCDE/libexec/fvwm-modules/FvwmScript NsCDE/libexec/nscde_setup \ - NsCDE/libexec/themegen.py \ - NsCDE/share/doc/examples/lxsession-integration/desktop.conf \ - NsCDE/share/doc/examples/mate-session-integration/nscde.desktop \ - NsCDE/share/doc/examples/sudo/006_PowerManager \ - NsCDE/share/doc/examples/xsession-integration/nscde.desktop \ - docbook/NsCDE.xml docbook/NsCDE.xsl - -_SHAREDOC= NsCDE/config/FrontPanel.actions \ - NsCDE/config/NsCDE-Keybindings.conf \ - NsCDE/config/NsCDE-Menus.conf NsCDE/config/NsCDE-Subpanels.conf \ - NsCDE/config/Subpanels.actions NsCDE/lib/scripts/BackdropMgr \ - NsCDE/lib/scripts/BeepMgr NsCDE/lib/scripts/CheckMailApplet \ - NsCDE/lib/scripts/ColorMgr NsCDE/lib/scripts/ExecDialog \ - NsCDE/lib/scripts/FontMgr NsCDE/lib/scripts/FpLite \ - NsCDE/lib/scripts/GeometryMgr NsCDE/libexec/GWM.sh \ - NsCDE/lib/scripts/GWMOptions NsCDE/lib/scripts/KeyboardMgr \ - NsCDE/lib/scripts/ModifyColor NsCDE/lib/scripts/MonthDayApplet \ - NsCDE/lib/scripts/NColorsDialog NsCDE/lib/scripts/NProcMgr \ - NsCDE/lib/scripts/Occupy NsCDE/lib/scripts/PaletteDialog \ - NsCDE/lib/scripts/PointerMgr NsCDE/lib/scripts/PowerSaveMgr \ - NsCDE/lib/scripts/StyleMgr NsCDE/lib/scripts/SubpanelMgr \ - NsCDE/lib/scripts/SysActionDialog \ - NsCDE/lib/scripts/SubpanelSettings NsCDE/lib/scripts/Sysinfo \ - 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 - -_CURLYICONS= NsCDE/config/NsCDE-Functions.conf NsCDE/libexec/colormgr \ - NsCDE/libexec/subpanel_menuitem_props - -_SHARESLASH= NsCDE/config/NsCDE-Backdrops.conf \ - NsCDE/config/NsCDE-Functions.conf NsCDE/config/NsCDE-Main.conf \ - NsCDE/share/doc/NsCDE.txt \ - NsCDE/share/doc/html/NsCDE-Localization.html - -_BSHARESLASH= NsCDE/config/NsCDE-Functions.conf NsCDE/lib/scripts/BackdropMgr \ - NsCDE/lib/scripts/BeepMgr NsCDE/lib/scripts/ColorMgr \ - NsCDE/lib/scripts/ExecDialog NsCDE/lib/scripts/FilePicker \ - NsCDE/lib/scripts/FontMgr NsCDE/lib/scripts/GeometryMgr \ - NsCDE/libexec/GWM.sh NsCDE/lib/scripts/GWMOptions \ - NsCDE/lib/scripts/InputForm NsCDE/lib/scripts/KeyboardMgr \ - NsCDE/lib/scripts/ModifyColor NsCDE/lib/scripts/NColorsDialog \ - NsCDE/lib/scripts/NProcMgr NsCDE/lib/scripts/Occupy \ - NsCDE/lib/scripts/PaletteDialog NsCDE/lib/scripts/PointerMgr \ - NsCDE/lib/scripts/PowerSaveMgr NsCDE/lib/scripts/StyleMgr \ - NsCDE/lib/scripts/SubpanelMgr NsCDE/lib/scripts/SysActionDialog \ - NsCDE/lib/scripts/SubpanelSettings NsCDE/lib/scripts/Sysinfo \ - 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 NsCDE/libexec/Notifier.sh \ - NsCDE/libexec/appfinder NsCDE/libexec/fontmgr \ - NsCDE/libexec/strip_icon_path \ - NsCDE/libexec/subpanel_menuitem_props \ - NsCDE/share/config_templates/colormgr.local \ - NsCDE/share/doc/NsCDE.txt README.localization \ - NsCDE/bin/fpclock - -_CSHARESLASH= NsCDE/libexec/colormgr NsCDE/libexec/fontmgr \ - NsCDE/libexec/style_managers.shlib \ - NsCDE/libexec/subpanel_menuitem_props \ - NsCDE/bin/fpclock NsCDE/share/config_templates/colormgr.local - -_SHARENSLASH= NsCDE/config/NsCDE-Main.conf - -_LIBEXEC_SCRIPTS= NsCDE/config/NsCDE-Functions.conf \ - NsCDE/config/NsCDE-Main.conf \ - NsCDE/config/NsCDE-Menus.conf \ - NsCDE/lib/scripts/ColorMgr \ - NsCDE/lib/scripts/ModifyColor - -_BLIBEXEC_SCRIPTS= NsCDE/lib/scripts/BackdropMgr \ - NsCDE/lib/scripts/ColorMgr NsCDE/lib/scripts/FontMgr \ - NsCDE/lib/scripts/FpLite NsCDE/lib/scripts/GeometryMgr \ - NsCDE/lib/scripts/ModifyColor \ - NsCDE/lib/scripts/PaletteDialog \ - NsCDE/lib/scripts/SubpanelMgr \ - NsCDE/lib/scripts/SysActionDialog \ - NsCDE/lib/scripts/SubpanelSettings \ - NsCDE/libexec/colormgr \ - NsCDE/libexec/subpanel_menuitem_props \ - NsCDE/share/config_templates/colormgr.local \ - NsCDE/share/doc/NsCDE.txt \ - NsCDE/bin/fpclock - -_CLIBEXEC_SCRIPTS= NsCDE/libexec/backdropmgr NsCDE/libexec/colormgr - -_CLIBS= NsCDE/libexec/colormgr - -_LIBS= NsCDE/config/NsCDE-Main.conf - -_BBINS= NsCDE/config/FrontPanel.actions \ - NsCDE/config/NsCDE-Main.conf.sample \ - NsCDE/config/NsCDE-Functions.conf.sample \ - NsCDE/lib/scripts/ActionForm NsCDE/lib/scripts/BackdropMgr \ - NsCDE/lib/scripts/BeepMgr NsCDE/lib/scripts/ChoiceForm \ - NsCDE/lib/scripts/ColorMgr NsCDE/lib/scripts/ExecDialog \ - NsCDE/lib/scripts/FilePicker NsCDE/lib/scripts/FontMgr \ - NsCDE/lib/scripts/GeometryMgr NsCDE/lib/scripts/InputForm \ - NsCDE/lib/scripts/KeyboardMgr NsCDE/lib/scripts/ModifyColor \ - NsCDE/lib/scripts/MonthDayApplet \ - NsCDE/lib/scripts/NColorsDialog NsCDE/lib/scripts/NProcMgr \ - NsCDE/lib/scripts/Occupy NsCDE/lib/scripts/PaletteDialog \ - NsCDE/lib/scripts/PointerMgr NsCDE/lib/scripts/PowerSaveMgr \ - NsCDE/lib/scripts/StyleMgr NsCDE/lib/scripts/SubpanelMgr \ - NsCDE/lib/scripts/SysActionDialog \ - NsCDE/lib/scripts/SubpanelSettings NsCDE/lib/scripts/Sysinfo \ - 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/WaitNotice \ - NsCDE/lib/scripts/WindowMgr NsCDE/lib/scripts/WsPgMgr \ - NsCDE/libexec/Notifier.sh NsCDE/libexec/backdropmgr \ - 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 \ - NsCDE/share/applications/NsCDE-StyleMgr.desktop \ - NsCDE/share/applications/NsCDE-Sysinfo.desktop \ - NsCDE/share/applications/NsCDE-WsPgMgr.desktop \ - NsCDE/share/applications/WatchErrors.desktop \ - NsCDE/share/doc/NsCDE.txt NsCDE/lib/scripts/GWMOptions \ - NsCDE/share/applications/NsCDE-GWM.desktop - -_SBINS= NsCDE/config/NsCDE-FrontPanel.conf \ - NsCDE/config/NsCDE-Functions.conf NsCDE/config/NsCDE-Main.conf \ - 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/WsPgMgr - -_CONFREF= NsCDE/config/NsCDE-Main.conf - -_CCONFIGS= NsCDE/libexec/colormgr - -_CONFIGS= NsCDE/lib/scripts/SubpanelMgr \ - 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 \ - NsCDE/libexec/generate_subpanels NsCDE/libexec/keymenu \ - NsCDE/libexec/subpanel_menuitem_props NsCDE/share/doc/NsCDE.txt \ - README.md - -_KSHFIX= NsCDE/bin/fpclock NsCDE/bin/get_fvwm_infostore NsCDE/bin/getdpi \ - NsCDE/bin/getfont NsCDE/bin/ised NsCDE/bin/mkpagemenu \ - 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 \ - NsCDE/libexec/fpexec NsCDE/libexec/fpseticon \ - NsCDE/libexec/fvwm-modules/FvwmScript \ - NsCDE/libexec/generate_app_menus \ - NsCDE/libexec/generate_subpanels NsCDE/libexec/keymenu \ - NsCDE/libexec/nscde-acpi \ - NsCDE/libexec/nscde_get_logical_screens \ - NsCDE/libexec/strip_icon_path \ - NsCDE/libexec/subpanel_menuitem_props \ - NsCDE/share/config_templates/colormgr.local \ - NsCDE/share/config_templates/fontmgr.local generate_subpanels +_SUDOFILES= data/fvwm/Functions.fvwmconf.in \ + lib/scripts/SysActionDialog post-extract: - ${MV} ${WRKDIR}/NsCDE-${DISTVERSION} ${WRKDIR}/${PORTNAME}-${DISTVERSION} - -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 ) - ${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 ) - ( for SLIB in ${_LIBS}; do ${REINPLACE_CMD} -e "s@$$\[NSCDE_ROOT\]/lib/@${PREFIX}/lib/nscde/@g" ${WRKSRC}/$${SLIB}; done ) - ( for SB in ${_SBINS}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/bin/@'${PREFIX}'/sbin/@g' ${WRKSRC}/$${SB}; done ) - ( for CR in ${_CONFREF}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/config/@'${ETCDIR}'/@g' ${WRKSRC}/$${CR}; done ) - ( for IDOC in ${_CURLYICONS}; do ${REINPLACE_CMD} -e 's@$${NSCDE_ROOT}/share/icons/@'${PREFIX}'/share/icons/@g' ${WRKSRC}/$${IDOC}; done ) - ( 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 ) - ( for CFG in ${_CCONFIGS}; do ${REINPLACE_CMD} -e 's@$${NSCDE_ROOT}/config/@'${ETCDIR}'/@g' ${WRKSRC}/$${CFG}; done ) - ( for SLIB in ${_CLIBEXEC_SCRIPTS}; do ${REINPLACE_CMD} -e 's@$${NSCDE_ROOT}/libexec/@'${PREFIX}'/libexec/nscde/@g' ${WRKSRC}/$${SLIB}; done ) - ( for CLIB in ${_CLIBS}; do ${REINPLACE_CMD} -e 's@$${NSCDE_ROOT}/lib/@'${PREFIX}'/lib/nscde/@g' ${WRKSRC}/$${CLIB}; done ) - ${WRKSRC}/NsCDE/bin/ised -c 's/\*FrontPanel: \(.*x.*\), Id NsCDE-Subpanel\(.*\), Frame 1, PressColorset 27, \\/\*FrontPanel: \1, Id NsCDE-Subpanel\2, Frame 1, PressColorset 27, \\\n Icon NsCDE\/FPSubArrowUp.xpm, PressIcon NsCDE\/FPSubArrowDown.xpm, \\/g' -f "${WRKSRC}/NsCDE/config/NsCDE-FrontPanel.conf.sample" - ( for KSHB in ${_KSHFIX}; do ${REINPLACE_CMD} -e 's@^#!/usr/bin/env ksh93@#!'${PREFIX}'/bin/ksh93@' ${WRKSRC}/$${KSHB}; done ) - ${FIND} ${WRKSRC}/NsCDE -type f -name '*.bak' -delete - ( for HLP in ${_PREFIX_FILES}; do ${REINPLACE_CMD} -e 's@$${PREFIX}@'${PREFIX}'@g' ${WRKSRC}/$${HLP}; done ) - ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT@${PREFIX}@g' ${WRKSRC}/NsCDE/bin/fpclock - ${REINPLACE_CMD} -e 's@-$${NSCDE_OS}\_$${MARCH}@@g' ${WRKSRC}/NsCDE/bin/fpclock - ${FIND} ${WRKSRC}/NsCDE -type f -name '*.bak' -delete - ${MV} ${WRKSRC}/NsCDE/share/config_templates/colormgr.local ${WRKSRC}/NsCDE/share/doc/examples/colormgr.local.sample - ${REINPLACE_CMD} -e 's@export NSCDE\_VERSION=\"1.3\"@export NSCDE_VERSION=\"'${DISTVERSION}'\"@g' ${WRKSRC}/NsCDE/bin/nscde + ${MV} ${WRKDIR}/NsCDE-2.2 ${WRKDIR}/${PORTNAME}-${DISTVERSION} 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 + ( for SUDOF in ${_SUDOFILES}; do ${REINPLACE_CMD} -e "s@sudo \\-n@doas@g" ${WRKSRC}/$${SUDOF}; done ) -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) - ${CP} ${WRKSRC}/docbook/NsCDE.css ${WRKSRC}/NsCDE/share/doc/html/NsCDE.css - make -C ${WRKSRC}/src/XOverrideFontCursor - make -C ${WRKSRC}/src/pclock-0.13.1/src - make -C ${WRKSRC}/src/colorpicker - ${STRIP_CMD} ${WRKSRC}/src/colorpicker/colorpicker - ${STRIP_CMD} ${WRKSRC}/src/pclock-0.13.1/src/pclock - ${STRIP_CMD} ${WRKSRC}/src/XOverrideFontCursor/XOverrideFontCursor.so +pre-configure: + #${REINPLACE_CMD} -e "s@^PYTHON=@PYTHON=${PYTHON_CMD}@" ${WRKSRC}/configure.ac -do-install: - ${FIND} ${WRKSRC} -type f -name '*.orig' -delete - ${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/nscde/fvwm-modules - ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/nscde - ${MKDIR} ${STAGEDIR}/${ETCDIR}/xdg/menus - ${MKDIR} ${STAGEDIR}/${PREFIX}/share/icons/NsCDE - ${MKDIR} ${STAGEDIR}/${PREFIX}/share/nscde - ${INSTALL_DATA} ${WRKSRC}/NsCDE/config/*.sample ${STAGEDIR}/${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/NsCDE/config/*.actions ${STAGEDIR}/${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/NsCDE/config/xdg/menus/* ${STAGEDIR}/${ETCDIR}/xdg/menus - ${INSTALL_DATA} ${WRKSRC}/src/XOverrideFontCursor/XOverrideFontCursor.so ${STAGEDIR}/${PREFIX}/lib/nscde - ${INSTALL_PROGRAM} ${WRKSRC}/src/pclock-0.13.1/src/pclock ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/src/colorpicker/colorpicker ${STAGEDIR}/${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/NsCDE/bin/* ${STAGEDIR}/${PREFIX}/sbin - ( for HLP in ${_NSCDE_HELPERS}; do ${INSTALL_SCRIPT} ${WRKSRC}/NsCDE/libexec/$${HLP} ${STAGEDIR}/${PREFIX}/libexec/nscde/$${HLP}; done ) - ${INSTALL_SCRIPT} ${WRKSRC}/NsCDE/libexec/fvwm-modules/FvwmScript ${STAGEDIR}/${PREFIX}/libexec/nscde/fvwm-modules - (cd ${WRKSRC}/NsCDE/share/icons && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/share/icons) - ${INSTALL_DATA} ${WRKSRC}/NsCDE/share/applications/* ${STAGEDIR}/${PREFIX}/share/applications - (cd ${WRKSRC}/NsCDE/share && ${COPYTREE_SHARE} "palettes photos config_templates backdrops defaults desktop-directories locale \ - fontsets fallback" ${STAGEDIR}/${DATADIR}) - (cd ${WRKSRC}/NsCDE/lib && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/lib/nscde) - NSCDE_ROOT="${STAGEDIR}/${PREFIX}" HAS_WINDOWNAME=1 SYSMODE=1 ${WRKSRC}/generate_subpanels > ${STAGEDIR}/${ETCDIR}/NsCDE-Subpanels.conf.sample - ${FIND} ${STAGEDIR}/${ETCDIR} -type f -name '*.actions' -exec ${MV} {} {}.sample \; - ${MKDIR} ${STAGEDIR}/${PREFIX}/share/xsessions - ${CP} ${WRKSRC}/NsCDE/share/doc/examples/xsession-integration/nscde.desktop ${STAGEDIR}/${PREFIX}/share/xsessions/nscde.desktop +post-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}/${PREFIX}/share/examples/${PORTNAME} + ${MV} ${STAGEDIR}/${PREFIX}/share/doc/nscde/examples/* ${STAGEDIR}/${PREFIX}/share/examples/${PORTNAME}/ -do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}/${PREFIX}/share/doc/nscde - ${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 +post-install-EXAMPLES-off: + ${RM} -fr ${STAGEDIR}/${PREFIX}/share/doc/nscde/examples/* .include diff --git a/x11-wm/nscde/distinfo b/x11-wm/nscde/distinfo index d36f8e82f..358a90516 100644 --- a/x11-wm/nscde/distinfo +++ b/x11-wm/nscde/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638108980 -SHA256 (nscde-nscde-1.4_GH0.tar.gz) = 838f17a3ef5f3cec409ed2ca0bd0ac1f324890bc50e64ee559321126516df1a9 -SIZE (nscde-nscde-1.4_GH0.tar.gz) = 32001678 +TIMESTAMP = 1660302821 +SHA256 (nscde-nscde-2.2_GH0.tar.gz) = 671b2c9969cd04159e5b597567cb9f59a53ccb6853f2a6340876f199aa03ca4a +SIZE (nscde-nscde-2.2_GH0.tar.gz) = 29868677 diff --git a/x11-wm/nscde/files/patch-Makefile.in b/x11-wm/nscde/files/patch-Makefile.in new file mode 100644 index 000000000..1ad2c6bc0 --- /dev/null +++ b/x11-wm/nscde/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2022-08-14 08:09:55 UTC ++++ Makefile.in +@@ -836,6 +836,7 @@ install-data-hook: + -cp $(srcdir)/COPYING $(DESTDIR)$(docdir)/LICENSE + -cp $(srcdir)/ReleaseNotes.txt $(DESTDIR)$(docdir)/ + -cp $(srcdir)/README.localization $(DESTDIR)$(docdir)/ ++ -cp $(srcdir)/UPDATE_2x.txt $(DESTDIR)$(docdir)/ + + uninstall-hook: + test -d $(DESTDIR)$(docdir) && \ diff --git a/x11-wm/nscde/files/patch-NsCDE_bin_get__fvwm__infostore b/x11-wm/nscde/files/patch-NsCDE_bin_get__fvwm__infostore deleted file mode 100644 index b1f619270..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_bin_get__fvwm__infostore +++ /dev/null @@ -1,11 +0,0 @@ ---- NsCDE/bin/get_fvwm_infostore.orig 2021-05-02 07:41:15 UTC -+++ NsCDE/bin/get_fvwm_infostore -@@ -9,7 +9,7 @@ if [ ! -d "$FVWM_USERDIR"/tmp ]; then - mkdir -p "$FVWM_USERDIR"/tmp - fi - --$NSCDE_ROOT/bin/nscde_fvwmclnt "Exec exec echo \$[infostore.$1] > \"$FVWM_USERDIR\"/tmp/ifsvar_get.$$" -+${PREFIX}/sbin/nscde_fvwmclnt "Exec exec echo \$[infostore.$1] > \"$FVWM_USERDIR\"/tmp/ifsvar_get.$$" - cnt=50 - while [ ! -r "$FVWM_USERDIR"/tmp/ifsvar_get.$$ ] - do diff --git a/x11-wm/nscde/files/patch-NsCDE_bin_getfont b/x11-wm/nscde/files/patch-NsCDE_bin_getfont deleted file mode 100644 index a5e517b02..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_bin_getfont +++ /dev/null @@ -1,41 +0,0 @@ ---- NsCDE/bin/getfont.orig 2021-05-02 07:40:22 UTC -+++ NsCDE/bin/getfont -@@ -12,11 +12,6 @@ export LC_ALL=C - PrintFnSize=0 - PrettyName=0 - --if [ -z $NSCDE_ROOT ]; then -- echo "No \$NSCDE_ROOT set. Exiting." -- exit 3 --fi -- - if [ -z $FVWM_USERDIR ]; then - echo "No \$FVWM_USERDIR set. Exiting." - exit 4 -@@ -46,7 +41,7 @@ function GetFont - Defaults - - if [ "x$FnFile" == "x" ]; then -- sysfncffile="${NSCDE_ROOT}/config/NsCDE-Font-${NSCDE_FONT_DPI}dpi.conf" -+ sysfncffile="${PREFIX}/etc/nscde/NsCDE-Font-${NSCDE_FONT_DPI}dpi.conf" - if [ -s "${FVWM_USERDIR}/NsCDE-Font-${NSCDE_FONT_DPI}dpi.conf" ]; then - fncnffile="${FVWM_USERDIR}/NsCDE-Font-${NSCDE_FONT_DPI}dpi.conf" - avoiddoublegrep=0 -@@ -74,7 +69,7 @@ function GetFont - - Catch2="${Catch/InfoStoreAdd font./}" - Catch3="${Catch2#*\"}" -- GetSize=$(echo "${Catch3/\"/}" | $NSCDE_ROOT/bin/ised -c "s/\(.*\)\(size=\)\(.*\)\(.*\)\?/\3/g" -o -f -) -+ GetSize=$(echo "${Catch3/\"/}" | ${PREFIX}/sbin/ised -c "s/\(.*\)\(size=\)\(.*\)\(.*\)\?/\3/g" -o -f -) - if (($PrettyName == 1)); then - FontStruct=$(echo "${Catch3/\"/}" | awk -F: '{ $1=""; print $0 }' | sed 's/^ //g; s/size=//g') - else -@@ -126,7 +121,7 @@ function GetFont - - if (($GetSize > $FnMaxSize)); then - if (($PrintFnSize == 0)); then -- echo "$FontStruct" | $NSCDE_ROOT/bin/ised -c "s/\(.*\)\(size=\)\([[:digit:]]\+\)\(\.[[:digit:]]\+\)\?\(.*\)\?/\1\2${FnMaxSize}\5/g" -o -f - -+ echo "$FontStruct" | ${PREFIX}/sbin/ised -c "s/\(.*\)\(size=\)\([[:digit:]]\+\)\(\.[[:digit:]]\+\)\?\(.*\)\?/\1\2${FnMaxSize}\5/g" -o -f - - else - echo $FnMaxSize - fi diff --git a/x11-wm/nscde/files/patch-NsCDE_bin_mkpagemenu b/x11-wm/nscde/files/patch-NsCDE_bin_mkpagemenu deleted file mode 100644 index 0add44704..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_bin_mkpagemenu +++ /dev/null @@ -1,29 +0,0 @@ ---- NsCDE/bin/mkpagemenu.orig 2021-05-02 07:39:06 UTC -+++ NsCDE/bin/mkpagemenu -@@ -31,13 +31,13 @@ do - if [ -r "$FVWM_USERDIR/WSM.conf" ]; then - pagenum_prepare=$(egrep "^PG:${pg}:.*:" "$FVWM_USERDIR/WSM.conf" | head -1) - if [ "x${pagenum_prepare}" == "x" ]; then -- if [ -r "${NSCDE_ROOT}/share/defaults/pages/${PagesX}x${PagesY}" ]; then -- pagenum_prepare=$(egrep "^PG:${pg}:.*:" ${NSCDE_ROOT}/share/defaults/pages/${PagesX}x${PagesY} | head -1) -+ if [ -r "${PREFIX}/share/nscde/defaults/pages/${PagesX}x${PagesY}" ]; then -+ pagenum_prepare=$(egrep "^PG:${pg}:.*:" ${PREFIX}/share/nscde/defaults/pages/${PagesX}x${PagesY} | head -1) - fi - fi - else -- if [ -r "${NSCDE_ROOT}/share/defaults/pages/${PagesX}x${PagesY}" ]; then -- pagenum_prepare=$(egrep "^PG:${pg}:.*:" ${NSCDE_ROOT}/share/defaults/pages/${PagesX}x${PagesY} | head -1) -+ if [ -r "${PREFIX}/share/nscde/defaults/pages/${PagesX}x${PagesY}" ]; then -+ pagenum_prepare=$(egrep "^PG:${pg}:.*:" ${PREFIX}/share/nscde/defaults/pages/${PagesX}x${PagesY} | head -1) - fi - fi - -@@ -50,7 +50,7 @@ do - fi - - if [ "$Fmt" == "menu_icons" ]; then -- if [ -r "$NSCDE_ROOT/share/icons/NsCDE/Wsm_${PagesX}x${PagesY}_${pagenum}.xpm" ]; then -+ if [ -r "${PREFIX}/share/icons/NsCDE/Wsm_${PagesX}x${PagesY}_${pagenum}.xpm" ]; then - echo "+ \"&${pg} ${MenuLeftTitle}${pagename}%NsCDE/Wsm_${PagesX}x${PagesY}_${pagenum}.xpm%\" $FvwmPageCmd $pagenum_fvwm" - else - echo "+ \"&${pg} ${MenuLeftTitle}${pagename}\" $FvwmPageCmd $pagenum_fvwm" diff --git a/x11-wm/nscde/files/patch-NsCDE_bin_nscde b/x11-wm/nscde/files/patch-NsCDE_bin_nscde deleted file mode 100644 index f1ee2a823..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_bin_nscde +++ /dev/null @@ -1,30 +0,0 @@ ---- NsCDE/bin/nscde.orig 2021-05-02 07:33:53 UTC -+++ NsCDE/bin/nscde -@@ -42,16 +42,11 @@ fi - # Set main NSCDE and FVWM variables. Most of the things later - # depends on this core variables. - export FVWM_USERDIR="${HOME}/.NsCDE" --export NSCDE_ROOT=/opt/NsCDE --export FVWM_DATADIR="${NSCDE_ROOT}/config" -+export NSCDE_ROOT=${PREFIX} -+export FVWM_DATADIR="${PREFIX}/etc/nscde" - - mkdir -p "${FVWM_USERDIR}/tmp" - --echo "$PATH" | egrep -q "/opt\/NsCDE\/bin" --if (($? != 0)); then -- export PATH="${PATH}:${NSCDE_ROOT}" --fi -- - # Find fvwm(1) binary. This is a critical point. - # We cannot continue without main workforce. - if [ "x$FVWM_BIN" == "x" ]; then -@@ -107,7 +102,7 @@ fi - if [ -r ${FVWM_USERDIR}/NsCDE-Main.conf ]; then - exec $FVWM_BIN -f ${FVWM_USERDIR}/NsCDE-Main.conf $FVWM_OPTS - else -- exec $FVWM_BIN -f ${NSCDE_ROOT}/config/NsCDE-Main.conf $FVWM_OPTS -+ exec $FVWM_BIN -f ${PREFIX}/etc/nscde/NsCDE-Main.conf $FVWM_OPTS - fi - - # Do not be picky if there is some failure left. diff --git a/x11-wm/nscde/files/patch-NsCDE_bin_nscde__colorpicker b/x11-wm/nscde/files/patch-NsCDE_bin_nscde__colorpicker deleted file mode 100644 index 0ac1b8e5f..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_bin_nscde__colorpicker +++ /dev/null @@ -1,13 +0,0 @@ ---- NsCDE/bin/nscde_colorpicker.orig 2021-05-02 07:36:07 UTC -+++ NsCDE/bin/nscde_colorpicker -@@ -6,9 +6,7 @@ - # Licence: GPLv3 - # - --[ -z $NSCDE_ROOT ] && exit 2 --MARCH=$(uname -m) --BIN="$NSCDE_ROOT/bin/colorpicker-${NSCDE_OS}_${MARCH}" -+BIN="${PREFIX}/bin/colorpicker" - - Existance=$(type "$BIN" 2>&1) - diff --git a/x11-wm/nscde/files/patch-NsCDE_bin_xdowrapper b/x11-wm/nscde/files/patch-NsCDE_bin_xdowrapper deleted file mode 100644 index 29c8cce78..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_bin_xdowrapper +++ /dev/null @@ -1,11 +0,0 @@ ---- NsCDE/bin/xdowrapper.orig 2021-05-02 07:38:18 UTC -+++ NsCDE/bin/xdowrapper -@@ -25,7 +25,7 @@ function xdofunc - xdotool search --name "NsCDE-Subpanel${subp}$" > /dev/null 2>&1 - if (($? == 0)); then - echo "Refreshing subpanel NsCDE-Subpanel${subp}" >&2 -- $NSCDE_ROOT/bin/nscde_fvwmclnt "Exec exec xdotool search --name "NsCDE-Subpanel${subp}\$" \ -+ ${PREFIX}/sbin/nscde_fvwmclnt "Exec exec xdotool search --name "NsCDE-Subpanel${subp}\$" \ - set_window --name \"\$[infostore.NsCDE-Subpanel${subp}-Name]\" \ - --icon-name \"\$[infostore.NsCDE-Subpanel${subp}-Name]\"" - fi diff --git a/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-FrontPanel.conf b/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-FrontPanel.conf deleted file mode 100644 index ded0ef92e..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-FrontPanel.conf +++ /dev/null @@ -1,182 +0,0 @@ ---- NsCDE/config/NsCDE-FrontPanel.conf.orig 2021-04-24 03:10:51 UTC -+++ NsCDE/config/NsCDE-FrontPanel.conf -@@ -79,7 +79,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *L1*) \ - - Test (EnvMatch infostore.FP.Launchers-Enabled *L1*, EnvMatch infostore.NsCDE-Subpanel1-Enabled 1) \ - *FrontPanel: (1x1+0+0, Id NsCDE-Subpanel1, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel1 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel1 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel1") - Test (EnvMatch infostore.FP.Launchers-Enabled *L1*, EnvMatch infostore.NsCDE-Subpanel1-Enabled 0) \ - *FrontPanel: (1x1+0+0, Id NsCDE-Subpanel1, Frame 1, Padding 1 1, \ -@@ -88,7 +88,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *L1*, En - - Test (EnvMatch infostore.FP.Launchers-Enabled *L2*, EnvMatch infostore.NsCDE-Subpanel2-Enabled 1) \ - *FrontPanel: (1x1+1+0, Id NsCDE-Subpanel2, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel2 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel2 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel2") - Test (EnvMatch infostore.FP.Launchers-Enabled *L2*, EnvMatch infostore.NsCDE-Subpanel2-Enabled 0) \ - *FrontPanel: (1x1+1+0, Id NsCDE-Subpanel2, Frame 1, Padding 1 1, \ -@@ -97,7 +97,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *L2*, En - - Test (EnvMatch infostore.FP.Launchers-Enabled *L3*, EnvMatch infostore.NsCDE-Subpanel3-Enabled 1) \ - *FrontPanel: (1x1+2+0, Id NsCDE-Subpanel3, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel3 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel3 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel3") - Test (EnvMatch infostore.FP.Launchers-Enabled *L3*, EnvMatch infostore.NsCDE-Subpanel3-Enabled 0) \ - *FrontPanel: (1x1+2+0, Id NsCDE-Subpanel3, Frame 1, Padding 1 1, \ -@@ -106,7 +106,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *L3*, En - - Test (EnvMatch infostore.FP.Launchers-Enabled *L4*, EnvMatch infostore.NsCDE-Subpanel4-Enabled 1) \ - *FrontPanel: (1x1+3+0, Id NsCDE-Subpanel4, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel4 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel4 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel4") - Test (EnvMatch infostore.FP.Launchers-Enabled *L4*, EnvMatch infostore.NsCDE-Subpanel4-Enabled 0) \ - *FrontPanel: (1x1+3+0, Id NsCDE-Subpanel4, Frame 1, Padding 1 1, \ -@@ -115,7 +115,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *L4*, En - - Test (EnvMatch infostore.FP.Launchers-Enabled *L5*, EnvMatch infostore.NsCDE-Subpanel5-Enabled 1) \ - *FrontPanel: (1x1+4+0, Id NsCDE-Subpanel5, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel5 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel5 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel5") - Test (EnvMatch infostore.FP.Launchers-Enabled *L5*, EnvMatch infostore.NsCDE-Subpanel5-Enabled 0) \ - *FrontPanel: (1x1+4+0, Id NsCDE-Subpanel5, Frame 1, Padding 1 1, \ -@@ -124,7 +124,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *L5*, En - - Test (EnvMatch infostore.FP.Launchers-Enabled *L11*, EnvMatch infostore.NsCDE-Subpanel11-Enabled 1) \ - *FrontPanel: (1x1+5+0, Id NsCDE-Subpanel11, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel11 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel11 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel11") - Test (EnvMatch infostore.FP.Launchers-Enabled *L11*, EnvMatch infostore.NsCDE-Subpanel11-Enabled 0) \ - *FrontPanel: (1x1+5+0, Id NsCDE-Subpanel11, Frame 1, Padding 1 1, \ -@@ -133,7 +133,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *L11*, E - - Test (EnvMatch infostore.FP.Launchers-Enabled *L12*, EnvMatch infostore.NsCDE-Subpanel12-Enabled 1) \ - *FrontPanel: (1x1+6+0, Id NsCDE-Subpanel12, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel12 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel12 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel12") - Test (EnvMatch infostore.FP.Launchers-Enabled *L12*, EnvMatch infostore.NsCDE-Subpanel12-Enabled 0) \ - *FrontPanel: (1x1+6+0, Id NsCDE-Subpanel12, Frame 1, Padding 1 1, \ -@@ -142,7 +142,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *L12*, E - - Test (EnvMatch infostore.FP.Launchers-Enabled *L13*, EnvMatch infostore.NsCDE-Subpanel13-Enabled 1) \ - *FrontPanel: (1x1+7+0, Id NsCDE-Subpanel13, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel13 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel13 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel13") - Test (EnvMatch infostore.FP.Launchers-Enabled *L13*, EnvMatch infostore.NsCDE-Subpanel13-Enabled 0) \ - *FrontPanel: (1x1+7+0, Id NsCDE-Subpanel13, Frame 1, Padding 1 1, \ -@@ -151,7 +151,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *L13*, E - - Test (EnvMatch infostore.FP.Launchers-Enabled *L14*, EnvMatch infostore.NsCDE-Subpanel14-Enabled 1) \ - *FrontPanel: (1x1+8+0, Id NsCDE-Subpanel14, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel14 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel14 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel14") - Test (EnvMatch infostore.FP.Launchers-Enabled *L14*, EnvMatch infostore.NsCDE-Subpanel14-Enabled 0) \ - *FrontPanel: (1x1+8+0, Id NsCDE-Subpanel14, Frame 1, Padding 1 1, \ -@@ -160,7 +160,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *L14*, E - - Test (EnvMatch infostore.FP.Launchers-Enabled *L15*, EnvMatch infostore.NsCDE-Subpanel15-Enabled 1) \ - *FrontPanel: (1x1+9+0, Id NsCDE-Subpanel15, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel15 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel15 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel15") - Test (EnvMatch infostore.FP.Launchers-Enabled *L15*, EnvMatch infostore.NsCDE-Subpanel15-Enabled 0) \ - *FrontPanel: (1x1+9+0, Id NsCDE-Subpanel15, Frame 1, Padding 1 1, \ -@@ -328,7 +328,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *R6*) \ - - Test (EnvMatch infostore.FP.Launchers-Enabled *R6*, EnvMatch infostore.NsCDE-Subpanel6-Enabled 1) \ - *FrontPanel: (1x1+0+0, Id NsCDE-Subpanel6, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel6 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel6 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel6") - Test (EnvMatch infostore.FP.Launchers-Enabled *R6*, EnvMatch infostore.NsCDE-Subpanel6-Enabled 0) \ - *FrontPanel: (1x1+0+0, Id NsCDE-Subpanel6, Frame 1, Padding 1 1, \ -@@ -337,7 +337,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *R6*, En - - Test (EnvMatch infostore.FP.Launchers-Enabled *R7*, EnvMatch infostore.NsCDE-Subpanel7-Enabled 1) \ - *FrontPanel: (1x1+1+0, Id NsCDE-Subpanel7, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel7 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel7 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel7") - Test (EnvMatch infostore.FP.Launchers-Enabled *R7*, EnvMatch infostore.NsCDE-Subpanel7-Enabled 0) \ - *FrontPanel: (1x1+1+0, Id NsCDE-Subpanel7, Frame 1, Padding 1 1, \ -@@ -346,7 +346,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *R7*, En - - Test (EnvMatch infostore.FP.Launchers-Enabled *R8*, EnvMatch infostore.NsCDE-Subpanel8-Enabled 1) \ - *FrontPanel: (1x1+2+0, Id NsCDE-Subpanel8, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel8 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel8 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel8") - Test (EnvMatch infostore.FP.Launchers-Enabled *R8*, EnvMatch infostore.NsCDE-Subpanel8-Enabled 0) \ - *FrontPanel: (1x1+2+0, Id NsCDE-Subpanel8, Frame 1, Padding 1 1, \ -@@ -355,7 +355,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *R8*, En - - Test (EnvMatch infostore.FP.Launchers-Enabled *R9*, EnvMatch infostore.NsCDE-Subpanel9-Enabled 1) \ - *FrontPanel: (1x1+3+0, Id NsCDE-Subpanel9, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel9 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel9 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel9") - Test (EnvMatch infostore.FP.Launchers-Enabled *R9*, EnvMatch infostore.NsCDE-Subpanel9-Enabled 0) \ - *FrontPanel: (1x1+3+0, Id NsCDE-Subpanel9, Frame 1, Padding 1 1, \ -@@ -364,7 +364,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *R9*, En - - Test (EnvMatch infostore.FP.Launchers-Enabled *R10*, EnvMatch infostore.NsCDE-Subpanel10-Enabled 1) \ - *FrontPanel: (1x1+4+0, Id NsCDE-Subpanel10, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel10 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel10 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel10") - Test (EnvMatch infostore.FP.Launchers-Enabled *R10*, EnvMatch infostore.NsCDE-Subpanel10-Enabled 0) \ - *FrontPanel: (1x1+4+0, Id NsCDE-Subpanel10, Frame 1, Padding 1 1, \ -@@ -373,7 +373,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *R10*, E - - Test (EnvMatch infostore.FP.Launchers-Enabled *R16*, EnvMatch infostore.NsCDE-Subpanel16-Enabled 1) \ - *FrontPanel: (1x1+5+0, Id NsCDE-Subpanel16, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel16 \ -+ Padding 1 1, Panel(up, smooth, steps 16, delay 2, Hints, position Button left) NsCDE-Subpanel16 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel16") - Test (EnvMatch infostore.FP.Launchers-Enabled *R16*, EnvMatch infostore.NsCDE-Subpanel16-Enabled 0) \ - *FrontPanel: (1x1+5+0, Id NsCDE-Subpanel16, Frame 1, Padding 1 1, \ -@@ -382,7 +382,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *R16*, E - - Test (EnvMatch infostore.FP.Launchers-Enabled *R17*, EnvMatch infostore.NsCDE-Subpanel17-Enabled 1) \ - *FrontPanel: (1x1+6+0, Id NsCDE-Subpanel17, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 17, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel17 \ -+ Padding 1 1, Panel(up, smooth, steps 17, delay 2, Hints, position Button left) NsCDE-Subpanel17 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel17") - Test (EnvMatch infostore.FP.Launchers-Enabled *R17*, EnvMatch infostore.NsCDE-Subpanel17-Enabled 0) \ - *FrontPanel: (1x1+6+0, Id NsCDE-Subpanel17, Frame 1, Padding 1 1, \ -@@ -391,7 +391,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *R17*, E - - Test (EnvMatch infostore.FP.Launchers-Enabled *R18*, EnvMatch infostore.NsCDE-Subpanel18-Enabled 1) \ - *FrontPanel: (1x1+7+0, Id NsCDE-Subpanel18, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 18, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel18 \ -+ Padding 1 1, Panel(up, smooth, steps 18, delay 2, Hints, position Button left) NsCDE-Subpanel18 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel18") - Test (EnvMatch infostore.FP.Launchers-Enabled *R18*, EnvMatch infostore.NsCDE-Subpanel18-Enabled 0) \ - *FrontPanel: (1x1+7+0, Id NsCDE-Subpanel18, Frame 1, Padding 1 1, \ -@@ -400,7 +400,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *R18*, E - - Test (EnvMatch infostore.FP.Launchers-Enabled *R19*, EnvMatch infostore.NsCDE-Subpanel19-Enabled 1) \ - *FrontPanel: (1x1+8+0, Id NsCDE-Subpanel19, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 19, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel19 \ -+ Padding 1 1, Panel(up, smooth, steps 19, delay 2, Hints, position Button left) NsCDE-Subpanel19 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel19") - Test (EnvMatch infostore.FP.Launchers-Enabled *R19*, EnvMatch infostore.NsCDE-Subpanel19-Enabled 0) \ - *FrontPanel: (1x1+8+0, Id NsCDE-Subpanel19, Frame 1, Padding 1 1, \ -@@ -409,7 +409,7 @@ Test (EnvMatch infostore.FP.Launchers-Enabled *R19*, E - - Test (EnvMatch infostore.FP.Launchers-Enabled *R20*, EnvMatch infostore.NsCDE-Subpanel20-Enabled 1) \ - *FrontPanel: (1x1+9+0, Id NsCDE-Subpanel20, Frame 1, PressColorset 27, \ -- Padding 1 1, Panel(up, smooth, steps 20, delay 2, Hints, indicator 12, position Button left) NsCDE-Subpanel20 \ -+ Padding 1 1, Panel(up, smooth, steps 20, delay 2, Hints, position Button left) NsCDE-Subpanel20 \ - "Module FvwmButtons -g -30000-30000 -transientpanel NsCDE-Subpanel20") - Test (EnvMatch infostore.FP.Launchers-Enabled *R20*, EnvMatch infostore.NsCDE-Subpanel20-Enabled 0) \ - *FrontPanel: (1x1+9+0, Id NsCDE-Subpanel20, Frame 1, Padding 1 1, \ diff --git a/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Main.conf b/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Main.conf deleted file mode 100644 index 0ce811d34..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Main.conf +++ /dev/null @@ -1,32 +0,0 @@ ---- NsCDE/config/NsCDE-Main.conf.orig 2021-04-24 03:10:51 UTC -+++ NsCDE/config/NsCDE-Main.conf -@@ -12,11 +12,11 @@ Test (Restart) Echo NsCDE: Restarting - Test (Init) Echo NsCDE: Starting initialization - - # Core variables for diverting paths and setting early parameters --SetEnv NSCDE_ROOT /opt/NsCDE -+SetEnv NSCDE_ROOT ${PREFIX} - SetEnv NSCDE_FVWM_VERSION_NUM $[version.num] - SetEnv NSCDE_FVWM_VERSION_INFO $[version.info] - SetEnv FVWM_USERDIR $[HOME]/.NsCDE --SetEnv FVWM_DATADIR $[NSCDE_ROOT]/config -+SetEnv FVWM_DATADIR ${PREFIX}/etc/nscde - SetEnv FVWM_SCRIPTDIR $[NSCDE_ROOT]/lib/scripts - SetEnv FVWM_FORMDIR $[NSCDE_ROOT]/lib/forms - Test (EnvMatch FVWM_IS_FVWM3 1) SetEnv FVWM3_LOGFILE $[FVWM_USERDIR]/tmp/fvwm.log -@@ -37,12 +37,12 @@ PipeRead $[NSCDE_ROOT]/libexec/nscde_get_logical_scree - DestroyStyle * - - # Core Options, if necessary, can be overriden later --ExecUseShell __KSH93__ -+ExecUseShell ${PREFIX}/bin/ksh93 - Emulate Mwm - IgnoreModifiers L25 --ImagePath $[FVWM_USERDIR]/icons:$[NSCDE_ROOT]/share/icons:$[HOME]/.icons:$[HOME]/.local/share/icons:/usr/share/icons:/usr/local/share/icons:$[NSCDE_ROOT]/share/fallback/icons -+ImagePath $[FVWM_USERDIR]/icons:$[HOME]/.icons:$[HOME]/.local/share/icons:/usr/share/icons:${PREFIX}/share/icons:${PREFIX}/share/nscde/fallback/icons - LocalePath $[NSCDE_ROOT]/share/locale;NsCDE:$[NSCDE_ROOT]/share/locale;NsCDE-Subpanels:+ --# ModulePath $[NSCDE_ROOT]/libexec/fvwm-modules:+ -+ModulePath ${PREFIX}/libexec/nscde/fvwm-modules:+ - InfoStoreAdd menudclicktm 750 - ClickTime $[infostore.menudclicktm] - DefaultIcon NsCDE/Noicon.xpm diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_Splash.sh b/x11-wm/nscde/files/patch-NsCDE_libexec_Splash.sh deleted file mode 100644 index 23b71c5a5..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_Splash.sh +++ /dev/null @@ -1,16 +0,0 @@ ---- NsCDE/libexec/Splash.sh.orig 2021-05-02 08:29:06 UTC -+++ NsCDE/libexec/Splash.sh -@@ -64,11 +64,11 @@ Begin - Quit - End - -- Do {Colorset 70 TiledPixmap \$[NSCDE_ROOT]/lib/progbits/$SplashBG} -+ Do {Colorset 70 TiledPixmap ${PREFIX}/lib/nscde/progbits/$SplashBG} - Do {Test (!EnvMatch FVWM_IS_FVWM3 1) Schedule 120 All (NsCDE-Splash) Move screen g 50-50w 50-50w ewmhiwa} - Do {Test (EnvMatch FVWM_IS_FVWM3 1) Schedule 120 All (NsCDE-Splash) Move screen p +0p +0p} - -- Set \$MainFontCmd = (GetOutput {\$NSCDE_ROOT/bin/getfont -v -t bold -s large} 1 -1) -+ Set \$MainFontCmd = (GetOutput {${PREFIX}/sbin/getfont -v -t bold -s large} 1 -1) - Set \$MainFont = {Shadow=1 0 SE:} \$MainFontCmd - - ChangeFont 5 \$MainFont diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_colormgr b/x11-wm/nscde/files/patch-NsCDE_libexec_colormgr deleted file mode 100644 index e9315f6ee..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_colormgr +++ /dev/null @@ -1,11 +0,0 @@ ---- NsCDE/libexec/colormgr.orig 2021-05-02 08:31:09 UTC -+++ NsCDE/libexec/colormgr -@@ -357,7 +357,7 @@ function Backdrops - while (($DeskNo != 0)) - do - egrep "^Colorset 3${DeskNo}" "${NSCDE_ROOT}/config/NsCDE-Backdrops.conf" | \ -- sed 's/\$\[NSCDE_ROOT\]\/share\/defaults\/backer/\$\[FVWM_USERDIR\]\/backer/g' \ -+ sed 's/\/usr\/local\/share\/nscde\/defaults\/backer/\$\[FVWM_USERDIR\]\/backer/g' \ - >> "${FVWM_USERDIR}/NsCDE-Backdrops.conf" - cp -f ${NSCDE_ROOT}/share/defaults/backer/Desk${DeskNo}-*pm "${FVWM_USERDIR}/backer/" - ((DeskNo = DeskNo - 1)) diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_fontmgr b/x11-wm/nscde/files/patch-NsCDE_libexec_fontmgr deleted file mode 100644 index 6491c414f..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_fontmgr +++ /dev/null @@ -1,26 +0,0 @@ ---- NsCDE/libexec/fontmgr.orig 2021-05-02 08:34:51 UTC -+++ NsCDE/libexec/fontmgr -@@ -6,11 +6,6 @@ - # Licence: GPLv3 - # - --if [ -z $NSCDE_ROOT ]; then -- echo "Error: NSCDE_ROOT is not set. Exiting." -- exit 2 --fi -- - type -p fc-list > /dev/null - if (($? != 0)); then - echo "Error: fc-list command not found." -@@ -25,11 +20,6 @@ FNUMS=$(echo "$FNAMES" | sort -u | grep -n '') - - function findfontsets - { -- if [ -z $NSCDE_ROOT ]; then -- echo "No NSCDE_ROOT defined. Exiting." -- exit 2 -- fi -- - SysFontsetsOut=$(ls -1 ${NSCDE_ROOT}/share/fontsets/*.fontset) - SysFontsets=$(echo "$SysFontsetsOut" | awk -F "/" '{print $NF}' | sed 's/\.fontset$//g') - SysFontsetsCnt=$(echo "$SysFontsetsOut" | wc -l) diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_fp__manage__subpanel b/x11-wm/nscde/files/patch-NsCDE_libexec_fp__manage__subpanel deleted file mode 100644 index 12db4b66d..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_fp__manage__subpanel +++ /dev/null @@ -1,28 +0,0 @@ ---- NsCDE/libexec/fp_manage_subpanel.orig 2021-04-24 03:10:51 UTC -+++ NsCDE/libexec/fp_manage_subpanel -@@ -5,16 +5,6 @@ if [ -z $HOME ]; then - exit 3 - fi - --if [ -z $NSCDE_ROOT ]; then -- echo "Error: NSCDE_ROOT is not set cannot continue." -- exit 4 --fi -- --if [ ! -e "$NSCDE_ROOT" ]; then -- echo "Error: NSCDE_ROOT does not exist. Cannot continue." -- exit 5 --fi -- - if [ -z $FVWM_USERDIR ]; then - echo "Error: FVWM_USERDIR is not set cannot continue." - exit 6 -@@ -113,7 +103,7 @@ function reset_this_button - fi - - if (($RestartFP == 0)); then -- $NSCDE_ROOT/bin/nscde_fvwmclnt "PipeRead \"\$[NSCDE_ROOT]/libexec/fpseticon Btn${PanelNo}\"" -+ $NSCDE_ROOT/bin/nscde_fvwmclnt "PipeRead \"${PREFIX}/libexec/nscde/fpseticon Btn${PanelNo}\"" - else - $NSCDE_ROOT/bin/nscde_fvwmclnt "InfoStoreRemove FP.Btn${PanelNo}.type" - $NSCDE_ROOT/bin/nscde_fvwmclnt "f_RestartFrontPanel" diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_fvwm-modules_FvwmScript b/x11-wm/nscde/files/patch-NsCDE_libexec_fvwm-modules_FvwmScript deleted file mode 100644 index 04f67a1b7..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_fvwm-modules_FvwmScript +++ /dev/null @@ -1,43 +0,0 @@ ---- NsCDE/libexec/fvwm-modules/FvwmScript.orig 2021-04-24 03:10:51 UTC -+++ NsCDE/libexec/fvwm-modules/FvwmScript -@@ -2,7 +2,7 @@ - - # Check if there is a XOverrideFontCursor.so for LD_PRELOAD and if LD_PRELOAD is already in - # use so we can append to the variable, and be careful to use colon as library object separator --if [ -x "$NSCDE_ROOT/lib/XOverrideFontCursor.so" ]; then -+if [ -x "${PREFIX}/lib/nscde/XOverrideFontCursor.so" ]; then - if [ "x$LD_PRELOAD" != "x" ]; then - echo "$LD_PRELOAD" | egrep -q "XOverrideFontCursor\.so" - if (($? != 0)); then -@@ -10,24 +10,25 @@ if [ -x "$NSCDE_ROOT/lib/XOverrideFontCursor.so" ]; th - ld_preload_lastchar=$(($ld_preload_wc - 1)) - ld_preload_last_letter=$(echo "$LD_PRELOAD" | cut -b $ld_preload_lastchar) - if [ "$ld_preload_lastletter" == ":" ]; then -- export LD_PRELOAD="$LD_PRELOAD:$NSCDE_ROOT/lib/XOverrideFontCursor.so" -+ export LD_PRELOAD="$LD_PRELOAD:${PREFIX}/lib/nscde/XOverrideFontCursor.so" - else - echo "$LD_PRELOAD" | egrep -q ' ' - if (($? == 0)); then - new_ld_preload=$(echo "$LD_PRELOAD" | tr ' ' ':') -- export LD_PRELOAD="$new_ld_preload:$NSCDE_ROOT/lib/XOverrideFontCursor.so" -+ export LD_PRELOAD="$new_ld_preload:${PREFIX}/lib/nscde/XOverrideFontCursor.so" - else -- export LD_PRELOAD="$LD_PRELOAD:$NSCDE_ROOT/lib/XOverrideFontCursor.so" -+ export LD_PRELOAD="$LD_PRELOAD:${PREFIX}/lib/nscde/XOverrideFontCursor.so" - fi - fi - else -- echo "Notice: $NSCDE_ROOT/lib/XOverrideFontCursor.so is already ld-preloaded, skipping" >&2 -+ echo "Notice: ${PREFIX}/lib/nscde/XOverrideFontCursor.so is already ld-preloaded, skipping" >&2 - fi - else -- export LD_PRELOAD="$NSCDE_ROOT/lib/XOverrideFontCursor.so" -+ export LD_PRELOAD="${PREFIX}/lib/nscde/XOverrideFontCursor.so" - fi - fi - - # Call the real FvwmScript --exec ${FVWM_MODULEDIR}/FvwmScript "$@" -+exec ${PREFIX}/libexec/fvwm/2.6.9/FvwmScript "$@" -+ - diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_generate__subpanels b/x11-wm/nscde/files/patch-NsCDE_libexec_generate__subpanels deleted file mode 100644 index b9105df4a..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_generate__subpanels +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 deleted file mode 100644 index ceb3d5ecc..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_nscde__setup +++ /dev/null @@ -1,381 +0,0 @@ ---- NsCDE/libexec/nscde_setup.orig 2021-10-08 08:21:08 UTC -+++ NsCDE/libexec/nscde_setup -@@ -7,7 +7,7 @@ - # - - VERBOSE=0 --export TEXTDOMAINDIR="$NSCDE_ROOT/share/locale" -+export TEXTDOMAINDIR="${PREFIX}/share/nscde/locale" - export TEXTDOMAIN="nscde_setup" - export OS=$(uname -s) - -@@ -16,16 +16,6 @@ if [ -z $HOME ]; then - exit 3 - fi - --if [ -z $NSCDE_ROOT ]; then -- gettext -s "Error: NSCDE_ROOT is not set cannot continue." -- exit 4 --fi -- --if [ ! -e "$NSCDE_ROOT" ]; then -- gettext -s "Error: NSCDE_ROOT does not exist. Cannot continue." -- exit 5 --fi -- - if [ -z $FVWM_USERDIR ]; then - gettext -s "Error: FVWM_USERDIR is not set cannot continue." - exit 6 -@@ -61,7 +51,7 @@ function setup_nscde - if (($VERBOSE == 1)); then - gettext -s "Generating NsCDE fvwm Colorset ..." - fi -- $NSCDE_ROOT/libexec/nscde_palette_colorgen.py -p $NSCDE_ROOT/share/palettes/${NSCDE_PALETTE}.dp \ -+ ${PREFIX}/libexec/nscde/nscde_palette_colorgen.py -p ${PREFIX}/share/nscde/palettes/${NSCDE_PALETTE}.dp \ - -n $NSCDE_PALETTE_NCOLORS -f > "$FVWM_USERDIR/NsCDE-Colorset.conf" - else - if (($VERBOSE == 1)); then -@@ -79,8 +69,8 @@ function setup_nscde - # Xdefaults includes - locale_Initializing_default=$(gettext -s "Initializing default") - if [ ! -e "${FVWM_USERDIR}/Xdefaults" ]; then -- $NSCDE_ROOT/libexec/nscde_palette_colorgen.py -p $NSCDE_ROOT/share/palettes/${NSCDE_PALETTE}.dp \ -- -n $NSCDE_PALETTE_NCOLORS -i $NSCDE_ROOT/share/config_templates/Xdefaults -c > "$FVWM_USERDIR/Xdefaults" -+ ${PREFIX}/libexec/nscde/nscde_palette_colorgen.py -p ${PREFIX}/share/nscde/palettes/${NSCDE_PALETTE}.dp \ -+ -n $NSCDE_PALETTE_NCOLORS -i ${PREFIX}/share/nscde/config_templates/Xdefaults -c > "$FVWM_USERDIR/Xdefaults" - else - if (($VERBOSE == 1)); then - echo "${FVWM_USERDIR}/Xdefaults ${already_exists}." -@@ -96,7 +86,7 @@ function setup_nscde - fi - - if [ ! -e "${FVWM_USERDIR}/Xdefaults.fontdefs" ]; then -- cp "${NSCDE_ROOT}/share/config_templates/Xdefaults.fontdefs" "${FVWM_USERDIR}/Xdefaults.fontdefs" -+ cp "${PREFIX}/share/nscde/config_templates/Xdefaults.fontdefs" "${FVWM_USERDIR}/Xdefaults.fontdefs" - else - if (($VERBOSE == 1)); then - echo "${FVWM_USERDIR}/Xdefaults.fontdefs ${already_exists}." -@@ -104,7 +94,7 @@ function setup_nscde - fi - - if [ ! -e "${FVWM_USERDIR}/Xdefaults.mouse" ]; then -- cp "${NSCDE_ROOT}/share/config_templates/Xdefaults.mouse" "${FVWM_USERDIR}/Xdefaults.mouse" -+ cp "${PREFIX}/share/nscde/config_templates/Xdefaults.mouse" "${FVWM_USERDIR}/Xdefaults.mouse" - else - if (($VERBOSE == 1)); then - echo "${FVWM_USERDIR}/Xdefaults.mouse ${already_exists}." -@@ -114,10 +104,10 @@ function setup_nscde - # Xdefaults pieces dir (XAPPLRESDIR) - if [ ! -e "${FVWM_USERDIR}/app-defaults" ]; then - mkdir -p "${FVWM_USERDIR}/app-defaults" -- for appres in $NSCDE_ROOT/share/config_templates/app-defaults/*.tmpl -+ for appres in ${PREFIX}/share/nscde/config_templates/app-defaults/*.tmpl - do - appres="${appres%.tmpl}" -- $NSCDE_ROOT/libexec/nscde_palette_colorgen.py -p $NSCDE_ROOT/share/palettes/${NSCDE_PALETTE}.dp \ -+ ${PREFIX}/libexec/nscde/nscde_palette_colorgen.py -p ${PREFIX}/share/nscde/palettes/${NSCDE_PALETTE}.dp \ - -n $NSCDE_PALETTE_NCOLORS -i ${appres}.tmpl -c > $FVWM_USERDIR/app-defaults/${appres##*/} - done - else -@@ -128,7 +118,7 @@ function setup_nscde - - # Xsettingsd daemon configuration - if [ ! -e "${FVWM_USERDIR}/Xsettingsd.conf" ]; then -- cp "${NSCDE_ROOT}/share/config_templates/Xsettingsd.conf" "${FVWM_USERDIR}/Xsettingsd.conf" -+ cp "${PREFIX}/share/nscde/config_templates/Xsettingsd.conf" "${FVWM_USERDIR}/Xsettingsd.conf" - else - if (($VERBOSE == 1)); then - echo "${FVWM_USERDIR}/Xsettingsd.conf ${already_exists}." -@@ -141,7 +131,7 @@ function setup_nscde - locale_Writing_default_background_pixel=$(gettext -s "Writing default background pixel") - echo "$locale_Writing_default_background_pixel ${FVWM_USERDIR}/.BGdefault ..." - fi -- cp ${NSCDE_ROOT}/share/config_templates/BGdefault "${FVWM_USERDIR}/.BGdefault" -+ cp ${PREFIX}/share/nscde/config_templates/BGdefault "${FVWM_USERDIR}/.BGdefault" - else - if (($VERBOSE == 1)); then - echo "${FVWM_USERDIR}/.BGdefault ${already_exists}." -@@ -153,7 +143,7 @@ function setup_nscde - if (($VERBOSE == 1)); then - echo "$locale_Initializing_default ${FVWM_USERDIR}/NsCDE.conf ..." - fi -- cp ${NSCDE_ROOT}/config/NsCDE.conf ${FVWM_USERDIR}/NsCDE.conf -+ cp ${PREFIX}/etc/nscde/NsCDE.conf ${FVWM_USERDIR}/NsCDE.conf - - if [ "$OS" == "NetBSD" ]; then - echo 'SetEnv XDG_CONFIG_DIRS $[XDG_CONFIG_DIRS]:/usr/pkg/etc/xdg' >> ${FVWM_USERDIR}/NsCDE.conf -@@ -171,7 +161,7 @@ function setup_nscde - if (($VERBOSE == 1)); then - echo "$locale_Initializing_default ${FVWM_USERDIR}/NsCDE-Init.conf ..." - fi -- cp ${NSCDE_ROOT}/config/NsCDE-Init.conf ${FVWM_USERDIR}/NsCDE-Init.conf -+ cp ${PREFIX}/etc/nscde/NsCDE-Init.conf ${FVWM_USERDIR}/NsCDE-Init.conf - else - if (($VERBOSE == 1)); then - echo "${FVWM_USERDIR}/NsCDE-Init.conf ${already_exists}." -@@ -186,7 +176,7 @@ function setup_nscde - if (($VERBOSE == 1)); then - echo "$locale_Initializing_default ${FVWM_USERDIR}/NsCDE-${localcf}.local ..." - fi -- cp ${NSCDE_ROOT}/share/config_templates/NsCDE-${localcf}.local ${FVWM_USERDIR}/NsCDE-${localcf}.local -+ cp ${PREFIX}/share/nscde/config_templates/NsCDE-${localcf}.local ${FVWM_USERDIR}/NsCDE-${localcf}.local - else - if (($VERBOSE == 1)); then - echo "${FVWM_USERDIR}/NsCDE-${localcf}.local ${already_exists}." -@@ -199,7 +189,7 @@ function setup_nscde - if (($VERBOSE == 1)); then - echo "$locale_Initializing_default ${FVWM_USERDIR}/GeoDB.ini ..." - fi -- cp ${NSCDE_ROOT}/share/config_templates/GeoDB.ini ${FVWM_USERDIR}/GeoDB.ini -+ cp ${PREFIX}/share/nscde/config_templates/GeoDB.ini ${FVWM_USERDIR}/GeoDB.ini - else - if (($VERBOSE == 1)); then - echo "${FVWM_USERDIR}/GeoDB.ini ${already_exists}." -@@ -225,7 +215,7 @@ function setup_nscde - if (($VERBOSE == 1)); then - 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 -+ $PEFIX/sbin/confset.py -t ini -c "$HOME/.icons/default/index.theme" -s "Icon Theme" -k Inherits -v dmz-aa - fi - fi - -@@ -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-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 -- $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-icon-theme-name -v '"NsCDE"' -- $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-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 -+ ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-icon-theme-name -v '"NsCDE"' -+ ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-button-images -v 0 -+ ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-menu-images -v 0 -+ ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-cursor-blink -v 0 - fi - fi - -@@ -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." -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-theme-name -v NsCDE -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-cursor-theme-name -v dmz-aa -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-button-images -v 0 -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-menu-images -v 0 -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-application-prefer-dark-theme -v 1 -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-font-name -v "DejaVu Serif Book 10" -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-icon-theme-name -v NsCDE -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-cursor-blink -v 0 -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-theme-name -v NsCDE -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-cursor-theme-name -v dmz-aa -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-button-images -v 0 -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-menu-images -v 0 -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-application-prefer-dark-theme -v 1 -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-font-name -v "DejaVu Serif Book 10" -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-icon-theme-name -v NsCDE -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/gtk-3.0/settings.ini" -s Settings -k gtk-cursor-blink -v 0 - fi - fi - -@@ -285,7 +275,7 @@ function setup_nscde - echo "$locale_generating_default_theme_for_gtk2_gtk3_in $HOME/.themes/NsCDE ..." - fi - mkdir -p "$HOME/.themes" -- $NSCDE_ROOT/libexec/themegen.py $NSCDE_ROOT/share/palettes/${NSCDE_PALETTE}.dp $NSCDE_PALETTE_NCOLORS gtk2 gtk3 -+ ${PREFIX}/libexec/nscde/themegen.py ${PREFIX}/share/nscde/palettes/${NSCDE_PALETTE}.dp $NSCDE_PALETTE_NCOLORS gtk2 gtk3 - else - if (($VERBOSE == 1)); then - echo "${HOME}/.themes/NsCDE ${already_exists}." -@@ -303,7 +293,7 @@ function setup_nscde - if (($VERBOSE == 1)); then - echo -ne "${HOME}/.config/Trolltech.conf ${already_exists}. " - gettext -s "Setting NsCDE style." -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/Trolltech.conf" -s Qt -k style -v GTK+ -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/Trolltech.conf" -s Qt -k style -v GTK+ - fi - fi - -@@ -317,9 +307,9 @@ function setup_nscde - if (($VERBOSE == 1)); then - echo "${HOME}/.config/qt5ct/qt5ct.conf ${already_exists}." - gettext -s "Setting NsCDE style." -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/qt5ct/qt5ct.conf" -s Appearance -k icon_theme -v NsCDE -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/qt5ct/qt5ct.conf" -s Appearance -k standard_dialogs -v gtk2 -- $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.config/qt5ct/qt5ct.conf" -s Appearance -k style -v gtk2 -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/qt5ct/qt5ct.conf" -s Appearance -k icon_theme -v NsCDE -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/qt5ct/qt5ct.conf" -s Appearance -k standard_dialogs -v gtk2 -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.config/qt5ct/qt5ct.conf" -s Appearance -k style -v gtk2 - fi - fi - -@@ -330,7 +320,7 @@ function setup_nscde - echo "$setting_default ${FVWM_USERDIR}/libexec/colormgr.local ..." - fi - mkdir -p "${FVWM_USERDIR}/libexec" -- cp ${NSCDE_ROOT}/share/config_templates/colormgr.local "${FVWM_USERDIR}/libexec/colormgr.local" -+ cp ${PREFIX}/share/nscde/config_templates/colormgr.local "${FVWM_USERDIR}/libexec/colormgr.local" - chmod +x "${FVWM_USERDIR}/libexec/colormgr.local" - else - if (($VERBOSE == 1)); then -@@ -351,7 +341,7 @@ function setup_nscde - fi - if [ "x$ans" == "xy" ]; then - echo "${locale_enabling}: pageshowrootpager --> 1" -- $NSCDE_ROOT/bin/ised -c 's/InfoStoreAdd pageshowrootpager 0/InfoStoreAdd pageshowrootpager 1/g' -f "$FVWM_USERDIR/NsCDE.conf" -+ ${PREFIX}/sbin/ised -c 's/InfoStoreAdd pageshowrootpager 0/InfoStoreAdd pageshowrootpager 1/g' -f "$FVWM_USERDIR/NsCDE.conf" - elif [ "x$ans" == "xn" ]; then - echo "${locale_not_enabling} pageshowrootpager --> 0" - else -@@ -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" -- $NSCDE_ROOT/bin/ised -c 's/InfoStoreAdd nscde_use_xscreensaver 1/InfoStoreAdd nscde_use_xscreensaver 0/g' -f "$FVWM_USERDIR/NsCDE.conf" -+ ${PREFIX}/sbin/ised -c 's/InfoStoreAdd nscde_use_xscreensaver 1/InfoStoreAdd nscde_use_xscreensaver 0/g' -f "$FVWM_USERDIR/NsCDE.conf" - else - gettext -s "Answer not understood." - echo "$locale_enabled_by_default nscde_use_xscreensaver --> 1" -@@ -391,7 +381,7 @@ function setup_nscde - if (($VERBOSE == 1)); then - echo "$setting_default ${FVWM_USERDIR}/Stalonetray.conf ..." - fi -- cp ${NSCDE_ROOT}/share/config_templates/Stalonetray.conf "${FVWM_USERDIR}/Stalonetray.conf" -+ cp ${PREFIX}/share/nscde/config_templates/Stalonetray.conf "${FVWM_USERDIR}/Stalonetray.conf" - else - if (($VERBOSE == 1)); then - locale_already_in_place=$(gettext -s "already in place") -@@ -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" -- $NSCDE_ROOT/bin/ised -c 's/InfoStoreAdd nscde_use_stalonetray 1/InfoStoreAdd nscde_use_stalonetray 0/g' -f "$FVWM_USERDIR/NsCDE.conf" -+ ${PREFIX}/sbin/ised -c 's/InfoStoreAdd nscde_use_stalonetray 1/InfoStoreAdd nscde_use_stalonetray 0/g' -f "$FVWM_USERDIR/NsCDE.conf" - else - gettext -s "Answer not understood." - echo "$locale_enabled_by_default nscde_use_stalonetray --> 1" -@@ -425,7 +415,7 @@ function setup_nscde - fi - if [ "x$ans" == "xy" ]; then - echo "$locale_enabling nscde_use_xsettingsd --> 1" -- $NSCDE_ROOT/bin/ised -c 's/InfoStoreAdd nscde_use_xsettingsd 0/InfoStoreAdd nscde_use_xsettingsd 1/g' -f "$FVWM_USERDIR/NsCDE.conf" -+ ${PREFIX}/sbin/ised -c 's/InfoStoreAdd nscde_use_xsettingsd 0/InfoStoreAdd nscde_use_xsettingsd 1/g' -f "$FVWM_USERDIR/NsCDE.conf" - elif [ "x$ans" == "xn" ]; then - echo "$locale_not_enabling nscde_use_xsettingsd --> 0" - else -@@ -444,8 +434,8 @@ function setup_nscde - fi - if [ "x$ans" == "xy" ]; then - echo "$locale_enabling nscde_use_dunst --> 1" -- cp -f "$NSCDE_ROOT/share/config_templates/Dunst.conf" "$FVWM_USERDIR/Dunst.conf" -- $NSCDE_ROOT/bin/ised -c 's/InfoStoreAdd nscde_use_dunst 0/InfoStoreAdd nscde_use_dunst 1/g' -f "$FVWM_USERDIR/NsCDE.conf" -+ cp -f "${PREFIX}/share/nscde/config_templates/Dunst.conf" "$FVWM_USERDIR/Dunst.conf" -+ ${PREFIX}/sbin/ised -c 's/InfoStoreAdd nscde_use_dunst 0/InfoStoreAdd nscde_use_dunst 1/g' -f "$FVWM_USERDIR/NsCDE.conf" - elif [ "x$ans" == "xn" ]; then - echo "$locale_not_enabling nscde_use_dunst --> 0" - else -@@ -464,7 +454,7 @@ function setup_nscde - fi - if [ "x$ans" == "xy" ]; then - echo "$locale_enabling nscde_use_rofi --> 1" -- $NSCDE_ROOT/bin/ised -c 's/# InfoStoreAdd nscde_use_rofi 1/InfoStoreAdd nscde_use_rofi 1/g' -f "$FVWM_USERDIR/NsCDE.conf" -+ ${PREFIX}/sbin/ised -c 's/# InfoStoreAdd nscde_use_rofi 1/InfoStoreAdd nscde_use_rofi 1/g' -f "$FVWM_USERDIR/NsCDE.conf" - elif [ "x$ans" == "xn" ]; then - echo "$locale_not_enabling nscde_use_rofi --> 0" - else -@@ -481,14 +471,14 @@ function setup_nscde - fi - if [ "x$ans" == "xy" ]; then - echo "$locale_enabling desklastpage --> 1" -- $NSCDE_ROOT/bin/ised -c 's/InfoStoreAdd desklastpage 0/InfoStoreAdd desklastpage 1/g' -f "$FVWM_USERDIR/NsCDE.conf" -+ ${PREFIX}/sbin/ised -c 's/InfoStoreAdd desklastpage 0/InfoStoreAdd desklastpage 1/g' -f "$FVWM_USERDIR/NsCDE.conf" - elif [ "x$ans" == "xn" ]; then - echo "$locale_not_enabling desklastpage --> 0" -- $NSCDE_ROOT/bin/ised -c 's/InfoStoreAdd desklastpage 1/InfoStoreAdd desklastpage 0/g' -f "$FVWM_USERDIR/NsCDE.conf" -+ ${PREFIX}/sbin/ised -c 's/InfoStoreAdd desklastpage 1/InfoStoreAdd desklastpage 0/g' -f "$FVWM_USERDIR/NsCDE.conf" - else - gettext -s "Answer not understood." - echo "$locale_not_enabling desklastpage --> 0" -- $NSCDE_ROOT/bin/ised -c 's/InfoStoreAdd desklastpage 1/InfoStoreAdd desklastpage 0/g' -f "$FVWM_USERDIR/NsCDE.conf" -+ ${PREFIX}/sbin/ised -c 's/InfoStoreAdd desklastpage 1/InfoStoreAdd desklastpage 0/g' -f "$FVWM_USERDIR/NsCDE.conf" - fi - - 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" - - # 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" - - # 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" - - # 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 "" -- $NSCDE_ROOT/bin/nscde_fvwmclnt 'Module FvwmScript ColorMgr $[desk.n] $[NSCDE_PALETTE_NCOLORS]' -+ ${PREFIX}/sbin/nscde_fvwmclnt 'Module FvwmScript ColorMgr $[desk.n] $[NSCDE_PALETTE_NCOLORS]' - gettext -s "Logout and login again for the full changes to take effect." - echo "" - gettext -s "You can set \$[infostore.terminal] variable to your favorite" - echo "$locale_terminal_program_in \$HOME/.NsCDE/NsCDE.conf ${locale_or_leave_autodiscovery}." - echo "" -- echo "$locale_Hint_See $NSCDE_ROOT/share/doc/examples $locale_for_Gkrellm_X_session_and" -+ echo "$locale_Hint_See ${PREFIX}/share/examples/nscde $locale_for_Gkrellm_X_session_and" - gettext -s "other integration options you may want to apply." - sleep 1 - echo "" -@@ -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 -- $NSCDE_ROOT/bin/nscde_fvwmclnt 'EdgeThickness 1' -- $NSCDE_ROOT/bin/nscde_fvwmclnt 'All ("ColorMgr", CirculateHit) AnimatedMove 50-50w 50-50w ewmhiwa' -+ ${PREFIX}/sbin/nscde_fvwmclnt 'EdgeThickness 1' -+ ${PREFIX}/sbin/nscde_fvwmclnt 'All ("ColorMgr", CirculateHit) AnimatedMove 50-50w 50-50w ewmhiwa' - exit 0 - fi - } diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_strip__icon__path b/x11-wm/nscde/files/patch-NsCDE_libexec_strip__icon__path deleted file mode 100644 index e55ac52b4..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_strip__icon__path +++ /dev/null @@ -1,21 +0,0 @@ ---- NsCDE/libexec/strip_icon_path.orig 2021-04-24 03:10:51 UTC -+++ NsCDE/libexec/strip_icon_path -@@ -20,9 +20,6 @@ case $icon in - $FVWM_USERDIR/icons/*) - echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^$sFVWM_USERDIR\/icons\///g" -o -f - - ;; -- $NSCDE_ROOT/share/icons/*) -- echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^$sNSCDE_ROOT\/share\/icons\///g" -o -f - -- ;; - $HOME/.icons/*) - echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^$sHOME\/\.\/icons\///g" -o -f - - ;; -@@ -36,7 +33,7 @@ case $icon in - echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^\/usr\/local\/share\/icons\///g" -o -f - - ;; - $NSCDE_ROOT/share/fallback/icons/*) -- echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^$sNSCDE_ROOT\/fallback\/share\/icons\///g" -o -f - -+ echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^\/usr\/local\/share\/nscde\/fallback\/icons\///g" -o -f - - ;; - esac - diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_style__managers.shlib b/x11-wm/nscde/files/patch-NsCDE_libexec_style__managers.shlib deleted file mode 100644 index 754e3caa4..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_style__managers.shlib +++ /dev/null @@ -1,38 +0,0 @@ ---- NsCDE/libexec/style_managers.shlib.orig 2021-05-02 08:44:06 UTC -+++ NsCDE/libexec/style_managers.shlib -@@ -11,11 +11,6 @@ - # Used in other API functions and in managers - function FindPalettes - { -- if [ -z $NSCDE_ROOT ]; then -- echo "No NSCDE_ROOT defined. Exiting." -- exit 2 -- fi -- - SysPalettes=$(ls -1 ${NSCDE_ROOT}/share/palettes/*.dp | awk -F "/" '{print $NF}' | sed 's/\.dp$//g') - - if [ -d "${FVWM_USERDIR}/palettes" ]; then -@@ -30,11 +25,6 @@ function FindPalettes - # Used in other API functions and in managers - function FindBackdrops - { -- if [ -z $NSCDE_ROOT ]; then -- echo "No NSCDE_ROOT defined. Exiting." -- exit 2 -- fi -- - SysBackdrops=$(ls -1 ${NSCDE_ROOT}/share/backdrops/*.pm | awk -F "/" '{print $NF}' | sed 's/\.pm$//g') - - if [ -d "${FVWM_USERDIR}/backdrops" ]; then -@@ -49,11 +39,6 @@ function FindBackdrops - # Used in other API functions and in managers - function FindPhotos - { -- if [ -z $NSCDE_ROOT ]; then -- echo "No NSCDE_ROOT defined. Exiting." -- exit 2 -- fi -- - SysPhotos=$(ls -1 ${NSCDE_ROOT}/share/photos/*.png | awk -F "/" '{print $NF}' | sed 's/\.png$//g') - - if [ -d "${FVWM_USERDIR}/photos" ]; then diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_subpanel__menuitem__props b/x11-wm/nscde/files/patch-NsCDE_libexec_subpanel__menuitem__props deleted file mode 100644 index 213b4ff3b..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_subpanel__menuitem__props +++ /dev/null @@ -1,21 +0,0 @@ ---- NsCDE/libexec/subpanel_menuitem_props.orig 2021-05-02 08:47:13 UTC -+++ NsCDE/libexec/subpanel_menuitem_props -@@ -401,9 +401,6 @@ function copy_to_main_panel - $FVWM_USERDIR/icons/*) - icon=$(echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^$sFVWM_USERDIR\/icons\///g" -o -f -) - ;; -- $NSCDE_ROOT/share/icons/*) -- icon=$(echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^$sNSCDE_ROOT\/share\/icons\///g" -o -f -) -- ;; - $HOME/.icons/*) - icon=$(echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^$sHOME\/\.\/icons\///g" -o -f -) - ;; -@@ -417,7 +414,7 @@ function copy_to_main_panel - icon=$(echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^\/usr\/local\/share\/icons\///g" -o -f -) - ;; - $NSCDE_ROOT/share/fallback/icons/*) -- icon=$(echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/^$sNSCDE_ROOT\/fallback\/share\/icons\///g" -o -f -) -+ icon=$(echo "$icon" | $NSCDE_ROOT/bin/ised -c "s/\/usr\/local\/share\/nscde\/fallback\/share\/icons\///g" -o -f -) - ;; - esac - diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_themegen.py b/x11-wm/nscde/files/patch-NsCDE_libexec_themegen.py deleted file mode 100644 index c0cf75c5e..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_themegen.py +++ /dev/null @@ -1,45 +0,0 @@ ---- NsCDE/libexec/themegen.py.orig 2021-05-02 13:42:24 UTC -+++ NsCDE/libexec/themegen.py -@@ -10,12 +10,7 @@ import os - import sys - import shutil - --nscde_root = os.environ.get('NSCDE_ROOT') --if not nscde_root: -- sys.stderr.write("NSCDE_ROOT not set. Stop.\n") -- sys.exit(1) --else: -- sys.path.append(nscde_root + "/lib/python") -+sys.path.append("${PREFIX}/lib/nscde/python") - - themegen=""" - For this script to work you need to install the Python 3 -@@ -46,7 +41,7 @@ Usage: - - Arguments: - Palette name or file path -- CDE color palettes, are located in NSCDE_ROOT/share/palettes -+ CDE color palettes, are located in ${PREFIX}/share/nscde/palettes - or in $HOME/.NsCDE/palettes - - Number of colors: 8 or 4 -@@ -93,8 +88,8 @@ nscdetheme = "NsCDE" - - if os.path.exists(userhome + "/.NsCDE/palettes/" + palettefile + ".dp"): - opts.currentpalettefile=(userhome + "/.NsCDE/palettes/" + palettefile + ".dp") --elif os.path.exists(nscde_root + "/share/palettes/" + palettefile + ".dp"): -- opts.currentpalettefile=(nscde_root + "/share/palettes/" + palettefile + ".dp") -+elif os.path.exists("${PREFIX}/share/nscde/palettes/" + palettefile + ".dp"): -+ opts.currentpalettefile=("${PREFIX}/share/nscde/palettes/" + palettefile + ".dp") - elif os.path.exists(palettefile): - opts.currentpalettefile=palettefile - # nscdetheme="NsCDE-" + os.path.basename(nscdetheme.replace(".dp", "")) -@@ -102,7 +97,7 @@ else: - print ('Palette not found: ' + palettefile) - sys.exit() - --Globals.themedir=nscde_root + "/share/config_templates/integration/gtk2_gtk3_qt" -+Globals.themedir="${PREFIX}/share/nscde/config_templates/integration/gtk2_gtk3_qt" - Globals.userthemedir=os.path.join(userhome,'.themes',nscdetheme) - Globals.themesrcdir=Globals.themedir - Globals.palettedir=os.path.join(Globals.themedir,'palettes') 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 deleted file mode 100644 index aa675b985..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_share_config__templates_NsCDE-Functions.local +++ /dev/null @@ -1,19 +0,0 @@ ---- NsCDE/share/config_templates/NsCDE-Functions.local.orig 2021-10-08 08:21:08 UTC -+++ NsCDE/share/config_templates/NsCDE-Functions.local -@@ -69,14 +69,14 @@ - # Hook of the f_SysConfigureWindowEvent called from - # FvwmEvent on configure_window event. See - # FvwmEvent(1) and f_SysConfigureWindowEvent in --# NsCDE config/NsCDE-Functions.conf -+# NsCDE etc/nscde/NsCDE-Functions.conf - # DestroyFunc f_ConfigureWindowEvent - # AddToFunc f_ConfigureWindowEvent - # + I Nop - - # Hook of the f_SysMapEvent called from FvwmEvent on - # map window event. See FvwmEvent(1) and f_SysMapEvent --# in NsCDE config/NsCDE-Functions.conf -+# in NsCDE etc/nscde/NsCDE-Functions.conf - # DestroyFunc f_MapEvent - # AddToFunc f_MapEvent - # + I Nop 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 deleted file mode 100644 index 164fd891c..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_doas.conf +++ /dev/null @@ -1,8 +0,0 @@ ---- 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_lxsession-integration_desktop.conf b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_lxsession-integration_desktop.conf deleted file mode 100644 index cb23cf6a9..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_lxsession-integration_desktop.conf +++ /dev/null @@ -1,11 +0,0 @@ ---- NsCDE/share/doc/examples/lxsession-integration/desktop.conf.orig 2021-05-01 21:42:43 UTC -+++ NsCDE/share/doc/examples/lxsession-integration/desktop.conf -@@ -2,7 +2,7 @@ - # Default program launched at startup - # Windows manager : Simple way to launch window manager (backward compatible). - # Let it empty if you want to use the advanced mode --window_manager=/opt/NsCDE/bin/nscde -i -+window_manager=${PREFIX}/bin/nscde -i - - # Window manager : Advanced mode to launch the window manager (with session, - # usefull for launching openbox with specific arguments (like configuration file) and extras commands) diff --git a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_mate-session-integration_nscde.desktop b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_mate-session-integration_nscde.desktop deleted file mode 100644 index b5613c690..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_mate-session-integration_nscde.desktop +++ /dev/null @@ -1,11 +0,0 @@ ---- NsCDE/share/doc/examples/mate-session-integration/nscde.desktop.orig 2021-05-01 21:43:18 UTC -+++ NsCDE/share/doc/examples/mate-session-integration/nscde.desktop -@@ -1,7 +1,7 @@ - [Desktop Entry] - Comment[en_US]=Not so Common Desktop Environment - Comment=NsCDE --Exec=/opt/NsCDE/bin/nscde -+Exec=${PREFIX}/sbin/nscde - Hidden=true - Name[en_US]=NsCDE - Name=NsCDE 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 deleted file mode 100644 index 1e9f4c00d..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_006__PowerManager +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 @@ - - Runas_Alias TOOR = root - --Cmnd_Alias NSCDE_ACPI = /opt/NsCDE/libexec/nscde-acpi suspend, \ -- /opt/NsCDE/libexec/nscde-acpi hibernate, \ -- /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/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 deleted file mode 100644 index 15e520701..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_README +++ /dev/null @@ -1,6 +0,0 @@ ---- 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-NsCDE_share_doc_examples_xsession-integration_nscde.desktop b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_xsession-integration_nscde.desktop deleted file mode 100644 index 64c512577..000000000 --- a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_xsession-integration_nscde.desktop +++ /dev/null @@ -1,11 +0,0 @@ ---- NsCDE/share/doc/examples/xsession-integration/nscde.desktop.orig 2021-05-01 21:41:34 UTC -+++ NsCDE/share/doc/examples/xsession-integration/nscde.desktop -@@ -2,7 +2,7 @@ - Encoding=UTF-8 - Name=NsCDE - Comment=Not so Common Desktop Environment --Exec=/opt/NsCDE/bin/nscde -+Exec=${PREFIX}/sbin/nscde - Terminal=False - DesktopNames=NsCDE - diff --git a/x11-wm/nscde/files/patch-UPDATE__2x.txt b/x11-wm/nscde/files/patch-UPDATE__2x.txt new file mode 100644 index 000000000..d2bcc3f99 --- /dev/null +++ b/x11-wm/nscde/files/patch-UPDATE__2x.txt @@ -0,0 +1,32 @@ +--- UPDATE_2x.txt.orig 2022-08-14 08:06:44 UTC ++++ UPDATE_2x.txt +@@ -0,0 +1,29 @@ ++NsCDE changed its installation layout when switching between ++versions 1.x and 2.x. ++ ++Point your X start scripts to /usr/local/bin/nscde instead of ++previously /usr/local/sbin/nscde. ++ ++For backward compatibility of your local 1.x configuration ++files, it is recommended to create a symbolic link from the ++old nscde shared folder to the new one: ++ ++ln -s ${PREFIX}/share/NsCDE ${PREFIX}/share/nscde ++ ++${PREFIX} usually is "/usr/local" unless you intentionally ++modified it for your system. ++ ++Also, default key bindings were changed. To restore original 1.x ++key bindings, add the following configuration to your ++~/.NsCDE/Keybindings.fvwmlocal file: ++ ++ # restore nscde 1.4 key bindings ++ Silent Key F4 A 1 Resize ++ Silent Key F5 A 1 Move ++ Silent Key F6 A 1 RaiseLower ++ ++Last but not least, it's recommended to check whether any old 1.x ++installation files remain after upgrading to 2.x because it may ++cause unexpected behavior. Remove any instance of ++/usr/local/lib/nscde for example. ++ diff --git a/x11-wm/nscde/files/patch-docbook_NsCDE.xml b/x11-wm/nscde/files/patch-docbook_NsCDE.xml deleted file mode 100644 index d3f0371ff..000000000 --- a/x11-wm/nscde/files/patch-docbook_NsCDE.xml +++ /dev/null @@ -1,1141 +0,0 @@ ---- docbook/NsCDE.xml.orig 2021-10-08 08:21:08 UTC -+++ docbook/NsCDE.xml -@@ -144,15 +144,13 @@ decade from the mainstream desktop players. - - - --NsCDE is by default rooted in /opt/NsCDE ($NSCDE_ROOT), --but it can be relocated with only one variable changed in main --wrapper bin/nscde and NsCDE-Main.conf. -+NsCDE is by default rooted in ${PREFIX}/libexec/nscde. - - - - It is not using your existing $HOME/.fvwm - but sets $FVWM_USERDIR to $HOME/.NsCDE, --and uses /opt/NsCDE/config as a sources of configuration. -+and uses ${PREFIX}/etc/nscde as a sources of configuration. - - - -@@ -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 $FVWM_USERDIR/NsCDE-Functions.conf, then --$NSCDE_ROOT/config/NsCDE-Functions.conf is read as default. Additionally, if -+${PREFIX}/etc/nscde/NsCDE-Functions.conf is read as default. Additionally, if - $FVWM_USERDIR/NsCDE-Functions.local 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 +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 $FVWM_USERDIR/NsCDE-Style.local "early" - configuration in $FVWM_USERDIR/NsCDE-Style.override will be read from --$NSCDE_ROOT/config/NsCDE-Style.conf just after applying general core -+${PREFIX}/etc/nscde/NsCDE-Style.conf just after applying general core - style for all applications (*) but before reading custom application - styles and prior to reading $FVWM_USERDIR/NsCDE-Style.local. - This mechanism is intended for changing and overriding core style options which are not - customizable by the Window Style Manager. Putting core Style options --after NsCDE applications in the $NSCDE_ROOT/NsCDE-Style.conf are processed -+after NsCDE applications in the ${PREFIX}/etc/nscde/NsCDE-Style.conf are processed - can nullify overrides for that particular applications, this is why this mechanism is provided. - This file is not created in $FVWM_USERDIR by setup procedure or Style - Managers, but it will be read if created manually. -@@ -301,7 +299,7 @@ differences are: - instead of static icons, because this cannot be done with gui menu actions. See - FrontPanel.actions for examples. - The other way (full control) is by copying FrontPanel.actions -- configuration file from $NSCDE_ROOT/config -+ configuration file from ${PREFIX}/etc/nscde - to $FVWM_USERDIR. - - -@@ -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 $FVWM_USERDIR/FrontPanel.actions and load default from -- the $NSCDE_ROOT/config/FrontPanel.actions., c) "Reset Subpanel" -+ the ${PREFIX}/etc/nscde/FrontPanel.actions., c) "Reset Subpanel" - will reset upper subpanel to it's default value (remove definition of the numbered - subpanel from the $FVWM_USERDIR/Subpanels.actions), - d) "Delete Subpanel" will disable subpanel for above this icon (without resetting -@@ -605,13 +603,13 @@ necessary, and to enable or disable that particular Su - On the first change with Install Icon or Subpanel Settings, - non-FVWM configuration file Subpanels.actions will be created in the - $FVWM_USERDIR, from where all subpanels changed from default will be read --by the $NSCDE_ROOT/libexec/generate_subpanels, while the rest will be --generated from the $NSCDE_ROOT/config/Subpanels.actions. This file can also -+by the ${PREFIX}/libexec/nscde/generate_subpanels, while the rest will be -+generated from the ${PREFIX}/etc/nscde/Subpanels.actions. This file can also - be edited by hand (ok, not by hand, but editor will suffice) and the result may be applied by - calling generate_subpanels and then f_ReadCfg Subpanels. - Generated file is called NsCDE-Subpanels.conf and it is expected in the - $FVWM_USERDIR. If not found there, --$NSCDE_ROOT/config/NsCDE-Subpanels.conf will be read instead. -+${PREFIX}/etc/nscde/NsCDE-Subpanels.conf will be read instead. - Syntax of the Subpanels.actions is explained in the - Configuration files explained section. - -@@ -687,7 +685,7 @@ same function. - then in 2 or 4 desks/buttons - 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. -- WSM.conf (system wide: $NSCDE_ROOT/config/WSM.conf) is -+ WSM.conf (system wide: ${PREFIX}/nscde/WSM.conf) is - a separate configuration - file read by WSM, WsPgMgr and such. Not a FVWM configuration file. - -@@ -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 --$NSCDE_ROOT/share/icons/CDE or even -+${PREFIX}/share/icons/CDE or even - replaced with a Solaris version with picture of the globe with red hands for - hours and minutes and white for seconds. If clicked, it will try to execute - firefox by default (which appears doesn't work if FVWM is started under some - desktop environment like MATE). --Pclock C source is provided for user's convenience if it --needs to be recompiled on another system or architecture. Source is in --$NSCDE_ROOT/src/pclock-0.13.1. - With NsCDE binary for Linux is provided by --default in $NSCDE_ROOT/bin. -+default in ${PREFIX}/bin. - - - -@@ -834,7 +829,7 @@ what is going on if FpLite is all red. - If clicked, it will call a function f_FpLiteClickAction which is by default - set to safe defaults ([default terminal app] -e top). - FpLite FvwmScript app uses little portable python script getla1.py from the --$NSCDE_ROOT/libexec to obtain 1-minute load data. -+${PREFIX}/libexec/nscde to obtain 1-minute load data. - - - Key F1 will bring this help text in browser. -@@ -942,7 +937,7 @@ Key Bindings: - - 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 --$NSCDE_ROOT/share/backdrops and -+${PREFIX}/share/nscde/backdrops and - $FVWM_USERDIR/backdrops (if any). From XPM - backdrop templates with symbol names (with .pm extension) it will generate - previews in user's $FVWM_USERDIR/tmp and if -@@ -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 -- $NSCDE_ROOT/share/photos and from the -+ ${PREFIX}/share/nscde/photos and from the - $FVWM_USERDIR/photos (if any). Option to - use one photo for all workspaces exists too. In this mode, backdrop-specific options - will be hidden until Use photo or picture is not deselected. -@@ -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 --$NSCDE_ROOT/share/palettes and -+${PREFIX}/share/nscde/palettes and - $FVWM_USERDIR/palettes. 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 -@@ -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 Grab Color button if a small binary "colorpicker" is --functional and properly installed in $NSCDE_ROOT/bin. -+functional and properly installed in ${PREFIX}/bin. - If action is not Cancel but OK, 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 -@@ -1319,10 +1314,10 @@ Monospaced Bold Large - - - This fonts are defined as FVWM infostore variables in the file --$NSCDE_ROOT/config/NsCDE-Font-$NSCDE_FONT_DPI.conf and/or in the file -+${PREFIX}/etc/nscde/NsCDE-Font-$NSCDE_FONT_DPI.conf and/or in the file - $FVWM_USERDIR/NsCDE-Font-$NCDE_FONT_DPI.conf. User's - $FVWM_USERDIR/NsCDE-Font-$NSCDE_FONT_DPI.conf is a symlink to either --$NSCDE_ROOT/share/fontsets/SomeName.fontset or to -+${PREFIX}/share/nscde/fontsets/SomeName.fontset or to - $FVWM_USERDIR/fontsets/SomeName.fontset. - Further, they are defined as CPP macros in - $FVWM_USERDIR/Xdefaults.fontdefs which is included in -@@ -1336,7 +1331,7 @@ if some of this widget integrations is not desirable b - - 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. --Fontsets are stored in $NSCDE_ROOT/share/fontsets and in -+Fontsets are stored in ${PREFIX}/share/nscde/fontsets and in - $FVWM_USERDIR/fontsets. 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 Use Predefined Font Set mode -@@ -1384,7 +1379,7 @@ to manual font selection for customizations into the n - - - Button Default loads default --$NSCDE_ROOT/share/fontsets/DejaVuSerif.fontset which can -+${PREFIX}/share/nscde/fontsets/DejaVuSerif.fontset which can - 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. - -@@ -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 - $FVWM_USERDIR/GeoDB.ini. This ini-style file is managed by this application, as --well as from the background runner $NSCDE_ROOT/bin/confset.py and read by the --$NSCDE_ROOT/bin/confget.py. Application automatically fills X11 Class and X11 -+well as from the background runner ${PREFIX}/sbin/confset.py and read by the -+${PREFIX}/sbin/confget.py. Application automatically fills X11 Class and X11 - 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 Clear all geometry values, as well as those which may be -@@ -1976,7 +1971,7 @@ button does this and also quits Subpanel Manager. - - Subpanels configuration file Subpanels.actions, can be edited by - hand in $FVWM_USERDIR if something needs to be changed on existing --entries. If editing by hand, $NSCDE_ROOT/libexec/generate_subpanels -+entries. If editing by hand, ${PREFIX}/libexec/nscde/generate_subpanels - must be used to generate FVWM configuration output which must be redirected into - $FVWM_USERDIR/NsCDE-Subpanels.conf. - -@@ -2046,10 +2041,10 @@ and hibernation of the system. Of course, reb - sudo(8) 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 --$NSCDE_ROOT/libexec/nscde-acpi wrapper, Linux with pm-utils, Linux without -+${PREFIX}/libexec/nscde/nscde-acpi wrapper, Linux with pm-utils, Linux without - pm-utils but with systemd(1) and FreeBSD with acpiconf(8) are supported in this moment. - --In $NSCDE_ROOT/share/doc/examples/sudo, one can find example -+In ${PREFIX}/share/examples/nscde/sudo, one can find example - which can be put in /etc/sudoers.d with little changes. - Confirm button applies, Dismiss cancels and - closes the dialog. -@@ -2678,7 +2673,7 @@ same line is set. - - - Default backdrops are set from the --$NSCDE_ROOT/share/defaults/backer until -+${PREFIX}/share/nscde/defaults/backer until - user does not redefine/set his own with - Backdrop Style Manager. Default - palette is Broica in 8 colors variant. -@@ -2693,9 +2688,9 @@ This file is read by FvwmBacker(1) FVWM module. It is - first change with Backdrop Style Manager. - - --Until then, file $NSCDE_ROOT/config/NsCDE-Backdrops.conf is read, which -+Until then, file ${PREFIX}/etc/nscde/NsCDE-Backdrops.conf is read, which - itself reads pre-generated and pre-defined backdrops from the --$NSCDE_ROOT/share/defaults/backer directory. -+${PREFIX}/share/nscde/defaults/backer directory. - - - We can conclude that backdrops are source form or template file, and when processed -@@ -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 ${PREFIX}/etc/nscde, while user local hooks or - user complete overrides are in $FVWM_USERDIR. - - -@@ -2821,11 +2816,11 @@ slightly different options: - - - --This file exists as the $NSCDE_ROOT/config/AppMenus.conf, but it can be -+This file exists as the ${PREFIX}/etc/nscde/AppMenus.conf, but it can be - extended by creating and writing $FVWM_USERDIR/AppMenus.conf file. - - -@@ -3426,7 +3421,7 @@ after losing mouse focus to free up space on the scree - - - -- XF86AudioLowerVolume and XF86AudioRaiseVolume 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 $NSCDE_ROOT/config/NsCDE-Keybindings.conf for f_Mixer options and interaction. -+ XF86AudioLowerVolume and XF86AudioRaiseVolume 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 ${PREFIX}/nscde/NsCDE-Keybindings.conf for f_Mixer options and interaction. - - - -@@ -3444,7 +3439,7 @@ Pressend second time just once, it will dismiss Local - Occupy Workspace dialog for window moving between the desks. - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3454,7 +3449,7 @@ Pressend second time just once, it will dismiss Local - Occupy Page dialog for window moving between the desks. - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3465,7 +3460,7 @@ Pressend second time just once, it will dismiss Local - only when multiple monitors are detected by NsCDE and FVWM. - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3473,7 +3468,7 @@ Pressend second time just once, it will dismiss Local - Alt+F1 regenerates and refreshes the window - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3481,7 +3476,7 @@ Pressend second time just once, it will dismiss Local - Meta+F1 Calls xrefresh(1) command to refresh the X11 display - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3489,7 +3484,7 @@ Pressend second time just once, it will dismiss Local - Alt+F2 iconifies (deiconifies if in icon context) - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3497,7 +3492,7 @@ Pressend second time just once, it will dismiss Local - Meta+F2 "shades" or rolls up the window to titlebar only view - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3508,7 +3503,7 @@ Pressend second time just once, it will dismiss Local - window with FVWM PlaceAgain command - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3517,7 +3512,7 @@ Pressend second time just once, it will dismiss Local - mouse pointer currently resides, together with frame - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3526,7 +3521,7 @@ Pressend second time just once, it will dismiss Local - and enter - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3535,7 +3530,7 @@ Pressend second time just once, it will dismiss Local - directions and place it again on page - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3544,7 +3539,7 @@ directions and place it again on page - directions and place it again on page - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3553,7 +3548,7 @@ directions and place it again on page - and enter - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3564,7 +3559,7 @@ directions and place it again on page - Meta+Shift+F5 combinations will put window back from sticky state - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3574,7 +3569,7 @@ directions and place it again on page - Pressing again the same combination toggles this state back - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3584,7 +3579,7 @@ directions and place it again on page - Pressing again the same combination toggles this state back - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3592,7 +3587,7 @@ directions and place it again on page - Alt+F6 raises or lowers the window - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3604,7 +3599,7 @@ directions and place it again on page - grow and maximized states. This is a cyclic keybinding in a "shrink" direction. - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3622,7 +3617,7 @@ directions and place it again on page - stretched and maximized state. This is a cyclic keybinding in a "grow" direction. - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3637,7 +3632,7 @@ directions and place it again on page - Alt+F9 is empty - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3651,7 +3646,7 @@ directions and place it again on page - Alt+F10 deletes a window (see fvwm(1)) - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3659,7 +3654,7 @@ directions and place it again on page - Meta+F10 closes a window - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3667,7 +3662,7 @@ directions and place it again on page - Meta+Alt+F10 forcefully destroys a window - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3675,7 +3670,7 @@ directions and place it again on page - Alt+F11 is empty - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3683,7 +3678,7 @@ directions and place it again on page - Meta+F11 is empty - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3692,7 +3687,7 @@ directions and place it again on page - variable in the $FVWM_USERDIR/NsCDE.conf - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3700,7 +3695,7 @@ directions and place it again on page - Meta+F12 invokes default terminal app ($[infostore.terminal]) - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3709,7 +3704,7 @@ directions and place it again on page - information for a current window in the GeoDB.ini - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3729,7 +3724,7 @@ directions and place it again on page - $HOME if XDG_PICTURES_DIR is not defined. - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3739,7 +3734,7 @@ directions and place it again on page - $HOME if XDG_PICTURES_DIR is not defined. - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3748,7 +3743,7 @@ directions and place it again on page - Screenshots in PNG format are saved into clipboard for pasting into compatible X11 applications. - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3757,7 +3752,7 @@ directions and place it again on page - Screenshots in PNG format are saved into clipboard for pasting into compatible X11 applications. - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3768,7 +3763,7 @@ directions and place it again on page - button on the borders of the frame has the same effect - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3780,7 +3775,7 @@ directions and place it again on page - itself. - - -- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions -+ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions - for automatic description on menus. - - -@@ -3813,7 +3808,7 @@ Front Panel or Subpanels documentation. - - This file is not FVWM configuration file. It is written - Subpanel Settings, or --manually with editor, and read by the $NSCDE_ROOT/libexec/keymenu -+manually with editor, and read by the ${PREFIX}/libexec/nscde/keymenu - command which will generate infostore variables with descriptive keyboard shortcut names which - are used in NsCDE menus from NsCDE-Menus.conf and - NsCDE-Functions.conf, and additionaly, use the whole line after the keyword -@@ -3836,7 +3831,7 @@ on menus. For example, "F3 A M" configuration for FVWM - description right of the (De)Shade item on titlebar left button popdown menu. - - --File Keymenu.actions is processed by $NSCDE_ROOT/libexec/keymenu script. -+File Keymenu.actions is processed by ${PREFIX}/libexec/nscde/keymenu script. - This script generates FVWM infostore variables used in menus, and executes FVWM "Key" commands - producing dynamic keybindings which are described in menus. - -@@ -4225,7 +4220,7 @@ differ from NsCDE, since FVWM has much more options an - huge number of tastes. '*' options are partially overridden or - extended in NsCDE.conf which can be generated with - Window Style Manager --or simply copied from $NSCDE_ROOT/config -+or simply copied from ${PREFIX}/etc/nscde - to $FVWM_USERDIR and edited to suit. - - -@@ -4253,7 +4248,7 @@ This styles can be extended and/or overridden by the u - $FVWM_USERDIR/NsCDE-Style.local, and core style - for all windows (*) can be overriden by creating - $FVWM_USERDIR/NsCDE-Style.override which extends or --changes directives for core style from $NSCDE_ROOT/NsCDE-Style.conf -+changes directives for core style from ${PREFIX}/etc/nscde/NsCDE-Style.conf - prior to applying particular application styles and prior to reading - $FVWM_USERDIR/NsCDE-Style.local. - -@@ -4273,7 +4268,7 @@ with a huge set of commands. - This file is not FVWM configuration file. It is written by the - Subpanels Manager, - Subpanel Settings, or --manually with editor, and read by the $NSCDE_ROOT/libexec/generate_subpanels -+manually with editor, and read by the ${PREFIX}/libexec/nscde/generate_subpanels - command which will generate - NsCDE-Subpanels.conf file in user's - $FVWM_USERDIR. -@@ -4319,14 +4314,14 @@ the field values. This values are: - - NsCDE-Subpanels.conf - --This file is generated by the $NSCDE_ROOT/libexec/generate_subpanels. -+This file is generated by the ${PREFIX}/libexec/nscde/generate_subpanels. - It is static in system directory, but changable and easly generated in the $FVWM_USERDIR - It contains FvwmButtons(8) definitions of all 10 possible subpanels which can be popped up from the - Front Panel. There are 3 ways to regenerate this file: - Subpanels Manager tool called from - the Install Icon, Subpanel Settings tool - called from the titlebar popdown menu on every subpanel as Subpanel Settings or --manually by calling $NSCDE_ROOT/libexec/generate_subpanels which will -+manually by calling ${PREFIX}/libexec/nscde/generate_subpanels which will - read user's or system Subpanels.actions for - every subpanel and if it is defined in user's one, take this one while generating NsCDE-Subpanels.conf. - In system default, subpanels 2, 5 and 6 are disabled by default, but can be activated with a very quick -@@ -4352,25 +4347,20 @@ or $FVWM_USERDIR. - - System Tree Layout - --Everything from NsCDE is for now located as one compact place for easier --portability between Linux and Unix systems in --/opt/NsCDE. Only symlink --to main starting wrapper /opt/NsCDE/bin/nscde is feasible to be put into --/usr/bin or /usr/local/bin, --since /opt/NsCDE/bin doesn't really need tobe put in --user's $PATH. -+FreeBSD's port of NsCDE places all application files into appropriate directories -+within -+${PREFIX}. - - --This are subdirectories of /opt/NsCDE with short -+This are subdirectories of NsCDE with short - description what is what, and what is where: - - - - --/opt/NsCDE -+${PREFIX}/usr/lib/nscde - --main top directory of NsCDE installation all further --descriptions will be written as relative to this directory -+main top directory of NsCDE installation - - - -@@ -4378,14 +4368,14 @@ descriptions will be written as relative to this direc - - - nscde start wrapper called from .xsession or integrated as .desktop -- file in /usr/share/xsession is located here, -+ file in ${PREFIX}/share/xsession is located here, - as well as some helper - scripts of the NsCDE which are suitable for general use. Front Panel - pclock is also here. Pclock is the only binary part of the NsCDE - - - -- config -+ ${PREFIX}/etc/nscde - - - Configuration directory. All .conf files described in documentation -@@ -4394,7 +4384,7 @@ descriptions will be written as relative to this direc - - - -- lib/progbits -+ ${PREFIX}/lib/nscde/progbits - - - Template X pixmap files used by Color Style Manager for producing -@@ -4406,7 +4396,7 @@ descriptions will be written as relative to this direc - - - -- lib/python -+ ${PREFIX}/lib/nscde/python - - - Python libraries used by themegen.py: part of the integration suite -@@ -4414,7 +4404,7 @@ descriptions will be written as relative to this direc - - - -- libexec -+ ${PREFIX}/libexec/nscde - - - The rest of the scripts (korn shell and python) are located here. In -@@ -4424,7 +4414,7 @@ descriptions will be written as relative to this direc - - - -- share/backdrops -+ ${PREFIX}/share/nscde/backdrops - - - Backdrop files. CDE and new, additional. Source for generation of active -@@ -4436,7 +4426,7 @@ descriptions will be written as relative to this direc - - - -- share/cursors -+ ${PREFIX}/share/nscde/cursors - - - Custom cursors which are missing on plain X server installations but -@@ -4444,7 +4434,7 @@ descriptions will be written as relative to this direc - - - -- share/defaults/backer -+ ${PREFIX}/share/nscde/defaults/backer - - - Default generated backdrops for first start (Broica, 8 colors) -@@ -4452,21 +4442,21 @@ descriptions will be written as relative to this direc - - - -- share/defaults/pages -+ ${PREFIX}/share/nscde/defaults/pages - - - Default page names for every possible combination supported by NsCDE - - - -- share/doc -+ ${PREFIX}/share/doc/nscde - - - Documentation - - - -- share/doc/examples -+ ${PREFIX}/share/examples/nscde - - - Examples for X display manager and DE integrations, sudo for shutdown -@@ -4475,21 +4465,21 @@ Examples for X display manager and DE integrations, - - -- share/fontsets -+ ${PREFIX}/share/nscde/fontsets - - - Default font sets used by the Font Style Manager - - - -- share/icons/CDE -+ ${PREFIX}/share/icons/CDE - - - Original CDE icons - - - -- share/icons/NsCDE -+ ${PREFIX}/share/icons/NsCDE - - - Custom NsCDE icons of which many are part of FvwmScript programs and -@@ -4497,7 +4487,7 @@ Examples for X display manager and DE integrations, - - -- share/palettes -+ ${PREFIX}/share/nscde/palettes - - - CDE palettes plus a bunch of new custom palettes. Used by Color -@@ -4508,7 +4498,7 @@ Examples for X display manager and DE integrations, - - -- share/photos -+ ${PREFIX}/share/nscde/photos - - - A couple of nice free photos collected and resized for various -@@ -4519,7 +4509,7 @@ Examples for X display manager and DE integrations, - - -- share/config_templates/app-defaults -+ ${PREFIX}/share/nscde/config_templates/app-defaults - - - X resources for a particular X applications (like XTerm) which -@@ -4529,7 +4519,7 @@ Examples for X display manager and DE integrations, - - -- share/config_templates/integration/gtk2_gtk3_qt -+ ${PREFIX}/share/nscde/config_templates/integration/gtk2_gtk3_qt - - - Part of the CDE theme which are used by libexec/themegen.py and -@@ -4549,24 +4539,6 @@ Examples for X display manager and DE integrations, $FVWM_USERDIR. - - -- -- src -- -- -- Here is the patch for fvwm 2.6.7 and 2.6.8 which adds additional -- small features to fvwm, so we can achieve even more similarity -- between NsCDE and CDE. See for the details. -- -- -- -- src/pclock-0.13.1 -- -- -- Latest version of pclock. Provided as C source (plus FreeBSD 12 -- binary) for non-Linux systems and Linux distributions where default -- binary cannot work (no matter how small and modest dependencies it has) -- -- - - - -@@ -4637,7 +4609,7 @@ it will not be touched and can co-exist with NsCDE in - NsCDE custom icons. Put here by Color Style Manager and the rest - of the tools. Since icons from here are referenced with a relative - path, whatever is missing here, will be loaded from system's -- $NSCDE_ROOT/share/icons/NsCDE automatically. -+ ${PREFIX}/share/icons/NsCDE automatically. - - - -@@ -4670,7 +4642,7 @@ it will not be touched and can co-exist with NsCDE in - - - NsCDE-XYZ.conf files: -- Absolute overrides of $NSCDE_ROOT/config/NsCDE-XYZ.conf files. -+ Absolute overrides of ${PREFIX}/etc/nscde/NsCDE-XYZ.conf files. - If in existence, they will be read instead of system defaults. - XYZ is here placeholder/example for Style, Functions, Keybindings, - Init, Menus etc ... -@@ -4678,7 +4650,7 @@ it will not be touched and can co-exist with NsCDE in - - - NsCDE-XYZ.local files: -- Extensions, added values of $NSCDE_ROOT/config/NsCDE-XYZ.conf files. -+ Extensions, added values of ${PREFIX}/etc/nscde/NsCDE-XYZ.conf files. - If in existence, they will be read in right after their .conf main - configurations from system (or local) directory. This is preferred - way to extend functionality or override something not big enough -@@ -4689,14 +4661,14 @@ it will not be touched and can co-exist with NsCDE in - - - NsCDE-Style.override file: -- If created, it will be read by the $NSCDE_ROOT/NsCDE-Style.conf. -+ If created, it will be read by the ${PREFIX}/etc/nscde/NsCDE-Style.conf. - Here, core style for all windows (*) can be overriden prior to reading particular - NsCDE application style overrides and addons, and prior to reading - $FVWM_USERDIR/NsCDE-Style.local. Here, advanced users can override - or extend core styles which are not customizable by the Window Style Manager. See fvwm(1) for - a huge list of Style options. - Putting core Style options after NsCDE applications in the -- $NSCDE_ROOT/NsCDE-Style.conf are processed can nullify overrides -+ ${PREFIX}/etc/nscde/NsCDE-Style.conf are processed can nullify overrides - for that particular applications, this is why this mechanism is provided. - This file is not created in $FVWM_USERDIR by setup procedure or Style - Managers, but if created (manually) it will be read and processed. -@@ -4716,7 +4688,7 @@ it will not be touched and can co-exist with NsCDE in - - WSM.conf: read/written by Workspace and Page Manager, WSM and - user's favorite editor. Not an FVWM config file. System default -- of this file is $NSCDE_ROOT/config/WSM.conf. -+ of this file is ${PREFIX}/etc/nscde/WSM.conf. - - - -@@ -4954,23 +4926,10 @@ one can use "-f" mode of installation instead "-w". - - - --Both of the examples above will install NsCDE into /opt/NsCDE. However, it is --possible to install to some other place. For example, this will install NsCDE --in /data/programs/nscde: -+Both of the examples above will install NsCDE into ${PREFIX}. - - -- -- -- -- - --For interactive mode of installation "-n" must be ommited. An asking wizard type --of installation will appear. -- -- -- - For a latest master tree from development page on Github, NsCDE can be fetched with - git(1) and upgraded with fetching changes in the master or some other branch. An example - of this would be: -@@ -5007,19 +4966,19 @@ Installer.ksh without arguments for a full set of opti - NsCDE Startup - - Session can be started from the $HOME/.xsession in last command line --as exec /opt/NsCDE/bin/nscde or -+as exec ${PREFIX}/sbin/nscde or - ssh-agent nscde or with gpg-agent, - lxsession or whatever. - - - If supported by the X Display Manager which is in use on the target system, an xsession --file /opt/NsCDE/share/doc/examples/xsession-integration/nscde.desktop -+file ${PREFIX}/share/examples/nscde/xsession-integration/nscde.desktop - will be put by Installer.ksh during the installation into - /usr/share/xsessions - (or in whatever place your system and your X Display Manager reads this files) - and afterwards NsCDE can be selected from the display manager's menu or similar - session selector. See the rest of the X Session Manager integration examples in the --directory /opt/NsCDE/share/doc/examples/ -+directory ${PREFIX}/share/examples/nscde/ - for MATE, KDE, LXDE and similar DE integrations and play with this if you like. - - -@@ -5028,15 +4987,15 @@ for MATE, KDE, LXDE and similar DE integrations and pl - NsCDE Localization - - NsCDE implements localization capabilities provided by FVWM and system C library. --Directive LocalePath in $NSCDE_ROOT/config/NsCDE-Main.conf --is set to look at $[NSCDE_ROOT]/share/locale;NsCDE:$[NSCDE_ROOT]/share/locale;NsCDE-Subpanels:+. -+Directive LocalePath in ${PREFIX}/etc/nscde/NsCDE-Main.conf -+is set to look at ${PREFIX}/share/locale;NsCDE:${PREFIX}/share/locale;NsCDE-Subpanels:+. - In other words, whole NsCDE reads it's localization from "mo" files from --$[NSCDE_ROOT]/share/locale/$LANG/LC_MESSAGES/NsCDE.mo except subpanels -+${PREFIX}/share/locale/$LANG/LC_MESSAGES/NsCDE.mo except subpanels - which have their localization in separate mo files in the same directory. - - - All FvwmScript based applications are reading their own "mo" file from --$[NSCDE_ROOT]/share/locale/$LANG/LC_MESSAGES/NsCDE.mo -+${PREFIX}/share/locale/$LANG/LC_MESSAGES/NsCDE.mo - which is defined in every program's header with UseGettext directive. - - -@@ -5077,7 +5036,7 @@ on the system and found, they will be run too. Stalone - Style Manager and Font Style Manager when theme or font is changed. - - --Initial setup is a simple script ($NSCDE_ROOT/libexec/nscde_setup) from -+Initial setup is a simple script (${PREFIX}/libexec/nscde/nscde_setup) from - the terminal which will run automatically and will set up the following: - - -@@ -5208,7 +5167,7 @@ When both windows are on the screen, this menu entries - - NsCDE is using it's own copies of Xdefaults and includes files for X - resources integration in $FVWM_USERDIR. X resources are filled with --this from $NSCDE_ROOT/bin/nscde main wrapper during startup as the -+this from ${PREFIX}/sbin/nscde main wrapper during startup as the - part of session assembling. Variable XAPPLRESDIR is also adjusted - to $FVWM_USERDIR/app-defaults. - There can be problems while using certain X session managers or DE which are -@@ -5226,7 +5185,7 @@ even better, $FVWM_USERDIR - and reworked for Color Style Manager integration, - because if find in that directory, - and with .tmpl extension, it will be processed in the same way --as system files from $NSCDE_ROOT/share/config_templates/app-defaults/ -+as system files from ${PREFIX}/share/nscde/config_templates/app-defaults/ - and put in $FVWM_USERDIR/app-defaults. - - -@@ -5240,12 +5199,12 @@ X resources integration is turned on by default in - - Gtk2, Gtk3, Qt4 and Qt5 - --$NSCDE_ROOT/libexec/themegen.py with --$NSCDE_ROOT/lib/python and with --$NSCDE_ROOT/share/config_templates/integration/gtk2_gtk3_qt -+${PREFIX}/libexec/nscde/themegen.py with -+${PREFIX}/libexec/nscde/lib/python and with -+${PREFIX}/share/nscde/config_templates/integration/gtk2_gtk3_qt - are parts of the optional Gtk2, Gtk3, Qt4 and Qt5 integration suite. When run from the - Color Style Manager or manually with the --$NSCDE_ROOT/libexec/themegen.py, -+${PREFIX}/libexec/nscde/themegen.py, - with proper options, this will produce $HOME/.themes/NsCDE - directory with either or both Gtk2 and Gtk3 themes. $HOME/.gtkrc-2.0 and - $HOME/.config/gtk-3.0/settings.ini will be edited to point to this -@@ -5275,7 +5234,7 @@ to generate colorsets also for either or both Firefox - - For this to work, - appropriate code or the whole colormgr.local from --$NSCDE_ROOT/share/config_templates/colormgr.local must be adapted into -+${PREFIX}/share/nscde/config_templates/colormgr.local must be adapted into - $FVWM_USERDIR/libexec/colormgr.local. Shell variable - FIREFOX_CHROMEDIR should contain path to the - ~/.mozilla/firefox/__PROFILE__/chrome., -@@ -5286,8 +5245,8 @@ point to chrome directory of user's thunderbird profil - directory does not exist, it will be created by the colormgr.local. This will make - appropriate entiries in userChrome.css and userContent.css to - import nscdeChrome.css, nscdeIcons.css and --nscdeContent.css from the $NSCDE_ROOT/share/config_templates/integration/firefox --and/or from $NSCDE_ROOT/share/config_templates/integration/thunderbird. -+nscdeContent.css from the ${PREFIX}/share/nscde/config_templates/integration/firefox -+and/or from ${PREFIX}/share/nscde/config_templates/integration/thunderbird. - File nscdeColordefs.css will be generated in the chrome dir with color mappings to the - current NsCDE theme. This wile is also imported in userChrome.css and userContent.css. - -@@ -5317,12 +5276,12 @@ makes a changes: - - $ cat /home/user/.thunderbird/Profile_1/chrome/userContent.css - @import url("nscdeColordefs.css"); --@import url("/opt/NsCDE/share/config_templates/integration/thunderbird/nscdeContent.css"); -+@import url("${PREFIX}/share/nscde/config_templates/integration/thunderbird/nscdeContent.css"); - - $ cat /home/user/.thunderbird/Profile_1/chrome/userChrome.css - @import url("nscdeColordefs.css"); --@import url("/opt/NsCDE/share/config_templates/integration/thunderbird/nscdeChrome.css"); --@import url("/opt/NsCDE/share/config_templates/integration/thunderbird/nscdeIcons.css"); -+@import url("${PREFIX}/share/nscde/config_templates/integration/thunderbird/nscdeChrome.css"); -+@import url("${PREFIX}/share/nscde/config_templates/integration/thunderbird/nscdeIcons.css"); - - - -@@ -5333,14 +5292,14 @@ This is how Firefox chromedir should look: - /opt/NsCDE/share/config_templates/integration/firefox/ff9x_nscdeContent.css -+|- nscdeContent.css -> ${PREFIX}/share/nscde/config_templates/integration/firefox/ff9x_nscdeContent.css - |- userChrome.css - |- userContent.css - - $ cat /home/user/.mozilla/firefox/testtest.default-release/chrome/userChrome.css - @import url("nscdeColordefs.css"); --@import url("/opt/NsCDE/share/config_templates/integration/firefox/ff9x_nscdeChrome.css"); --@import url("/opt/NsCDE/share/config_templates/integration/firefox/nscdeIcons.css"); -+@import url("${PREFIX}/share/nscde/config_templates/integration/firefox/ff9x_nscdeChrome.css"); -+@import url("${PREFIX}/share/nscde/config_templates/integration/firefox/nscdeIcons.css"); - - $ cat /home/user/.mozilla/firefox/testtest.default-release/chrome/userContent.css - @import url("nscdeColordefs.css"); -@@ -5370,13 +5329,13 @@ of this resources. Also "skins" for programs like Gkrellm can be processed from custom colormgr.local. - - --In the directory $NSCDE_ROOT/share/config_templates/Gkrellm -+In the directory ${PREFIX}/share/nscde/config_templates/Gkrellm - is the complete NsCDE theme for the Gkrellm. --File $NSCDE_ROOT/share/doc/examples/colormgr.local.example -+File ${PREFIX}/share/examples/nscde/colormgr.local.example - can be used for this integration. There are also examples for - Gkrellm and - mate-terminal. Local script colormgr.local --will most likely use $NSCDE_ROOT/libexec/nscde_palette_colorgen.py in some way. -+will most likely use ${PREFIX}/libexec/nscde/nscde_palette_colorgen.py in some way. - - - -@@ -5442,7 +5401,7 @@ set to look almost as Dtterm, but with richer menu and - handling, the bad thing is that configuration if not done via GUI or configuration file but is - stored in binary DCONF registry, and registry editor like dconf-editor or - or dconf gsettings must be used for non-interactive or CLI editing. --See the example in $NSCDE_ROOT/share/doc/examples/colormgr.local.example -+See the example in ${PREFIX}/share/examples/nscde/colormgr.local.example - on how to integrate mate-terminal with a - Color Style Manager. - Second (if not first) best choice is Urxvt, but since it does not have a menu nor a -@@ -5473,7 +5432,7 @@ NsCDE has a ready drop-in theme called (of course) NsC - share/config_templates and it can be put in user's - ~/.gkrellm2/themes and integrated with - Color Style Manager --with the $NSCDE_ROOT/share/doc/examples/colormgr.local.example which can be -+with the ${PREFIX}/share/examples/nscde/colormgr.local.example which can be - installed as $FVWM_USERDIR/libexec/colormgr.local. - - -@@ -5492,7 +5451,7 @@ powerful GPU, CPU and RAM I have. I turn it on occasio - amusement of xsnow, xsanta or xeyes type, but when I have serious work to do, - I simply turn it off in some moment. - Maybe it can be better if it is configured more conservative than example. See --/opt/NsCDE/share/doc/examples/compton-integration for -+${PREFIX}/share/examples/nscde/compton-integration for - a starting point. Syntax of this file is largely compatible for all three above mentioned - X compositors. - -@@ -5744,6 +5703,8 @@ with complete explanations: - - Patches for FVWM - -+(This FreeBSD port does not include these patches in fvwm and therefore are not -+applicable) - Optional but recommended patches for FVWM 2.6.7 and 2.6.8 are in - /opt/NsCDE/src directory. - -@@ -5834,7 +5795,7 @@ in layout to old Xinerama support in FVWM2, while seco - workspaces, so different parts of different workspaces can be shown on different - monitors. NsCDE implements dynamic finding and displaying, as well as creation of - joint backdrops combinations for multiple monitors layout out of the box, so old --hack described in $NSCDE_ROOT/share/doc/examples/fvwm3-per-monitor/README -+hack described in ${PREFIX}/share/examples/nscde/fvwm3-per-monitor/README - is not needed anymore. As in the future more desktop layouts are planned by FVWM3 developers, this - setting has it's GUI control usable on FVWM3 in the - Workspaces and Pages Style Manager. NsCDE diff --git a/x11-wm/nscde/files/patch-docbook_NsCDE.xsl b/x11-wm/nscde/files/patch-docbook_NsCDE.xsl deleted file mode 100644 index e70869911..000000000 --- a/x11-wm/nscde/files/patch-docbook_NsCDE.xsl +++ /dev/null @@ -1,10 +0,0 @@ ---- docbook/NsCDE.xsl.orig 2021-05-07 20:46:05 UTC -+++ docbook/NsCDE.xsl -@@ -1,6 +1,6 @@ - - -- -+ - - - diff --git a/x11-wm/nscde/files/patch-src_XOverrideFontCursor_Makefile b/x11-wm/nscde/files/patch-src_XOverrideFontCursor_Makefile deleted file mode 100644 index 2c5fa432c..000000000 --- a/x11-wm/nscde/files/patch-src_XOverrideFontCursor_Makefile +++ /dev/null @@ -1,8 +0,0 @@ ---- src/XOverrideFontCursor/Makefile.orig 2021-10-16 21:57:28 UTC -+++ src/XOverrideFontCursor/Makefile -@@ -1,4 +1,4 @@ --CC ?= gcc -+CC ?= clang - CFLAGS ?= - LDFLAGS ?= - diff --git a/x11-wm/nscde/files/patch-src_colorpicker_Makefile b/x11-wm/nscde/files/patch-src_colorpicker_Makefile deleted file mode 100644 index 22c5bea15..000000000 --- a/x11-wm/nscde/files/patch-src_colorpicker_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- src/colorpicker/Makefile.orig 2021-10-08 08:21:08 UTC -+++ src/colorpicker/Makefile -@@ -1,6 +1,6 @@ - CC ?= gcc - CFLAGS ?= --LDFLAGS ?= -+CC=/usr/bin/clang - - colorpicker: main.c - $(CC) -o colorpicker $(CFLAGS) main.c `pkg-config --libs --cflags x11` $(LDFLAGS) diff --git a/x11-wm/nscde/files/patch-src_pclock-0.13.1_src_Makefile b/x11-wm/nscde/files/patch-src_pclock-0.13.1_src_Makefile deleted file mode 100644 index d8a89928d..000000000 --- a/x11-wm/nscde/files/patch-src_pclock-0.13.1_src_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pclock-0.13.1/src/Makefile.orig 2021-10-16 21:57:41 UTC -+++ src/pclock-0.13.1/src/Makefile -@@ -7,7 +7,7 @@ DEFAULT_XPM = Fpclock.xpm - - INCDIR = -I/usr/X11R6/include -I/usr/X11R7/include -I/usr/include -I/usr/local/include -I. - LIBDIR = -L/usr/X11R6/lib -L/usr/X11R7/lib -L/usr/lib64 -L/usr/local/lib --CC ?= gcc -+CC ?= clang - CFLAGS ?= -O2 -g -Wall - LDFLAGS ?= - LIBS = -lXpm -lXext -lX11 -lm diff --git a/x11-wm/nscde/pkg-message b/x11-wm/nscde/pkg-message index 68e50783f..d94d0b695 100644 --- a/x11-wm/nscde/pkg-message +++ b/x11-wm/nscde/pkg-message @@ -22,6 +22,42 @@ NsCDE comes with a default xsessions configuration that is managed by and integrated with fvwm; for further details on how to integrate NsCDE xsessions with other session managers, refer to the examples in /usr/local/share/examples/nscde/. + +Refer to /usr/local/share/doc/nscde/UPDATE_2x.txt for details +on how to migrate from versions 1.x to 2.x. +EOM +} +{ type: upgrade + maximum_version: 2.2 + message: <