3 files changed, 42 insertions, 52 deletions

diff --git a/dns/dns_balance/files/dns_balance.sh b/dns/dns_balance/files/dns_balance.sh
index 49c7fff46472..cda1b4dd7857 100644
--- a/dns/dns_balance/files/dns_balance.sh
+++ b/dns/dns_balance/files/dns_balance.sh
@@ -1,30 +1,22 @@
 #!/bin/sh
 #
 # $FreeBSD$
+#
+# PROVIDE: dns_balance
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD
+
+dns_balance_enable="NO"
+dns_balance_pidfile="/var/run/dns_balance.pid"
+dns_balance_flags="-l /var/log/dns_balance.log -p ${dns_balance_pidfile}"
+
+. %%RC_SUBR%%
 
-dns_balance="!!PREFIX!!/sbin/dns_balance"
-pidfile="/var/run/dns_balance.pid"
-logfile="/var/log/dns_balance.log"
-#listen="-i 192.168.0.1"
+name=dns_balance
+rcvar=`set_rcvar`
 
-case "$1" in
-start)
-	if [ -x $dns_balance ]; then
-	    echo -n ' dns_balance'
-	    $dns_balance -l $logfile -p $pidfile $listen
-	fi
-	;;
-stop)
-	if [ -f $pidfile ]; then
-	    kill `cat $pidfile` && echo -n ' dns_balance'
-	else
-	    echo ' dns_balance: not running'
-	fi
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
+command="env ROOT=%%PREFIX%%/lib/dns_balance %%PREFIX%%/sbin/dns_balance"
+pidfile=${dns_balance_pidfile}
 
-exit 0
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/dns/dns_balance/files/patch-dns_balance.rb b/dns/dns_balance/files/patch-dns_balance.rb
index f23d043f24eb..d3ef71c182d6 100644
--- a/dns/dns_balance/files/patch-dns_balance.rb
+++ b/dns/dns_balance/files/patch-dns_balance.rb
@@ -1,36 +1,36 @@
---- dns_balance.rb.orig	Fri Dec 22 12:46:39 2000
-+++ dns_balance.rb	Mon Mar  5 16:59:36 2001
-@@ -10,6 +10,8 @@
+--- dns_balance.rb.orig	Thu Feb  6 17:39:46 2003
++++ dns_balance.rb	Sun Jul 18 00:58:12 2004
+@@ -19,6 +19,8 @@
  require 'thread'
  require 'getopts'
  
-+$:.unshift "!!PREFIX!!/etc/dns_balance", "!!PREFIX!!/lib/dns_balance"
++$:.unshift "%%PREFIX%%/etc/dns_balance", "%%PREFIX%%/lib/dns_balance"
 +
  require 'datatype.rb'
+ require 'multilog.rb'
  require 'log_writer.rb'
- require 'util.rb'
-@@ -138,9 +140,10 @@
- end
+@@ -39,9 +41,11 @@
+ # ´Ø¿ô
  
  def usage()
 -  print "Usage: ruby dns_balance.rb [-lh] [-i ipaddr]\n"
--  print "       -l         print log to stdout\n"
-+  print "Usage: dns_balance [-h] [-i ipaddr] [-l logfile] [-p pidfile]\n"
++  print "Usage: dns_balance.rb [-h] [-i ipaddr] [-l logfile] [-p pidfile]\n"
 +  print "       -l logfile print log to logfile\n"
    print "       -i ipaddr  listen IP address (default:0.0.0.0)\n"
-+  print "       -p pidfile record PID in pidfile\n"
    print "       -h         help message\n"
++  print "       -p pidfile record PID in pidfile\n"
+   print "       --as       Enable AS namespace\n"
    exit(111)
  end
-@@ -149,9 +152,36 @@
+@@ -184,12 +188,45 @@
  # main
  
  srand()
--getopts("lh", "i:0.0.0.0")
-+getopts("h", "i:0.0.0.0", 'l:', 'p:')
+-getopts("lh", "i:0.0.0.0", "d:", "as")
++getopts("h", "i:0.0.0.0", "d:", "as", 'l:', 'p:')
  
  usage() if $OPT_h
-+
+ 
 +exit! if fork
 +Process::setsid
 +exit! if fork
@@ -57,6 +57,16 @@
 +    exit
 +  }
 +end
++
+ ML = MultiLog.new
+-ML.open
++if $OPT_l
++  $logout = File::open($OPT_l, 'a+')
++  $logout.sync = true
++  ML.open($logout)
++else
++  ML.open
++end
  
- put_log("start\n") if $OPT_l
- 
+ ML.log("dir: " + Prefix)
+ ML.log("start")
diff --git a/dns/dns_balance/files/patch-log_writer.rb b/dns/dns_balance/files/patch-log_writer.rb
deleted file mode 100644
index e18aced47fb8..000000000000
--- a/dns/dns_balance/files/patch-log_writer.rb
+++ /dev/null
@@ -1,12 +0,0 @@
---- log_writer.rb.orig	Fri Dec 22 12:46:39 2000
-+++ log_writer.rb	Mon Mar  5 16:05:06 2001
-@@ -12,8 +12,7 @@
- 
- def put_log(str)
-   $loglock.synchronize do
--    $stdout.print(str)
--    $stdout.flush
-+    $logout.print(str)
-   end
- end
-