Remove support for automatic interactive fetching -- the master site

is broken anyway.
Remove makedepend tarball and corresponding master site, it does not
exist any longer.
Remove FLAGS=-m486, newer gcc does not like it.
Replace USE_PERL5 with USE_TOOLS+=perl.

2 files changed, 3 insertions, 49 deletions

diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile
index 04502a77f98..6380e7763c1 100644
--- a/parallel/glunix/Makefile
+++ b/parallel/glunix/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2005/05/22 20:08:26 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/29 11:25:12 wiz Exp $
 
 DISTNAME=	glunix-release-1-0a
 PKGNAME=	glunix-1.0a
 PKGREVISION=	1
 CATEGORIES=	parallel
-MASTER_SITES=	http://now.cs.berkeley.edu/Glunix/ \
-		http://www.inficad.com/~garbled/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} makedepend${EXTRACT_SUFX}
+MASTER_SITES=	http://now.cs.berkeley.edu/Glunix/
 
 MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://now.cs.berkeley.edu/Glunix/glunix.html
@@ -20,18 +18,13 @@ SSH=		${LOCALBASE}/bin/ssh
 .endif
 
 WRKSRC=		${WRKDIR}
-USE_TOOLS+=	gmake
-USE_PERL5=	yes
+USE_TOOLS+=	gmake perl
 INTERACTIVE_STAGE=	fetch
 NO_MTREE=	yes
 
 NOW_ROOT=	${LOCALBASE}/now
 MESSAGE_SUBST+=	NOW_ROOT=${NOW_ROOT}
 
-.if (${MACHINE} == "i386")
-FLAGS=-m486
-.endif
-
 .include "../../mk/endian.mk"
 .if (${MACHINE_ENDIAN} == "little")
 FLAGS+=-DL_ENDIAN
@@ -41,8 +34,6 @@ MAKE_ENV+= OPSYS=${OPSYS} ARCH=${MACHINE_ARCH} NOW_ROOT=${NOW_ROOT}
 MAKE_ENV+= PORTSDIR=${PKGDIR} WRKDIR=${WRKDIR} FLAGS="${FLAGS}"
 MAKE_ENV+= SSH=${SSH}
 
-SCRIPTS_ENV+= ARCH=${MACHINE_ARCH} RM=${RM} NOW_ROOT=${NOW_ROOT}
-
 .if exists(/usr/sbin/user)
 USER_CMD=       /usr/sbin/user
 GROUP_CMD=      /usr/sbin/group
@@ -52,13 +43,6 @@ USER_CMD=       ${LOCALBASE}/sbin/user
 GROUP_CMD=      ${LOCALBASE}/sbin/group
 .endif
 
-.if defined(BATCH)
-BATCH_CHECK_DISTFILES=	batch-check-distfiles
-.endif
-
-pre-fetch: ${BATCH_CHECK_DISTFILES}
-	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/pre-fetch
-
 post-patch:
 	cd ${WRKSRC};							\
 		for f in progs/glupart/glupart.c			\
diff --git a/parallel/glunix/scripts/pre-fetch b/parallel/glunix/scripts/pre-fetch
deleted file mode 100755
index 1ac956b35ff..00000000000
--- a/parallel/glunix/scripts/pre-fetch
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-if [ -f $DISTDIR/glunix-release-1-0a.tar.gz ]; then
-  exit 0
-fi
-
-echo ""
-echo "The authors of glunix would like to keep track of"
-echo "who their user community is.  They promise that the"
-echo "information obtained will not be used for marketing"
-echo "of any kind."
-echo ""
-echo -n "Please enter your Name: "
-
-read dname
-if [ "$dname" = "" ]; then
-	echo "Please run make again, and enter your name."
-	exit 1
-fi
-echo -n "Please enter your email address: "
-read email
-if [ "$email" = "" ]; then
-	echo "Please run make again, and enter your email."
-	exit 1
-fi
-
-name=`echo $dname | sed 's/ /+/'`
-nmail=`echo $email | sed 's/ /+/'`
-
-ftp "http://now.cs.berkeley.edu/cgi-bin/glunix_download.pl?name=$name&email=$nmail&use=NetBSD+pkg+system+download."
-$RM "glunix_download.pl?name=$name&email=$email&use=NetBSD+pkg+system+download."