From 7b15b724f982d7cc9f9bd05706f83fbf1892382a Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Thu, 27 Aug 2020 17:23:59 -0400
Subject: contrib/palaver: Remove rc script

---
 contrib/palaver/Makefile               | 14 ++--------
 contrib/palaver/configure              |  4 ---
 contrib/palaver/pounce-palaver.1       | 46 +-----------------------------
 contrib/palaver/rc.d/pounce_palaver.in | 51 ----------------------------------
 4 files changed, 3 insertions(+), 112 deletions(-)
 delete mode 100644 contrib/palaver/rc.d/pounce_palaver.in

(limited to 'contrib')

diff --git a/contrib/palaver/Makefile b/contrib/palaver/Makefile
index 3321ac4..8c8f2d4 100644
--- a/contrib/palaver/Makefile
+++ b/contrib/palaver/Makefile
@@ -14,24 +14,14 @@ all: pounce-palaver
 pounce-palaver: ${OBJS}
 	${CC} ${LDFLAGS} ${OBJS} ${LDLIBS} -o $@
 
-.SUFFIXES: .in
-
-.in:
-	sed -e 's|%%PREFIX%%|${PREFIX}|g' $< > $@
-
 clean:
-	rm -f ${OBJS} pounce-palaver rc.d/pounce_palaver
+	rm -f ${OBJS} pounce-palaver
 
-install: pounce-palaver pounce-palaver.1 ${INSTALLS}
+install: pounce-palaver pounce-palaver.1
 	install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
 	install pounce-palaver ${DESTDIR}${PREFIX}/bin
 	install -m 644 pounce-palaver.1 ${DESTDIR}${MANDIR}/man1
 
-install-rcs: rc.d/pounce_palaver
-	install -d ${DESTDIR}${ETCDIR}/rc.d
-	install rc.d/pounce_palaver ${DESTDIR}${ETCDIR}/rc.d
-
 uninstall:
 	rm -f ${DESTDIR}${PREFIX}/bin/pounce-palaver
 	rm -f ${DESTDIR}${MANDIR}/man1/pounce-palaver.1
-	rm -f ${DESTDIR}${ETCDIR}/rc.d/pounce_palaver
diff --git a/contrib/palaver/configure b/contrib/palaver/configure
index 9a7e8d8..65c82fe 100755
--- a/contrib/palaver/configure
+++ b/contrib/palaver/configure
@@ -31,10 +31,6 @@ for opt; do
 done
 
 case "$(uname)" in
-	(FreeBSD)
-		config libcurl libtls sqlite3
-		echo 'INSTALLS = install-rcs'
-		;;
 	(OpenBSD)
 		ldlibs -ltls
 		config libcurl sqlite3
diff --git a/contrib/palaver/pounce-palaver.1 b/contrib/palaver/pounce-palaver.1
index 4f0b870..c97f530 100644
--- a/contrib/palaver/pounce-palaver.1
+++ b/contrib/palaver/pounce-palaver.1
@@ -1,4 +1,4 @@
-.Dd August 16, 2020
+.Dd August 27, 2020
 .Dt POUNCE-PALAVER 1
 .Os
 .
@@ -71,50 +71,6 @@ Connect to
 .Ar host .
 .El
 .
-.Ss Service Configuration
-Add the following to
-.Pa /etc/rc.conf
-to enable the
-.Nm
-daemon:
-.Bd -literal -offset indent
-pounce_palaver_enable="YES"
-.Ed
-.
-.Pp
-To use the preferences database of a user,
-add the following:
-.Bd -literal -offset indent
-pounce_palaver_user="user"
-pounce_palaver_env="HOME=/home/user"
-.Ed
-.
-.Pp
-The
-.Nm
-service supports profiles
-for running multiple instances.
-Set
-.Va pounce_palaver_profiles
-to a space-separated list of names.
-Flags for each profile
-will be set from
-.Va pounce_palaver_${profile}_flags .
-For example:
-.Bd -literal -offset indent
-pounce_palaver_profiles="example1 example2"
-pounce_palaver_example1_flags="example1.irc.example.org"
-pounce_palaver_example2_flags="example2.irc.example.org"
-.Ed
-.Pp
-The commands
-.Cm start , stop ,
-etc.\&
-will operate on the profile
-given as an additional argument,
-or on all profiles
-without an additional argument.
-.
 .Sh FILES
 .Bl -tag -width Ds
 .It Pa $XDG_DATA_DIRS/pounce-palaver/preferences.sqlite
diff --git a/contrib/palaver/rc.d/pounce_palaver.in b/contrib/palaver/rc.d/pounce_palaver.in
deleted file mode 100644
index f97e3e7..0000000
--- a/contrib/palaver/rc.d/pounce_palaver.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: pounce_palaver
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name='pounce_palaver'
-rcvar='pounce_palaver_enable'
-
-load_rc_config "${name}"
-
-: ${pounce_palaver_enable:='NO'}
-
-command='/usr/sbin/daemon'
-pidprefix="/var/run/${name}"
-pidfile="${pidprefix}.pid"
-
-child_command='%%PREFIX%%/bin/pounce-palaver'
-
-if [ -n "$2" ]; then
-	profile=$2
-	if [ -n "${pounce_palaver_profiles}" ]; then
-		pidfile="${pidprefix}.${profile}.pid"
-		eval pounce_palaver_enable="\${pounce_palaver_${profile}_enable:-${pounce_palaver_enable}}"
-		eval pounce_palaver_flags="\${pounce_palaver_${profile}_flags:-${pounce_palaver_flags}}"
-		eval pounce_palaver_user="\${pounce_palaver_${profile}_user:-${pounce_palaver_user}}"
-		eval pounce_palaver_env="\${pounce_palaver_${profile}_env:-${pounce_palaver_env}}"
-	else
-		echo "$0: extra argument ignored"
-	fi
-else
-	if [ -n "${pounce_palaver_profiles}" -a -n "$1" ]; then
-		for profile in ${pounce_palaver_profiles}; do
-			echo "===> ${name} profile: ${profile}"
-			%%PREFIX%%/etc/rc.d/${name} "$1" "${profile}" || exit "$?"
-		done
-		exit
-	fi
-fi
-
-child_flags=$pounce_palaver_flags
-child_user=$pounce_palaver_user
-unset pounce_palaver_flags pounce_palaver_user
-command_args="\
-	-r -P ${pidfile} -T ${name}${profile:+/${profile}} \
-	${child_user:+-u ${child_user}} \
-	-- ${child_command} ${child_flags}"
-
-run_rc_command "$1"
-- 
cgit 1.4.1