From nobody Wed Dec 08 02:04:50 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8514D18D83E0; Wed, 8 Dec 2021 02:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J80q61zfZz4mYx; Wed, 8 Dec 2021 02:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23FEB2BA8; Wed, 8 Dec 2021 02:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B824oxv075569; Wed, 8 Dec 2021 02:04:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B824o5Q075568; Wed, 8 Dec 2021 02:04:50 GMT (envelope-from git) Date: Wed, 8 Dec 2021 02:04:50 GMT Message-Id: <202112080204.1B824o5Q075568@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 2a2c8c6c8212 - main - x11-wm/nscde: update to 1.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a2c8c6c8212db7ea154ef08de6a1fdeed19c89a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638929090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GHQOrIStxd+PXCmiLIxQ7daZqs9OaF9OqaR/OozER/k=; b=uEJStP9rpCjrAXMNBT/ooys4yEL/OX1cWon2UBRSCv/FGj0Rcr8KTst7Bi8jcsk+nA5umB 0YRMUVMdeNbt5NvklwNG83jfXpzQCqRU+GJNw43WHzDk/ITfbIYtVdwkjrAFGNsBdFVOlO LzVX3VNBL4FYwxxwu72TtubT1Dh4PS2cxxDg5K6geLJr9AXsuzd46DRQqqbM2JibJiFw2w 82OeDwYhr3bXRaDF2vZX8BLZm3Kl7X8dHbRSG/fjte6XUjdmvWXTT3cD9R/XsTqMJ3Z2R7 fNCtDaf6cwjfr3FC16RAu5+ewmCeCK4KW/UVKxEP/Qe5Eo2/qVMuIdvPZWBCGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638929090; a=rsa-sha256; cv=none; b=pEpUc7ODqYHSuTE7zJKwqyvvbieRQ05pPXXDzeX4pLOYVyH+ZvOcXfI08LtkqpLj48wyOe fHtQdxOZwW1rBjiRu7FJc73OnMApZRKHQK9zhepnztWFOZvwW+2rKyAi+vGV2oKCfzW5zU RsGr3zGDaQW8sqMTC/L9EYDmmLJiP1CNTO199pHyhP9IQBWJwYTbmiHMY5G+JuEGCr1E3j njHTuJtrgeUnglf1WzcYmpbH9L0MaxAm4gx3SxKMOs1s6URR3iN8yDsj6ziWkey1IVG3bB ncbTKjM06rOWNWthgot2IdVF7rZumj6Xcb0sp5BbCmCuycULHeAOMopbh18J8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a2c8c6c8212db7ea154ef08de6a1fdeed19c89a commit 2a2c8c6c8212db7ea154ef08de6a1fdeed19c89a Author: Chris Moerz AuthorDate: 2021-12-08 01:59:37 +0000 Commit: Hiroki Tagato CommitDate: 2021-12-08 02:03:28 +0000 x11-wm/nscde: update to 1.4 Port changes: * imagemagick dependency removed from options, relying on DEFAULT versions in /etc/make.conf instead * added option for choosing ksh version; default switched to ksh2020 because it compiles and works on arm64 * add WWW to pkg-descr * convert pkg-message to UCL format Upstream changes: https://github.com/NsCDE/NsCDE/releases/tag/1.4 PR: 260219 Reported by: Chris Moerz (maintainer) --- x11-wm/nscde/Makefile | 53 +++++++++++++--------- x11-wm/nscde/distinfo | 6 +-- x11-wm/nscde/files/patch-NsCDE_bin_fpclock | 44 ------------------ .../files/patch-NsCDE_config_NsCDE-Functions.conf | 11 ----- x11-wm/nscde/pkg-descr | 2 + x11-wm/nscde/pkg-message | 7 ++- x11-wm/nscde/pkg-plist | 24 +++++++--- 7 files changed, 59 insertions(+), 88 deletions(-) diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile index 98870538fe76..3258915c7afa 100644 --- a/x11-wm/nscde/Makefile +++ b/x11-wm/nscde/Makefile @@ -1,5 +1,5 @@ PORTNAME= nscde -DISTVERSION= 1.3 +DISTVERSION= 1.4 CATEGORIES= x11-wm MAINTAINER= freebsd@ny-central.org @@ -14,6 +14,7 @@ BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \ 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} \ + convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ dunst:sysutils/dunst \ font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \ fvwm2:x11-wm/fvwm2 \ @@ -51,34 +52,33 @@ SHEBANG_FILES= Installer.ksh NsCDE/bin/confget.py NsCDE/bin/confset.py \ DOCSDIR= ${PREFIX}/share/doc/nscde OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_DEFAULT= DOCS EXAMPLES SUDO IMGV6 -OPTIONS_SINGLE= ROOTAUTH IMGMAG -OPTIONS_SINGLE_IMGMAG= IMGV6 IMGV7 +OPTIONS_DEFAULT= DOCS EXAMPLES SUDO KSH2020 +OPTIONS_SINGLE= ROOTAUTH IMGMAG KSHOPT +OPTIONS_SINGLE_KSHOPT= ASTKSH KSH2020 OPTIONS_SINGLE_ROOTAUTH= SUDO DOAS +ASTKSH_DESC= AT&T KSH93 DOAS_DESC= Use doas to elevate privileges -IMGMAG_DESC= ImageMagick release -IMGV6_DESC= ImageMagick version 6 -IMGV7_DESC= ImageMagick version 7 +KSH2020_DESC= Updated AT&T KSH93 (arm64 compatible) +KSHOPT_DESC= KSH version ROOTAUTH_DESC= Root authorization SUDO_DESC= Use sudo to elevate privileges +ASTKSH_RUN_DEPENDS= ksh93:shells/ast-ksh93 DOAS_RUN_DEPENDS= doas:security/doas -IMGV6_RUN_DEPENDS= convert:graphics/ImageMagick6 -IMGV7_RUN_DEPENDS= magick:graphics/ImageMagick7 +KSH2020_RUN_DEPENDS= ksh93:shells/ksh2020 SUDO_RUN_DEPENDS= sudo:security/sudo -_NSCDE_HELPERS= Notifier.sh Splash.sh appfinder backdropmgr colorconv.py \ +_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 GWM.sh + xrandr_backer -_PREFIX_FILES= NsCDE/bin/fpclock NsCDE/bin/get_fvwm_infostore \ +_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-Functions.conf.sample \ NsCDE/config/NsCDE-Main.conf.sample NsCDE/libexec/Splash.sh \ NsCDE/libexec/fp_manage_subpanel \ NsCDE/libexec/fvwm-modules/FvwmScript NsCDE/libexec/nscde_setup \ @@ -96,7 +96,8 @@ _SHAREDOC= NsCDE/config/FrontPanel.actions \ 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/lib/scripts/KeyboardMgr \ + 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 \ @@ -107,8 +108,7 @@ _SHAREDOC= NsCDE/config/FrontPanel.actions \ NsCDE/lib/scripts/WSM NsCDE/lib/scripts/WSM-2 \ NsCDE/lib/scripts/WSM-4 NsCDE/lib/scripts/WSM-6 \ NsCDE/lib/scripts/WSM-8 NsCDE/lib/scripts/WindowMgr \ - NsCDE/lib/scripts/WsPgMgr \ - NsCDE/libexec/GWM.sh + NsCDE/lib/scripts/WsPgMgr _CURLYICONS= NsCDE/config/NsCDE-Functions.conf NsCDE/libexec/colormgr \ NsCDE/libexec/subpanel_menuitem_props @@ -122,6 +122,7 @@ _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 \ @@ -136,13 +137,14 @@ _BSHARESLASH= NsCDE/config/NsCDE-Functions.conf NsCDE/lib/scripts/BackdropMgr \ NsCDE/libexec/appfinder NsCDE/libexec/fontmgr \ NsCDE/libexec/strip_icon_path \ NsCDE/libexec/subpanel_menuitem_props \ - NsCDE/libexec/GWM.sh \ NsCDE/share/config_templates/colormgr.local \ - NsCDE/share/doc/NsCDE.txt README.localization + 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/libexec/subpanel_menuitem_props \ + NsCDE/bin/fpclock NsCDE/share/config_templates/colormgr.local _SHARENSLASH= NsCDE/config/NsCDE-Main.conf @@ -150,7 +152,8 @@ _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 + NsCDE/lib/scripts/ModifyColor \ + NsCDE/bin/fpclock _BLIBEXEC_SCRIPTS= NsCDE/lib/scripts/BackdropMgr \ NsCDE/lib/scripts/ColorMgr NsCDE/lib/scripts/FontMgr \ @@ -163,7 +166,8 @@ _BLIBEXEC_SCRIPTS= NsCDE/lib/scripts/BackdropMgr \ NsCDE/libexec/colormgr \ NsCDE/libexec/subpanel_menuitem_props \ NsCDE/share/config_templates/colormgr.local \ - NsCDE/share/doc/NsCDE.txt + NsCDE/share/doc/NsCDE.txt \ + NsCDE/bin/fpclock _CLIBEXEC_SCRIPTS= NsCDE/libexec/backdropmgr NsCDE/libexec/colormgr @@ -203,7 +207,8 @@ _BBINS= NsCDE/config/FrontPanel.actions \ NsCDE/share/applications/NsCDE-Sysinfo.desktop \ NsCDE/share/applications/NsCDE-WsPgMgr.desktop \ NsCDE/share/applications/WatchErrors.desktop \ - NsCDE/share/doc/NsCDE.txt + 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 \ @@ -273,7 +278,11 @@ post-patch: ( 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 post-patch-DOAS-on: ${REINPLACE_CMD} -e 's@sudo@doas@g' ${WRKSRC}/NsCDE/lib/scripts/SysActionDialog diff --git a/x11-wm/nscde/distinfo b/x11-wm/nscde/distinfo index cb165fce0361..d36f8e82fd25 100644 --- a/x11-wm/nscde/distinfo +++ b/x11-wm/nscde/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634580730 -SHA256 (nscde-nscde-1.3_GH0.tar.gz) = 9867f3511dca6f89c03ac253643de6d942975ddc7892921e6e5b3137fad22a6b -SIZE (nscde-nscde-1.3_GH0.tar.gz) = 31935416 +TIMESTAMP = 1638108980 +SHA256 (nscde-nscde-1.4_GH0.tar.gz) = 838f17a3ef5f3cec409ed2ca0bd0ac1f324890bc50e64ee559321126516df1a9 +SIZE (nscde-nscde-1.4_GH0.tar.gz) = 32001678 diff --git a/x11-wm/nscde/files/patch-NsCDE_bin_fpclock b/x11-wm/nscde/files/patch-NsCDE_bin_fpclock deleted file mode 100644 index a99260355322..000000000000 --- a/x11-wm/nscde/files/patch-NsCDE_bin_fpclock +++ /dev/null @@ -1,44 +0,0 @@ ---- NsCDE/bin/fpclock.orig 2021-05-02 07:41:34 UTC -+++ NsCDE/bin/fpclock -@@ -6,7 +6,6 @@ - # Licence: GPLv3 - # - --[ -z $NSCDE_ROOT ] && exit 2 - MARCH=$(uname -m) - - function find_colors -@@ -15,8 +14,8 @@ function find_colors - if [ -r "$FVWM_USERDIR/palettes/${NSCDE_PALETTE}.dp" ]; then - palfile="$FVWM_USERDIR/palettes/${NSCDE_PALETTE}.dp" - else -- if [ -r "$NSCDE_ROOT/share/palettes/${NSCDE_PALETTE}.dp" ]; then -- palfile="$NSCDE_ROOT/share/palettes/${NSCDE_PALETTE}.dp" -+ if [ -r "${PREFIX}/share/nscde/palettes/${NSCDE_PALETTE}.dp" ]; then -+ palfile="${PREFIX}/share/nscde/palettes/${NSCDE_PALETTE}.dp" - fi - fi - -@@ -25,9 +24,9 @@ function find_colors - fi - - if [ "x$palfile" != "x" ]; then -- $NSCDE_ROOT/libexec/nscde_palette_colorgen.py \ -+ ${PREFIX}/libexec/nscde/nscde_palette_colorgen.py \ - -n ${NSCDE_PALETTE_NCOLORS} \ -- -p /opt/NsCDE/share/palettes/${NSCDE_PALETTE}.dp -sl | \ -+ -p ${PREFIX}/share/nscde/palettes/${NSCDE_PALETTE}.dp -sl | \ - egrep '(ts|bs)_color_3' | while IFS=" " read name value - do - eval "${name}"="${value}" -@@ -50,8 +49,8 @@ function find_colors - - find_colors - --if [ -x $NSCDE_ROOT/bin/fpclock-${NSCDE_OS}_${MARCH} ]; then -- exec $NSCDE_ROOT/bin/fpclock-${NSCDE_OS}_${MARCH} -H $bs_color_3 -S $ts_color_3 "$@" -+if [ -x ${PREFIX}/bin/fpclock ]; then -+ exec ${PREFIX}/bin/fpclock -H $bs_color_3 -S $ts_color_3 "$@" - else - pclock=$(whence -p pclock) - if [ "x$pclock" != "x" ]; then diff --git a/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Functions.conf b/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Functions.conf deleted file mode 100644 index 427d5a87eb65..000000000000 --- a/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Functions.conf +++ /dev/null @@ -1,11 +0,0 @@ ---- NsCDE/config/NsCDE-Functions.conf.orig 2021-10-18 18:47:50 UTC -+++ NsCDE/config/NsCDE-Functions.conf -@@ -963,7 +963,7 @@ AddToFunc f_ShowGlobalPager - + I All (GWM, CirculateHit) Break 1 - + I All (CurrentPage, LocalPager, CirculateHit, !Iconic) Iconify True - + I All (WspLocPager, CirculateHit) KillModule FvwmPager WspLocPager --+ I PipeRead "/opt/NsCDE/libexec/GWM.sh -w 1920 -h 1200 -f 16 -d 4 -c -" -++ I PipeRead "${PREFIX}/libexec/nscde/GWM.sh -w 1920 -h 1200 -f 16 -d 4 -c -" - + I Wait GWMPager - + I All ("GWMPager", CirculateHit, !Transient) $[0-] - + I All ("GWMPager", CirculateHit, !Transient) f_OverScreen GWMPager PlaceAgain diff --git a/x11-wm/nscde/pkg-descr b/x11-wm/nscde/pkg-descr index a66bfa95558c..6d040697a857 100644 --- a/x11-wm/nscde/pkg-descr +++ b/x11-wm/nscde/pkg-descr @@ -7,3 +7,5 @@ NsCDE can be considered as a heavyweight FVWM theme on steroids, but combined with a couple other free software components and custom FVWM applications and a lot of configuration, NsCDE can be considered a lightweight hybrid desktop environment. + +WWW: https://github.com/NsCDE/NsCDE diff --git a/x11-wm/nscde/pkg-message b/x11-wm/nscde/pkg-message index ee493f65b50c..57339af08939 100644 --- a/x11-wm/nscde/pkg-message +++ b/x11-wm/nscde/pkg-message @@ -1,3 +1,6 @@ +[ +{ type: install + message: <