summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile22
-rw-r--r--README.716
-rwxr-xr-xconfigure5
-rw-r--r--rc.d/litterbox.in71
4 files changed, 9 insertions, 105 deletions
diff --git a/Makefile b/Makefile
index e85d6c2..fd56245 100644
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,13 @@ LDLIBS = -lsqlite3 -ltls
 
 BINS = litterbox scoop unscoop
 MANS = ${BINS:=.1}
-RCS  = rc.d/litterbox
 
 -include config.mk
 
 OBJS.litterbox = litterbox.o config.o xdg.o
 OBJS.scoop = scoop.o xdg.o
 OBJS.unscoop = unscoop.o xdg.o
+OBJS = ${OBJS.litterbox} ${OBJS.scoop} ${OBJS.unscoop}
 
 FORMATS = generic catgirl irc textual
 
@@ -30,7 +30,7 @@ unscoop: ${OBJS.unscoop}
 .o:
 	${CC} ${LDFLAGS} ${OBJS.$@} ${LDLIBS} -o $@
 
-${BINS:=.o}: database.h
+${OBJS}: database.h
 
 test: .test
 
@@ -38,27 +38,17 @@ test: .test
 	set -e; for format in ${FORMATS}; do ./unscoop -n -f $$format; done
 	touch .test
 
-.SUFFIXES: .in
-
-.in:
-	sed -e 's|%%PREFIX%%|${PREFIX}|g' $< > $@
-
-tags: *.c *.h
-	ctags -w *.c *.h
+tags: *.[ch]
+	ctags -w *.[ch]
 
 clean:
-	rm -f .test tags ${BINS} ${RCS} ${BINS:=.o} config.o xdg.o
+	rm -f ${BINS} ${OBJS} .test tags
 
-install: ${BINS} ${MANS} ${INSTALLS}
+install: ${BINS} ${MANS}
 	install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
 	install ${BINS} ${DESTDIR}${PREFIX}/bin
 	install -m 644 ${MANS} ${DESTDIR}${MANDIR}/man1
 
-install-rcs: ${RCS}
-	install -d ${DESTDIR}${ETCDIR}/rc.d
-	install ${RCS} ${DESTDIR}${ETCDIR}/rc.d
-
 uninstall:
 	rm -f ${BINS:%=${DESTDIR}${PREFIX}/bin/%}
 	rm -f ${MANS:%=${DESTDIR}${MANDIR}/man1/%}
-	rm -f ${RCS:%=${DESTDIR}${ETCDIR}/%}
diff --git a/README.7 b/README.7
index eda8f8d..ddff5e9 100644
--- a/README.7
+++ b/README.7
@@ -1,4 +1,4 @@
-.Dd August 24, 2020
+.Dd August 27, 2020
 .Dt README 7
 .Os "Causal Agency"
 .
@@ -76,14 +76,8 @@ and
 .Ox
 the recommended way to run
 .Nm
-is with the
-.Lk https://git.causal.agency/catsit catsit
-process supervisor.
-Alternatively,
-an
-.Xr rc 8
-script is provided for
-.Fx .
+is with the process supervisor
+.Lk https://git.causal.agency/catsit catsit .
 .
 .Sh FILES
 .Bl -tag -width "litterbox.c" -compact
@@ -100,10 +94,6 @@ log file processing
 configuration parsing
 .It Pa xdg.c
 XDG base directories
-.It Pa rc.d/
-.Fx
-.Xr rc 8
-scripts
 .El
 .
 .Sh CONTRIBUTING
diff --git a/configure b/configure
index 5e9a7e3..bf9d132 100755
--- a/configure
+++ b/configure
@@ -31,11 +31,6 @@ for opt; do
 done
 
 case "$(uname)" in
-	(FreeBSD)
-		config sqlite3 libtls
-		defvar SQLITE3_BIN sqlite3 exec_prefix /bin/sqlite3
-		echo 'INSTALLS = install-rcs'
-		;;
 	(OpenBSD)
 		ldlibs -ltls
 		config sqlite3
diff --git a/rc.d/litterbox.in b/rc.d/litterbox.in
deleted file mode 100644
index b0a3067..0000000
--- a/rc.d/litterbox.in
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: litterbox
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-# Add the following to /etc/rc.conf to enable litterbox running as a
-# user:
-#
-#     litterbox_enable="YES"
-#     litterbox_user="user"
-#     litterbox_env="HOME=/home/user"
-#
-# The litterbox service supports profiles for running multiple
-# instances. Set litterbox_profiles to a space-separated list of names.
-# Flags for each profile will be set from litterbox_${profile}_flags.
-# For example:
-#
-#     litterbox_profiles="example1 example2"
-#     litterbox_example1_flags="example1.conf"
-#     litterbox_example2_flags="example2.conf"
-#
-# The commands start, stop, etc. will operating on the profile given as
-# an additional argument, or on all profiles without an additional
-# argument.
-
-. /etc/rc.subr
-
-name='litterbox'
-rcvar='litterbox_enable'
-
-load_rc_config "${name}"
-
-: ${litterbox_enable:='NO'}
-
-command='/usr/sbin/daemon'
-pidprefix="/var/run/${name}"
-pidfile="${pidprefix}.pid"
-
-child_command='%%PREFIX%%/bin/litterbox'
-
-if [ -n "$2" ]; then
-	profile=$2
-	if [ -n "${litterbox_profiles}" ]; then
-		pidfile="${pidprefix}.${profile}.pid"
-		eval litterbox_enable="\${litterbox_${profile}_enable:-${litterbox_enable}}"
-		eval litterbox_flags="\${litterbox_${profile}_flags:-${litterbox_flags}}"
-		eval litterbox_user="\${litterbox_${profile}_user:-${litterbox_user}}"
-		eval litterbox_env="\${litterbox_${profile}_env:-${litterbox_env}}"
-	else
-		echo "$0: extra argument ignored"
-	fi
-else
-	if [ -n "${litterbox_profiles}" -a -n "$1" ]; then
-		for profile in ${litterbox_profiles}; do
-			echo "===> ${name} profile: ${profile}"
-			%%PREFIX%%/etc/rc.d/${name} "$1" "${profile}" || exit "$?"
-		done
-		exit
-	fi
-fi
-
-child_flags=$litterbox_flags
-child_user=$litterbox_user
-unset litterbox_flags litterbox_user
-command_args="\
-	-r -P ${pidfile} -T ${name}${profile:+/${profile}} \
-	${child_user:+-u ${child_user}} \
-	-- ${child_command} ${child_flags}"
-
-run_rc_command "$1"