Another round of Makefile updates, editors version.

17 files changed, 185 insertions, 128 deletions

diff --git a/editors/axe/Makefile b/editors/axe/Makefile
index 1334c7bd4e80..92fc6f39240d 100644
--- a/editors/axe/Makefile
+++ b/editors/axe/Makefile
@@ -3,13 +3,14 @@
 # Date created:		28 December 1994
 # Whom:			jc@irbs.com John Capo
 #
-# $Id: Makefile,v 1.1.1.1 1995/01/04 07:39:52 jkh Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:44:44 jkh Exp $
 #
 
 DISTNAME=	aXe-6.1.2
-DISTFILES=	aXe-6.1.2.tar.Z
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/editors/
 CATEGORIES+=	editors
+MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/editors/
+EXTRACT_SUFX=	.tar.Z
+
+USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 5d302f443272..760ce206f8ef 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,15 +3,16 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1995/02/13 13:02:31 ats Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:46 jkh Exp $
 #
 
 DISTNAME=	emacs-19.28
-USE_GMAKE=	yes
+CATEGORIES+=	editors
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+
 HAS_CONFIGURE=	yes
-STRIP=
+USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX}
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
-CATEGORIES+=	editors
+STRIP=
 
 .include <bsd.port.mk>
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index 5d302f443272..760ce206f8ef 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -3,15 +3,16 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1995/02/13 13:02:31 ats Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:46 jkh Exp $
 #
 
 DISTNAME=	emacs-19.28
-USE_GMAKE=	yes
+CATEGORIES+=	editors
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+
 HAS_CONFIGURE=	yes
-STRIP=
+USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX}
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
-CATEGORIES+=	editors
+STRIP=
 
 .include <bsd.port.mk>
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 5d302f443272..760ce206f8ef 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -3,15 +3,16 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1995/02/13 13:02:31 ats Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:46 jkh Exp $
 #
 
 DISTNAME=	emacs-19.28
-USE_GMAKE=	yes
+CATEGORIES+=	editors
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+
 HAS_CONFIGURE=	yes
-STRIP=
+USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX}
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
-CATEGORIES+=	editors
+STRIP=
 
 .include <bsd.port.mk>
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 5d302f443272..760ce206f8ef 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -3,15 +3,16 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1995/02/13 13:02:31 ats Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:46 jkh Exp $
 #
 
 DISTNAME=	emacs-19.28
-USE_GMAKE=	yes
+CATEGORIES+=	editors
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+
 HAS_CONFIGURE=	yes
-STRIP=
+USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX}
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
-CATEGORIES+=	editors
+STRIP=
 
 .include <bsd.port.mk>
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 5d302f443272..760ce206f8ef 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -3,15 +3,16 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1995/02/13 13:02:31 ats Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:46 jkh Exp $
 #
 
 DISTNAME=	emacs-19.28
-USE_GMAKE=	yes
+CATEGORIES+=	editors
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+
 HAS_CONFIGURE=	yes
-STRIP=
+USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX}
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
-CATEGORIES+=	editors
+STRIP=
 
 .include <bsd.port.mk>
diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index 5d9231bb8b6d..94596b8bb662 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -1,14 +1,17 @@
 # New ports collection makefile for:	jove
-# Version required:	4.
+# Version required:	4.16
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.9 1994/11/27 02:29:12 ats Exp $
+# $Id: Makefile,v 1.10 1995/04/01 12:44:47 jkh Exp $
 #
 
 DISTNAME=	jove-4.16beta
-MASTER_SITES=	ftp://relay.cs.toronto.edu/pub/moraes/jove/
+PKGNAME=	jove-4.16b
 CATEGORIES+=	editors
+MASTER_SITES=	ftp://relay.cs.toronto.edu/pub/moraes/jove/
 EXTRACT_SUFX=	.tar.gz
+
 WRKSRC=		${WRKDIR}/jove-4.16beta
+
 .include <bsd.port.mk>
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 0d4b68ed540d..14e4e168918d 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -1,33 +1,39 @@
 # New ports collection makefile for:	mule
-# Version required:	2.2
+# Version required:	2.2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.12 1995/03/28 06:21:04 asami Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:49 jkh Exp $
 #
 
 DISTNAME=	mule-2.2.2
-DISTFILES=	emacs-19.28.tar.gz
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 CATEGORIES+=	editors
-MAINTAINER=	asami@FreeBSD.ORG
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-STRIP=
-CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
-		  --wnn --wnn-libraries=/usr/X11R6/lib \
-		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
-WRKSRC=		${WRKDIR}/emacs-19.28
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+DISTFILES=	emacs-19.28.tar.gz
+
 # Use one of these if you are in Japan
+
 # PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
 # PATCHSITE=	etlport.etl.go.jp:/pub/mule/
+
 PATCH_SITES=	ftp.cs.buffalo.edu:/pub/mule/
 PATCHFILES=	diff-19.28-2.2.gz patch-2.2.1.gz patch-2.2.2.gz
 PATCH_DIST_STRIP=	-p1
 
+MAINTAINER=	asami@FreeBSD.ORG
+
 .if !exists(/usr/X11R6/lib/libwnn.a)
 DEPENDS=	${PORTSDIR}/utils/Wnn
 .endif
+
+WRKSRC=		${WRKDIR}/emacs-19.28
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
+		  --wnn --wnn-libraries=/usr/X11R6/lib \
+		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
+STRIP=
+
 PREBUILD_COOKIE=	${.CURDIR}/work/.prebuild_done
 
 pre-build:	${PREBUILD_COOKIE}
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 0d4b68ed540d..14e4e168918d 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,33 +1,39 @@
 # New ports collection makefile for:	mule
-# Version required:	2.2
+# Version required:	2.2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.12 1995/03/28 06:21:04 asami Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:49 jkh Exp $
 #
 
 DISTNAME=	mule-2.2.2
-DISTFILES=	emacs-19.28.tar.gz
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 CATEGORIES+=	editors
-MAINTAINER=	asami@FreeBSD.ORG
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-STRIP=
-CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
-		  --wnn --wnn-libraries=/usr/X11R6/lib \
-		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
-WRKSRC=		${WRKDIR}/emacs-19.28
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+DISTFILES=	emacs-19.28.tar.gz
+
 # Use one of these if you are in Japan
+
 # PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
 # PATCHSITE=	etlport.etl.go.jp:/pub/mule/
+
 PATCH_SITES=	ftp.cs.buffalo.edu:/pub/mule/
 PATCHFILES=	diff-19.28-2.2.gz patch-2.2.1.gz patch-2.2.2.gz
 PATCH_DIST_STRIP=	-p1
 
+MAINTAINER=	asami@FreeBSD.ORG
+
 .if !exists(/usr/X11R6/lib/libwnn.a)
 DEPENDS=	${PORTSDIR}/utils/Wnn
 .endif
+
+WRKSRC=		${WRKDIR}/emacs-19.28
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
+		  --wnn --wnn-libraries=/usr/X11R6/lib \
+		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
+STRIP=
+
 PREBUILD_COOKIE=	${.CURDIR}/work/.prebuild_done
 
 pre-build:	${PREBUILD_COOKIE}
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index 022b03d81bd2..cf05fd63ab31 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -3,18 +3,24 @@
 # Date created:         16 Jan 1995
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
+# $Id:$
+#
 
 DISTNAME=	uemacs
-MASTER_SITES=	ftp://midas.mgmt.purdue.edu/pub/ue312/
+PKGNAME=	uemacs-3.12
 CATEGORIES+=	editors
-PATCH_STRIP=	-p1
+MASTER_SITES=	ftp://midas.mgmt.purdue.edu/pub/ue312/
 DISTFILES=	ue312dev.zip
+
 EXEC_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
+NO_WRKSUBDIR=	yes
+PATCH_STRIP=	-p1
+
 # one weakness of the ports scheme: it doesn't allow arguments
 # to ${EXTRACT_CMD} after the filename, which is required for unzip.
 
-NO_WRKSUBDIR=	yes
+# Satoshi: it does now, so please update it when you see this.... :)
 
 pre-extract: exec_depends
 	@echo "===>  Extracting for ${DISTNAME}"
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index ea9c151c9261..6911b4687783 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -3,15 +3,14 @@
 # Date created:         Thu Feb 23, 1995
 # Whom:                 pgf
 #
-# $Id: Makefile,v 1.2 1995/02/27 23:15:01 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:44:52 jkh Exp $
 #
 
-
 DISTNAME=       vile-5.2
-MASTER_SITES=   ftp://id.wing.net/pub/pgf/vile/
 CATEGORIES+=	editors
-MAKEFILE=	makefile
-GNU_CONFIGURE=	YES
+MASTER_SITES=   ftp://id.wing.net/pub/pgf/vile/
 
+MAKEFILE=	makefile
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index b56fe4729465..5f893b94db93 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -3,15 +3,16 @@
 # Date created:         Tue Feb 21, 1995
 # Whom:                 pgf
 #
-# $Id: Makefile,v 1.2 1995/02/27 23:15:05 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:44:58 jkh Exp $
 #
 
-PKGNAME=	xvile-5.2
 DISTNAME=       vile-5.2
-MASTER_SITES=   ftp://id.wing.net/pub/pgf/vile/
+PKGNAME=	xvile-5.2
 CATEGORIES+=	editors
+MASTER_SITES=   ftp://id.wing.net/pub/pgf/vile/
+
 MAKEFILE=	makefile
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-screen=x11
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index 0d4b68ed540d..14e4e168918d 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -1,33 +1,39 @@
 # New ports collection makefile for:	mule
-# Version required:	2.2
+# Version required:	2.2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.12 1995/03/28 06:21:04 asami Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:49 jkh Exp $
 #
 
 DISTNAME=	mule-2.2.2
-DISTFILES=	emacs-19.28.tar.gz
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 CATEGORIES+=	editors
-MAINTAINER=	asami@FreeBSD.ORG
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-STRIP=
-CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
-		  --wnn --wnn-libraries=/usr/X11R6/lib \
-		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
-WRKSRC=		${WRKDIR}/emacs-19.28
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+DISTFILES=	emacs-19.28.tar.gz
+
 # Use one of these if you are in Japan
+
 # PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
 # PATCHSITE=	etlport.etl.go.jp:/pub/mule/
+
 PATCH_SITES=	ftp.cs.buffalo.edu:/pub/mule/
 PATCHFILES=	diff-19.28-2.2.gz patch-2.2.1.gz patch-2.2.2.gz
 PATCH_DIST_STRIP=	-p1
 
+MAINTAINER=	asami@FreeBSD.ORG
+
 .if !exists(/usr/X11R6/lib/libwnn.a)
 DEPENDS=	${PORTSDIR}/utils/Wnn
 .endif
+
+WRKSRC=		${WRKDIR}/emacs-19.28
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
+		  --wnn --wnn-libraries=/usr/X11R6/lib \
+		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
+STRIP=
+
 PREBUILD_COOKIE=	${.CURDIR}/work/.prebuild_done
 
 pre-build:	${PREBUILD_COOKIE}
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 0d4b68ed540d..14e4e168918d 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -1,33 +1,39 @@
 # New ports collection makefile for:	mule
-# Version required:	2.2
+# Version required:	2.2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.12 1995/03/28 06:21:04 asami Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:49 jkh Exp $
 #
 
 DISTNAME=	mule-2.2.2
-DISTFILES=	emacs-19.28.tar.gz
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 CATEGORIES+=	editors
-MAINTAINER=	asami@FreeBSD.ORG
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-STRIP=
-CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
-		  --wnn --wnn-libraries=/usr/X11R6/lib \
-		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
-WRKSRC=		${WRKDIR}/emacs-19.28
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+DISTFILES=	emacs-19.28.tar.gz
+
 # Use one of these if you are in Japan
+
 # PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
 # PATCHSITE=	etlport.etl.go.jp:/pub/mule/
+
 PATCH_SITES=	ftp.cs.buffalo.edu:/pub/mule/
 PATCHFILES=	diff-19.28-2.2.gz patch-2.2.1.gz patch-2.2.2.gz
 PATCH_DIST_STRIP=	-p1
 
+MAINTAINER=	asami@FreeBSD.ORG
+
 .if !exists(/usr/X11R6/lib/libwnn.a)
 DEPENDS=	${PORTSDIR}/utils/Wnn
 .endif
+
+WRKSRC=		${WRKDIR}/emacs-19.28
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
+		  --wnn --wnn-libraries=/usr/X11R6/lib \
+		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
+STRIP=
+
 PREBUILD_COOKIE=	${.CURDIR}/work/.prebuild_done
 
 pre-build:	${PREBUILD_COOKIE}
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 0d4b68ed540d..14e4e168918d 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -1,33 +1,39 @@
 # New ports collection makefile for:	mule
-# Version required:	2.2
+# Version required:	2.2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.12 1995/03/28 06:21:04 asami Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:49 jkh Exp $
 #
 
 DISTNAME=	mule-2.2.2
-DISTFILES=	emacs-19.28.tar.gz
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 CATEGORIES+=	editors
-MAINTAINER=	asami@FreeBSD.ORG
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-STRIP=
-CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
-		  --wnn --wnn-libraries=/usr/X11R6/lib \
-		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
-WRKSRC=		${WRKDIR}/emacs-19.28
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+DISTFILES=	emacs-19.28.tar.gz
+
 # Use one of these if you are in Japan
+
 # PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
 # PATCHSITE=	etlport.etl.go.jp:/pub/mule/
+
 PATCH_SITES=	ftp.cs.buffalo.edu:/pub/mule/
 PATCHFILES=	diff-19.28-2.2.gz patch-2.2.1.gz patch-2.2.2.gz
 PATCH_DIST_STRIP=	-p1
 
+MAINTAINER=	asami@FreeBSD.ORG
+
 .if !exists(/usr/X11R6/lib/libwnn.a)
 DEPENDS=	${PORTSDIR}/utils/Wnn
 .endif
+
+WRKSRC=		${WRKDIR}/emacs-19.28
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
+		  --wnn --wnn-libraries=/usr/X11R6/lib \
+		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
+STRIP=
+
 PREBUILD_COOKIE=	${.CURDIR}/work/.prebuild_done
 
 pre-build:	${PREBUILD_COOKIE}
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index 0d4b68ed540d..14e4e168918d 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -1,33 +1,39 @@
 # New ports collection makefile for:	mule
-# Version required:	2.2
+# Version required:	2.2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.12 1995/03/28 06:21:04 asami Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:49 jkh Exp $
 #
 
 DISTNAME=	mule-2.2.2
-DISTFILES=	emacs-19.28.tar.gz
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 CATEGORIES+=	editors
-MAINTAINER=	asami@FreeBSD.ORG
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-STRIP=
-CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
-		  --wnn --wnn-libraries=/usr/X11R6/lib \
-		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
-WRKSRC=		${WRKDIR}/emacs-19.28
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+DISTFILES=	emacs-19.28.tar.gz
+
 # Use one of these if you are in Japan
+
 # PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
 # PATCHSITE=	etlport.etl.go.jp:/pub/mule/
+
 PATCH_SITES=	ftp.cs.buffalo.edu:/pub/mule/
 PATCHFILES=	diff-19.28-2.2.gz patch-2.2.1.gz patch-2.2.2.gz
 PATCH_DIST_STRIP=	-p1
 
+MAINTAINER=	asami@FreeBSD.ORG
+
 .if !exists(/usr/X11R6/lib/libwnn.a)
 DEPENDS=	${PORTSDIR}/utils/Wnn
 .endif
+
+WRKSRC=		${WRKDIR}/emacs-19.28
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
+		  --wnn --wnn-libraries=/usr/X11R6/lib \
+		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
+STRIP=
+
 PREBUILD_COOKIE=	${.CURDIR}/work/.prebuild_done
 
 pre-build:	${PREBUILD_COOKIE}
diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index 0d4b68ed540d..14e4e168918d 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -1,33 +1,39 @@
 # New ports collection makefile for:	mule
-# Version required:	2.2
+# Version required:	2.2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.12 1995/03/28 06:21:04 asami Exp $
+# $Id: Makefile,v 1.13 1995/04/01 12:44:49 jkh Exp $
 #
 
 DISTNAME=	mule-2.2.2
-DISTFILES=	emacs-19.28.tar.gz
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 CATEGORIES+=	editors
-MAINTAINER=	asami@FreeBSD.ORG
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-STRIP=
-CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
-		  --wnn --wnn-libraries=/usr/X11R6/lib \
-		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
-WRKSRC=		${WRKDIR}/emacs-19.28
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+DISTFILES=	emacs-19.28.tar.gz
+
 # Use one of these if you are in Japan
+
 # PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
 # PATCHSITE=	etlport.etl.go.jp:/pub/mule/
+
 PATCH_SITES=	ftp.cs.buffalo.edu:/pub/mule/
 PATCHFILES=	diff-19.28-2.2.gz patch-2.2.1.gz patch-2.2.2.gz
 PATCH_DIST_STRIP=	-p1
 
+MAINTAINER=	asami@FreeBSD.ORG
+
 .if !exists(/usr/X11R6/lib/libwnn.a)
 DEPENDS=	${PORTSDIR}/utils/Wnn
 .endif
+
+WRKSRC=		${WRKDIR}/emacs-19.28
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
+		  --wnn --wnn-libraries=/usr/X11R6/lib \
+		  --wnn-includes=/usr/X11R6/include/wnn --terminal-face
+STRIP=
+
 PREBUILD_COOKIE=	${.CURDIR}/work/.prebuild_done
 
 pre-build:	${PREBUILD_COOKIE}