Skip to content

Commit

Permalink
sysutils/dunst: Update to 1.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
dmgk committed Apr 27, 2022
1 parent b9fea4e commit 1625e8e
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 11 deletions.
15 changes: 7 additions & 8 deletions sysutils/dunst/Makefile
Expand Up @@ -2,7 +2,7 @@

PORTNAME= dunst
DISTVERSIONPREFIX= v
DISTVERSION= 1.7.3
DISTVERSION= 1.8.1
CATEGORIES= sysutils

MAINTAINER= dmgk@FreeBSD.org
Expand All @@ -24,9 +24,7 @@ USE_GNOME= cairo gdkpixbuf2 pango
USE_PERL5= build
USE_XORG= x11 xext xinerama xrandr xscrnsaver

MAKE_ARGS= MANPREFIX="${PREFIX}/man" SYSCONFDIR="${PREFIX}/etc"
ALL_TARGET= dunst
TEST_TARGET= test
MAKE_ARGS= MANPREFIX="${PREFIX}/man" SYSCONFDIR="${PREFIX}/etc" SYSTEMD=0

OPTIONS_DEFINE= DUNSTIFY WAYLAND
OPTIONS_DEFAULT= DUNSTIFY WAYLAND
Expand All @@ -41,13 +39,14 @@ WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
WAYLAND_MAKE_ENV_OFF= WAYLAND=0

post-patch:
@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \
@${REINPLACE_CMD} \
-e 's,/usr/bin,${PREFIX}/bin,g' \
-e 's,/usr/share,${PREFIX}/share,g' \
-e 's,/etc,${PREFIX}&,g' \
${WRKSRC}/docs/dunst.?.pod \
${WRKSRC}/dunstrc \
${WRKSRC}/src/settings.c
@${REINPLACE_CMD} -e 's,/dunstrc,&.sample,' \
${WRKSRC}/Makefile
${WRKSRC}/src/settings_data.h \
${WRKSRC}/src/icon-lookup.c

post-patch-DUNSTIFY-off:
@${REINPLACE_CMD} -e '/^all:/s/dunstify//' \
Expand Down
6 changes: 3 additions & 3 deletions sysutils/dunst/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1641380994
SHA256 (dunst-project-dunst-v1.7.3_GH0.tar.gz) = 150c782690286e163663b0eb2605b733927240159738b8365808b851e0afbbee
SIZE (dunst-project-dunst-v1.7.3_GH0.tar.gz) = 4596283
TIMESTAMP = 1651078734
SHA256 (dunst-project-dunst-v1.8.1_GH0.tar.gz) = 90325a4004626ce516ac7b5b0ed1aaab11c5315385d31f781d6f26064601c3a1
SIZE (dunst-project-dunst-v1.8.1_GH0.tar.gz) = 4603941
41 changes: 41 additions & 0 deletions sysutils/dunst/files/patch-Makefile
@@ -0,0 +1,41 @@
--- Makefile.orig 2022-03-02 10:55:25 UTC
+++ Makefile
@@ -184,22 +184,22 @@ install-dunst: dunst doc
install: install-dunst install-dunstctl install-dunstrc install-service install-dunstify

install-dunst: dunst doc
- install -Dm755 dunst ${DESTDIR}${BINDIR}/dunst
- install -Dm644 docs/dunst.1 ${DESTDIR}${MANPREFIX}/man1/dunst.1
- install -Dm644 docs/dunst.5 ${DESTDIR}${MANPREFIX}/man5/dunst.5
- install -Dm644 docs/dunstctl.1 ${DESTDIR}${MANPREFIX}/man1/dunstctl.1
+ install -m555 dunst ${DESTDIR}${BINDIR}/dunst
+ install -m644 docs/dunst.1 ${DESTDIR}${MANPREFIX}/man1/dunst.1
+ install -m644 docs/dunst.5 ${DESTDIR}${MANPREFIX}/man5/dunst.5
+ install -m644 docs/dunstctl.1 ${DESTDIR}${MANPREFIX}/man1/dunstctl.1

install-dunstctl: dunstctl
- install -Dm755 dunstctl ${DESTDIR}${BINDIR}/dunstctl
+ install -m555 dunstctl ${DESTDIR}${BINDIR}/dunstctl

ifeq (1,${SYSCONF_FORCE_NEW})
install-dunstrc:
- install -Dm644 dunstrc ${DESTDIR}${SYSCONFFILE}
+ install -m644 dunstrc ${DESTDIR}${SYSCONFFILE}
endif

install-service: install-service-dbus
install-service-dbus: service-dbus
- install -Dm644 org.knopwob.dunst.service ${DESTDIR}${SERVICEDIR_DBUS}/org.knopwob.dunst.service
+ install -m644 org.knopwob.dunst.service ${DESTDIR}${SERVICEDIR_DBUS}/org.knopwob.dunst.service
ifneq (0,${SYSTEMD})
install-service: install-service-systemd
install-service-systemd: service-systemd
@@ -207,7 +207,7 @@ install-dunstify: dunstify
endif

install-dunstify: dunstify
- install -Dm755 dunstify ${DESTDIR}${BINDIR}/dunstify
+ install -m555 dunstify ${DESTDIR}${BINDIR}/dunstify

uninstall: uninstall-keepconf
uninstall-purge: uninstall-keepconf uninstall-dunstrc

0 comments on commit 1625e8e

Please sign in to comment.