14 files changed, 35 insertions, 57 deletions

diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index ccc6f6c051c6..b07b79651445 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -1,23 +1,17 @@
 # New ports collection makefile for:	mule
-# Version required:	2.2.2
+# Version required:	2.3
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.20 1995/07/20 00:25:14 asami Exp $
+# $Id: Makefile,v 1.21 1995/07/23 22:32:38 asami Exp $
 #
 
-DISTNAME=	mule-2.2
-PKGNAME=	mule-2.2.2
+DISTNAME=	mule-2.3
 CATEGORIES+=	editors
 MASTER_SITES=	ftp://ftp.cs.buffalo.edu/pub/mule/ \
 		ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/
-
-PATCH_SITES=	ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/
-PATCHFILES=	patch-2.2.1.gz patch-2.2.2.gz
-PATCH_DIST_STRIP=	-p1
+		ftp://sh.wide.ad.jp/JAPAN/mule/ \
+		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -26,7 +20,6 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
 		--terminal-face \
 		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
-
 STRIP=
 
 pre-build:
diff --git a/editors/mule-common/distinfo b/editors/mule-common/distinfo
index 11d885ed90da..b6026659567d 100644
--- a/editors/mule-common/distinfo
+++ b/editors/mule-common/distinfo
@@ -1,3 +1 @@
-MD5 (mule-2.2.tar.gz) = c8d482c64e655f84e0e025018ea36bf1
-MD5 (patch-2.2.1.gz) = dcab3b4331c0cc1341dffd75ee77c6bf
-MD5 (patch-2.2.2.gz) = 647edaa06da2eca9b662efa0ea98903a
+MD5 (mule-2.3.tar.gz) = 1394af7f1f0f1fa4552984924e7789db
diff --git a/editors/mule-common/pkg-comment b/editors/mule-common/pkg-comment
index a0a474925266..b8a3bece7f71 100644
--- a/editors/mule-common/pkg-comment
+++ b/editors/mule-common/pkg-comment
@@ -1 +1 @@
-mule-2.2.2, a multilingual emacs
+mule-2.3, a multilingual emacs
diff --git a/editors/mule-common/pkg-descr b/editors/mule-common/pkg-descr
index 9a25bcf015ca..c30d1534f978 100644
--- a/editors/mule-common/pkg-descr
+++ b/editors/mule-common/pkg-descr
@@ -1,4 +1,4 @@
-This is mule-2.2.2, a multilingual editor based on emacs-19.28.
+This is mule-2.3, a multilingual editor based on emacs-19.28.
 
 This package is not built with any particular language support.  If
 you want a built-in input method, look into the mule ports in language-
diff --git a/editors/mule-common/pkg-plist b/editors/mule-common/pkg-plist
index 9d7f9ba8a9cb..c023df450c4f 100644
--- a/editors/mule-common/pkg-plist
+++ b/editors/mule-common/pkg-plist
@@ -325,7 +325,7 @@ lib/mule/19.28/lisp/egg-keymap.el
 lib/mule/19.28/lisp/egg.el
 lib/mule/19.28/lisp/egg.elc
 lib/mule/19.28/lisp/eggrc-sj3
-lib/mule/19.28/lisp/eggrc-v41
+lib/mule/19.28/lisp/eggrc-wnn
 lib/mule/19.28/lisp/ehelp.el
 lib/mule/19.28/lisp/ehelp.elc
 lib/mule/19.28/lisp/electric.el
@@ -478,6 +478,7 @@ lib/mule/19.28/lisp/lisp.elc
 lib/mule/19.28/lisp/lmenu.el
 lib/mule/19.28/lisp/lmenu.elc
 lib/mule/19.28/lisp/loaddefs.el
+lib/mule/19.28/lisp/loaddefs.elc
 lib/mule/19.28/lisp/loadhist.el
 lib/mule/19.28/lisp/loadhist.elc
 lib/mule/19.28/lisp/loadup.el
@@ -807,8 +808,8 @@ lib/mule/19.28/lisp/vt100-led.elc
 lib/mule/19.28/lisp/window.el
 lib/mule/19.28/lisp/window.elc
 lib/mule/19.28/lisp/wnn-client.el
-lib/mule/19.28/lisp/wnn4-egg.el
-lib/mule/19.28/lisp/wnn4-egg.elc
+lib/mule/19.28/lisp/wnn-egg.el
+lib/mule/19.28/lisp/wnn-egg.elc
 lib/mule/19.28/lisp/ws-mode.el
 lib/mule/19.28/lisp/ws-mode.elc
 lib/mule/19.28/lisp/x-menu.el
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index ccc6f6c051c6..b07b79651445 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,23 +1,17 @@
 # New ports collection makefile for:	mule
-# Version required:	2.2.2
+# Version required:	2.3
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.20 1995/07/20 00:25:14 asami Exp $
+# $Id: Makefile,v 1.21 1995/07/23 22:32:38 asami Exp $
 #
 
-DISTNAME=	mule-2.2
-PKGNAME=	mule-2.2.2
+DISTNAME=	mule-2.3
 CATEGORIES+=	editors
 MASTER_SITES=	ftp://ftp.cs.buffalo.edu/pub/mule/ \
 		ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/
-
-PATCH_SITES=	ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/
-PATCHFILES=	patch-2.2.1.gz patch-2.2.2.gz
-PATCH_DIST_STRIP=	-p1
+		ftp://sh.wide.ad.jp/JAPAN/mule/ \
+		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -26,7 +20,6 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
 		--terminal-face \
 		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
-
 STRIP=
 
 pre-build:
diff --git a/editors/mule/pkg-comment b/editors/mule/pkg-comment
index a0a474925266..b8a3bece7f71 100644
--- a/editors/mule/pkg-comment
+++ b/editors/mule/pkg-comment
@@ -1 +1 @@
-mule-2.2.2, a multilingual emacs
+mule-2.3, a multilingual emacs
diff --git a/editors/mule/pkg-descr b/editors/mule/pkg-descr
index 9a25bcf015ca..c30d1534f978 100644
--- a/editors/mule/pkg-descr
+++ b/editors/mule/pkg-descr
@@ -1,4 +1,4 @@
-This is mule-2.2.2, a multilingual editor based on emacs-19.28.
+This is mule-2.3, a multilingual editor based on emacs-19.28.
 
 This package is not built with any particular language support.  If
 you want a built-in input method, look into the mule ports in language-
diff --git a/editors/mule/pkg-plist b/editors/mule/pkg-plist
index 9d7f9ba8a9cb..c023df450c4f 100644
--- a/editors/mule/pkg-plist
+++ b/editors/mule/pkg-plist
@@ -325,7 +325,7 @@ lib/mule/19.28/lisp/egg-keymap.el
 lib/mule/19.28/lisp/egg.el
 lib/mule/19.28/lisp/egg.elc
 lib/mule/19.28/lisp/eggrc-sj3
-lib/mule/19.28/lisp/eggrc-v41
+lib/mule/19.28/lisp/eggrc-wnn
 lib/mule/19.28/lisp/ehelp.el
 lib/mule/19.28/lisp/ehelp.elc
 lib/mule/19.28/lisp/electric.el
@@ -478,6 +478,7 @@ lib/mule/19.28/lisp/lisp.elc
 lib/mule/19.28/lisp/lmenu.el
 lib/mule/19.28/lisp/lmenu.elc
 lib/mule/19.28/lisp/loaddefs.el
+lib/mule/19.28/lisp/loaddefs.elc
 lib/mule/19.28/lisp/loadhist.el
 lib/mule/19.28/lisp/loadhist.elc
 lib/mule/19.28/lisp/loadup.el
@@ -807,8 +808,8 @@ lib/mule/19.28/lisp/vt100-led.elc
 lib/mule/19.28/lisp/window.el
 lib/mule/19.28/lisp/window.elc
 lib/mule/19.28/lisp/wnn-client.el
-lib/mule/19.28/lisp/wnn4-egg.el
-lib/mule/19.28/lisp/wnn4-egg.elc
+lib/mule/19.28/lisp/wnn-egg.el
+lib/mule/19.28/lisp/wnn-egg.elc
 lib/mule/19.28/lisp/ws-mode.el
 lib/mule/19.28/lisp/ws-mode.elc
 lib/mule/19.28/lisp/x-menu.el
diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index ccc6f6c051c6..b07b79651445 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -1,23 +1,17 @@
 # New ports collection makefile for:	mule
-# Version required:	2.2.2
+# Version required:	2.3
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.20 1995/07/20 00:25:14 asami Exp $
+# $Id: Makefile,v 1.21 1995/07/23 22:32:38 asami Exp $
 #
 
-DISTNAME=	mule-2.2
-PKGNAME=	mule-2.2.2
+DISTNAME=	mule-2.3
 CATEGORIES+=	editors
 MASTER_SITES=	ftp://ftp.cs.buffalo.edu/pub/mule/ \
 		ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/
-
-PATCH_SITES=	ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/
-PATCHFILES=	patch-2.2.1.gz patch-2.2.2.gz
-PATCH_DIST_STRIP=	-p1
+		ftp://sh.wide.ad.jp/JAPAN/mule/ \
+		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -26,7 +20,6 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
 		--terminal-face \
 		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
-
 STRIP=
 
 pre-build:
diff --git a/textproc/coco/distinfo b/textproc/coco/distinfo
index 11d885ed90da..b6026659567d 100644
--- a/textproc/coco/distinfo
+++ b/textproc/coco/distinfo
@@ -1,3 +1 @@
-MD5 (mule-2.2.tar.gz) = c8d482c64e655f84e0e025018ea36bf1
-MD5 (patch-2.2.1.gz) = dcab3b4331c0cc1341dffd75ee77c6bf
-MD5 (patch-2.2.2.gz) = 647edaa06da2eca9b662efa0ea98903a
+MD5 (mule-2.3.tar.gz) = 1394af7f1f0f1fa4552984924e7789db
diff --git a/textproc/coco/pkg-comment b/textproc/coco/pkg-comment
index a0a474925266..b8a3bece7f71 100644
--- a/textproc/coco/pkg-comment
+++ b/textproc/coco/pkg-comment
@@ -1 +1 @@
-mule-2.2.2, a multilingual emacs
+mule-2.3, a multilingual emacs
diff --git a/textproc/coco/pkg-descr b/textproc/coco/pkg-descr
index 9a25bcf015ca..c30d1534f978 100644
--- a/textproc/coco/pkg-descr
+++ b/textproc/coco/pkg-descr
@@ -1,4 +1,4 @@
-This is mule-2.2.2, a multilingual editor based on emacs-19.28.
+This is mule-2.3, a multilingual editor based on emacs-19.28.
 
 This package is not built with any particular language support.  If
 you want a built-in input method, look into the mule ports in language-
diff --git a/textproc/coco/pkg-plist b/textproc/coco/pkg-plist
index 9d7f9ba8a9cb..c023df450c4f 100644
--- a/textproc/coco/pkg-plist
+++ b/textproc/coco/pkg-plist
@@ -325,7 +325,7 @@ lib/mule/19.28/lisp/egg-keymap.el
 lib/mule/19.28/lisp/egg.el
 lib/mule/19.28/lisp/egg.elc
 lib/mule/19.28/lisp/eggrc-sj3
-lib/mule/19.28/lisp/eggrc-v41
+lib/mule/19.28/lisp/eggrc-wnn
 lib/mule/19.28/lisp/ehelp.el
 lib/mule/19.28/lisp/ehelp.elc
 lib/mule/19.28/lisp/electric.el
@@ -478,6 +478,7 @@ lib/mule/19.28/lisp/lisp.elc
 lib/mule/19.28/lisp/lmenu.el
 lib/mule/19.28/lisp/lmenu.elc
 lib/mule/19.28/lisp/loaddefs.el
+lib/mule/19.28/lisp/loaddefs.elc
 lib/mule/19.28/lisp/loadhist.el
 lib/mule/19.28/lisp/loadhist.elc
 lib/mule/19.28/lisp/loadup.el
@@ -807,8 +808,8 @@ lib/mule/19.28/lisp/vt100-led.elc
 lib/mule/19.28/lisp/window.el
 lib/mule/19.28/lisp/window.elc
 lib/mule/19.28/lisp/wnn-client.el
-lib/mule/19.28/lisp/wnn4-egg.el
-lib/mule/19.28/lisp/wnn4-egg.elc
+lib/mule/19.28/lisp/wnn-egg.el
+lib/mule/19.28/lisp/wnn-egg.elc
 lib/mule/19.28/lisp/ws-mode.el
 lib/mule/19.28/lisp/ws-mode.elc
 lib/mule/19.28/lisp/x-menu.el