Fix mtree problem reported by Bento.

4 files changed, 21 insertions, 24 deletions

diff --git a/net-mgmt/satellite/Makefile b/net-mgmt/satellite/Makefile
index 2f1e86799b4d..109e17d2d100 100644
--- a/net-mgmt/satellite/Makefile
+++ b/net-mgmt/satellite/Makefile
@@ -26,6 +26,6 @@ pre-install:
 	@${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@${SH} pkg-install ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/satellite/pkg-descr b/net-mgmt/satellite/pkg-descr
index 5e29a98e0397..a4708e5be82f 100644
--- a/net-mgmt/satellite/pkg-descr
+++ b/net-mgmt/satellite/pkg-descr
@@ -1,7 +1,7 @@
 Satellite can track many remote machines with dynamic IP addresses in
 situations where public DNS services are inappropriate.  It can log
-and alert an admin immediately when a site moves around, comes online,
-or needs attention.
+and alert an admin immediately when a site comes online or needs
+attention.
 
 WWW: http://www.kyne.com.au/~mark/software/satellite.php
 
diff --git a/net-mgmt/satellite/pkg-install b/net-mgmt/satellite/pkg-install
index 7145c4db65da..61b065a8b237 100644
--- a/net-mgmt/satellite/pkg-install
+++ b/net-mgmt/satellite/pkg-install
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-[ "${PKG_PREFIX}" ] && PREFIX="${PKG_PREFIX}"
-[ "${PREFIX}" ] || PREFIX=/usr/local
-
 case "$2" in
 	PRE-INSTALL)
 		if ! pw user show satellite >/dev/null 2>&1
@@ -12,24 +9,6 @@ case "$2" in
 		fi
 	;;
 	POST-INSTALL)
-		if [ ! -f "${PREFIX}/etc/satellite.db" ]
-		then
-			echo "===>   Creating ${PREFIX}/etc/satellite.db configuration file"
-			${PREFIX}/sbin/satcfg -L
-			chown satellite ${PREFIX}/etc/satellite.db
-			chmod 600 ${PREFIX}/etc/satellite.db
-		fi
-		if [ ! -f "/var/log/satellite" ]
-		then
-			echo "===>   Creating initial log file /var/log/satellite"
-			touch /var/log/satellite
-			chown satellite /var/log/satellite
-		fi
-		echo "===>   To run the satellited server you will need to change a few files."
-		echo "===>   Please add the following line to /etc/services"
-		echo "satellite       1764/tcp"
-		echo "===>   Please add the following line to /etc/inetd.conf and restart inetd"
-		echo "satellite stream tcp nowait satellite ${PREFIX}/sbin/satellited satellited -v"
 	;;
 	*)
 		echo "Incorrect parameter"
diff --git a/net-mgmt/satellite/pkg-message b/net-mgmt/satellite/pkg-message
new file mode 100644
index 000000000000..60ec64177cd9
--- /dev/null
+++ b/net-mgmt/satellite/pkg-message
@@ -0,0 +1,18 @@
+If you are planning to use the Satellite server (not the client) on
+this machine you must complete several additional steps, substituting
+your installation prefix (usually /usr/local) for PREFIX:
+
+1) Create the Satellite configuration file:
+# PREFIX/sbin/satcfg -L
+# chown satellite PREFIX/etc/satellite.db
+# chmod 600 PREFIX/etc/satellite.db
+
+2) Create the Satellite log file:
+# touch /var/log/satellite
+# chown satellite /var/log/satellite
+
+3) Add Satellite to /etc/services with the line:
+satellite	1764/tcp
+
+4) Add Satellite to /etc/inetd.conf with the line:
+satellite stream tcp nowait satellite PREFIX/sbin/satellited satellited -v