- Fix handling if "local_startup" is not default

maintainer contacted 2003-06-01

- Fix handling of ps in startup script
maintainer contacted 2003-06-03
Submitted by: jonc@mobiledatanow.com

- Drop alpha for now, only new alpha binary is for OpenBSD.
ELF 64-bit LSB executable, Alpha (unofficial), version 1 (SYSV),
for OpenBSD, dynamically linked (uses shared libs), stripped
tested on beast: ELF binary type "0" not known.

2 files changed, 10 insertions, 8 deletions

diff --git a/astro/setiathome/Makefile b/astro/setiathome/Makefile
index 785e32430deb..30a77327a7ad 100644
--- a/astro/setiathome/Makefile
+++ b/astro/setiathome/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	setiathome
 PORTVERSION?=	3.08
+PORTREVISION?=	2
 CATEGORIES?=	astro
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/setiathome/ \
 		ftp://alien.ssl.berkeley.edu/pub/
@@ -24,7 +25,7 @@ COMMENT?=	Donate idle cycles to the search for space aliens
 IS_INTERACTIVE=	yes
 .endif
 
-ONLY_FOR_ARCHS?= alpha i386
+ONLY_FOR_ARCHS?= i386
 
 NO_BUILD=	binary distribution
 NO_CDROM=	interactive install
@@ -105,6 +106,11 @@ X11PORTS=
 X11PORTS=	"@comment "
 .endif
 
+
+post-extract:
+	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/setiathome.sh \
+		> ${WRKSRC}/setiathome.sh
+
 # Post-patch
 #
 
@@ -168,7 +174,7 @@ install-startup-files:
 	-@${CHMOD} -x ${RC_DIR}/*${file}*.sh 2> /dev/null
 .endif
 .if exists(${FILESDIR}/${file}.sh)
-	@${INSTALL_SCRIPT} ${FILESDIR}/${file}.sh \
+	@${INSTALL_SCRIPT} ${WRKSRC}/${file}.sh \
 		${RC_DIR}/${PKGNAMEPREFIX}${file}${PKGNAMESUFFIX}.sh
 .endif
 .if exists(${FILESDIR}/${file}.bin)
diff --git a/astro/setiathome/files/setiathome.sh b/astro/setiathome/files/setiathome.sh
index 4e6b7e7fe061..57e39b70ff68 100644
--- a/astro/setiathome/files/setiathome.sh
+++ b/astro/setiathome/files/setiathome.sh
@@ -29,11 +29,7 @@ seti_maxprocs=$(sysctl -n hw.ncpu)	# max. number of processes to start
 seti_sleep_time=21600			# time to sleep between restarts
 set +a
 
-if ! PREFIX=$(expr ${rc_path} : "\(/.*\)/etc/rc\.d/${rc_file}\$"); then
-	echo "${rc_file}: Cannot determine PREFIX." >&2
-	echo "Please use the complete pathname." >&2
-	exit 64
-fi
+PREFIX=%%PREFIX%%
 
 rcconf_dir=${PREFIX}/etc
 rcconf_file=rc.${rc_file%.sh}.conf
@@ -97,7 +93,7 @@ start)
 			exit 72
 		fi
 	done
-	if ps axo comm | egrep ${program_file}; then
+	if ps axo command | egrep ${wrapper_path}; then
 		logger -sp ${syslog_facility} -t ${program_file} \
 		"unable to start: ${program_file} is already running."
 		exit 72