git: e9239f769c1c - main - x11/bemenu: update to 0.6.14

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Tue, 25 Apr 2023 13:22:44 UTC
The branch main has been updated by fernape:

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

commit e9239f769c1ce7f6a87306b0e478788ba6e84d58
Author:     Zsolt Udvari <uzsolt@uzsolt.hu>
AuthorDate: 2023-04-25 13:04:56 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-04-25 13:04:56 +0000

    x11/bemenu: update to 0.6.14
    
    Submitter becomes maintainer, already maintainer of several ports.
    
    ChangeLog: https://github.com/Cloudef/bemenu/compare/0.6.7...0.6.13
    
    PR:             271022
    Reported by:    uzsolt@uzsolt.hu
---
 x11/bemenu/Makefile       | 33 +++++++++++++++++++----------
 x11/bemenu/distinfo       |  6 +++---
 x11/bemenu/files/Makefile | 54 -----------------------------------------------
 x11/bemenu/pkg-plist      |  1 -
 4 files changed, 25 insertions(+), 69 deletions(-)

diff --git a/x11/bemenu/Makefile b/x11/bemenu/Makefile
index fa65630a4b14..7b200ef4b5ee 100644
--- a/x11/bemenu/Makefile
+++ b/x11/bemenu/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	bemenu
-DISTVERSION=	0.6.7
+DISTVERSION=	0.6.14
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/Cloudef/bemenu/releases/download/${DISTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	uzsolt@uzsolt.hu
 COMMENT=	Dynamic menu library and client program inspired by dmenu
 WWW=		https://github.com/Cloudef/bemenu
 
@@ -14,10 +14,11 @@ LICENSE_FILE_LGPL3+ =	${WRKSRC}/LICENSE-LIB
 
 BUILD_DEPENDS=	scdoc:textproc/scdoc
 
+USES=		gmake
 USE_LDCONFIG=	yes
-MAKEFILE=	${FILESDIR}/Makefile
-MAKE_ARGS=	RENDERERS="${_BEMENU_RENDERERS}" \
-		VERSION=${DISTVERSION}
+LIB_DEPENDS+=	libharfbuzz.so:print/harfbuzz
+MAKEFILE=	GNUmakefile
+ALL_TARGET=	clients
 PLIST_SUB=	SOVERSION=${DISTVERSION}
 
 OPTIONS_DEFAULT=	${OPTIONS_MULTI_BACKEND}
@@ -27,10 +28,8 @@ OPTIONS_SUB=		yes
 
 BACKEND_DESC=	Backend
 
-NCURSES_USES=		ncurses
-NCURSES_MAKE_ARGS=	curses_CFLAGS="-I${NCURSESINC}" \
-			curses_LIBS="-L${NCURSESLIB} ${NCURSESLIBS}"
-NCURSES_VARS=		_BEMENU_RENDERERS+=curses
+NCURSES_USES=		ncurses:base
+NCURSES_ALL_TARGET=	curses
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
@@ -39,10 +38,22 @@ WAYLAND_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_USES=		gnome pkgconfig
 WAYLAND_USE=		GNOME=cairo,glib20,pango
-WAYLAND_VARS=		_BEMENU_RENDERERS+=wayland
+WAYLAND_ALL_TARGET=	wayland
 X11_USES=		gnome pkgconfig xorg
 X11_USE=		GNOME=cairo,glib20,pango \
 			XORG=x11,xinerama
-X11_VARS=		_BEMENU_RENDERERS+=x11
+X11_ALL_TARGET=		x11
+
+post-extract:
+	${REINPLACE_CMD} -e 's,$$(shell $$(PKG_CONFIG) --libs ncursesw),${NCURSES_LIB},' \
+		${WRKSRC}/${MAKEFILE}
+	${REINPLACE_CMD} -e 's,$$(shell $$(PKG_CONFIG) --cflags-only-I ncursesw),,' \
+		${WRKSRC}/${MAKEFILE}
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-run
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${DISTVERSION}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/*.so
 
 .include <bsd.port.mk>
diff --git a/x11/bemenu/distinfo b/x11/bemenu/distinfo
index 6e6d137a9adf..a98598d93776 100644
--- a/x11/bemenu/distinfo
+++ b/x11/bemenu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649937573
-SHA256 (bemenu-0.6.7.tar.gz) = 8982ffbeebb0f642e0a68d3ab5a16078b2f43548ddca70a5ad30a597529ff142
-SIZE (bemenu-0.6.7.tar.gz) = 128361
+TIMESTAMP = 1682192766
+SHA256 (bemenu-0.6.14.tar.gz) = 603358a039ac0014de14339d3e143dae67035cb84fa7c021563c7798064cdee8
+SIZE (bemenu-0.6.14.tar.gz) = 133648
diff --git a/x11/bemenu/files/Makefile b/x11/bemenu/files/Makefile
deleted file mode 100644
index beadc03537ee..000000000000
--- a/x11/bemenu/files/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-BEMENU_LIB=	libbemenu.so.${VERSION}
-wayland_PC=	epoll-shim pangocairo wayland-client xkbcommon
-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,--as-needed -Wl,--no-undefined -pthread
-
-all: bemenu bemenu.1 bemenu-run bemenu.pc ${RENDERERS:@r@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-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 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
-.xml.c .xml.h:
-	wayland-scanner ${"${@:M*.h}"!="":?client-header:private-code} < $< > $@
-
-lib/renderers/wayland/xdg-shell.xml:
-	cp "`pkg-config --variable=pkgdatadir wayland-protocols`/stable/${@:T:R}/${@:T}" $@
-
-${BEMENU_LIB}:
-	${CC} ${LDFLAGS} -fPIC -shared -Wl,-soname=${BEMENU_LIB:R:R} -o $@ $>
-
-bemenu bemenu-run: ${BEMENU_LIB}
-	${CC} ${LDFLAGS} -o $@ $>
-
-bemenu-renderer-curses.so bemenu-renderer-wayland.so bemenu-renderer-x11.so: ${BEMENU_LIB}
-	${CC} ${LDFLAGS} -fPIC -shared -o $@ $> ${${@:R:S,-, ,g:[3]}_LIBS} ${${@:R:S,-, ,g:[3]}_PC:D`pkg-config --libs ${${@:R:S,-, ,g:[3]}_PC}`} -lm
-
-bemenu.pc: bemenu.pc.in
-	sed -e 's,@INCLUDEDIR@,/include,' -e 's,@LIBDIR@,/lib,' -e 's,@PREFIX@,${PREFIX},' -e 's,@VERSION@,${VERSION},' $> > $@
-	cat $@
-
-bemenu.1: man/bemenu.1.scd.in
-	sed 's,@LIBDIR@,${PREFIX}/lib,' $> | scdoc > $@
-
-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
-	${BSD_INSTALL_DATA} lib/bemenu.h ${DESTDIR}${PREFIX}/include
-	${BSD_INSTALL_LIB} ${BEMENU_LIB} ${DESTDIR}${PREFIX}/lib
-	cd ${DESTDIR}${PREFIX}/lib && \
-		ln -sf ${BEMENU_LIB} ${BEMENU_LIB:R:R} && \
-		ln -sf ${BEMENU_LIB:R:R} ${BEMENU_LIB:R:R:R}
-.if !empty(RENDERERS)
-	@mkdir -p ${DESTDIR}${PREFIX}/lib/bemenu
-	${BSD_INSTALL_LIB} bemenu-renderer-*.so ${DESTDIR}${PREFIX}/lib/bemenu
-.endif
-	${BSD_INSTALL_DATA} bemenu.pc ${DESTDIR}${PREFIX}/libdata/pkgconfig
-	${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
diff --git a/x11/bemenu/pkg-plist b/x11/bemenu/pkg-plist
index bb4fb84e18a0..1a9aa54a3de2 100644
--- a/x11/bemenu/pkg-plist
+++ b/x11/bemenu/pkg-plist
@@ -8,5 +8,4 @@ lib/libbemenu.so
 lib/libbemenu.so.0
 lib/libbemenu.so.%%SOVERSION%%
 libdata/pkgconfig/bemenu.pc
-share/man/man1/bemenu-run.1.gz
 share/man/man1/bemenu.1.gz