CVS commit: pkgsrc/net

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Sat Dec 21 23:09:24 UTC 2019

Modified Files:
        pkgsrc/net/dhcpcd-gtk: Makefile PLIST
        pkgsrc/net/dhcpcd-qt: Makefile PLIST

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


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/dhcpcd-gtk/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/dhcpcd-gtk/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/dhcpcd-qt/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/dhcpcd-qt/PLIST

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

Modified files:

Index: pkgsrc/net/dhcpcd-gtk/Makefile
diff -u pkgsrc/net/dhcpcd-gtk/Makefile:1.47 pkgsrc/net/dhcpcd-gtk/Makefile:1.48
--- pkgsrc/net/dhcpcd-gtk/Makefile:1.47 Sun Jul 21 22:25:29 2019
+++ pkgsrc/net/dhcpcd-gtk/Makefile      Sat Dec 21 23:09:23 2019
@@ -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 @@ DEPENDS+=    dhcpcd-icons>=${DHCPCD_UI_VERS
 
 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"

Index: pkgsrc/net/dhcpcd-gtk/PLIST
diff -u pkgsrc/net/dhcpcd-gtk/PLIST:1.4 pkgsrc/net/dhcpcd-gtk/PLIST:1.5
--- pkgsrc/net/dhcpcd-gtk/PLIST:1.4     Mon Oct  6 19:46:59 2014
+++ pkgsrc/net/dhcpcd-gtk/PLIST Sat Dec 21 23:09:23 2019
@@ -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

Index: pkgsrc/net/dhcpcd-qt/Makefile
diff -u pkgsrc/net/dhcpcd-qt/Makefile:1.6 pkgsrc/net/dhcpcd-qt/Makefile:1.7
--- pkgsrc/net/dhcpcd-qt/Makefile:1.6   Tue Oct 29 12:39:13 2019
+++ pkgsrc/net/dhcpcd-qt/Makefile       Sat Dec 21 23:09:24 2019
@@ -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+=     --with-qt
 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"

Index: pkgsrc/net/dhcpcd-qt/PLIST
diff -u pkgsrc/net/dhcpcd-qt/PLIST:1.2 pkgsrc/net/dhcpcd-qt/PLIST:1.3
--- pkgsrc/net/dhcpcd-qt/PLIST:1.2      Tue Oct 29 12:39:13 2019
+++ pkgsrc/net/dhcpcd-qt/PLIST  Sat Dec 21 23:09:24 2019
@@ -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