Upgrade, 2.2.2 -> 2.3. Note the base emacs version is still 19.28.

Other variations (japanese/mule-canna, editors/mule) to follow.

9 files changed, 27 insertions, 42 deletions

diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 6c60378..d14648a 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -1,23 +1,18 @@
 # New ports collection makefile for:	mule with Wnn
-# 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:25 asami Exp $
+# $Id: Makefile,v 1.21 1995/07/23 22:32:44 asami Exp $
 #
 
-DISTNAME=	mule-2.2
-PKGNAME=	jp-wmule-2.2.2
+DISTNAME=	mule-2.3
+PKGNAME=	jp-wmule-2.3
 CATEGORIES+=	japanese editors
 MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
 		ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/
-
-PATCH_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://ftp.cs.buffalo.edu/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
 
@@ -28,7 +23,7 @@ DEPENDS=	${PORTSDIR}/japanese/Wnn
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
-		--wnn --wnn-libraries=/usr/X11R6/lib \
+		--with-wnn4 --wnn-libraries=/usr/X11R6/lib \
 		--wnn-includes=/usr/X11R6/include/wnn --terminal-face \
 		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 STRIP=
diff --git a/japanese/mule-freewnn/pkg-comment b/japanese/mule-freewnn/pkg-comment
index 5219a6c..2b11ea9 100644
--- a/japanese/mule-freewnn/pkg-comment
+++ b/japanese/mule-freewnn/pkg-comment
@@ -1 +1 @@
-mule-2.2.2, a multilingual emacs, with Wnn support built in
+mule-2.3, a multilingual emacs, with Wnn support built in
diff --git a/japanese/mule-freewnn/pkg-descr b/japanese/mule-freewnn/pkg-descr
index e5f7e64..788eb54 100644
--- a/japanese/mule-freewnn/pkg-descr
+++ b/japanese/mule-freewnn/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 built with Japanese support, using Wnn as default.
 
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 6c60378..d14648a 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -1,23 +1,18 @@
 # New ports collection makefile for:	mule with Wnn
-# 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:25 asami Exp $
+# $Id: Makefile,v 1.21 1995/07/23 22:32:44 asami Exp $
 #
 
-DISTNAME=	mule-2.2
-PKGNAME=	jp-wmule-2.2.2
+DISTNAME=	mule-2.3
+PKGNAME=	jp-wmule-2.3
 CATEGORIES+=	japanese editors
 MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
 		ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/
-
-PATCH_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://ftp.cs.buffalo.edu/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
 
@@ -28,7 +23,7 @@ DEPENDS=	${PORTSDIR}/japanese/Wnn
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
-		--wnn --wnn-libraries=/usr/X11R6/lib \
+		--with-wnn4 --wnn-libraries=/usr/X11R6/lib \
 		--wnn-includes=/usr/X11R6/include/wnn --terminal-face \
 		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 STRIP=
diff --git a/japanese/mule-wnn6/pkg-comment b/japanese/mule-wnn6/pkg-comment
index 5219a6c..2b11ea9 100644
--- a/japanese/mule-wnn6/pkg-comment
+++ b/japanese/mule-wnn6/pkg-comment
@@ -1 +1 @@
-mule-2.2.2, a multilingual emacs, with Wnn support built in
+mule-2.3, a multilingual emacs, with Wnn support built in
diff --git a/japanese/mule-wnn6/pkg-descr b/japanese/mule-wnn6/pkg-descr
index e5f7e64..788eb54 100644
--- a/japanese/mule-wnn6/pkg-descr
+++ b/japanese/mule-wnn6/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 built with Japanese support, using Wnn as default.
 
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index 6c60378..d14648a 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -1,23 +1,18 @@
 # New ports collection makefile for:	mule with Wnn
-# 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:25 asami Exp $
+# $Id: Makefile,v 1.21 1995/07/23 22:32:44 asami Exp $
 #
 
-DISTNAME=	mule-2.2
-PKGNAME=	jp-wmule-2.2.2
+DISTNAME=	mule-2.3
+PKGNAME=	jp-wmule-2.3
 CATEGORIES+=	japanese editors
 MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
 		ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/
-
-PATCH_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://ftp.cs.buffalo.edu/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
 
@@ -28,7 +23,7 @@ DEPENDS=	${PORTSDIR}/japanese/Wnn
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
-		--wnn --wnn-libraries=/usr/X11R6/lib \
+		--with-wnn4 --wnn-libraries=/usr/X11R6/lib \
 		--wnn-includes=/usr/X11R6/include/wnn --terminal-face \
 		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 STRIP=
diff --git a/japanese/mule-wnn7/pkg-comment b/japanese/mule-wnn7/pkg-comment
index 5219a6c..2b11ea9 100644
--- a/japanese/mule-wnn7/pkg-comment
+++ b/japanese/mule-wnn7/pkg-comment
@@ -1 +1 @@
-mule-2.2.2, a multilingual emacs, with Wnn support built in
+mule-2.3, a multilingual emacs, with Wnn support built in
diff --git a/japanese/mule-wnn7/pkg-descr b/japanese/mule-wnn7/pkg-descr
index e5f7e64..788eb54 100644
--- a/japanese/mule-wnn7/pkg-descr
+++ b/japanese/mule-wnn7/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 built with Japanese support, using Wnn as default.