From 8562a75c53353957da96b1ebef88f46d8e0f8b5e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 15 Feb 2021 15:55:47 +0200
Subject: [PATCH] 66: clean default $PATH, change system-dir.

---
 srcpkgs/66/INSTALL.msg | 10 ++++++----
 srcpkgs/66/template    | 12 ++++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/66/INSTALL.msg b/srcpkgs/66/INSTALL.msg
index 4eb62e16d37..6b99e71aa81 100644
--- a/srcpkgs/66/INSTALL.msg
+++ b/srcpkgs/66/INSTALL.msg
@@ -1,4 +1,6 @@
-CAUTION: 66 v0.6.0.0 has changes to the way the log and env options
-are handled in the frontend service file. Please consult the 
-documentation and make the appropriate changes before restarting
-or enabling your services, especially complex module services.
+CAUTION: package revision 0.6.1.1_2 changes the default system-dir
+from /var/lib/66 to /usr/lib/66. The change requires user intervention.
+Users who upgrade from an earlier version should either copy the 
+contents of the old dir to the new one after installation, or recreate
+trees and re-enable services. That should be done before rebooting/halting
+the system.
\ No newline at end of file
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 1a81ba6b898..9623ea2e90a 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,14 +1,15 @@
 # Template file for '66'
 pkgname=66
 version=0.6.1.1
-revision=1
+revision=2
 wrksrc="66-v${version}"
 build_style=configure
 configure_args="--prefix=/usr
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib
  --with-s6-log-timestamp=iso
- --with-s6-log-user=_s6log"
+ --with-s6-log-user=_s6log
+ --with-system-dir=/usr/lib/66"
 hostmakedepends="pkg-config lowdown"
 makedepends="oblibs-devel skalibs-devel execline-devel s6-devel s6-rc-devel"
 short_desc="Small tools built around s6 and s6-rc programs"
@@ -23,6 +24,13 @@ conf_files="/etc/66/init /etc/66/init.conf"
 
 system_accounts="_s6log"
 
+pre_configure() {
+
+	# Clean the default $PATH for service scripts
+	vsed -i "s@PATH=/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin@PATH=/usr/bin:usr/sbin@" \
+	 "${wrksrc}/skel/init.conf"
+}
+
 post_install() {
 	vdoc README.md
 	vlicense LICENSE