Update x11/dunst to 1.2.0

pkgsrc changes:
- dunst now also needs x11/gtk2 and x11/libXrandr

Changes:
## 1.2.0 - 2017-07-12
### Added
- `always_run_script` option to run script even if a notification is suppressed
- Support for more icon file types
- Support for raw icons
- `hide_duplicate_count` option to hide the number of duplicate notifications
- Support for per-urgency frame colours
- `markup` setting for more fine-grained control over how markup is handled
- `history_ignore` rule action to exclude a notification from being added to the
  history
- Support for setting the dpi value dunst will use for font rendering via the
  `Xft.dpi` X resource
- Experimental support for per-monitor dpi calculation
- `max_icon_size` option to scale down icons if they exceed a certain size
- Middle click on notifications can be used to trigger actions
- Systemd service file, installed by default
- `%n` format flag for getting progress value without any extra characters

### Changed
- Text and icons are now centred vertically
- Notifications aren't considered duplicate if urgency or icons differ
- The maximum length of a notification is limited to 5000 characters
- The frame width and color settings were moved to the global section as
  `frame_width` and `frame_color` respectively
- Dropped Xinerama in favour of RandR, Xinerama can be enabled with the
  `-force_xinerama` option if needed

### Deprecated
- `allow_markup` is deprecated with `markup` as its replacement
- The urgency specific command line flags have been deprecated with no
  replacement, respond to issue #328 on the bug tracker if you depend on them

### Fixed
- Infinite loop if there are 2 configuration file sections with the same name
- URLs with dashes and underscores in them are now parsed properly
- Many memory leaks
- Category based rules were applied without actually matching
- dmenu command not parsing quoted arguments correctly
- Icon alignment with dynamic width
- Issue when loading configuration files with very long lines
- '\n' is no longer expanded to a newline inside notification text
- Notification window wasn't redrawn if obscured on systems without a compositor
- `ignore_newline` now works regardless of the markup setting
- dmenu process being left as a zombie if no option was selected
- Crash when opening urls parsed from `<a href="">` tags

6 files changed, 46 insertions, 47 deletions

diff --git a/x11/dunst/Makefile b/x11/dunst/Makefile
index 3fb9f53c944..cc5a260f5c2 100644
--- a/x11/dunst/Makefile
+++ b/x11/dunst/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2017/02/12 06:26:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2017/07/20 10:39:25 leot Exp $
 
-DISTNAME=	dunst-1.1.0
-PKGREVISION=	4
+DISTNAME=	dunst-1.2.0
 CATEGORIES=	x11
-MASTER_SITES=	http://www.knopwob.org/public/dunst-release/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=dunst-project/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://knopwob.org/dunst/
+HOMEPAGE=	https://dunst-project.org/
 COMMENT=	Customizable and lightweight notification-daemon
 LICENSE=	modified-bsd
 
@@ -27,4 +26,6 @@ SUBST_SED.fix-paths+=		-e 's,/usr/share,${PREFIX}/share,g'
 .include "../../x11/libxdg-basedir/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/dunst/distinfo b/x11/dunst/distinfo
index ece529fa527..23e050316da 100644
--- a/x11/dunst/distinfo
+++ b/x11/dunst/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2016/08/26 17:16:08 joerg Exp $
+$NetBSD: distinfo,v 1.4 2017/07/20 10:39:25 leot Exp $
 
-SHA1 (dunst-1.1.0.tar.bz2) = 9fd95cf803307609053b45d9fbe864e4dcccc457
-RMD160 (dunst-1.1.0.tar.bz2) = e219b3ef8e97536b7dee2ddcb1e113da84fc4251
-SHA512 (dunst-1.1.0.tar.bz2) = ba01a6b18da5199b3356342f5c22592f93f447389267810bbfc35decf1a67f89650d445d3c1dd6f3cc76a4f86f7165adc777b669444627e42d3e671d4f04a04b
-Size (dunst-1.1.0.tar.bz2) = 79032 bytes
-SHA1 (patch-Makefile) = 5e2f407bc35ae9f5bf8b847b36129ae34ad6226d
-SHA1 (patch-config.mk) = 90b417fe5353140aeb227f05114b3bfdfc52372e
-SHA1 (patch-notification.c) = 5d1440fe22a928a96a544d7a9ba0a841789a6b69
+SHA1 (dunst-1.2.0.tar.gz) = 0345274eb2d9a07690fad650523714c552465692
+RMD160 (dunst-1.2.0.tar.gz) = 3314646f4baaf246397766e60fa2ec1fd6660641
+SHA512 (dunst-1.2.0.tar.gz) = 223c8aae61574770a76bff84723643a3c03d3d9a8f4094bc4e92e16826703e7c0a7c3327945db8469b8dcc48fe5cfaba51e6724149e6571a7ffc1716656e30f3
+Size (dunst-1.2.0.tar.gz) = 110628 bytes
+SHA1 (patch-Makefile) = d56b2d25fccbee89eed23097defff9fa0cc561dd
+SHA1 (patch-config.mk) = 36ff5dd95e73dfbc00181bc0e67e4cf0db40a93b
+SHA1 (patch-src_notification.c) = 4ce64e6d2882303e24df9d99789491ac4b986fcf
diff --git a/x11/dunst/patches/patch-Makefile b/x11/dunst/patches/patch-Makefile
index 8e30da2bcdd..cc646cdc45d 100644
--- a/x11/dunst/patches/patch-Makefile
+++ b/x11/dunst/patches/patch-Makefile
@@ -1,20 +1,14 @@
-$NetBSD: patch-Makefile,v 1.1 2016/06/17 19:42:47 kamil Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/07/20 10:39:25 leot Exp $
 
-Fix the install target on SmartOS.
+Do not install systemd `.service' file.
 
-There shouldn't be used cp(1) there, but it's good enough for now.
-
---- Makefile.orig	2014-07-29 20:49:11.000000000 +0000
+--- Makefile.orig	2017-07-12 08:22:04.000000000 +0000
 +++ Makefile
-@@ -75,9 +75,9 @@ install: all
- 	cp -f dunst.1 ${DESTDIR}${MANPREFIX}/man1/
- 	chmod 644 ${DESTDIR}${MANPREFIX}/man1/dunst.1
- 	mkdir -p "${DESTDIR}${PREFIX}/share/dunst"
--	 cp -f dunstrc ${DESTDIR}${PREFIX}/share/dunst
-+	cp -f dunstrc ${DESTDIR}${PREFIX}/share/dunst
- 	mkdir -p "${DESTDIR}${PREFIX}/share/dbus-1/services/"
--	cp -vf org.knopwob.dunst.service "${DESTDIR}${PREFIX}/share/dbus-1/services/org.knopwob.dunst.service"
-+	cp -f org.knopwob.dunst.service "${DESTDIR}${PREFIX}/share/dbus-1/services/org.knopwob.dunst.service"
+@@ -64,7 +64,6 @@ install-doc:
+ install-service: service
+ 	mkdir -p ${DESTDIR}${PREFIX}/share/dbus-1/services/
+ 	install -m644 org.knopwob.dunst.service ${DESTDIR}${PREFIX}/share/dbus-1/services
+-	install -Dm644 dunst.systemd.service ${DESTDIR}${PREFIX}/lib/systemd/user/dunst.service
+ 
+ install: install-dunst install-doc install-service
  
- uninstall:
- 	@echo removing executables from ${DESTDIR}${PREFIX}/bin
diff --git a/x11/dunst/patches/patch-config.mk b/x11/dunst/patches/patch-config.mk
index 84517e70e24..7c41ab116d5 100644
--- a/x11/dunst/patches/patch-config.mk
+++ b/x11/dunst/patches/patch-config.mk
@@ -1,13 +1,15 @@
-$NetBSD: patch-config.mk,v 1.1 2016/08/26 17:16:09 joerg Exp $
+$NetBSD: patch-config.mk,v 1.2 2017/07/20 10:39:25 leot Exp $
 
---- config.mk.orig	2016-08-26 13:34:57.775528056 +0000
+Do not manually provide an undefined (and not needed) ${X11LIB} to LDFLAGS.
+
+--- config.mk.orig	2017-07-12 08:22:04.000000000 +0000
 +++ config.mk
-@@ -37,7 +37,7 @@ endif
+@@ -42,7 +42,7 @@ endif
  # includes and libs
  INCS := $(shell ${PKG_CONFIG} --cflags ${pkg_config_packs})
  CFLAGS += ${INCS}
--LDFLAGS += -lm -L${X11LIB} -lXss ${XINERAMALIBS} $(shell ${PKG_CONFIG} --libs ${pkg_config_packs})
-+LDFLAGS += -lm -lXss ${XINERAMALIBS} $(shell ${PKG_CONFIG} --libs ${pkg_config_packs})
+-LDFLAGS += -lm -L${X11LIB} -lXss $(shell ${PKG_CONFIG} --libs ${pkg_config_packs})
++LDFLAGS += -lm -lXss $(shell ${PKG_CONFIG} --libs ${pkg_config_packs})
  
  # only make this an fatal error when where not cleaning
  ifneq (clean, $(MAKECMDGOALS))
diff --git a/x11/dunst/patches/patch-notification.c b/x11/dunst/patches/patch-notification.c
deleted file mode 100644
index d96147287b6..00000000000
--- a/x11/dunst/patches/patch-notification.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-notification.c,v 1.1 2016/08/26 17:16:09 joerg Exp $
-
---- notification.c.orig	2016-08-26 13:36:35.405971570 +0000
-+++ notification.c
-@@ -6,6 +6,7 @@
- #include <glib.h>
- #include <errno.h>
- #include <string.h>
-+#include <libgen.h>
- #include <stdbool.h>
- #include <unistd.h>
- #include <sys/wait.h>
diff --git a/x11/dunst/patches/patch-src_notification.c b/x11/dunst/patches/patch-src_notification.c
new file mode 100644
index 00000000000..b1afb1724f4
--- /dev/null
+++ b/x11/dunst/patches/patch-src_notification.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_notification.c,v 1.1 2017/07/20 10:39:25 leot Exp $
+
+<libgen.h> is needed for basename(3).
+
+--- src/notification.c.orig	2017-07-12 08:22:04.000000000 +0000
++++ src/notification.c
+@@ -6,6 +6,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <glib.h>
++#include <libgen.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>