From nobody Fri Dec 30 08:53:06 2022 X-Original-To: dev-commits-ports-branches@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 4NjzYb2f7Cz2kZ0Z; Fri, 30 Dec 2022 08:53:07 +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 4NjzYb1jZjz3nkw; Fri, 30 Dec 2022 08:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672390387; 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=U8ulFE5r/5E2VdjWWSZQbp/1tzSDMw4LNG1AnMvYonM=; b=UZKaLXxDXe2/18dwDwysD6YFYpB07IDgNKaNP4Ac0b4LooMXCydAEUB2GeCEzSTRWojnYq 2YkFxuLhU/g3Jsb5CYlsC0A6PS5s5KO0hwo2kNRfDj06taZBgLnSTP9rNSzfSWwW6xWaeC nMe2IW6SHr8+U8/Ly6/BqEf9cVMe14c3aTZ9QiBShZdZSNMbsDSOZanKHHWZ16ixhwk4wI sAHQAbXh7VFSMmj0btzT4zADXWGw1rVoOVmQJ/TTzOzAbchYSNgDU5J070COTRhWeyQTO+ 2bGVwRLi2+VfIhM0jvNmmFalI6J6UZU9h3hvWAhqDKjqnjjB1DjVKbKhNGcQRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672390387; 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=U8ulFE5r/5E2VdjWWSZQbp/1tzSDMw4LNG1AnMvYonM=; b=mB1eYnc/E3qsFf2Mkq5fMgbI1n/wC8cMDXz2h02Ou1767jPGxwwvc6ya2nJTa0zScqlIlM Q54zHMhZcpTYmG170bRb+KoVbCEAWbMxkSuMeMcPcW3zOqm2FXZaFRq5dfIAr13/ZbmZ2e kZKa6iMl6PuyWVmIClwZSzzYlhQnwpJ0FhP4z3zPQOtfSXGhonOGAGu37JQ/Z1X8pG+odX Xd9go9PSdYM4/3KJC3CafNXbWTjKAyZivm9g/fcLRiX9UXBV6zlUAAC8yD7QRrtmQF1Oev kZ9WuJ7Eqf4UPdiuUazHLoJacGqeJNz+JOFLj2TVkp7zquUJa5J4VDdE0+/xEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672390387; a=rsa-sha256; cv=none; b=Q2l49i+Wxm9u4xLWdF+A+KDLoGXQ9KvT2gq4QKpJIF8ZZDwfllLJAa9WMq4892UAKV8gn1 GxJHwCBhISP2SpayEgs/dqpvBVG58oKWETOw+ZDrCM5XUa1ULVfzL28lw+AooUKzBUz1Wr NFhyyv/PyB2PO4bKAUYvcyTnkHpeXmxbmVfS51W0sXB+zpMXwXNZd2aiQHVY15WzoOXdEl de9kYP2ykfIoTjGZwuve304mIPNCEabIeMKfyQg8SfZQklcK+0mNxL3jXv3mYwZM+k8J5u iFfo6f32EchAnE/P6FXDrQlQgkaH8Cgwq/PMO5JVglW3VMWOl0DBtSx14kbl9A== 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 4NjzYb0RTLz12YV; Fri, 30 Dec 2022 08:53:07 +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 2BU8r6vj078377; Fri, 30 Dec 2022 08:53:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BU8r6TO078376; Fri, 30 Dec 2022 08:53:06 GMT (envelope-from git) Date: Fri, 30 Dec 2022 08:53:06 GMT Message-Id: <202212300853.2BU8r6TO078376@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: ec758d993d3b - 2022Q4 - x11-wm/nscde: Replace expired ksh2020 dependency, Remove DEPRECATED List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: ec758d993d3b5c197443778f302a5cbae8d5f363 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec758d993d3b5c197443778f302a5cbae8d5f363 commit ec758d993d3b5c197443778f302a5cbae8d5f363 Author: Chris Moerz AuthorDate: 2022-12-30 08:36:08 +0000 Commit: Nuno Teixeira CommitDate: 2022-12-30 08:42:21 +0000 x11-wm/nscde: Replace expired ksh2020 dependency, Remove DEPRECATED - add LICENSE_FILE - fix avoiding use of != in assignments PR: 267501 MFH: 2022Q4 (cherry picked from commit f9080cec69db09ce08dc72da892cc830fdbfe231) --- x11-wm/nscde/Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile index 101e986ba64a..19db82204080 100644 --- a/x11-wm/nscde/Makefile +++ b/x11-wm/nscde/Makefile @@ -1,5 +1,6 @@ PORTNAME= nscde DISTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= https://github.com/NsCDE/NsCDE/releases/download/${DISTVERSION}/ @@ -8,9 +9,7 @@ COMMENT= Modern CDE clone based on fvwm WWW= https://github.com/NsCDE/NsCDE LICENSE= GPLv3 - -DEPRECATED= Depends on expired shells/ksh2020 -EXPIRATION_DATE=2022-12-31 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \ @@ -19,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAV font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \ fvwm2:x11-wm/fvwm2 \ gsed:textproc/gsed \ - ksh93:shells/ksh2020 \ + ksh93:shells/ksh93 \ qt5-style-plugins>=5.0.0:x11-themes/qt5-style-plugins \ roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \ stalonetray:x11/stalonetray \ @@ -52,8 +51,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR xsettingsd:x11/xsettingsd \ xterm:x11/xterm -USES= gettext magick pkgconfig:build pyqt:5 python:3.7+ shebangfix \ - xorg +USES= desktop-file-utils gettext magick pkgconfig:build pyqt:5 \ + python:3.7+ shebangfix xorg USE_PYQT= pyqt5 USE_XORG= x11 xext xpm @@ -83,15 +82,15 @@ SUDO_DESC= Use sudo to elevate privileges ASTKSH_RUN_DEPENDS= ksh93:shells/ast-ksh93 DOAS_RUN_DEPENDS= doas:security/doas -KSH2020_RUN_DEPENDS= ksh93:shells/ksh2020 +KSH2020_RUN_DEPENDS= ksh93:shells/ksh93 SUDO_RUN_DEPENDS= sudo:security/sudo _SUDOFILES= data/fvwm/Functions.fvwmconf.in lib/scripts/SysActionDialog .include -UNAME_M!= ${UNAME} -m -PLIST_SUB+= ARCH=${UNAME_M} +UNAME_M_CMD= ${UNAME} -m +PLIST_SUB+= ARCH="$$(${UNAME_M_CMD})" post-patch-DOAS-on: ( for SUDOF in ${_SUDOFILES}; do ${REINPLACE_CMD} -e "s@sudo \\-n@doas@g" ${WRKSRC}/$${SUDOF}; done )