Several changes across all ports:

1.	Make MASTER_SITES entries contain a trailing /.  Garrett says that
	assuming a '/' seperator between entries in MASTER_SITES and entries
	in DISTFILES is a dangerous assumption.  This will also be taken
	out of bsd.port.mk.

2.	General clean-up.  Some of these Makefiles were a little grim.
	Make sure they're all in sync with the sometimes rapidly changing
	bsd.port.mk! :)

3.	Some small configuration tweaks to keep them compiling under the
	most recent 2.0 - some things seem to have broken along our road
	to release.

13 files changed, 28 insertions, 37 deletions

diff --git a/benchmarks/tcpblast/src/Makefile b/benchmarks/tcpblast/src/Makefile
index 42d678f5b6eb..103db01ad737 100644
--- a/benchmarks/tcpblast/src/Makefile
+++ b/benchmarks/tcpblast/src/Makefile
@@ -1,7 +1,6 @@
-PROG=tcpblast
-SRCS=tcpblast.c
-NOMAN=noman
-DESTDIR?=/usr/local
-BINDIR=/bin
+PROG=		tcpblast
+SRCS=		tcpblast.c
+NOMAN=		yes
+BINDIR=		/usr/local/bin
 
-.include<bsd.prog.mk>
+.include <bsd.prog.mk>
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 9e8da4741d28..235ae6f0fcf3 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -3,11 +3,11 @@
 # Date created:		11 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.1 1994/09/11 11:26:58 jkh Exp $
+# $Id: Makefile,v 1.2 1994/09/13 06:34:41 jkh Exp $
 #
 
 DISTNAME=	make-3.71
 HAS_CONFIGURE=	yes
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 .include <bsd.port.mk>
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index 9e8da4741d28..235ae6f0fcf3 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -3,11 +3,11 @@
 # Date created:		11 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.1 1994/09/11 11:26:58 jkh Exp $
+# $Id: Makefile,v 1.2 1994/09/13 06:34:41 jkh Exp $
 #
 
 DISTNAME=	make-3.71
 HAS_CONFIGURE=	yes
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 .include <bsd.port.mk>
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 8716f109836c..7f5637fba919 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.4 1994/09/13 06:34:46 jkh Exp $
+# $Id: Makefile,v 1.5 1994/09/13 08:37:24 jkh Exp $
 #
 
 DISTNAME=	emacs-19.26
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	i386--freebsd
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 .include <bsd.port.mk>
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index 8716f109836c..7f5637fba919 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.4 1994/09/13 06:34:46 jkh Exp $
+# $Id: Makefile,v 1.5 1994/09/13 08:37:24 jkh Exp $
 #
 
 DISTNAME=	emacs-19.26
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	i386--freebsd
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 .include <bsd.port.mk>
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 8716f109836c..7f5637fba919 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.4 1994/09/13 06:34:46 jkh Exp $
+# $Id: Makefile,v 1.5 1994/09/13 08:37:24 jkh Exp $
 #
 
 DISTNAME=	emacs-19.26
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	i386--freebsd
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 .include <bsd.port.mk>
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 8716f109836c..7f5637fba919 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.4 1994/09/13 06:34:46 jkh Exp $
+# $Id: Makefile,v 1.5 1994/09/13 08:37:24 jkh Exp $
 #
 
 DISTNAME=	emacs-19.26
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	i386--freebsd
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 .include <bsd.port.mk>
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 8716f109836c..7f5637fba919 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.4 1994/09/13 06:34:46 jkh Exp $
+# $Id: Makefile,v 1.5 1994/09/13 08:37:24 jkh Exp $
 #
 
 DISTNAME=	emacs-19.26
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	i386--freebsd
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 .include <bsd.port.mk>
diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index ba9625c63b7f..4dbfca3f4622 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -3,11 +3,11 @@
 # Date created:		03 September 1994
 # Whom:			mr
 #
-# $Id: Makefile,v 1.3 1994/09/04 01:08:46 jkh Exp $
+# $Id: Makefile,v 1.4 1994/09/13 06:34:51 jkh Exp $
 #
 
 DISTNAME=	pine3.90
-MASTER_SITES=	ftp://ftp.cac.washington.edu/pine
+MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 EXTRACT_SUFX=.tar.Z
 
 .include <bsd.port.mk>
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index c504616c5ca8..6f35aad078aa 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -51,15 +51,6 @@ ${PATCH_COOKIE}: ${PATCHLIST}
 	fi
 	@touch -f ${PATCH_COOKIE}
 
-bundle: extract
-	@echo "===>  Bundling for ${DISTNAME}.${PATCHLEVEL}"
-	@if [ -f ${CONFIGURE_COOKIE} ]; then \
-		echo ">> WARNING:  This source has been configured and may"; \
-		echo ">> produce a tainted distfile!"; \
-	fi
-	tar -C ${WRKDIR} -cf - dgd | gzip -9 \
-		>${DISTDIR}/${DISTNAME}.${PATCHLEVEL}${EXTRACT_SUFX}
-
 install: all
 	@chown -R mud.mud ${WRKDIR}/dgd
 	@tar -C ${WRKDIR} -cf - `grep '^dgd/' pkg/PLIST` \
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 2ba2818223c8..1723f7e39c34 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -3,10 +3,10 @@
 # Date created:		22 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.3 1994/09/01 08:08:00 ache Exp $
+# $Id: Makefile,v 1.4 1994/09/13 06:34:59 jkh Exp $
 #
 
 DISTNAME=	tcsh-6.05
-MASTER_SITES=	ftp://tesla.ee.cornell.edu/pub/tcsh
+MASTER_SITES=	ftp://tesla.ee.cornell.edu/pub/tcsh/
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index f2bd52042233..40875ad95346 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -3,14 +3,15 @@
 # Date created:		25 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.2 1994/09/10 22:22:36 jkh Exp $
+# $Id: Makefile,v 1.3 1994/09/13 06:35:06 jkh Exp $
 #
 
 DISTNAME=	fvwm-1.23b
 NO_WRKSUBDIR=	yes
 DISTFILES=	fvwm-1.23b-core.tar.gz fvwm-1.23b-modules.tar.gz \
 		fvwm-1.23-icons.tar.gz
-MASTER_SITES=	ftp://spcot.sanders.com/pub/fvwm
+MASTER_SITES=	ftp://spcot.sanders.com/pub/fvwm/
 USE_IMAKE=	yes
+DEPENDS=	x11/xpm
 
 .include <bsd.port.mk>
diff --git a/x11/emu/Makefile b/x11/emu/Makefile
index e5744f90fac3..bd1304b0488e 100644
--- a/x11/emu/Makefile
+++ b/x11/emu/Makefile
@@ -3,12 +3,12 @@
 # Date created:		13 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.1.1.1 1994/09/13 12:39:52 jkh Exp $
+# $Id: Makefile,v 1.2 1994/09/14 12:00:57 jkh Exp $
 #
 
 DISTNAME=	emu-1.3
 WRKSRC=		${WRKDIR}/emu
 USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications
+MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
 
 .include <bsd.port.mk>