From 244348f83c4e8695ba6aa7cdc6b9a39377754761 Mon Sep 17 00:00:00 2001
From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Tue, 15 Jan 2008 20:21:52 +0000
Subject: [PATCH] Move the plist file to examples/ along with the other startup
 files.

Teach scripts/teardown about Mac.
---
 .bzrignore                                          |  3 +--
 examples/Makefile.am                                |  8 +++++---
 .../uk.org.greenend.rjk.disorder.plist.in           |  0
 scripts/setup.in                                    |  2 +-
 scripts/teardown.in                                 | 11 +++++++++++
 server/Makefile.am                                  | 21 ++-------------------
 6 files changed, 20 insertions(+), 25 deletions(-)
 rename {server => examples}/uk.org.greenend.rjk.disorder.plist.in (100%)

diff --git a/.bzrignore b/.bzrignore
index 9fda4fa..ffea199 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -93,8 +93,7 @@ TAGS
 ktrace.out
 tests/Makefile
 tests/testroot
-disorder.plist
-server/uk.org.greenend.rjk.disorder.plist
+examples/uk.org.greenend.rjk.disorder.plist
 doc/guts
 clients/disorder-playrtp
 doc/disorder-playrtp.1.html
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 6265895..c33b554 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -19,12 +19,14 @@
 #
 
 noinst_SCRIPTS=disorder.init disorder.rc
-noinst_DATA=config.sample
+noinst_DATA=config.sample uk.org.greenend.rjk.disorder.plist
 
-SEDFILES=disorder.init config.sample disorder.rc
+SEDFILES=disorder.init config.sample disorder.rc \
+	uk.org.greenend.rjk.disorder.plist
 
 include ${top_srcdir}/scripts/sedfiles.make
 
-EXTRA_DIST=disorder.init.in config.sample.in disorder-log disorder.rc.in
+EXTRA_DIST=disorder.init.in config.sample.in disorder-log disorder.rc.in \
+	uk.org.greenend.rjk.disorder.plist.in
 
 CLEANFILES=$(SEDFILES)
diff --git a/server/uk.org.greenend.rjk.disorder.plist.in b/examples/uk.org.greenend.rjk.disorder.plist.in
similarity index 100%
rename from server/uk.org.greenend.rjk.disorder.plist.in
rename to examples/uk.org.greenend.rjk.disorder.plist.in
diff --git a/scripts/setup.in b/scripts/setup.in
index 991b060..d3d6a48 100755
--- a/scripts/setup.in
+++ b/scripts/setup.in
@@ -233,7 +233,7 @@ chmod 2755 pkgstatedir
 case $os in
 Mac )
   echo "Installing the plist into /Library/LaunchDaemons"
-  cp server/uk.org.greenend.rjk.disorder.plist /Library/LaunchDaemons/.
+  cp examples/uk.org.greenend.rjk.disorder.plist /Library/LaunchDaemons/.
   echo "Reloading launchd"
   launchctl load /Library/LaunchDaemons
   echo "Starting DisOrder server"
diff --git a/scripts/teardown.in b/scripts/teardown.in
index b9361b9..dbf593c 100755
--- a/scripts/teardown.in
+++ b/scripts/teardown.in
@@ -35,6 +35,17 @@ FreeBSD )
   pw groupdel jukebox || true
   pw userdel jukebox || true
   ;;
+Darwin )
+  echo "* stopping server"
+  launchctl stop uk.org.greenend.rjk.disorder || true
+  launchctl unload /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist || true
+  echo "* removing files"
+  rm -f /Library/WebServer/CGI-Executables/disorder
+  rm -f /Library/WebServer/Documents/disorder
+  rm -f /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist
+  rm -rf pkgstatedir
+  rm -rf pkgconfdir
+  ;;  
 * )
   echo Unknown operating system >&2
   exit 1
diff --git a/server/Makefile.am b/server/Makefile.am
index eca95c4..bc58b84 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+# Copyright (C) 2004-2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
 	      disorder-speaker disorder-decode disorder-normalize \
 	      disorder-stats disorder-dbupgrade
 noinst_PROGRAMS=disorder.cgi trackname
-noinst_DATA=uk.org.greenend.rjk.disorder.plist
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
@@ -148,20 +147,4 @@ check-decode: disorder-decode disorder-normalize
 
 cgi.o: ../lib/definitions.h
 
-# for Mac OS X >=10.4
-SEDFILES=uk.org.greenend.rjk.disorder.plist
-include ${top_srcdir}/scripts/sedfiles.make
-EXTRA_DIST=uk.org.greenend.rjk.disorder.plist.in README.dbversions
-LAUNCHD=/Library/LaunchDaemons
-
-#install-data-hook:
-#	@if [ -d ${LAUNCHD} ]; then \
-#	  echo $(INSTALL) -m 644 uk.org.greenend.rjk.disorder.plist ${LAUNCHD};\
-#	  $(INSTALL) -m 644 uk.org.greenend.rjk.disorder.plist ${LAUNCHD};\
-#	  if [ "$$(NOLAUNCH)" != "" ]; then \
-#	    echo launchctl unload ${LAUNCHD} \|\| true;\
-#	    launchctl unload ${LAUNCHD} || true;\
-#	    echo launchctl load ${LAUNCHD} \|\| true;\
-#	    launchctl load ${LAUNCHD} || true;\
-#         fi;\
-#	fi
+EXTRA_DIST=README.dbversions
-- 
2.11.0