- Update to 0.94.12.r2

- Give maintainership to Alex Dupre who requested it

PR:		35065, 35279
Submitted by:	Paul Marquis <pmarquis@pobox.com>,
		Alex Dupre <sysadmin@alexdupre.com>

4 files changed, 33 insertions, 15 deletions

diff --git a/www/boa/files/boa.sh.sample b/www/boa/files/boa.sh.sample
new file mode 100644
index 000000000000..8693df9b9202
--- /dev/null
+++ b/www/boa/files/boa.sh.sample
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+case "$1" in
+start)
+	[ -x ${PREFIX}/sbin/boa ] && ${PREFIX}/sbin/boa & && echo -n ' boa'
+	;;
+stop)
+	killall boa && echo -n ' boa'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/www/boa/files/patch-aa b/www/boa/files/patch-aa
deleted file mode 100644
index 9c2edcc10473..000000000000
--- a/www/boa/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Sun Feb 13 06:52:45 2000
-+++ Makefile.in	Thu Mar 30 20:22:55 2000
-@@ -12,8 +12,8 @@
- # Add -lefence to LDFLAGS to link with ElectricFence
- # Add -pg to CFLAGS and LDFLAGS to get profiling output with gcc/gprof
- 
--LDFLAGS = @LIBS@ -g 
--CFLAGS = -O -Wall -g
-+LDFLAGS = @LIBS@
-+CFLAGS = @CFLAGS@
- 
- # Change these if necessary
- 
diff --git a/www/boa/files/patch-ab b/www/boa/files/patch-ab
index f325e4723132..9fec127bd36f 100644
--- a/www/boa/files/patch-ab
+++ b/www/boa/files/patch-ab
@@ -1,5 +1,5 @@
---- defines.h.orig	Fri Feb 18 13:18:42 2000
-+++ defines.h	Thu Mar 30 20:31:43 2000
+--- defines.h.orig	Thu Nov  1 23:37:46 2001
++++ defines.h	Sun Feb 17 13:40:30 2002
 @@ -27,7 +27,7 @@
  /***** Change this, or use -c on the command line to specify it *****/
  
diff --git a/www/boa/files/patch-boa.conf b/www/boa/files/patch-boa.conf
new file mode 100644
index 000000000000..a84412f66eb7
--- /dev/null
+++ b/www/boa/files/patch-boa.conf
@@ -0,0 +1,11 @@
+--- ../boa.conf.orig	Mon Sep 24 23:28:30 2001
++++ ../boa.conf	Sun Feb 17 16:33:43 2002
+@@ -127,7 +127,7 @@
+ # DirectoryIndex are commented out, accessing a directory will give
+ # an error (though accessing files in the directory are still ok).
+ 
+-DirectoryMaker /usr/lib/boa/boa_indexer
++DirectoryMaker %%PREFIX%%/sbin/boa_indexer
+ 
+ # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker
+ # has been commented out, the the on-the-fly indexing of Boa can be used