From nobody Sun Aug 04 06:24:12 2024 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 4Wc8fh5NbBz5SDft; Sun, 04 Aug 2024 06:24:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wc8fh4vMrz55vQ; Sun, 4 Aug 2024 06:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722752652; 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=vY/kMz3S/eKQVSZg6RGO1GUj8Y2mXJXLu6O+i4pqqYA=; b=pSJkjeke9PnS/Nyd6qpzgCts35q9jg0zMcUF1fwqzontHI0eINK3/zXBMHgg0myX/IGYJX sOMTyhI4Rr6j1n4AXY2bbFv7wTXuzNXsDOX9ikaj2SugK2oGN2edefwGbsmGS0oEaMttWE yCgZSSe3fmo4lUn7U0xEBrD2EP++qTO/3NLSg8lsUYT1SrIDfMhyvLJrCPwIPRg++AyIpm RpbJR9bdDx5MC27aiNbJgtSQJ9Yhp1cCHA839N4MB8TQVyv2oKSurfe2IDH9qK1ezPGqdb bvhS0bW5bYRe/KwIYashjR+/28PTYxPNSNHR+t7v0LRbEpaeL0QkQdeXX+h1cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722752652; a=rsa-sha256; cv=none; b=R5GitOAaKK1nJ1jZK104/sYZATYlc4K42jJJ2dMqqLsDrjrv3AaRUhu8awjG3pbcFzQ0uI xfvpZ1+MNDLNYmFORxOsJGfPKha3kfVYHnC4150Qsvx1N/d5/tIehAvia8oNXvpHcrvupD 8Yk/EtcTc8jBFFxiy43sc6C/GgK9CjuzTxrFH352DKCS3jMAhUQDWsAq3Cq2UqJdUxXTJs z8IzKUmQRszuT+eA5JdK6bemDiykBTB1Zzd50RMtwChVcmh+l1K4fEkd2lBp/3jHlwk1or K8jMYv/J2z4KuJbX+bbLdTY/p+niA+vopL+wONxSW5cv7DDg3sfj+5gFZ4Yc7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722752652; 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=vY/kMz3S/eKQVSZg6RGO1GUj8Y2mXJXLu6O+i4pqqYA=; b=NOFjfKeqNWaMszjHxOmM1KknjBudUCLXrTvTucvxDtwKbCtfJlyvrgIydpla2FLw4aBw1q TQEQJmIZBMQ9LoDO9Hl1bgK2w2ArLqW5rAad9hhitmRX2wRSxuONH4ItNh72hmmpn9CmS3 1UZHPfEreDvVMVzcKR31f9OkT7+Cfvu18dJxM+2OIem7z1z2/CB/f4D4nusCfoMgqLMksu n1ZVu+G55tJFKGFNU5n67hDin7cMMWwA+lt0f9xe1EdHERlOs/FYyMnrzsNWhpTe6NOBcp /H1D4Hpzf5F66vnZACbJik0R3t91tNRwW0cIwRDE7qT+2Qejo+xaP2TTXR4cBg== 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 4Wc8fh4VMDzlM3; Sun, 4 Aug 2024 06:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4746OC9O040091; Sun, 4 Aug 2024 06:24:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4746OCEb040088; Sun, 4 Aug 2024 06:24:12 GMT (envelope-from git) Date: Sun, 4 Aug 2024 06:24:12 GMT Message-Id: <202408040624.4746OCEb040088@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: 1f1d5e1cdf72 - main - x11-wm/herbstluftwm: remove default autostart's patch 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f1d5e1cdf72f1001565724c0b33797877bee36d Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f1d5e1cdf72f1001565724c0b33797877bee36d commit 1f1d5e1cdf72f1001565724c0b33797877bee36d Author: Zsolt Udvari AuthorDate: 2024-08-04 06:10:44 +0000 Commit: Zsolt Udvari CommitDate: 2024-08-04 06:23:23 +0000 x11-wm/herbstluftwm: remove default autostart's patch The autostart's patch doesn't work as expected. It will be simplier to use bash-dependent autostart so removed this patch and add bash to RUN_DEPENDS (see https://forums.freebsd.org/threads/herbstluftwm-0-9-5.88019/). The default autostart uses panel.sh which requires dzen2, add it to RUN_DEPEDS. Fix shell completions directories. Remove the '/usr/local/' path from patch. Pet portfmt. Bump PORTREVISION. Reported by: Vlad Biley (email) --- x11-wm/herbstluftwm/Makefile | 18 +++++++++-------- x11-wm/herbstluftwm/files/patch-CMakeLists.txt | 26 +++++++++--------------- x11-wm/herbstluftwm/files/patch-share_autostart | 27 ------------------------- x11-wm/herbstluftwm/files/pkg-message.in | 5 +++-- x11-wm/herbstluftwm/pkg-plist | 4 ++-- 5 files changed, 24 insertions(+), 56 deletions(-) diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile index ecd0837e80ca..c9be093e7d4b 100644 --- a/x11-wm/herbstluftwm/Makefile +++ b/x11-wm/herbstluftwm/Makefile @@ -1,6 +1,6 @@ PORTNAME= herbstluftwm DISTVERSION= 0.9.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= https://herbstluftwm.org/tarballs/ @@ -11,10 +11,12 @@ WWW= https://herbstluftwm.org/ LICENSE= BSD2CLAUSE BUILD_DEPENDS= asciidoc:textproc/asciidoc -LIB_DEPENDS+= libfreetype.so:print/freetype2 +LIB_DEPENDS= libfreetype.so:print/freetype2 +RUN_DEPENDS= bash>0:shells/bash \ + dzen2>0:x11/dzen2 -USES= cmake compiler:c++11-lang gnome \ - localbase:ldflags pkgconfig shebangfix xorg +USES= cmake compiler:c++11-lang gnome localbase:ldflags pkgconfig \ + shebangfix xorg USE_GNOME= glib20 USE_XORG= x11 xext xfixes xft xinerama xrandr xrender @@ -22,12 +24,12 @@ SHEBANG_FILES= doc/gendoc.py scripts/*.sh share/*.sh SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_SUB= yes -DOCS_USES+= python:build +OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_SUB= yes +DOCS_USES+= python:build DOCS_CMAKE_BOOL+= WITH_DOCUMENTATION -DOCS_VARS= binary_alias=python3=${PYTHON_CMD} +DOCS_VARS= BINARY_ALIAS=python3=${PYTHON_CMD} .include diff --git a/x11-wm/herbstluftwm/files/patch-CMakeLists.txt b/x11-wm/herbstluftwm/files/patch-CMakeLists.txt index df06cfaf8379..174cefd21a6a 100644 --- a/x11-wm/herbstluftwm/files/patch-CMakeLists.txt +++ b/x11-wm/herbstluftwm/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2022-07-30 05:55:21 UTC +--- CMakeLists.txt.orig 2024-08-04 05:15:09 UTC +++ CMakeLists.txt -@@ -20,13 +20,13 @@ include(ccache) +@@ -20,7 +20,7 @@ include(ccache) ## set install variables # prefix for systemwide configuration, accompanies CMAKE_INSTALL_PREFIX @@ -9,28 +9,20 @@ "Top-level install path for configuration files. May be given relative to CMAKE_INSTALL_PREFIX.") set(CONFIGDIR "${CMAKE_INSTALL_SYSCONF_PREFIX}/xdg/herbstluftwm") - set(BINDIR bin) - set(DATADIR share) --set(MANDIR ${DATADIR}/man) -+set(MANDIR ${CMAKE_INSTALL_PREFIX}/share/man) - set(DOCDIR ${DATADIR}/doc/herbstluftwm) - set(LICENSEDIR ${DOCDIR} - CACHE PATH "Install path for license file") -@@ -36,7 +36,7 @@ set(FISHCOMPLETIONDIR ${DATADIR}/fish/vendor_completio +@@ -34,7 +34,7 @@ set(ZSHCOMPLETIONDIR ${DATADIR}/zsh/site-functions + CACHE PATH "Install path for xsession file") + set(ZSHCOMPLETIONDIR ${DATADIR}/zsh/site-functions CACHE PATH "Install path for zsh completions file") - set(FISHCOMPLETIONDIR ${DATADIR}/fish/vendor_completions.d +-set(FISHCOMPLETIONDIR ${DATADIR}/fish/vendor_completions.d ++set(FISHCOMPLETIONDIR ${DATADIR}/fish/completions CACHE PATH "Install path for fish completions file") --set(BASHCOMPLETIONDIR ${DATADIR}/bash-completion/completions -+set(BASHCOMPLETIONDIR ${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d + set(BASHCOMPLETIONDIR ${DATADIR}/bash-completion/completions CACHE PATH "Install path for bash completions file") - - ## do the actual work @@ -47,7 +47,6 @@ install(FILES NEWS DESTINATION ${DOCDIR}) ## install everything that was not installed from subdirectories install(FILES NEWS DESTINATION ${DOCDIR}) -install(FILES LICENSE DESTINATION ${LICENSEDIR}) --install(DIRECTORY scripts/ DESTINATION ${DOCDIR}/examples USE_SOURCE_PERMISSIONS) -+install(DIRECTORY scripts/ DESTINATION /usr/local/share/examples/herbstluftwm USE_SOURCE_PERMISSIONS) + install(DIRECTORY scripts/ DESTINATION ${DOCDIR}/examples USE_SOURCE_PERMISSIONS) # vim: et:ts=4:sw=4 diff --git a/x11-wm/herbstluftwm/files/patch-share_autostart b/x11-wm/herbstluftwm/files/patch-share_autostart deleted file mode 100644 index 90dbdd1954e7..000000000000 --- a/x11-wm/herbstluftwm/files/patch-share_autostart +++ /dev/null @@ -1,27 +0,0 @@ ---- share/autostart.orig 2022-03-17 08:18:57 UTC -+++ share/autostart -@@ -62,18 +62,13 @@ hc keybind $Mod-Control-Down resize down +$resizest - hc keybind $Mod-Control-Up resize up +$resizestep - hc keybind $Mod-Control-Right resize right +$resizestep - --# tags --tag_names=( {1..9} ) --tag_keys=( {1..9} 0 ) - --hc rename default "${tag_names[0]}" || true --for i in "${!tag_names[@]}" ; do -- hc add "${tag_names[$i]}" -- key="${tag_keys[$i]}" -- if [ -n "$key" ] ; then -- hc keybind "$Mod-$key" use_index "$i" -- hc keybind "$Mod-Shift-$key" move_index "$i" -- fi -+# tags are 1..9 -+hc rename default "1" || true -+for i in $(seq 1 9) ; do -+ hc add "${i}" -+ hc keybind "$Mod-$key" use_index "$i" -+ hc keybind "$Mod-Shift-$key" move_index "$i" - done - - # cycle through tags diff --git a/x11-wm/herbstluftwm/files/pkg-message.in b/x11-wm/herbstluftwm/files/pkg-message.in index a2b7497857ae..ab20f5de8a7f 100644 --- a/x11-wm/herbstluftwm/files/pkg-message.in +++ b/x11-wm/herbstluftwm/files/pkg-message.in @@ -1,8 +1,9 @@ [ { message: <