initware: Fix package and update

[David MacKay <david%netascale.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	David MacKay <david%netascale.com@localhost>
Pushed By:	dmackay
Date:		Wed Aug 11 11:50:08 2021 +0100
Changeset:	5d01b7421ab5769ba561db2e23bfdf65bec5c886

Modified Files:
	initware-git/DESCR
	initware-git/Makefile
	initware-git/PLIST
Added Files:
	initware-git/MESSAGE
	initware-git/files/initware.sh
Removed Files:
	initware-git/distinfo
	initware-git/patches/patch-doc_manual_CMakeLists.txt

Log Message:
initware: Fix package and update

Added dependency on gperf, use a snapshot commit, update PLIST etc,
and include an rc script.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5d01b7421ab5769ba561db2e23bfdf65bec5c886

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

diffstat:
 initware-git/DESCR                                 | 15 +++++++++--
 initware-git/MESSAGE                               | 21 ++++++++++++++++
 initware-git/Makefile                              | 15 ++++++++---
 initware-git/PLIST                                 | 29 ++++++++++++++++------
 initware-git/distinfo                              |  3 ---
 initware-git/files/initware.sh                     | 27 ++++++++++++++++++++
 .../patches/patch-doc_manual_CMakeLists.txt        | 10 --------
 7 files changed, 93 insertions(+), 27 deletions(-)

diffs:
diff --git a/initware-git/DESCR b/initware-git/DESCR
index 17299ba8d1..321d9a8124 100644
--- a/initware-git/DESCR
+++ b/initware-git/DESCR
@@ -1,3 +1,14 @@
-InitWare isn't ready to use yet!! Unless you are doing so for fun,
-to experiment, or to contribute, you most likely do not want to try to install
+InitWare isn't ready to use yet!! Unless you are doing so for fun, to
+experiment, or to contribute, you most likely do not want to try to install
 InitWare until a first stable release is made!
+
+The InitWare Suite of Middleware allows you to manage services and system
+resources as logical entities called units. Units are automatically scheduled by
+the InitWare manager according to their dependency specifications. A user
+session manager facilitates tracking of users' login sessions, with each user
+getting their own dedicated service manager. Finally the Event Log System
+provides a system-wide Event Log of events from various sources.
+
+This package provides InitWare as an auxiliary service manager running under the
+NetBSD rc.d framework. It does not replace init(8) or rc(8) by default. Logind
+is non-functional for now.
diff --git a/initware-git/MESSAGE b/initware-git/MESSAGE
new file mode 100644
index 0000000000..163e2e29bc
--- /dev/null
+++ b/initware-git/MESSAGE
@@ -0,0 +1,21 @@
+===========================================================================
+$NetBSD$
+
+To set up InitWare as an auxiliary service manager:
+
+1. Unless you have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy the dbus
+   and initware rc scripts from ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/ into
+   /etc/rc.d/
+
+2. Add these lines to your /etc/rc.conf
+
+        dbus=YES
+        initware=YES
+
+3. Reboot and InitWare will start automatically, or start it immediately by
+   issuing the commands
+
+        /etc/rc.d/dbus start
+        /etc/rc.d/initware start
+
+===========================================================================
diff --git a/initware-git/Makefile b/initware-git/Makefile
index 14ba694267..37c8a6e3aa 100644
--- a/initware-git/Makefile
+++ b/initware-git/Makefile
@@ -1,25 +1,32 @@
 # $NetBSD$
 
 DISTNAME=	initware
-PKGNAME=	initware-208
+PKGNAME=	initware-git
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=InitWare/}
 
 GIT_REPOSITORIES=	initware
 GIT_REPO.initware=	https://github.com/InitWare/InitWare.git
 GIT_BRANCH.initware=	main
+GIT_REVISION.initware=	6c926fb5106d46b240f79cfdf749a393940017d1
 WRKSRC=			${WRKDIR}/initware
 
 MAINTAINER=	dan%alt.md@localhost
-HOMEPAGE=	https://brand.initware.com/
-COMMENT=	Services and system resources manager
+HOMEPAGE=	https://github.com/InitWare/InitWare
+COMMENT=	Suite for management of services and system resources
 LICENSE=	gnu-lgpl-v2.1
 
 USE_CMAKE=	yes
 USE_LANGUAGES+=	c c++
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config sh
+
+RCD_SCRIPTS=	initware
+
+post-install:
+	${TOOLS_SH} ${WRKSRC}/pkg/netbsd/postinst.sh "${DESTDIR}${PREFIX}"
 
 .include "../../sysutils/dbus/buildlink3.mk"
+.include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/libinotify/buildlink3.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/initware-git/PLIST b/initware-git/PLIST
index 8ccd031db7..0882f7b7db 100644
--- a/initware-git/PLIST
+++ b/initware-git/PLIST
@@ -1,14 +1,18 @@
 @comment $NetBSD$
-bin/iwanalyse
-bin/iwctl
-bin/iwloginctl
-bin/iwrun
+bin/evlogcat
+bin/evlogctl
+bin/svcanalyse
+bin/svcctl
+bin/svcloginctl
+bin/svcrun
+lib/InitWare/system/auxiliary-manager.target
 lib/InitWare/system/basic.target
 lib/InitWare/system/bluetooth.target
 lib/InitWare/system/bootdone.service
 lib/InitWare/system/cryptsetup-pre.target
 lib/InitWare/system/cryptsetup.target
 lib/InitWare/system/debug-shell.service
+lib/InitWare/system/default.target
 lib/InitWare/system/emergency.service
 lib/InitWare/system/emergency.target
 lib/InitWare/system/final.target
@@ -42,10 +46,12 @@ lib/InitWare/system/sleep.target
 lib/InitWare/system/slices.target
 lib/InitWare/system/smartcard.target
 lib/InitWare/system/sockets.target
+lib/InitWare/system/sockets.target.wants/systemd-journald.socket
 lib/InitWare/system/sound.target
 lib/InitWare/system/suspend.target
 lib/InitWare/system/swap.target
 lib/InitWare/system/sysinit.target
+lib/InitWare/system/sysinit.target.wants/systemd-journald.service
 lib/InitWare/system/system-update.target
 lib/InitWare/system/system.slice
 lib/InitWare/system/systemd-ask-password-console.path
@@ -58,6 +64,8 @@ lib/InitWare/system/systemd-hostnamed.service
 lib/InitWare/system/systemd-hybrid-sleep.service
 lib/InitWare/system/systemd-initctl.service
 lib/InitWare/system/systemd-initctl.socket
+lib/InitWare/system/systemd-journald.service
+lib/InitWare/system/systemd-journald.socket
 lib/InitWare/system/systemd-logind.service
 lib/InitWare/system/systemd-nspawn@.service
 lib/InitWare/system/systemd-poweroff.service
@@ -79,6 +87,7 @@ lib/InitWare/system/umount.target
 lib/InitWare/system/user.slice
 lib/InitWare/system/user@.service
 lib/InitWare/system/x-.slice
+lib/InitWare/tmpfiles.d/systemd.conf
 lib/InitWare/user/bluetooth.target
 lib/InitWare/user/default.target
 lib/InitWare/user/exit.target
@@ -89,11 +98,15 @@ lib/InitWare/user/smartcard.target
 lib/InitWare/user/sockets.target
 lib/InitWare/user/sound.target
 lib/InitWare/user/timers.target
-libexec/InitWare/iw.logind
-libexec/InitWare/iw.manager
+libexec/InitWare/evlogd
 libexec/InitWare/rcng2unit
-libexec/InitWare/runrcng.sh
+libexec/InitWare/svc.logind
+libexec/InitWare/svc.managerd
 libexec/InitWare/system-generators/rcng-generator.sh
+libexec/InitWare/system-generators/ttys-generator
+libexec/InitWare/tmpfiles
 libexec/InitWare/user-sessions
 libexec/InitWare/wait4pipe
-@pkgdir man/man7
+man/man7/svc_rcng.7
+share/dbus-1/system-services/org.freedesktop.systemd1.service
+share/dbus-1/system.d/org.freedesktop.systemd1.conf
diff --git a/initware-git/distinfo b/initware-git/distinfo
deleted file mode 100644
index 9aea1b0aea..0000000000
--- a/initware-git/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD$
-
-SHA1 (patch-doc_manual_CMakeLists.txt) = 83befed183d325049eb7a83f0eb7b4e610f45fce
diff --git a/initware-git/files/initware.sh b/initware-git/files/initware.sh
new file mode 100755
index 0000000000..175958c217
--- /dev/null
+++ b/initware-git/files/initware.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# PROVIDE: initware
+# REQUIRE: dbus
+#
+
+. /etc/rc.subr
+
+name="initware"
+rcvar=$name
+pidfile="@VARBASE@/run/InitWare/initware.pid"
+command="@PREFIX@/libexec/InitWare/svc.managerd"
+command_args="--system --daemonise"
+start_precmd="initware_prestart"
+stop_cmd="initware_stop"
+
+initware_prestart() {
+	@PREFIX@/libexec/InitWare/tmpfiles --create
+}
+
+initware_stop() {
+	@PREFIX@/bin/svcctl halt
+	pkill evlogd
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/initware-git/patches/patch-doc_manual_CMakeLists.txt b/initware-git/patches/patch-doc_manual_CMakeLists.txt
deleted file mode 100644
index efa83a98ff..0000000000
--- a/initware-git/patches/patch-doc_manual_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD$
-
---- doc/manual/CMakeLists.txt.orig	2021-06-02 10:10:27.000000000 +0000
-+++ doc/manual/CMakeLists.txt
-@@ -1,4 +1,4 @@
--set (DOCBOOKS iw_rcng.7.xml)
-+#set (DOCBOOKS iw_rcng.7.xml)
- 
- foreach(DOCBOOK_IN ${DOCBOOKS})
-     get_filename_component(MAN_BASE ${DOCBOOK_IN} NAME_WLE)