- update pkg-message; now gives instructions to the user on how to run fam

  from inetd
- remove rc.d/fam.sh on deinstall if it exists
- start fam with better arguments from fam.sh

PR:		38960
Submitted by:	maintainer

4 files changed, 27 insertions, 2 deletions

diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index 5682ca9e1056..5db30a80704a 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fam
 PORTVERSION=	2.6.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://oss.sgi.com/projects/fam/download/
 DISTNAME=	${PORTNAME}-oss-${PORTVERSION}
diff --git a/devel/fam/files/fam.sh.sample b/devel/fam/files/fam.sh.sample
index e1c252bdb2a0..3ed1a018563f 100644
--- a/devel/fam/files/fam.sh.sample
+++ b/devel/fam/files/fam.sh.sample
@@ -7,7 +7,8 @@ fi
 
 case "$1" in
 start)
-	[ -x ${PREFIX}/bin/fam ] && ( ${PREFIX}/bin/fam & ) && echo -n ' fam'
+	[ -x ${PREFIX}/bin/fam ] && ( ${PREFIX}/bin/fam -T 0 & ) \
+	    && echo -n ' fam'
 	;;
 stop)
 	killall fam && echo -n ' fam'
diff --git a/devel/fam/pkg-message b/devel/fam/pkg-message
index d28d68afc971..467f8ba901ef 100644
--- a/devel/fam/pkg-message
+++ b/devel/fam/pkg-message
@@ -1,8 +1,30 @@
 ************************************************************************
 
-In order to run this port, please add the following line to /etc/rpc if
+1. In order to run this port, please add the following line to /etc/rpc if
 it is not already there:
 
+==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
 sgi_fam		391002
+==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
+
+2. If you wish to run fam from inetd (the recommended method), then
+please add the following lines to /etc/inetd.conf if they are not
+already there:
+
+==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
+# FAM: File Alteration Monitor [devel/fam]
+sgi_fam/1-2	stream rpc/tcp wait root /usr/local/bin/fam	fam
+==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
+
+After modifying /etc/inetd.conf, you must (as root) run:
+
+	killall -HUP inetd
+
+3. If, instead, you wish to run fam as a system daemon, then (as root)
+do the following:
+
+	cd /usr/local/etc/rc.d
+	cp fam.sh.sample fam.sh
+	/usr/local/etc/rc.d/fam.sh start
 
 ************************************************************************
diff --git a/devel/fam/pkg-plist b/devel/fam/pkg-plist
index 690e520775d2..a427fd997e05 100644
--- a/devel/fam/pkg-plist
+++ b/devel/fam/pkg-plist
@@ -7,3 +7,4 @@ lib/libfam.a
 lib/libfam.so
 lib/libfam.so.0
 @dirrm lib/fam
+@unexec rm -f %D/etc/rc.d/fam.sh || true