From 689e4c3e6d5e7ea49d58efd6e68ea93f48ce8bbe Mon Sep 17 00:00:00 2001
From: iratqq <iratqq@ec19f817-7043-0410-8555-aba96bfc7626>
Date: Fri, 21 Mar 2008 12:17:03 +0000
Subject: [PATCH] remove sed trick.

---
 trunk/configure.in                         |  2 ++
 trunk/src/sj3proxy/Makefile.am             |  5 -----
 trunk/src/sj3proxy/freebsd-sj3proxy.sh.in  |  0
 trunk/src/sj3proxy/sj3proxy.lua.example.in |  4 ++--
 trunk/src/sj3serv/Makefile.am              |  5 -----
 trunk/src/sj3serv/freebsd-sj3.sh.in        |  0
 trunk/src/sj3serv/freebsd-sj3.sh.in.in     | 26 ++++++++++++++++++++++
 trunk/src/sj3serv/sj3serv.lua.example.in   |  4 ++--
 8 files changed, 32 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 trunk/src/sj3proxy/freebsd-sj3proxy.sh.in
 mode change 100755 => 100644 trunk/src/sj3serv/freebsd-sj3.sh.in
 create mode 100755 trunk/src/sj3serv/freebsd-sj3.sh.in.in

diff --git a/trunk/configure.in b/trunk/configure.in
index 6ea8809..fd4421c 100644
--- a/trunk/configure.in
+++ b/trunk/configure.in
@@ -922,7 +922,9 @@ AC_CONFIG_FILES([
 	  src/sj3dic/Makefile
 	  src/sj3mkdic/Makefile
 	  src/sj3proxy/Makefile
+	  src/sj3proxy/sj3proxy.lua.example
 	  src/sj3serv/Makefile
+	  src/sj3serv/sj3serv.lua.example
 	  src/sj3stat/Makefile
 ])
 
diff --git a/trunk/src/sj3proxy/Makefile.am b/trunk/src/sj3proxy/Makefile.am
index 0fc14e8..4a5b4ff 100644
--- a/trunk/src/sj3proxy/Makefile.am
+++ b/trunk/src/sj3proxy/Makefile.am
@@ -39,11 +39,6 @@ example_DATA = \
 	freebsd-sj3proxy.sh.in \
 	sj3proxy.lua.example
 
-sj3proxy.lua.example: sj3proxy.lua.example.in
-	sed -e "s,%%SJ3VARDIR%%,$(SJ3VARDIR),g" \
-	    -e "s,%%SJ3OWNER%%,$(SJ3OWNER),g" \
-	    sj3proxy.lua.example.in > sj3proxy.lua.example
-
 CLEANFILES = \
 	sj3proxy.lua.example
 
diff --git a/trunk/src/sj3proxy/freebsd-sj3proxy.sh.in b/trunk/src/sj3proxy/freebsd-sj3proxy.sh.in
old mode 100755
new mode 100644
diff --git a/trunk/src/sj3proxy/sj3proxy.lua.example.in b/trunk/src/sj3proxy/sj3proxy.lua.example.in
index 7fe23e0..6ea170e 100644
--- a/trunk/src/sj3proxy/sj3proxy.lua.example.in
+++ b/trunk/src/sj3proxy/sj3proxy.lua.example.in
@@ -14,12 +14,12 @@
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 --]]
 
-local prefix = "%%SJ3VARDIR%%"
+local prefix = "@SJ3VARDIR@"
 
 sj3proxy.set_server {
    -- user: String
    --  run as user name
-   user = "%%SJ3OWNER%%",
+   user = "@SJ3OWNER@",
 
    -- chroot: Boolean
    --  sj3serv is chrooted or not
diff --git a/trunk/src/sj3serv/Makefile.am b/trunk/src/sj3serv/Makefile.am
index b853f51..0ddd72e 100644
--- a/trunk/src/sj3serv/Makefile.am
+++ b/trunk/src/sj3serv/Makefile.am
@@ -51,11 +51,6 @@ example_DATA = \
 time_stamp.c: time_stamp.sh
 	sh ./time_stamp.sh > time_stamp.c
 
-sj3serv.lua.example: sj3serv.lua.example.in
-	sed -e "s,%%SJ3VARDIR%%,$(SJ3VARDIR),g" \
-	    -e "s,%%SJ3OWNER%%,$(SJ3OWNER),g" \
-	    sj3serv.lua.example.in > sj3serv.lua.example
-
 CLEANFILES = \
 	sj3serv.lua.example \
 	time_stamp.c
diff --git a/trunk/src/sj3serv/freebsd-sj3.sh.in b/trunk/src/sj3serv/freebsd-sj3.sh.in
old mode 100755
new mode 100644
diff --git a/trunk/src/sj3serv/freebsd-sj3.sh.in.in b/trunk/src/sj3serv/freebsd-sj3.sh.in.in
new file mode 100755
index 0000000..47829d9
--- /dev/null
+++ b/trunk/src/sj3serv/freebsd-sj3.sh.in.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+
+# PROVIDE: sj3
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Define these sj3_* variables in one of these files:
+#	/etc/rc.conf
+#	/etc/rc.conf.local
+#	/etc/rc.conf.d/sj3
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+sj3_enable=${sj3_enable:-"NO"}		# Enable sj3
+#sj3_program="%%PREFIX%%/sbin/sj3serv"	# Location of sj3
+
+. %%RC_SUBR%%
+
+name="sj3"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/sbin/sj3serv"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/trunk/src/sj3serv/sj3serv.lua.example.in b/trunk/src/sj3serv/sj3serv.lua.example.in
index 82a928e..460beb0 100644
--- a/trunk/src/sj3serv/sj3serv.lua.example.in
+++ b/trunk/src/sj3serv/sj3serv.lua.example.in
@@ -14,7 +14,7 @@
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 --]]
 
-local prefix = "%%SJ3VARDIR%%"
+local prefix = "@SJ3VARDIR@"
 
 sj3.set_server {
    -- max_client: Integer
@@ -23,7 +23,7 @@ sj3.set_server {
 
    -- user: String
    --  run as user name
-   user = "%%SJ3OWNER%%",
+   user = "@SJ3OWNER@",
 
    -- chroot: Boolean
    --  sj3serv is chrooted or not