aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitri Goutnik <dmgk@FreeBSD.org>2022-04-27 19:30:42 +0000
committerDmitri Goutnik <dmgk@FreeBSD.org>2022-04-27 19:33:37 +0000
commit1625e8e0a8b0109229facbcdb5e58e85a4cfb36d (patch)
tree5d5b09f2b7fb919f60a9d0af44b679db15700949
parentb9fea4eb787a69bb0b37ff18d857e4df6f3f857d (diff)
downloadports-1625e8e0a8b0109229facbcdb5e58e85a4cfb36d.tar.gz
ports-1625e8e0a8b0109229facbcdb5e58e85a4cfb36d.zip
sysutils/dunst: Update to 1.8.1
-rw-r--r--sysutils/dunst/Makefile15
-rw-r--r--sysutils/dunst/distinfo6
-rw-r--r--sysutils/dunst/files/patch-Makefile41
3 files changed, 51 insertions, 11 deletions
diff --git a/sysutils/dunst/Makefile b/sysutils/dunst/Makefile
index e166d781159e..a8d712d2085f 100644
--- a/sysutils/dunst/Makefile
+++ b/sysutils/dunst/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dunst
DISTVERSIONPREFIX= v
-DISTVERSION= 1.7.3
+DISTVERSION= 1.8.1
CATEGORIES= sysutils
MAINTAINER= dmgk@FreeBSD.org
@@ -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
@@ -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//' \
diff --git a/sysutils/dunst/distinfo b/sysutils/dunst/distinfo
index b05bb08e71f9..b186fc13cbe2 100644
--- a/sysutils/dunst/distinfo
+++ b/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
diff --git a/sysutils/dunst/files/patch-Makefile b/sysutils/dunst/files/patch-Makefile
new file mode 100644
index 000000000000..0ca8c8d8e443
--- /dev/null
+++ b/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