svn commit: r531506 - in head/x11/bemenu: . files

Tobias Kortkamp tobik at FreeBSD.org
Sun Apr 12 12:42:19 UTC 2020 

Author: tobik
Date: Sun Apr 12 12:42:18 2020
New Revision: 531506
URL: https://svnweb.freebsd.org/changeset/ports/531506

Log:
  x11/bemenu: Update to 0.4.0
  
  Changes:	https://github.com/Cloudef/bemenu/releases/tag/0.4.0

Added:
  head/x11/bemenu/files/
  head/x11/bemenu/files/Makefile   (contents, props changed)
Modified:
  head/x11/bemenu/Makefile
  head/x11/bemenu/distinfo
  head/x11/bemenu/pkg-plist

Modified: head/x11/bemenu/Makefile
==============================================================================
--- head/x11/bemenu/Makefile	Sun Apr 12 12:39:22 2020	(r531505)
+++ head/x11/bemenu/Makefile	Sun Apr 12 12:42:18 2020	(r531506)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bemenu
-DISTVERSION=	0.3.0
+DISTVERSION=	0.4.0
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	tobik at FreeBSD.org
@@ -12,12 +12,12 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSE-CLIENT
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/LICENSE-LIB
 
-USES=		cmake localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cloudef
 USE_LDCONFIG=	yes
 
-LDFLAGS+=	-pthread -Wl,--as-needed
+MAKEFILE=	${FILESDIR}/Makefile
+MAKE_ARGS=	RENDERERS="${_BEMENU_RENDERERS}"
 PLIST_SUB=	SOVERSION=${DISTVERSION}
 
 OPTIONS_DEFAULT=	${OPTIONS_MULTI_BACKEND}
@@ -28,19 +28,19 @@ OPTIONS_SUB=		yes
 BACKEND_DESC=	Backend
 
 NCURSES_USES=		ncurses
-NCURSES_CMAKE_BOOL=	BEMENU_CURSES_RENDERER
-NCURSES_CMAKE_ON=	-DCURSES_FOUND:BOOL=yes \
-			-DCURSES_INCLUDE_DIRS:PATH="${NCURSESINC}" \
-			-DCURSES_LIBRARY:PATH="${NCURSESLIB}/libncursesw.so"
+NCURSES_MAKE_ARGS=	curses_CFLAGS="-I${NCURSESINC}" \
+			curses_LIBS="-L${NCURSESLIB} -l${NCURSES_IMPL}"
+NCURSES_VARS=		_BEMENU_RENDERERS+=curses
+WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libwayland-client.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_USES=		gnome pkgconfig
 WAYLAND_USE=		GNOME=cairo,glib20,pango
-WAYLAND_CMAKE_BOOL=	BEMENU_WAYLAND_RENDERER
+WAYLAND_VARS=		_BEMENU_RENDERERS+=wayland
 X11_USES=		gnome pkgconfig xorg
 X11_USE=		GNOME=cairo,glib20,pango \
 			XORG=x11,xinerama
-X11_CMAKE_BOOL=		BEMENU_X11_RENDERER
+X11_VARS=		_BEMENU_RENDERERS+=x11
 
 .include <bsd.port.mk>

Modified: head/x11/bemenu/distinfo
==============================================================================
--- head/x11/bemenu/distinfo	Sun Apr 12 12:39:22 2020	(r531505)
+++ head/x11/bemenu/distinfo	Sun Apr 12 12:42:18 2020	(r531506)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576848650
-SHA256 (Cloudef-bemenu-0.3.0_GH0.tar.gz) = a57ae85ca14b4adb6c32bc40138d49ec51dd2e2b0d211557c8f92489f4c3fb84
-SIZE (Cloudef-bemenu-0.3.0_GH0.tar.gz) = 120059
+TIMESTAMP = 1586692092
+SHA256 (Cloudef-bemenu-0.4.0_GH0.tar.gz) = 1489d72abdd99919cfdc0ad06668b617bba30ea7d643395a048a4206e7b06d99
+SIZE (Cloudef-bemenu-0.4.0_GH0.tar.gz) = 110381

Added: head/x11/bemenu/files/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/bemenu/files/Makefile	Sun Apr 12 12:42:18 2020	(r531506)
@@ -0,0 +1,53 @@
+VERSION!=	cat VERSION
+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,--no-undefined -pthread
+
+all: bemenu 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
+bemenu-renderer-wayland.so: ${wayland_OBJS}
+${wayland_OBJS}: lib/renderers/wayland/wlr-layer-shell-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, at LIBDIR@,/lib,' -e 's, at PREFIX@,${PREFIX},' -e 's, at VERSION@,${VERSION},' $> > $@
+	echo 'includedir=$${prefix}/include' >> $@
+	echo 'Cflags: -I$${includedir}' >> $@
+	cat $@
+
+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} man/*.1 ${DESTDIR}${PREFIX}/share/man/man1

Modified: head/x11/bemenu/pkg-plist
==============================================================================
--- head/x11/bemenu/pkg-plist	Sun Apr 12 12:39:22 2020	(r531505)
+++ head/x11/bemenu/pkg-plist	Sun Apr 12 12:42:18 2020	(r531506)
@@ -7,5 +7,6 @@ include/bemenu.h
 lib/libbemenu.so
 lib/libbemenu.so.0
 lib/libbemenu.so.%%SOVERSION%%
-man/man1/bemenu-run.1.gz
-man/man1/bemenu.1.gz
+libdata/pkgconfig/bemenu.pc
+share/man/man1/bemenu-run.1.gz
+share/man/man1/bemenu.1.gz

More information about the svn-ports-all mailing list