Another round of Makefile updates, in utils!

26 files changed, 169 insertions, 58 deletions

diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 627d9feff227..7bf4acc64342 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,12 +1,24 @@
-DISTFILES=      iozone-2.01.shar.gz
+# New ports collection makefile for:    iozone
+# Version required:     2.01
+# Date created:         26 September 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=       iozone
-MASTER_SITES=   ftp://ftp.cs.uni-sb.de/pub/others/
+PKGNAME=	iozone-2.01
 CATEGORIES+=	utilities
+MASTER_SITES=   ftp://ftp.cs.uni-sb.de/pub/others/
+DISTFILES=      iozone-2.01.shar.gz
+
+MAINTAINER=	jmz@FreeBSD.org
+
+EXEC_DEPENDS=   gunshar:${PORTSDIR}/archivers/gshar+gunshar
+
 EXTRACT_CMD=    ( gzcat | /usr/local/bin/gunshar )
 EXTRACT_ARGS=   <
 NO_WRKSUBDIR=   YES
-EXEC_DEPENDS=   gunshar:${PORTSDIR}/archivers/gshar+gunshar
-MAINTAINER=	jmz@FreeBSD.org
 
 pre-extract: depends
 
diff --git a/benchmarks/iozone21/Makefile b/benchmarks/iozone21/Makefile
index 627d9feff227..7bf4acc64342 100644
--- a/benchmarks/iozone21/Makefile
+++ b/benchmarks/iozone21/Makefile
@@ -1,12 +1,24 @@
-DISTFILES=      iozone-2.01.shar.gz
+# New ports collection makefile for:    iozone
+# Version required:     2.01
+# Date created:         26 September 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=       iozone
-MASTER_SITES=   ftp://ftp.cs.uni-sb.de/pub/others/
+PKGNAME=	iozone-2.01
 CATEGORIES+=	utilities
+MASTER_SITES=   ftp://ftp.cs.uni-sb.de/pub/others/
+DISTFILES=      iozone-2.01.shar.gz
+
+MAINTAINER=	jmz@FreeBSD.org
+
+EXEC_DEPENDS=   gunshar:${PORTSDIR}/archivers/gshar+gunshar
+
 EXTRACT_CMD=    ( gzcat | /usr/local/bin/gunshar )
 EXTRACT_ARGS=   <
 NO_WRKSUBDIR=   YES
-EXEC_DEPENDS=   gunshar:${PORTSDIR}/archivers/gshar+gunshar
-MAINTAINER=	jmz@FreeBSD.org
 
 pre-extract: depends
 
diff --git a/emulators/cpmtools/Makefile b/emulators/cpmtools/Makefile
index 703132ab3d61..9aa2ec2a89d7 100644
--- a/emulators/cpmtools/Makefile
+++ b/emulators/cpmtools/Makefile
@@ -3,13 +3,15 @@
 # Date created:		25 December 1994
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.1.1.1 1994/12/28 11:53:41 joerg Exp $
+# $Id: Makefile,v 1.2 1995/04/01 13:48:34 joerg Exp $
 #
 
 DISTNAME=	cpm-1.1
-WRKSRC=		${WRKDIR}/cpm
 
 MAINTAINER=	joerg@FreeBSD.org
+
+WRKSRC=		${WRKDIR}/cpm
+
 #
 # need our own build target to pass PREFIX down to the make command
 #
diff --git a/emulators/hfs/Makefile b/emulators/hfs/Makefile
index c7d0f9fa1a06..463f1c7b9a87 100644
--- a/emulators/hfs/Makefile
+++ b/emulators/hfs/Makefile
@@ -1,9 +1,20 @@
+# New ports collection makefile for:    hfs
+# Version required:     0.37
+# Date created:         17 November 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	hfs0_37
-MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
+PKGNAME=	hfs-0.37
 CATEGORIES+=	utilities
-USE_GMAKE=	yes
+MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
+
 MAINTAINER=	jmz@FreeBSD.org
 
+USE_GMAKE=	yes
+
 .include <bsd.port.mk>
 
 pre-install:
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index f49fa10ac917..9dc76fee5f35 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -1,6 +1,15 @@
+# New ports collection makefile for:    mtools
+# Version required:     2.0.7
+# Date created:         5 October 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	mtools-2.0.7
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+
 MAINTAINER=	jmz@FreeBSD.org
 
 MAKE_FLAGS=	PREFIX=${PREFIX}
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 76733873f94f..86c970ef022c 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -3,10 +3,12 @@
 # Date created:		7 March 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:50:21 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/01 13:48:38 joerg Exp $
 #
 
 DISTNAME=	pcemu1.01alpha
+PKGNAME=	pcemu-1.01a
+CATEGORIES+=	utilities emulation
 
 # Warning notice:  by now, you'll have to live with those warnings:
 #
@@ -26,7 +28,7 @@ MASTER_SITES+=	ftp://ftp.iij.ad.jp/pub/linux/tsx-11/ALPHA/dosemu/Misc/
 #
 # This is the original master site, but better use a well-connected server
 MASTER_SITES+=	ftp://ftp.cs.bris.ac.uk/users/hedley/
+
 MAINTAINER=	joerg@FreeBSD.org
-CATEGORIES+=	utilities emulation
 
 .include <bsd.port.mk>
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 1b7ca43bcc42..f81cd71f9139 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,15 +1,20 @@
 # New ports collection makefile for:    wine
 # Version required:     950302
 # Date created:         Sun Feb  5 16:12:09  1995
+# Whom:			hsu
+#
+# $Id$
 #
 
 DISTNAME=       Wine-950302
+PKGNAME=	Wine-95.03.02
 CATEGORIES+=	utilities x11 emulation
 MASTER_SITES=   ftp://sunsite.unc.edu/pub/Linux/ALPHA/wine/ \
 		ftp://aris.com/pub/linux/ALPHA/Wine/development/ \
 		ftp://tsx-11.mit.edu/pub/linux/ALPHA/Wine/development/ \
 		ftp://ftp.funet.fi/pub/OS/Linux/ALPHA/Wine/ \
 		ftp://ftp.wonderland.org/Wine/
+
 WRKSRC=		${WRKDIR}/wine950302
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 1b7ca43bcc42..f81cd71f9139 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,15 +1,20 @@
 # New ports collection makefile for:    wine
 # Version required:     950302
 # Date created:         Sun Feb  5 16:12:09  1995
+# Whom:			hsu
+#
+# $Id$
 #
 
 DISTNAME=       Wine-950302
+PKGNAME=	Wine-95.03.02
 CATEGORIES+=	utilities x11 emulation
 MASTER_SITES=   ftp://sunsite.unc.edu/pub/Linux/ALPHA/wine/ \
 		ftp://aris.com/pub/linux/ALPHA/Wine/development/ \
 		ftp://tsx-11.mit.edu/pub/linux/ALPHA/Wine/development/ \
 		ftp://ftp.funet.fi/pub/OS/Linux/ALPHA/Wine/ \
 		ftp://ftp.wonderland.org/Wine/
+
 WRKSRC=		${WRKDIR}/wine950302
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda24-client/Makefile b/misc/amanda24-client/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda24-client/Makefile
+++ b/misc/amanda24-client/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda24-server/Makefile b/misc/amanda24-server/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda24-server/Makefile
+++ b/misc/amanda24-server/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda24/Makefile b/misc/amanda24/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda24/Makefile
+++ b/misc/amanda24/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 6be500d3df29..fc1cf301603d 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -3,13 +3,15 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1995/03/01 00:23:25 gpalmer Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:03 jkh Exp $
 #
 
 DISTNAME=	amanda-2.2.6
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
 CATEGORIES+=	utilities
+MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+
 MAINTAINER=	gpalmer@FreeBSD.ORG
+
 PATCH_STRIP=	
 
 .include <bsd.port.mk>
diff --git a/misc/mshell/Makefile b/misc/mshell/Makefile
index 8c5628524fdd..2a2694a528bc 100644
--- a/misc/mshell/Makefile
+++ b/misc/mshell/Makefile
@@ -1,10 +1,21 @@
+# New ports collection makefile for:    mshell
+# Version required:     93/3/3
+# Date created:         24 September 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	mshell
-DISTFILES=	7432.Z
-MASTER_SITES=	ftp://src.doc.ic.ac.uk/usenet/alt.sources/articles/07000-07999/
+PKGNAME=	mshell-1.0
 CATEGORIES+=	utilities
-NO_WRKSUBDIR=	yes
+MASTER_SITES=	ftp://src.doc.ic.ac.uk/usenet/alt.sources/articles/07000-07999/
+DISTFILES=	7432.Z
+
 MAINTAINER=	jmz@FreeBSD.org
 
+NO_WRKSUBDIR=	yes
+
 EXTRACT_COOKIE?=	${.CURDIR}/.extract_done
 
 extract: fetch pre-extract ${EXTRACT_COOKIE}
diff --git a/sysutils/tua/Makefile b/sysutils/tua/Makefile
index 62d78020d64b..6c982370ce81 100644
--- a/sysutils/tua/Makefile
+++ b/sysutils/tua/Makefile
@@ -3,13 +3,14 @@
 # Date created:		11 Feb. 1995
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1995/02/15 23:51:22 torstenb Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:50:34 jkh Exp $
 #
 
 DISTNAME=       tua-4.0
-MASTER_SITES=   ftp://itnsg1.cineca.it/local/tua/
 CATEGORIES+=	utilities
-GNU_CONFIGURE=	YES
+MASTER_SITES=   ftp://itnsg1.cineca.it/local/tua/
+
+GNU_CONFIGURE=	yes
 
 pre-install:
 	mkdir -p ${PREFIX}/bin
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index f369de5ddfe2..2020d398a2b1 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -3,15 +3,17 @@
 # Date created:		9 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/03/24 11:11:26 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:50:37 jkh Exp $
 #
 
 DISTNAME=	xdu-3.0
-EXTRACT_SUFX=	.tar.Z
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.arl.mil/pub/
 CATEGORIES+=	utilities x11
+MASTER_SITES=	ftp://ftp.arl.mil/pub/
+EXTRACT_SUFX=	.tar.Z
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 NO_WRKSUBDIR=	yes
+USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index b7c898a82623..a317931ab41a 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -3,13 +3,16 @@
 # Date created:		12 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1995/03/28 05:58:11 asami Exp $
+# $Id: Makefile,v 1.5 1995/04/01 12:50:39 jkh Exp $
 #
 
 DISTNAME=	xsysstats1.34
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/utilities/
+PKGNAME=	xsysstats-1.34
 CATEGORIES+=	utilities x11
+MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/utilities/
+
 MAINTAINER=	asami@FreeBSD.ORG
 
+USE_IMAKE=	yes
+
 .include <bsd.port.mk>
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index d7b79307dabf..d004d705363c 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,17 +1,27 @@
-DISTFILES=	ispell-3.1.18.tar.gz
+# New ports collection makefile for:    ispell
+# Version required:     3.1.18
+# Date created:         6 November 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	ispell-3.1
-MASTER_SITES=	ftp://ftp.cs.ucla.edu/pub/ispell-3.1/
+PKGNAME=	ispell-3.1.18
 CATEGORIES+=	utilities
-MAKE_FLAGS=	TMPDIR=${.CURDIR} -f 
+MASTER_SITES=	ftp://ftp.cs.ucla.edu/pub/ispell-3.1/
+DISTFILES=	ispell-3.1.18.tar.gz
+
 MAINTAINER=	jmz@FreeBSD.org
 
 # French
 #EXTRA_DICT=	   francais-IREQ-1.3.tar.gz
 #MASTER_SITES+=    ftp://ftp.ireq-robot.hydro.qc.ca/pub/ispell/
-CATEGORIES+=	utilities
 
 DISTFILES+=	   ${EXTRA_DICT}
 
+MAKE_FLAGS=	TMPDIR=${.CURDIR} -f 
+
 pre-configure:
 .if defined(EXTRA_DICT)
 	@echo ${EXTRA_DICT} > ${WRKDIR}/extra_dict
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index 7ec881ef5088..727c12f91924 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -3,10 +3,12 @@
 # Date created:         27 Dec 1994
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
+# $Id$
+#
 
 DISTNAME=       rman-2.0
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=   ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
 CATEGORIES+=	utilities
+MASTER_SITES=   ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
+EXTRACT_SUFX=	.tar.Z
 
 .include <bsd.port.mk>