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 <bileslav@gmail.com> (email)
2024-11-18 00:10:04 +00:00 · 2024-08-04 08:10:44 +02:00 · 2024-08-04 08:10:44 +02:00 · 1f1d5e1cdf
commit 1f1d5e1cdf
parent 335734129f
5 changed files with 24 additions and 56 deletions
--- 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 <bsd.port.options.mk>

--- 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
--- a/x11-wm/herbstluftwm/files/patch-share_autostart
+++ b/x11-wm/herbstluftwm/files/patch-share_autostart
@ -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
--- a/x11-wm/herbstluftwm/files/pkg-message.in
+++ b/x11-wm/herbstluftwm/files/pkg-message.in
@ -1,8 +1,9 @@
 [
 {
  message: <<EOM
-You need to specify your own autostart file with -c or place it in this path:
-%%PREFIX%%/etc/xdg/etc/xdg/herbstluftwm/autostart
+You need to place your own autostart file in this path:
+$XDG_CONFIG_HOME/herbstluftwm if you don't use the default
+(%%PREFIX%%/etc/xdg/herbstluftwm/autostart).

 Keep in mind that most of the scripts are written in bash syntax.
 EOM
--- a/x11-wm/herbstluftwm/pkg-plist
+++ b/x11-wm/herbstluftwm/pkg-plist
@ -1,11 +1,11 @@
 bin/herbstclient
 bin/herbstluftwm
-etc/bash_completion.d/herbstclient
 etc/xdg/herbstluftwm/autostart
 etc/xdg/herbstluftwm/dmenu_run_hlwm
 etc/xdg/herbstluftwm/panel.sh
 etc/xdg/herbstluftwm/restartpanels.sh
-share/fish/vendor_completions.d/herbstclient.fish
+share/bash-completion/completions/herbstclient
+share/fish/completions/herbstclient.fish
 share/xsessions/herbstluftwm.desktop
 share/zsh/site-functions/_herbstclient
 %%PORTDOCS%%%%DOCSDIR%%/NEWS