- Utilize new features: USE_RC_SUBR, SUB_FILES. It simplifies Makefile.

- Fix pkg-message
- Remove redundant code from a startup script
- Install a sample config in EXAMPLESDIR instead of PREFIX/etc
- Refine pkg-descr a little

2 files changed, 16 insertions, 13 deletions

diff --git a/ftp/frox/files/frox.sh b/ftp/frox/files/frox.sh.in
index bc8fc02fbf19..b2ce5678859e 100644
--- a/ftp/frox/files/frox.sh
+++ b/ftp/frox/files/frox.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: frox
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable frox:
@@ -24,20 +24,8 @@ command=%%PREFIX%%/sbin/frox
 pidfile=/var/run/frox.pid
 required_files=%%PREFIX%%/etc/frox.conf
 
-start_precmd=start_precmd
 stop_postcmd=stop_postcmd
 
-# if require start from inetd?
-start_precmd()
-{
-  if grep -iq '^[[:space:]]*frominetd[[:space:]]*yes' %%PREFIX%%/etc/frox.conf;
-  then
-	  return 1
-  else
-	  return 0
-  fi
-}
-
 stop_postcmd()
 {
    rm -f $pidfile
diff --git a/ftp/frox/files/pkg-message.in b/ftp/frox/files/pkg-message.in
new file mode 100644
index 000000000000..58c02d5fd0ff
--- /dev/null
+++ b/ftp/frox/files/pkg-message.in
@@ -0,0 +1,15 @@
+**************************************************************************
+Don't forget to create %%PREFIX%%/etc/frox.conf.
+See an example in %%EXAMPLESDIR%%/frox.conf
+
+You can use frox by two ways:
+1) run as a daemon:
+Add `frox_enable="YES"' in /etc/rc.conf and run %%PREFIX%%/etc/rc.d/frox.sh
+
+2) run frox with inetd(8):
+* uncomment 'FromInetd yes' in your %%PREFIX%%/etc/frox.conf
+* add a line in /etc/inetd.conf:
+frox     stream  tcp     nowait  nobody    %%PREFIX%%/sbin/frox    frox
+* assign a port number for frox inside /etc/services (e.g. 2121):
+frox	2121/tcp
+**************************************************************************