[pkgsrc/trunk]: pkgsrc/net Fix installation of xdg autostart desktop files in...

[nros <nros%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/65d7c0ce9609
branches:  trunk
changeset: 419547:65d7c0ce9609
user:      nros <nros%pkgsrc.org@localhost>
date:      Sat Dec 21 23:09:23 2019 +0000

description:
Fix installation of xdg autostart desktop files in dhcpcd-*

Make dhcpcd-gtk and dhcpcd-qt install xdg autostart files in the right
locations and use pkg_install framework to put then in PKG_SYSCONFDIR.
Fixes installation that was broken due to non updated PLIST files.

diffstat:

 net/dhcpcd-gtk/Makefile |  8 +++++++-
 net/dhcpcd-gtk/PLIST    |  4 ++--
 net/dhcpcd-qt/Makefile  |  8 +++++++-
 net/dhcpcd-qt/PLIST     |  4 ++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diffs (64 lines):

diff -r 854a0b59aff7 -r 65d7c0ce9609 net/dhcpcd-gtk/Makefile
--- a/net/dhcpcd-gtk/Makefile   Sat Dec 21 22:50:00 2019 +0000
+++ b/net/dhcpcd-gtk/Makefile   Sat Dec 21 23:09:23 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2019/07/21 22:25:29 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2019/12/21 23:09:23 nros Exp $
 #
 
 PKGNAME=               dhcpcd-gtk-${DHCPCD_UI_VERSION}
@@ -14,6 +14,12 @@
 
 USE_TOOLS+=            pkg-config
 CONFIGURE_ARGS+=       --with-gtk+
+EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
+MAKEFLAGS+=            SYSCONFDIR=${EGDIR}
+
+CONF_FILES=            ${EGDIR}/xdg/autostart/${PKGBASE}.desktop \
+                       ${PKG_SYSCONFDIR}/xdg/autostart/${PKGBASE}.desktop
+MAKE_DIRS+=            ${PKG_SYSCONFDIR}/xdg/autostart
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff -r 854a0b59aff7 -r 65d7c0ce9609 net/dhcpcd-gtk/PLIST
--- a/net/dhcpcd-gtk/PLIST      Sat Dec 21 22:50:00 2019 +0000
+++ b/net/dhcpcd-gtk/PLIST      Sat Dec 21 23:09:23 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/10/06 19:46:59 roy Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/12/21 23:09:23 nros Exp $
 bin/dhcpcd-gtk
 man/man8/dhcpcd-gtk.8
-share/applications/dhcpcd-gtk.desktop
+share/examples/dhcpcd-gtk/xdg/autostart/dhcpcd-gtk.desktop
diff -r 854a0b59aff7 -r 65d7c0ce9609 net/dhcpcd-qt/Makefile
--- a/net/dhcpcd-qt/Makefile    Sat Dec 21 22:50:00 2019 +0000
+++ b/net/dhcpcd-qt/Makefile    Sat Dec 21 23:09:23 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/10/29 12:39:13 kamil Exp $
+# $NetBSD: Makefile,v 1.7 2019/12/21 23:09:24 nros Exp $
 #
 
 PKGNAME=               dhcpcd-qt-${DHCPCD_UI_VERSION}
@@ -17,6 +17,12 @@
 CONFIGURE_ARGS+=       --disable-notification
 
 INSTALL_MAKE_FLAGS+=   INSTALL_ROOT=${DESTDIR:Q}
+EGDIR=                  ${PREFIX}/share/examples/${PKGBASE}
+MAKEFLAGS+=             SYSCONFDIR=${EGDIR}
+
+CONF_FILES=             ${EGDIR}/xdg/autostart/${PKGBASE}.desktop \
+                        ${PKG_SYSCONFDIR}/xdg/autostart/${PKGBASE}.desktop
+MAKE_DIRS+=             ${PKG_SYSCONFDIR}/xdg/autostart
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff -r 854a0b59aff7 -r 65d7c0ce9609 net/dhcpcd-qt/PLIST
--- a/net/dhcpcd-qt/PLIST       Sat Dec 21 22:50:00 2019 +0000
+++ b/net/dhcpcd-qt/PLIST       Sat Dec 21 23:09:23 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/10/29 12:39:13 kamil Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/12/21 23:09:24 nros Exp $
 bin/dhcpcd-qt
 man/man8/dhcpcd-qt.8
-share/applications/dhcpcd-qt.desktop
+share/examples/dhcpcd-qt/xdg/autostart/dhcpcd-qt.desktop