6 files changed, 31 insertions, 27 deletions

diff --git a/astro/setiathome/Makefile b/astro/setiathome/Makefile
index 897f3fe8feb1..ffdfb5841f6f 100644
--- a/astro/setiathome/Makefile
+++ b/astro/setiathome/Makefile
@@ -3,10 +3,10 @@
 # Date created:         22 Apr 1999
 # Whom:                 stb@freebsd.org
 #
-# $Id: Makefile,v 1.5 1999/04/22 12:24:23 stb Exp $
+# $Id: Makefile,v 1.6 1999/04/23 18:27:31 stb Exp $
 #
 
-PKGNAME=	setiathome-0.46
+PKGNAME=	setiathome-0.47
 CATEGORIES=	astro
 MASTER_SITES=   http://setiathome.ssl.berkeley.edu/software/ \
 		http://www.freebsd.org/~stb/mirror/setiathome.ssl.berkeley.edu/software/
@@ -15,35 +15,37 @@ MAINTAINER=	stb@freebsd.org
 
 ONLY_FOR_ARCHS=	i386
 
-RESTRICTED=	"Binary redistribution not authorized."
-
 EXTRACT_CMD=		tar
 EXTRACT_BEFORE_ARGS=	-xf
 EXTRACT_AFTER_ARGS=	
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 310000
-DISTFILES=      setiathome-0.46.i386-unknown-freebsd3.1.tar
-WRKSRC=         setiathome-0.46.i386-unknown-freebsd3.1
+.if ${OSVERSION} >= 400000
+DISTFILES=      setiathome-0.47.i386-unknown-freebsd4.0.tar
+WRKSRC=         setiathome-0.47.i386-unknown-freebsd4.0
+.elif ${OSVERSION} >= 310000
+DISTFILES=      setiathome-0.47.i386-unknown-freebsd3.1.tar
+WRKSRC=         setiathome-0.47.i386-unknown-freebsd3.1
 .elif ${OSVERSION} >= 228000
-DISTFILES=      setiathome-0.46.i386-unknown-freebsd2.2.8.tar
-WRKSRC=         setiathome-0.46.i386-unknown-freebsd2.2.8
+DISTFILES=      setiathome-0.47.i386-unknown-freebsd2.2.8.tar
+WRKSRC=         setiathome-0.47.i386-unknown-freebsd2.2.8
 .elif ${OSVERSION} >= 227000
-DISTFILES=      setiathome-0.46.i386-unknown-freebsd2.2.7.tar
-WRKSRC=         setiathome-0.46.i386-unknown-freebsd2.2.7
+DISTFILES=      setiathome-0.47.i386-unknown-freebsd2.2.7.tar
+WRKSRC=         setiathome-0.47.i386-unknown-freebsd2.2.7
 .elif ${OSVERSION} >= 226000
-DISTFILES=      setiathome-0.46.i386-unknown-freebsd2.2.6.tar
-WRKSRC=         setiathome-0.46.i386-unknown-freebsd2.2.6
+DISTFILES=      setiathome-0.47.i386-unknown-freebsd2.2.6.tar
+WRKSRC=         setiathome-0.47.i386-unknown-freebsd2.2.6
 .else
 DISTFILES=
 .endif
 
-.if make(makesum)
-DISTFILES=	setiathome-0.46.i386-unknown-freebsd2.2.6.tar	\
-			setiathome-0.46.i386-unknown-freebsd2.2.7.tar	\
-			setiathome-0.46.i386-unknown-freebsd2.2.8.tar	\
-			setiathome-0.46.i386-unknown-freebsd3.1.tar
+.if make(makesum) | make(fetch-all)
+DISTFILES=	setiathome-0.47.i386-unknown-freebsd2.2.6.tar	\
+			setiathome-0.47.i386-unknown-freebsd2.2.7.tar	\
+			setiathome-0.47.i386-unknown-freebsd2.2.8.tar	\
+			setiathome-0.47.i386-unknown-freebsd3.1.tar	\
+			setiathome-0.47.i386-unknown-freebsd4.0.tar
 .endif
 
 NO_BUILD=	"binary distribution"
@@ -54,11 +56,12 @@ MAN1=		setiathome.1
 IS_INTERACTIVE=	yes
 .endif
 
+
 pre-fetch:
 	@if [ -z "${DISTFILES}" ]; then \
 		${ECHO} "It seems you are running FreeBSD `uname -r`, which is not currently";	\
 		${ECHO} "supported.  SETI@home currently supports only FreeBSD 2.2.6 and above,";	\
-		${ECHO} "and FreeBSD 3.1."; \
+		${ECHO} "FreeBSD 3.1. and above, and FreeBSD 4.0."; \
 		${ECHO} \
 		exit 72; \
 	fi;
diff --git a/astro/setiathome/distinfo b/astro/setiathome/distinfo
index 8d039e9ea52e..51e4110a314b 100644
--- a/astro/setiathome/distinfo
+++ b/astro/setiathome/distinfo
@@ -1,4 +1,5 @@
-MD5 (setiathome-0.46.i386-unknown-freebsd2.2.6.tar) = 6981dc4c5efeb22cba1bb93f71507617
-MD5 (setiathome-0.46.i386-unknown-freebsd2.2.7.tar) = 8ca2f0c04063d8c4a25fc2f062cd4427
-MD5 (setiathome-0.46.i386-unknown-freebsd2.2.8.tar) = 1f141456399fb79442056174e2654258
-MD5 (setiathome-0.46.i386-unknown-freebsd3.1.tar) = eb874113b92e29276251115ffb4ba26f
+MD5 (setiathome-0.47.i386-unknown-freebsd2.2.6.tar) = 27e91ec35ae6930f0b3680d032f40d0a
+MD5 (setiathome-0.47.i386-unknown-freebsd2.2.7.tar) = 6f6467a48f1c3ddf8190db5782b5d7e2
+MD5 (setiathome-0.47.i386-unknown-freebsd2.2.8.tar) = b5a4190b57c1607b79902e905c725ed4
+MD5 (setiathome-0.47.i386-unknown-freebsd3.1.tar) = a8ce3db4280d83f0ef2f434292bf53ab
+MD5 (setiathome-0.47.i386-unknown-freebsd4.0.tar) = 24402893c125a0fdd2692ce634732904
diff --git a/astro/setiathome/files/setiathome.1 b/astro/setiathome/files/setiathome.1
index cd4f21bfab4f..47fa61dda816 100644
--- a/astro/setiathome/files/setiathome.1
+++ b/astro/setiathome/files/setiathome.1
@@ -45,7 +45,7 @@ that starts
 at system start-up. You can also use this script to set up a working
 directory
 .Pa ( /var/db/setiathome ) ,
-and lets you register with or login to
+and lets you register with or log in to
 .Tn SETI@home
 by calling it with the argument
 .Li register .
diff --git a/astro/setiathome/pkg-comment b/astro/setiathome/pkg-comment
index 2423e247f92d..b24678c23cae 100644
--- a/astro/setiathome/pkg-comment
+++ b/astro/setiathome/pkg-comment
@@ -1 +1 @@
-SETI@home - donate idle cycles to the search for aliens
+donate idle cycles to the search for space aliens
diff --git a/astro/setiathome/pkg-descr b/astro/setiathome/pkg-descr
index 00c94f12a9be..6839e292aaa7 100644
--- a/astro/setiathome/pkg-descr
+++ b/astro/setiathome/pkg-descr
@@ -21,7 +21,7 @@ directory, and about 12 MBytes of memory.  If you have ample physical
 memory, it's work load should be almost undetectable.
 
 setiathome is a binary distribution currently available for FreeBSD
-2.2.6, 2.2.7, 2.2.8, and 3.1.  Newer versions of FreeBSD should be able
+2.2.6, 2.2.7, 2.2.8, 3.1, and 4.0.  Newer versions of FreeBSD should be able
 to run older binaries.
 
 WWW: http://setiathome.ssl.berkeley.edu/
diff --git a/astro/setiathome/pkg-install b/astro/setiathome/pkg-install
index adb539464788..8d5edd96ebc1 100644
--- a/astro/setiathome/pkg-install
+++ b/astro/setiathome/pkg-install
@@ -54,7 +54,7 @@ EOF
 		echo "      a brief registration process."
 		echo "      Would you like to set up a working directory in ${DBDIR},"
 		echo "      register with SETI@home, and let me arrange for SETI@home to be"
-		echo -n "      started automatically [Y/n]? "
+		echo -n "      started automatically as user \`nobody' [Y/n]? "
 		read a
 		echo ""
 		if [ "$a" = "N" -o "$a" = "n" ]; then