Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_160859689357330"
MIME-Version: 1.0
Date: Tue, 22 Dec 2020 00:28:13 +0000
From: "David H. Gutteridge" <gutteridge@netbsd.org>
Subject: CVS commit: pkgsrc/x11/xfce4-notifyd
To: pkgsrc-changes@NetBSD.org
Reply-To: gutteridge@netbsd.org
Message-Id: <20201222002813.91CCDFA9D@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_160859689357330
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Tue Dec 22 00:28:13 UTC 2020

Modified Files:
	pkgsrc/x11/xfce4-notifyd: Makefile distinfo
Added Files:
	pkgsrc/x11/xfce4-notifyd/patches: patch-Makefile.in
Removed Files:
	pkgsrc/x11/xfce4-notifyd/files: xfce4-notifyd.desktop

Log Message:
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).


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/xfce4-notifyd/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xfce4-notifyd/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xfce4-notifyd/files/xfce4-notifyd.desktop
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xfce4-notifyd/patches/patch-Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_160859689357330
Content-Disposition: inline
Content-Length: 3373
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/xfce4-notifyd/Makefile
diff -u pkgsrc/x11/xfce4-notifyd/Makefile:1.29 pkgsrc/x11/xfce4-notifyd/Makefile:1.30
--- pkgsrc/x11/xfce4-notifyd/Makefile:1.29	Thu Sep 10 00:34:44 2020
+++ pkgsrc/x11/xfce4-notifyd/Makefile	Tue Dec 22 00:28:13 2020
@@ -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/autost
 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"

Index: pkgsrc/x11/xfce4-notifyd/distinfo
diff -u pkgsrc/x11/xfce4-notifyd/distinfo:1.9 pkgsrc/x11/xfce4-notifyd/distinfo:1.10
--- pkgsrc/x11/xfce4-notifyd/distinfo:1.9	Thu Sep 10 00:34:44 2020
+++ pkgsrc/x11/xfce4-notifyd/distinfo	Tue Dec 22 00:28:13 2020
@@ -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

Added files:

Index: pkgsrc/x11/xfce4-notifyd/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/x11/xfce4-notifyd/patches/patch-Makefile.in:1.1
--- /dev/null	Tue Dec 22 00:28:13 2020
+++ pkgsrc/x11/xfce4-notifyd/patches/patch-Makefile.in	Tue Dec 22 00:28:13 2020
@@ -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 = \


--_----------=_160859689357330--