git: e5e51d21a8c7 - main - x11/bemenu: Update to 0.6.0

[Tobias Kortkamp]

The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e5e51d21a8c770c4fecf72923d42c00fe3155cc4

commit e5e51d21a8c770c4fecf72923d42c00fe3155cc4
Author:     Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-05-20 17:58:59 +0000
Commit:     Tobias Kortkamp <tobik at FreeBSD.org>
CommitDate: 2021-05-20 18:03:20 +0000

    x11/bemenu: Update to 0.6.0
    
    Changes:        https://github.com/Cloudef/bemenu/compare/0.5.0...0.6.0
---
 x11/bemenu/Makefile       |  9 ++++-----
 x11/bemenu/distinfo       |  6 +++---
 x11/bemenu/files/Makefile | 12 ++++++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/x11/bemenu/Makefile b/x11/bemenu/Makefile
index eaccbc9a5071..e556976534db 100644
--- a/x11/bemenu/Makefile
+++ b/x11/bemenu/Makefile
@@ -1,8 +1,9 @@
 PORTNAME=	bemenu
-DISTVERSION=	0.5.0
+DISTVERSION=	0.6.0
 CATEGORIES=	x11 wayland
+MASTER_SITES=	https://github.com/Cloudef/bemenu/releases/download/${DISTVERSION}/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	tobik at FreeBSD.org
 COMMENT=	Dynamic menu library and client program inspired by dmenu
 
 LICENSE=	GPLv3+ LGPL3+
@@ -10,13 +11,11 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSE-CLIENT
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/LICENSE-LIB
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	Cloudef
 USE_LDCONFIG=	yes
-
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ARGS=	RENDERERS="${_BEMENU_RENDERERS}" \
 		VERSION=${DISTVERSION}
+WRKSRC=		${WRKDIR}/${DISTVERSION}
 PLIST_SUB=	SOVERSION=${DISTVERSION}
 
 OPTIONS_DEFAULT=	${OPTIONS_MULTI_BACKEND}
diff --git a/x11/bemenu/distinfo b/x11/bemenu/distinfo
index 819bb5b3cbbb..fca2405f7aa1 100644
--- a/x11/bemenu/distinfo
+++ b/x11/bemenu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593867098
-SHA256 (Cloudef-bemenu-0.5.0_GH0.tar.gz) = 56e4a0bd06f93e7dfcdabbf7ee1ed973ce4e77d648132064f26f30662c4055f1
-SIZE (Cloudef-bemenu-0.5.0_GH0.tar.gz) = 110749
+TIMESTAMP = 1621533026
+SHA256 (bemenu-0.6.0.tar.gz) = b4344b8b1a4762d71167c1d753e6c4dc4603ec64ffe411cc2c8e5fddcbb653ce
+SIZE (bemenu-0.6.0.tar.gz) = 118057
diff --git a/x11/bemenu/files/Makefile b/x11/bemenu/files/Makefile
index aa4eeee62d6b..45f5cacf4bdf 100644
--- a/x11/bemenu/files/Makefile
+++ b/x11/bemenu/files/Makefile
@@ -4,14 +4,14 @@ x11_PC=		pangocairo x11 xinerama
 CFLAGS+=	-DBM_VERSION="\"${VERSION}\"" -DBM_PLUGIN_VERSION="\"${VERSION}-nogit\"" -DINSTALL_LIBDIR="\"${PREFIX}/lib\"" -std=c99 -fPIC -pthread -Ilib ${:!pkg-config --cflags ${RENDERERS:@r@${${r}_PC}@}!} ${RENDERERS:@r@${${r}_CFLAGS}@}
 LDFLAGS+=	-Wl,--no-undefined -pthread
 
-all: bemenu bemenu-run bemenu.pc ${RENDERERS:@r at bemenu-renderer-${r}.so@}
+all: bemenu bemenu.1 bemenu-run bemenu.pc ${RENDERERS:@r at bemenu-renderer-${r}.so@}
 ${BEMENU_LIB}: lib/3rdparty/cdl.o lib/filter.o lib/item.o lib/library.o lib/list.o lib/menu.o lib/util.o
 bemenu: client/bemenu.o client/common/common.o
 bemenu-run: client/bemenu-run.o client/common/common.o
 bemenu-renderer-curses.so: lib/renderers/curses/curses.o
-wayland_OBJS=	lib/renderers/wayland/registry.o lib/renderers/wayland/wayland.o lib/renderers/wayland/window.o lib/renderers/wayland/wlr-layer-shell-unstable-v1.o lib/renderers/wayland/xdg-shell.o
+wayland_OBJS=	lib/renderers/wayland/registry.o lib/renderers/wayland/wayland.o lib/renderers/wayland/window.o lib/renderers/wayland/wlr-layer-shell-unstable-v1.o lib/renderers/wayland/xdg-output-unstable-v1.o lib/renderers/wayland/xdg-shell.o
 bemenu-renderer-wayland.so: ${wayland_OBJS}
-${wayland_OBJS}: lib/renderers/wayland/wlr-layer-shell-unstable-v1.h
+${wayland_OBJS}: lib/renderers/wayland/wlr-layer-shell-unstable-v1.h lib/renderers/wayland/xdg-output-unstable-v1.h
 bemenu-renderer-x11.so: lib/renderers/x11/window.o lib/renderers/x11/x11.o lib/renderers/x11/xkb_unicode.o
 
 .SUFFIXES: .xml
@@ -36,6 +36,9 @@ bemenu.pc: bemenu.pc.in
 	echo 'Cflags: -I$${includedir}' >> $@
 	cat $@
 
+bemenu.1: man/bemenu.1.in
+	sed 's, at LIBDIR@,${PREFIX}/lib,' $> > $@
+
 install:
 	@mkdir -p ${DESTDIR}${PREFIX}/bin ${DESTDIR}${PREFIX}/include ${DESTDIR}${PREFIX}/lib ${DESTDIR}${PREFIX}/libdata/pkgconfig ${DESTDIR}${PREFIX}/share/man/man1
 	${BSD_INSTALL_PROGRAM} bemenu bemenu-run ${DESTDIR}${PREFIX}/bin
@@ -49,4 +52,5 @@ install:
 	${BSD_INSTALL_LIB} bemenu-renderer-*.so ${DESTDIR}${PREFIX}/lib/bemenu
 .endif
 	${BSD_INSTALL_DATA} bemenu.pc ${DESTDIR}${PREFIX}/libdata/pkgconfig
-	${BSD_INSTALL_MAN} man/*.1 ${DESTDIR}${PREFIX}/share/man/man1
+	${BSD_INSTALL_MAN} bemenu.1 ${DESTDIR}${PREFIX}/share/man/man1
+	ln ${DESTDIR}${PREFIX}/share/man/man1/bemenu.1 ${DESTDIR}${PREFIX}/share/man/man1/bemenu-run.1