Thu May 31 09:16:46 2018 UTC ()
xfce4-notifyd: Simplify and fix xfce4-notifyd.desktop handling.


(jperkin)
diff -r1.13 -r1.14 pkgsrc/x11/xfce4-notifyd/Makefile
diff -r1.3 -r1.4 pkgsrc/x11/xfce4-notifyd/PLIST
cvs diff -r1.13 -r1.14 pkgsrc/x11/xfce4-notifyd/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-notifyd/Makefile 2018/05/29 21:24:20 1.13
+++ pkgsrc/x11/xfce4-notifyd/Makefile 2018/05/31 09:16:46 1.14
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.13 2018/05/29 21:24:20 youri Exp $ 1# $NetBSD: Makefile,v 1.14 2018/05/31 09:16:46 jperkin Exp $
2# 2#
3 3
4.include "../../meta-pkgs/xfce4/Makefile.common" 4.include "../../meta-pkgs/xfce4/Makefile.common"
5 5
6DISTNAME= xfce4-notifyd-0.4.2 6DISTNAME= xfce4-notifyd-0.4.2
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= http://archive.xfce.org/src/apps/xfce4-notifyd/0.4/ 8MASTER_SITES= http://archive.xfce.org/src/apps/xfce4-notifyd/0.4/
9 9
10HOMEPAGE= http://goodies.xfce.org/projects/applications/xfce4-notifyd 10HOMEPAGE= http://goodies.xfce.org/projects/applications/xfce4-notifyd
11COMMENT= XFCE Notify daemon 11COMMENT= XFCE Notify daemon
12 12
13TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 13TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
14 14
15DESKTOP_FILE= xfce4-notifyd.desktop 15DESKTOP_FILE= xfce4-notifyd.desktop
16 16EGDIR= share/examples/xfce4-notifyd
17SUBST_CLASSES= prefix 17MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart
18SUBST_MESSAGE.prefix= Fixing path 18CONF_FILES+= ${EGDIR}/${DESKTOP_FILE} \
19SUBST_STAGE.prefix= pre-install 19 ${PKG_SYSCONFDIR}/xdg/autostart/${DESKTOP_FILE}
20SUBST_FILES.prefix= xfce4-notifyd/${DESKTOP_FILE} 20
21SUBST_VARS.prefix= PREFIX 21INSTALLATION_DIRS+= ${EGDIR}
22 22
23pre-configure: 23post-build:
24 cp ${FILESDIR}/${DESKTOP_FILE} \ 24 ${SED} ${FILES_SUBST_SED} ${FILESDIR}/${DESKTOP_FILE} \
25 ${WRKSRC}/xfce4-notifyd/${DESKTOP_FILE} 25 > ${WRKSRC}/${DESKTOP_FILE}
26 26
27post-install: 27post-install:
28 ${INSTALL_DATA} ${WRKSRC}/xfce4-notifyd/${DESKTOP_FILE} \ 28 ${INSTALL_DATA} ${WRKSRC}/${DESKTOP_FILE} \
29 ${PKG_SYSCONFDIR}/xdg/autostart/${DESKTOP_FILE} 29 ${DESTDIR}${PREFIX}/${EGDIR}/${DESKTOP_FILE}
30 30
31.include "../../sysutils/desktop-file-utils/desktopdb.mk" 31.include "../../sysutils/desktop-file-utils/desktopdb.mk"
32.include "../../x11/libxfce4ui/buildlink3.mk" 32.include "../../x11/libxfce4ui/buildlink3.mk"
33.include "../../x11/xfce4-panel/buildlink3.mk" 33.include "../../x11/xfce4-panel/buildlink3.mk"
34.include "../../sysutils/libnotify/buildlink3.mk" 34.include "../../sysutils/libnotify/buildlink3.mk"
35.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 35.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/x11/xfce4-notifyd/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-notifyd/PLIST 2018/05/15 22:11:39 1.3
+++ pkgsrc/x11/xfce4-notifyd/PLIST 2018/05/31 09:16:46 1.4
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1@comment $NetBSD: PLIST,v 1.3 2018/05/15 22:11:39 youri Exp $ 1@comment $NetBSD: PLIST,v 1.4 2018/05/31 09:16:46 jperkin Exp $
2bin/xfce4-notifyd-config 2bin/xfce4-notifyd-config
3lib/systemd/user/xfce4-notifyd.service 3lib/systemd/user/xfce4-notifyd.service
4lib/xfce4/notifyd/xfce4-notifyd 4lib/xfce4/notifyd/xfce4-notifyd
5lib/xfce4/panel/plugins/libnotification-plugin.la 5lib/xfce4/panel/plugins/libnotification-plugin.la
6man/man1/xfce4-notifyd-config.1 6man/man1/xfce4-notifyd-config.1
7share/applications/xfce4-notifyd-config.desktop 7share/applications/xfce4-notifyd-config.desktop
8share/dbus-1/services/org.xfce.xfce4-notifyd.Notifications.service 8share/dbus-1/services/org.xfce.xfce4-notifyd.Notifications.service
 9share/examples/xfce4-notifyd/xfce4-notifyd.desktop
9share/icons/hicolor/16x16/apps/xfce4-notifyd.png 10share/icons/hicolor/16x16/apps/xfce4-notifyd.png
10share/icons/hicolor/24x24/apps/xfce4-notifyd.png 11share/icons/hicolor/24x24/apps/xfce4-notifyd.png
11share/icons/hicolor/32x32/apps/xfce4-notifyd.png 12share/icons/hicolor/32x32/apps/xfce4-notifyd.png
12share/icons/hicolor/48x48/apps/xfce4-notifyd.png 13share/icons/hicolor/48x48/apps/xfce4-notifyd.png
13share/icons/hicolor/scalable/apps/xfce4-notifyd.svg 14share/icons/hicolor/scalable/apps/xfce4-notifyd.svg
14share/icons/hicolor/scalable/status/notification-disabled-new-symbolic.svg 15share/icons/hicolor/scalable/status/notification-disabled-new-symbolic.svg
15share/icons/hicolor/scalable/status/notification-disabled-symbolic.svg 16share/icons/hicolor/scalable/status/notification-disabled-symbolic.svg
16share/icons/hicolor/scalable/status/notification-new-symbolic.svg 17share/icons/hicolor/scalable/status/notification-new-symbolic.svg
17share/icons/hicolor/scalable/status/notification-symbolic.svg 18share/icons/hicolor/scalable/status/notification-symbolic.svg
18share/locale/ar/LC_MESSAGES/xfce4-notifyd.mo 19share/locale/ar/LC_MESSAGES/xfce4-notifyd.mo
19share/locale/ast/LC_MESSAGES/xfce4-notifyd.mo 20share/locale/ast/LC_MESSAGES/xfce4-notifyd.mo
20share/locale/bg/LC_MESSAGES/xfce4-notifyd.mo 21share/locale/bg/LC_MESSAGES/xfce4-notifyd.mo
21share/locale/ca/LC_MESSAGES/xfce4-notifyd.mo 22share/locale/ca/LC_MESSAGES/xfce4-notifyd.mo