3 files changed, 78 insertions, 26 deletions

diff --git a/www/wcol/files/patch-aa b/www/wcol/files/patch-aa
index 4e6480025d0b..f805a7829bf9 100644
--- a/www/wcol/files/patch-aa
+++ b/www/wcol/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Jun 29 18:59:44 1998
-+++ Makefile.in	Sat Sep  4 01:13:54 1999
+--- Makefile.in.orig	Tue Dec  1 12:03:35 1998
++++ Makefile.in	Sat Sep  4 23:07:24 1999
 @@ -8,8 +8,8 @@
  
  
@@ -23,8 +23,16 @@
 +	-DDEFAULT_POOLDIR=\"${DEFAULT_POOLDIR}\" \
  	-DLOGGING_LOCALTIME \
  	-DMAX_REQUEST_QUEUE=2048 \
- 	-DMAX_HANDLER=4  -DNUM_HANDLER=4 \
-@@ -72,7 +76,7 @@
+-	-DMAX_HANDLER=4  -DNUM_HANDLER=4 \
++	-DMAX_HANDLER=2  -DNUM_HANDLER=2 \
+@@ -66,13 +70,14 @@
+ 	-DSESSION_TIMEOUT=60000 -DSESSION_LIFETIME=3600000 \
+ 	-DMAX_PROMPTER=2 -DNUM_PROMPTER=2 \
+ 	-DMAX_SPEAKER=2  -DNUM_SPEAKER=2 \
++	-DUSE_SYSLOG \
+ 	-DUSE_ICP_NOTIFY \
+ 	-DQUERY_TIMEOUT=2000
+ 
  
  LIBS = @LIBS@
  
@@ -33,16 +41,6 @@
  
  
  ###
-@@ -96,7 +100,8 @@
- ICP_OBJS    = _icp.o socket.o hname.o msg.o base.o url.o mem.o sigs.o
- FLOOD_OBJS  = flood.o icp.o socket.o hname.o msg.o base.o url.o mem.o sigs.o misc.o
- PLIST_OBJS  = plist.o msg.o base.o url.o info.o mem.o misc.o \
--    args.o rglobal.o accept.o pstate.o conv.o
-+    args.o rglobal.o accept.o pstate.o conv.o \
-+    reaper.o sigs.o ipc.o eqsort.o
- 
- OBJS = $(WCOL_OBJS) $(SSTATE_OBJS) $(HSTATE_OBJS) $(REAPER_OBJS) \
-     $(FTP_OBJS) $(PARSE_OBJS) $(JFILTER_OBJS) $(ICP_OBJS) $(FLOOD_OBJS) \
 @@ -155,6 +160,27 @@
  allclean:
  	-$(MAKE) clean
diff --git a/www/wcol/files/patch-ab b/www/wcol/files/patch-ab
index 15e58abf9cc7..2ebe332c6dcf 100644
--- a/www/wcol/files/patch-ab
+++ b/www/wcol/files/patch-ab
@@ -1,5 +1,5 @@
 --- wcol.conf-dist.orig	Sat Sep 20 21:55:05 1997
-+++ wcol.conf-dist	Mon Jul 13 03:48:00 1998
++++ wcol.conf-dist	Sun Sep  5 00:55:45 1999
 @@ -46,7 +46,7 @@
  #
  #
@@ -41,7 +41,7 @@
  #
  
 -LogFile     /var/tmp/wcol.log
-+LogFile     /var/log/wcol.log
++#LogFile     /var/log/wcol.log
  
  StateFile   /var/tmp/wcol.state
 -PidFile     /var/tmp/wcol.pid
@@ -49,21 +49,33 @@
  
  
  
-@@ -388,7 +388,7 @@
+@@ -381,14 +381,17 @@
+ # <num> is indicated number of handlers by integer. If it is not specified
+ # wcol wake all handlers in MAX_HANDLER (It is defined in Makefile).
+ #
++# In the case of FreeBSD packages/ports:
++#	MAX_HANDLER is 2 in this wcol binary.
++#
+ #           NumHandler <= MaxHandler <= MAX_HANDLER
+ #
+ # example:
+-#       NumHandler  4
++#       NumHandler  2
  #
  
- NumHandler      4
+-NumHandler      4
 -MaxHandler      8
-+MaxHandler      4
++NumHandler      2
++MaxHandler      2
  
  
  NumPrompter     1
-@@ -417,7 +417,7 @@
+@@ -417,7 +420,7 @@
  #       CacheDir    /var/tmp/www-pool
  #
  
 -CacheDir    /var/tmp/pool
-+CacheDir    /var/spool/wcol
++CacheDir    @@DEFAULT_POOLDIR@@
  
  
  #
diff --git a/www/wcol/files/wcol.sh.sample b/www/wcol/files/wcol.sh.sample
index 5855b633c114..b3e0772a046d 100644
--- a/www/wcol/files/wcol.sh.sample
+++ b/www/wcol/files/wcol.sh.sample
@@ -1,8 +1,50 @@
 #!/bin/sh
-wcolspool=/var/spool/wcol
-wcol=/usr/local/wcol/wcol
+#
+# Startup for wcol daemon
+#
 
-if [ -f $wcol ]; then
-	echo -n ' wcol'
-	$wcol >/dev/null 2>&1 &
+# default settings.
+wcol_program=@@PREFIX@@/wcol/wcol
+wcol_kill_program=@@PREFIX@@/wcol/killwcol
+wcol_conf=@@PREFIX@@/etc/wcol.conf
+wcol_spooldir=@@DEFAULT_POOLDIR@@
+wcol_pid=/var/run/wcol.pid
+
+#
+# If there is a global system configuration file, suck it in.
+#
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
+	. /etc/rc.conf
 fi
+
+case "$1" in
+'start')
+	if [ "x${wcol_enable}"  = "xYES" ] ; then
+		if [ -f ${wcol_conf} -a -f ${wcol_program} ]; then
+			if [ ! -d ${wcol_spooldir} ]; then
+				/bin/mkdir ${wcol_spooldir}
+			fi
+			${wcol_program} >/dev/null 2>&1 &
+			echo -n ' wcol'
+		fi
+	fi
+	;;
+'stop')
+	if [ -f ${wcol_kill_program} ]; then
+		${wcol_kill_program} >/dev/null 2>&1
+	else 
+		PID=`cat ${wcol_pid}`
+		if [ ! -z "$PID" ] ;  then
+			/bin/kill ${PID} >/dev/null 2>&1
+		fi
+		/bin/rm -f ${wcol_pid}
+	fi
+	;;
+*)
+	echo "Usage: wcol.sh { start | stop }"
+	;;
+esac
+
+exit 0