CVS commit: pkgsrc/x11/xfce4-notifyd

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 31 09:16:46 UTC 2018

Modified Files:
        pkgsrc/x11/xfce4-notifyd: Makefile PLIST

Log Message:
xfce4-notifyd: Simplify and fix xfce4-notifyd.desktop handling.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/xfce4-notifyd/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xfce4-notifyd/PLIST

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

Modified files:

Index: pkgsrc/x11/xfce4-notifyd/Makefile
diff -u pkgsrc/x11/xfce4-notifyd/Makefile:1.13 pkgsrc/x11/xfce4-notifyd/Makefile:1.14
--- pkgsrc/x11/xfce4-notifyd/Makefile:1.13      Tue May 29 21:24:20 2018
+++ pkgsrc/x11/xfce4-notifyd/Makefile   Thu May 31 09:16:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/05/29 21:24:20 youri Exp $
+# $NetBSD: Makefile,v 1.14 2018/05/31 09:16:46 jperkin Exp $
 #
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -13,20 +13,20 @@ COMMENT=    XFCE Notify daemon
 TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 
 DESKTOP_FILE=  xfce4-notifyd.desktop
-
-SUBST_CLASSES=         prefix
-SUBST_MESSAGE.prefix=  Fixing path
-SUBST_STAGE.prefix=    pre-install
-SUBST_FILES.prefix=    xfce4-notifyd/${DESKTOP_FILE}
-SUBST_VARS.prefix=     PREFIX
-
-pre-configure:
-       cp ${FILESDIR}/${DESKTOP_FILE} \
-           ${WRKSRC}/xfce4-notifyd/${DESKTOP_FILE}
+EGDIR=         share/examples/xfce4-notifyd
+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}/xfce4-notifyd/${DESKTOP_FILE} \
-           ${PKG_SYSCONFDIR}/xdg/autostart/${DESKTOP_FILE}
+       ${INSTALL_DATA} ${WRKSRC}/${DESKTOP_FILE} \
+           ${DESTDIR}${PREFIX}/${EGDIR}/${DESKTOP_FILE}
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libxfce4ui/buildlink3.mk"

Index: pkgsrc/x11/xfce4-notifyd/PLIST
diff -u pkgsrc/x11/xfce4-notifyd/PLIST:1.3 pkgsrc/x11/xfce4-notifyd/PLIST:1.4
--- pkgsrc/x11/xfce4-notifyd/PLIST:1.3  Tue May 15 22:11:39 2018
+++ pkgsrc/x11/xfce4-notifyd/PLIST      Thu May 31 09:16:46 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/05/15 22:11:39 youri Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/05/31 09:16:46 jperkin Exp $
 bin/xfce4-notifyd-config
 lib/systemd/user/xfce4-notifyd.service
 lib/xfce4/notifyd/xfce4-notifyd
@@ -6,6 +6,7 @@ lib/xfce4/panel/plugins/libnotification-
 man/man1/xfce4-notifyd-config.1
 share/applications/xfce4-notifyd-config.desktop
 share/dbus-1/services/org.xfce.xfce4-notifyd.Notifications.service
+share/examples/xfce4-notifyd/xfce4-notifyd.desktop
 share/icons/hicolor/16x16/apps/xfce4-notifyd.png
 share/icons/hicolor/24x24/apps/xfce4-notifyd.png
 share/icons/hicolor/32x32/apps/xfce4-notifyd.png