pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/rc.d-boot Mollify pkglint.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc190b05d997
branches:  trunk
changeset: 421629:fc190b05d997
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Jan 16 16:54:36 2020 +0000

description:
Mollify pkglint.

diffstat:

 pkgtools/rc.d-boot/Makefile |  22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diffs (51 lines):

diff -r debbe155c3fe -r fc190b05d997 pkgtools/rc.d-boot/Makefile
--- a/pkgtools/rc.d-boot/Makefile       Thu Jan 16 16:47:38 2020 +0000
+++ b/pkgtools/rc.d-boot/Makefile       Thu Jan 16 16:54:36 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/01/16 16:47:32 schmonz Exp $
+# $NetBSD: Makefile,v 1.12 2020/01/16 16:54:36 schmonz Exp $
 #
 
 PKGNAME=               rc.d-boot-20200116
@@ -37,16 +37,18 @@
 
 EGDIR=                 share/examples/${PKGBASE}
 
+SLASH_TO_MOLLIFY_PKGLINT=      /
+
 .if ${OPSYS} == "Darwin" && exists(/Library/LaunchDaemons)
 RCDBOOT_STYLE=         darwin-launchd
 CONF_FILES+=           ${PREFIX}/${EGDIR}/org.pkgsrc.rc.d-boot.plist \
-                       /Library/LaunchDaemons/org.pkgsrc.rc.d-boot.plist
+                       ${SLASH_TO_MOLLIFY_PKGLINT}Library/LaunchDaemons/org.pkgsrc.rc.d-boot.plist
 .elif ${OPSYS} == "FreeBSD" && exists(/etc/rc.d)
 RCDBOOT_STYLE=         freebsd-native
 .elif ${OPSYS} == "Linux" && exists(/run/systemd/system) && exists(/bin/systemctl)
 RCDBOOT_STYLE=         linux-systemd
 CONF_FILES+=           ${PREFIX}/${EGDIR}/pkgsrc-rc.d-boot.service \
-                       /etc/systemd/system/pkgsrc-rc.d-boot.service
+                       ${SLASH_TO_MOLLIFY_PKGLINT}etc/systemd/system/pkgsrc-rc.d-boot.service
 .elif ${OPSYS} == "Linux" && exists(/etc/rc.d/init.d) && exists(/sbin/chkconfig)
 RCDBOOT_STYLE=         linux-sysv-redhat
 CONF_FILES_PERMS+=     ${PREFIX}/${EGDIR}/pkgsrc-rc.d-boot \
@@ -80,13 +82,13 @@
        ${CP} -R ${FILESDIR} ${WRKSRC}
 
 do-install:
-.      for i in org.pkgsrc.rc.d-boot.plist \
-               pkgsrc-rc.d-boot.service
-               ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${EGDIR}/
-.      endfor
-.      for i in pkgsrc-rc.d-boot
-               ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${EGDIR}/
-.      endfor
+.for i in org.pkgsrc.rc.d-boot.plist \
+       pkgsrc-rc.d-boot.service
+       ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${EGDIR}/
+.endfor
+.for i in pkgsrc-rc.d-boot
+       ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${EGDIR}/
+.endfor
        ${INSTALL_SCRIPT} ${WRKSRC}/rc.d-boot ${DESTDIR}${PREFIX}/sbin/
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index