pkgsrc-Changes archive

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

CVS commit: pkgsrc/pkgtools/rc.d-boot



Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Dec 16 05:41:01 UTC 2018

Modified Files:
        pkgsrc/pkgtools/rc.d-boot: DEINSTALL INSTALL Makefile

Log Message:
Add FreeBSD support, trivially.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/rc.d-boot/DEINSTALL
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/rc.d-boot/INSTALL \
    pkgsrc/pkgtools/rc.d-boot/Makefile

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

Modified files:

Index: pkgsrc/pkgtools/rc.d-boot/DEINSTALL
diff -u pkgsrc/pkgtools/rc.d-boot/DEINSTALL:1.1 pkgsrc/pkgtools/rc.d-boot/DEINSTALL:1.2
--- pkgsrc/pkgtools/rc.d-boot/DEINSTALL:1.1     Wed Dec 12 02:08:10 2018
+++ pkgsrc/pkgtools/rc.d-boot/DEINSTALL Sun Dec 16 05:41:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1 2018/12/12 02:08:10 schmonz Exp $
+# $NetBSD: DEINSTALL,v 1.2 2018/12/16 05:41:01 schmonz Exp $
 
 RCDBOOT_STYLE=@RCDBOOT_STYLE@
 
@@ -8,6 +8,8 @@ DEINSTALL)
        case "${RCDBOOT_STYLE}" in
        darwin-launchd)
                ;;
+       freebsd-native)
+               ;;
        linux-systemd)
                systemctl disable pkgsrc-rc.d-boot.service
                ;;
@@ -15,7 +17,11 @@ DEINSTALL)
                ;;
        esac
 
-       ${CAT} <<EOF
+       case "${RCDBOOT_STYLE}" in
+       *-native)
+               ;;
+       *)
+               ${CAT} <<EOF
 ===========================================================================
 
 pkgsrc-provided rc.d scripts will no longer be started at boot.
@@ -24,6 +30,9 @@ If you wish to stop them, please do so n
 
 ===========================================================================
 EOF
+               ;;
+       esac
+
        ;;
 
 esac

Index: pkgsrc/pkgtools/rc.d-boot/INSTALL
diff -u pkgsrc/pkgtools/rc.d-boot/INSTALL:1.3 pkgsrc/pkgtools/rc.d-boot/INSTALL:1.4
--- pkgsrc/pkgtools/rc.d-boot/INSTALL:1.3       Wed Dec 12 02:08:10 2018
+++ pkgsrc/pkgtools/rc.d-boot/INSTALL   Sun Dec 16 05:41:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.3 2018/12/12 02:08:10 schmonz Exp $
+# $NetBSD: INSTALL,v 1.4 2018/12/16 05:41:01 schmonz Exp $
 
 RCDBOOT_STYLE=@RCDBOOT_STYLE@
 
@@ -9,6 +9,8 @@ POST-INSTALL)
        darwin-launchd)
                launchctl load -w /Library/LaunchDaemons/org.pkgsrc.rc.d-boot.plist
                ;;
+       freebsd-native)
+               ;;
        linux-systemd)
                systemctl enable --now /etc/systemd/system/pkgsrc-rc.d-boot.service
                ;;
Index: pkgsrc/pkgtools/rc.d-boot/Makefile
diff -u pkgsrc/pkgtools/rc.d-boot/Makefile:1.3 pkgsrc/pkgtools/rc.d-boot/Makefile:1.4
--- pkgsrc/pkgtools/rc.d-boot/Makefile:1.3      Wed Dec 12 02:08:10 2018
+++ pkgsrc/pkgtools/rc.d-boot/Makefile  Sun Dec 16 05:41:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/12/12 02:08:10 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/16 05:41:01 schmonz Exp $
 #
 
 PKGNAME=               rc.d-boot-20181211
@@ -12,12 +12,12 @@ ONLY_FOR_PLATFORM=  # empty by default
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} != "NetBSD"
+.if exists(/sbin/rcorder)
+RCORDER=               /sbin/rcorder
+.else
 DEPENDS+=              rc.subr-[0-9]*:../../pkgtools/rc.subr
 DEPENDS+=              rcorder-[0-9]*:../../pkgtools/rcorder
 RCORDER=               ${PREFIX}/sbin/rcorder
-.else
-RCORDER=               /sbin/rcorder
 .endif
 
 NO_CHECKSUM=           yes
@@ -33,17 +33,20 @@ SUBST_VARS.paths=   PREFIX RCD_SCRIPTS_DIR
 FILES_SUBST+=          RCDBOOT_STYLE=${RCDBOOT_STYLE:Q}
 
 .if ${OPSYS} == "Darwin" && exists (/Library/LaunchDaemons)
-ONLY_FOR_PLATFORM+=    Darwin-*-*
+ONLY_FOR_PLATFORM+=    ${OPSYS}-*-*
 RCDBOOT_STYLE=         darwin-launchd
 CONF_FILES+=           ${PREFIX}/share/examples/${PKGBASE}/org.pkgsrc.rc.d-boot.plist \
                        /Library/LaunchDaemons/org.pkgsrc.rc.d-boot.plist
+.elif ${OPSYS} == "FreeBSD" && exists(/etc/rc.d)
+ONLY_FOR_PLATFORM+=    ${OPSYS}-*-*
+RCDBOOT_STYLE=         freebsd-native
 .elif ${OPSYS} == "Linux" && exists(/etc/systemd/system)
-ONLY_FOR_PLATFORM+=    Linux-*-*
+ONLY_FOR_PLATFORM+=    ${OPSYS}-*-*
 RCDBOOT_STYLE=         linux-systemd
 CONF_FILES+=           ${PREFIX}/share/examples/${PKGBASE}/pkgsrc-rc.d-boot.service \
                        /etc/systemd/system/pkgsrc-rc.d-boot.service
 .elif ${OPSYS} == "NetBSD" && exists(/etc/rc.d)
-ONLY_FOR_PLATFORM+=    NetBSD-*-*
+ONLY_FOR_PLATFORM+=    ${OPSYS}-*-*
 RCDBOOT_STYLE=         netbsd-native
 .endif
 



Home | Main Index | Thread Index | Old Index