x11-wm/herbstluftwm: Update to 0.7.2

- remove gettext-runtime, add gnome, xorg to USES
- patch share/autostart: remove bashism
- add pkg-message.in about bash dependency of scripts

Submitted by:	maintainer
Reviewed by:	mmokhi, mat
Differential Revision:	https://reviews.freebsd.org/D20457

4 files changed, 49 insertions, 8 deletions

diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile
index c3e81475aeaf..9e47ae4e0404 100644
--- a/x11-wm/herbstluftwm/Makefile
+++ b/x11-wm/herbstluftwm/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	herbstluftwm
-PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTVERSION=	0.7.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://herbstluftwm.org/tarballs/
 
@@ -11,10 +10,11 @@ COMMENT=	Manual tiling window manager for X11
 
 LICENSE=	BSD2CLAUSE
 
-USES=		compiler:c++11-lib gettext-runtime gmake pkgconfig shebangfix
-SHEBANG_FILES=	scripts/*.sh share/autostart share/*.sh
-USE_XORG=	x11 xext xinerama
+USES=		compiler:c++11-lang gmake gnome pkgconfig shebangfix
 USE_GNOME=	glib20
+USE_XORG=	x11 xext xinerama
+
+SHEBANG_FILES=	scripts/*.sh share/*.sh
 
 MAKE_ARGS=	PREFIX=${PREFIX} SYSCONFDIR=${PREFIX}/etc \
 		DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
@@ -25,6 +25,8 @@ MAKE_ARGS=	PREFIX=${PREFIX} SYSCONFDIR=${PREFIX}/etc \
 OPTIONS_DEFINE=	BASH FISH ZSH DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
+SUB_FILES=	pkg-message
+
 ALL_TARGET=	all-nodoc
 INSTALL_TARGET=	install-nodoc
 DOCS_ALL_TARGET=	doc
diff --git a/x11-wm/herbstluftwm/distinfo b/x11-wm/herbstluftwm/distinfo
index fec1a5dae060..02c300bad872 100644
--- a/x11-wm/herbstluftwm/distinfo
+++ b/x11-wm/herbstluftwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533876625
-SHA256 (herbstluftwm-0.7.1.tar.gz) = dc0ef362013f4eb68314e120010f8cb426eb615b87f8054d6aa8e1dee5a28734
-SIZE (herbstluftwm-0.7.1.tar.gz) = 244726
+TIMESTAMP = 1559116941
+SHA256 (herbstluftwm-0.7.2.tar.gz) = dff613fc6d7883ea2011318ef8a7b15b92f7864eaf63229df9ce0e99a44281cd
+SIZE (herbstluftwm-0.7.2.tar.gz) = 245506
diff --git a/x11-wm/herbstluftwm/files/patch-share_autostart b/x11-wm/herbstluftwm/files/patch-share_autostart
new file mode 100644
index 000000000000..7018399c5aa3
--- /dev/null
+++ b/x11-wm/herbstluftwm/files/patch-share_autostart
@@ -0,0 +1,28 @@
+--- share/autostart.orig	2019-05-09 09:04:33 UTC
++++ share/autostart
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # this is a simple config for herbstluftwm
+ 
+@@ -66,14 +66,11 @@ hc keybind $Mod-Control-Right   resize right +$resizes
+ 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 ! [ -z "$key" ] ; then
+-        hc keybind "$Mod-$key" use_index "$i"
+-        hc keybind "$Mod-Shift-$key" move_index "$i"
+-    fi
++hc rename default "1" || true
++for i in $(seq 1 9); do
++    hc add "${i}"
++    hc keybind "$Mod-$i" use_index "$i"
++    hc keybind "$Mod-Shift-$i" 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
new file mode 100644
index 000000000000..a2b7497857ae
--- /dev/null
+++ b/x11-wm/herbstluftwm/files/pkg-message.in
@@ -0,0 +1,11 @@
+[
+{
+  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
+
+Keep in mind that most of the scripts are written in bash syntax.
+EOM
+  type: install
+}
+]