CVS commit: pkgsrc/sysutils/daemontools-run

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Nov 29 15:18:21 UTC 2023

Modified Files:
        pkgsrc/sysutils/daemontools-run: DEINSTALL INSTALL Makefile

Log Message:
daemontools-run: improve symlink creation. Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/daemontools-run/DEINSTALL \
    pkgsrc/sysutils/daemontools-run/INSTALL
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/daemontools-run/Makefile

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

Modified files:

Index: pkgsrc/sysutils/daemontools-run/DEINSTALL
diff -u pkgsrc/sysutils/daemontools-run/DEINSTALL:1.1 pkgsrc/sysutils/daemontools-run/DEINSTALL:1.2
--- pkgsrc/sysutils/daemontools-run/DEINSTALL:1.1       Mon Sep  4 17:51:10 2023
+++ pkgsrc/sysutils/daemontools-run/DEINSTALL   Wed Nov 29 15:18:21 2023
@@ -1,9 +1,15 @@
-# $NetBSD: DEINSTALL,v 1.1 2023/09/04 17:51:10 schmonz Exp $
+# $NetBSD: DEINSTALL,v 1.2 2023/11/29 15:18:21 schmonz Exp $
+
+OPSYS=@OPSYS@
 
 case "${STAGE}" in
 
 DEINSTALL)
-       ${RM} -f /service
+       if [ ${OPSYS} = "Darwin" ]; then
+               ${ECHO} "please remove /etc/synthetic.conf entry 'service       ${VARBASE}/service' (and reboot when ready)"
+       else
+               ${RM} -f /service
+       fi
 
        ;;
 
Index: pkgsrc/sysutils/daemontools-run/INSTALL
diff -u pkgsrc/sysutils/daemontools-run/INSTALL:1.1 pkgsrc/sysutils/daemontools-run/INSTALL:1.2
--- pkgsrc/sysutils/daemontools-run/INSTALL:1.1 Mon Sep  4 17:51:10 2023
+++ pkgsrc/sysutils/daemontools-run/INSTALL     Wed Nov 29 15:18:21 2023
@@ -1,11 +1,19 @@
-# $NetBSD: INSTALL,v 1.1 2023/09/04 17:51:10 schmonz Exp $
+# $NetBSD: INSTALL,v 1.2 2023/11/29 15:18:21 schmonz Exp $
 
 VARBASE=@VARBASE@
+OPSYS=@OPSYS@
 
 case "${STAGE}" in
 
 POST-INSTALL)
-       ${LN} -s ${VARBASE}/service             /service
+       if [ ! -e /service ]; then
+               if [ ${OPSYS} = "Darwin" ]; then
+                       ${ECHO} "please create /etc/synthetic.conf entry 'service       ${VARBASE}/service' (and reboot when ready)"
+               else
+                       ${LN} -s ${VARBASE}/service /service
+               fi
+       fi
+
 
        ;;
 

Index: pkgsrc/sysutils/daemontools-run/Makefile
diff -u pkgsrc/sysutils/daemontools-run/Makefile:1.12 pkgsrc/sysutils/daemontools-run/Makefile:1.13
--- pkgsrc/sysutils/daemontools-run/Makefile:1.12       Thu Nov 16 23:17:15 2023
+++ pkgsrc/sysutils/daemontools-run/Makefile    Wed Nov 29 15:18:21 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2023/11/16 23:17:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2023/11/29 15:18:21 schmonz Exp $
 
-DISTNAME=              daemontools-run-20231116
+DISTNAME=              daemontools-run-20231129
 CATEGORIES=            sysutils
 MASTER_SITES=          # empty
 DISTFILES=             # empty
@@ -25,6 +25,7 @@ RCD_SCRIPTS=          svscan
 SMF_NAME=              svscan
 FILES_SUBST+=          VARBASE=${VARBASE:Q}
 FILES_SUBST+=          DAEMONTOOLS_LOG_USER=${DAEMONTOOLS_LOG_USER:Q}
+FILES_SUBST+=          OPSYS=${OPSYS:Q}
 FILES_SUBST+=          PKGNAME=${PKGNAME:Q}
 
 INSTALLATION_DIRS=     share/doc/${PKGBASE}