Attachment 222769 Details for Bug 253805 – v1

[patch] v1

bug253805.diff (text/plain), 3.41 KB, created by Jan Beich on 2021-02-23 21:42:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2021-02-23 21:42:13 UTC

Size: 3.41 KB

patch

obsolete

>From 8537838caec84f33aab61b48b8c63d4b18cc2549 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Tue, 23 Feb 2021 20:48:37 +0000
>Subject: [PATCH] sysutils/dunst: update to 1.6.1
>
>- Adjust paths in config and manpages
>- Unbreak DUNSTIFY=off in poudriere
>
>Changes:	https://github.com/dunst-project/dunst/releases/tag/v1.6.0
>PR:		253805
>Reported by:	GitHub (watch releases)
>Approved by:	dmgk (maintainer)
>---
> sysutils/dunst/Makefile  | 32 ++++++++++++++++++++++++++------
> sysutils/dunst/distinfo  |  6 +++---
> sysutils/dunst/pkg-plist |  3 ++-
> 3 files changed, 31 insertions(+), 10 deletions(-)
>
>diff --git a/sysutils/dunst/Makefile b/sysutils/dunst/Makefile
>index 09f2acc278ab..6e4942277ad1 100644
>--- a/sysutils/dunst/Makefile
>+++ b/sysutils/dunst/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	dunst
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.5.0
>+DISTVERSION=	1.6.1
> CATEGORIES=	sysutils
> 
> MAINTAINER=	dmgk@FreeBSD.org
>@@ -12,6 +12,7 @@ COMMENT=	Lightweight notification daemon
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
> LIB_DEPENDS=	libdbus-1.so:devel/dbus
> 
> USES=		gmake gnome perl5 pkgconfig xorg
>@@ -23,21 +24,40 @@ USE_GNOME=	cairo gdkpixbuf2 pango
> USE_PERL5=	build
> USE_XORG=	x11 xext xinerama xrandr xscrnsaver
> 
>-MAKE_ARGS=	MANPREFIX="${PREFIX}/man"
>+MAKE_ARGS=	MANPREFIX="${PREFIX}/man" SYSCONFDIR="${PREFIX}/etc"
> ALL_TARGET=	dunst
> TEST_TARGET=	test
> 
>-OPTIONS_DEFINE=	DUNSTIFY
>-OPTIONS_DEFAULT=	DUNSTIFY
>+OPTIONS_DEFINE=	DUNSTIFY WAYLAND
>+OPTIONS_DEFAULT=	DUNSTIFY WAYLAND
> 
> DUNSTIFY_DESC=	Install dunstify (alternative to the notify-send)
> 
> DUNSTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
>-DUNSTIFY_ALL_TARGET=	dunstify
> DUNSTIFY_PLIST_FILES=	bin/dunstify
> 
>+WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
>+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
>+WAYLAND_MAKE_ENV_OFF=	WAYLAND=0
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \
>+		-e 's,/etc,${PREFIX}&,g' \
>+		${WRKSRC}/config.h \
>+		${WRKSRC}/docs/dunst.?.pod \
>+		${WRKSRC}/dunstrc \
>+		${WRKSRC}/src/settings.c
>+	@${REINPLACE_CMD} -e 's,/dunstrc,&.sample,' \
>+		${WRKSRC}/Makefile
>+
>+post-patch-DUNSTIFY-off:
>+	@${REINPLACE_CMD} -e '/^all:/s/dunstify//' \
>+		 -e '/^install:/s/install-dunstify//' \
>+		${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} '/libnotify/d' ${WRKSRC}/config.mk
>+
> pre-install:
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dunst/
>+	@${MKDIR} ${STAGEDIR}${ETCDIR}
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/services/
> 
> post-install:
>diff --git a/sysutils/dunst/distinfo b/sysutils/dunst/distinfo
>index e79caa8ac8bb..6f9fbfa92fa3 100644
>--- a/sysutils/dunst/distinfo
>+++ b/sysutils/dunst/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1595614338
>-SHA256 (dunst-project-dunst-v1.5.0_GH0.tar.gz) = 2c390adf144b5fa0ff007ea3616c90f1bb537df6a8042196993f5585d1bc8c9a
>-SIZE (dunst-project-dunst-v1.5.0_GH0.tar.gz) = 169272
>+TIMESTAMP = 1613910171
>+SHA256 (dunst-project-dunst-v1.6.1_GH0.tar.gz) = cc7d801575f75e92b18d46ee5d3df80aaf331c88b83ec6caabbecf8636310e13
>+SIZE (dunst-project-dunst-v1.6.1_GH0.tar.gz) = 217267
>diff --git a/sysutils/dunst/pkg-plist b/sysutils/dunst/pkg-plist
>index eb39e055b73b..af58e4ef0480 100644
>--- a/sysutils/dunst/pkg-plist
>+++ b/sysutils/dunst/pkg-plist
>@@ -1,6 +1,7 @@
> bin/dunst
> bin/dunstctl
>+@sample %%ETCDIR%%/dunstrc.sample
> man/man1/dunst.1.gz
> man/man1/dunstctl.1.gz
>+man/man5/dunst.5.gz
> share/dbus-1/services/org.knopwob.dunst.service
>-%%DATADIR%%/dunstrc

Flags:

dmgk: maintainer-approval+

Actions: View | Diff

Attachments on bug 253805: 222769