xfce4-notifyd: use upstream-supplied configuration file (NFC)

Originally the upstream package didn't supply an xfce4-notifyd.desktop
file, so we added one locally. Now it does provide this file, so use it
instead. Committed in part to try to fix a packaging failure noted in
Joyent SunOS builds. I wasn't able to duplicate it, but this should
avoid the problem by preventing the upstream tooling from trying to
install directly to a path under PKG_SYSCONFDIR (which usually in this
example check-files.mk ignores, and we'd specified the same file name
and path to install our local version of the config file to).

4 files changed, 20 insertions, 20 deletions

diff --git a/x11/xfce4-notifyd/Makefile b/x11/xfce4-notifyd/Makefile
index a5cc1ab068f..1f9be64cb47 100644
--- a/x11/xfce4-notifyd/Makefile
+++ b/x11/xfce4-notifyd/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.29 2020/09/10 00:34:44 gutteridge Exp $
+# $NetBSD: Makefile,v 1.30 2020/12/22 00:28:13 gutteridge Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 VERSION=	0.6.2
 DISTNAME=	xfce4-notifyd-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://archive.xfce.org/src/apps/xfce4-notifyd/${VERSION:R}/
 
 HOMEPAGE=	https://goodies.xfce.org/projects/applications/xfce4-notifyd
-COMMENT=	XFCE Notify daemon
+COMMENT=	Xfce Notify daemon
 
 TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 
@@ -18,16 +19,6 @@ MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg/autostart
 CONF_FILES+=	${EGDIR}/${DESKTOP_FILE} \
 		${PKG_SYSCONFDIR}/xdg/autostart/${DESKTOP_FILE}
 
-INSTALLATION_DIRS+=	${EGDIR}
-
-post-build:
-	${SED} ${FILES_SUBST_SED} ${FILESDIR}/${DESKTOP_FILE} \
-	    > ${WRKSRC}/${DESKTOP_FILE}
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/${DESKTOP_FILE} \
-	    ${DESTDIR}${PREFIX}/${EGDIR}/${DESKTOP_FILE}
-
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libxfce4ui/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-notifyd/distinfo b/x11/xfce4-notifyd/distinfo
index b72dafd2e99..c6574f970c3 100644
--- a/x11/xfce4-notifyd/distinfo
+++ b/x11/xfce4-notifyd/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2020/09/10 00:34:44 gutteridge Exp $
+$NetBSD: distinfo,v 1.10 2020/12/22 00:28:13 gutteridge Exp $
 
 SHA1 (xfce4-notifyd-0.6.2.tar.bz2) = ac82a3604d3dfc38f6104e2cc0b908142331f00a
 RMD160 (xfce4-notifyd-0.6.2.tar.bz2) = ecafce753674b79b13f66fddd77774820f47b44f
 SHA512 (xfce4-notifyd-0.6.2.tar.bz2) = 13fdbcd5031ad44a89327eb65356a4d2c45315e0c8c507e457eee4cc95898794679163de9603a2059d9aaf20d62df317f8a09e0353f6adb526970a21d580b325
 Size (xfce4-notifyd-0.6.2.tar.bz2) = 548415 bytes
+SHA1 (patch-Makefile.in) = fbccb3ba71f22eb275b0f9570899105d1fdb6d08
diff --git a/x11/xfce4-notifyd/files/xfce4-notifyd.desktop b/x11/xfce4-notifyd/files/xfce4-notifyd.desktop
deleted file mode 100644
index d8cbf3878bf..00000000000
--- a/x11/xfce4-notifyd/files/xfce4-notifyd.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Notification Daemon
-Comment=Launch notification daemon
-Icon=preferences-system-notifications
-Exec=@PREFIX@/lib/xfce4/notifyd/xfce4-notifyd
-OnlyShowIn=XFCE;
diff --git a/x11/xfce4-notifyd/patches/patch-Makefile.in b/x11/xfce4-notifyd/patches/patch-Makefile.in
new file mode 100644
index 00000000000..b72c1a29771
--- /dev/null
+++ b/x11/xfce4-notifyd/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/12/22 00:28:13 gutteridge Exp $
+
+Adjust to pkgsrc norms for placing configuration files.
+
+--- Makefile.in.orig	2020-08-31 22:01:43.000000000 +0000
++++ Makefile.in
+@@ -662,7 +662,7 @@ dist_autostart = \
+ @USE_DBUS_START_DAEMON_TRUE@systemd_userdir = $(prefix)/lib/systemd/user
+ @USE_DBUS_START_DAEMON_TRUE@systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+ @USE_DBUS_START_DAEMON_TRUE@distclean_service = $(service_DATA) $(systemd_user_DATA)
+-@USE_DBUS_START_DAEMON_FALSE@autostartdir = $(sysconfdir)/xdg/autostart
++@USE_DBUS_START_DAEMON_FALSE@autostartdir = $(datadir)/examples/xfce4-notifyd
+ @USE_DBUS_START_DAEMON_FALSE@autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ @USE_DBUS_START_DAEMON_FALSE@distclean_autostart = $(autostart_DATA)
+ dist_man1_MANS = \