12 files changed, 40 insertions, 52 deletions

diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index 9110db049aa5..c601218b89eb 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:	mule
-# Version required:	2.1
+# Version required:	2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.4 1994/11/27 03:40:09 asami Exp $
+# $Id: Makefile,v 1.5 1994/12/23 06:56:00 asami Exp $
 #
 
-DISTNAME=	mule-2.1
-DISTFILES=	emacs-19.27.tar.gz
+DISTNAME=	mule-2.2
+DISTFILES=	emacs-19.28.tar.gz
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 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.27
-PATCHFILES=	diff-19.27-2.1.gz
+WRKSRC=		${WRKDIR}/emacs-19.28
+PATCHFILES=	diff-19.28-2.2.gz
 .if !defined(MASTER_SITE_OVERRIDE)
-PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
+# PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
+PATCHSITE=	ftp.cs.buffalo.edu:/pub/mule/
 .else
 PATCHSITE=	${MASTER_SITE_OVERRIDE}
 .endif
@@ -38,10 +39,6 @@ pre-fetch:
 pre-patch:	${PREPATCH_COOKIE}
 
 ${PREPATCH_COOKIE}:
-	/bin/rm -f ${WRKSRC}/src/unexsunos4.c ${WRKSRC}/src/s/freebsd.h
-# I took these two files from emacs-19.28 and added -lcrypt
-	cp ${FILESDIR}/unexsunos4.c ${WRKSRC}/src
-	cp ${FILESDIR}/freebsd.h ${WRKSRC}/src/s
 	@echo "===>  Applying emacs -> mule patch"
 	@for file in ${PATCHFILES}; do \
 		gzip -c -d ${DISTDIR}/$$file | patch -d ${WRKSRC} -p1 -s; \
diff --git a/japanese/mule-canna/pkg-comment b/japanese/mule-canna/pkg-comment
index a5e877d4bcae..3da1b5602cf4 100644
--- a/japanese/mule-canna/pkg-comment
+++ b/japanese/mule-canna/pkg-comment
@@ -1 +1 @@
-mule-2.1, a multilingual emacs
+mule-2.2, a multilingual emacs
diff --git a/japanese/mule-canna/pkg-descr b/japanese/mule-canna/pkg-descr
index 31dcabd5deb9..95ad0b97fa33 100644
--- a/japanese/mule-canna/pkg-descr
+++ b/japanese/mule-canna/pkg-descr
@@ -1,4 +1,4 @@
-This is mule-2.1, a multilingual editor based on emacs-19.27.
+This is mule-2.2, a multilingual editor based on emacs-19.28.
 
 This package is built with Japanese support, using Wnn, as default.  I 
 don't use other language/input methods.  People are welcome to test
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 9110db049aa5..c601218b89eb 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:	mule
-# Version required:	2.1
+# Version required:	2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.4 1994/11/27 03:40:09 asami Exp $
+# $Id: Makefile,v 1.5 1994/12/23 06:56:00 asami Exp $
 #
 
-DISTNAME=	mule-2.1
-DISTFILES=	emacs-19.27.tar.gz
+DISTNAME=	mule-2.2
+DISTFILES=	emacs-19.28.tar.gz
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 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.27
-PATCHFILES=	diff-19.27-2.1.gz
+WRKSRC=		${WRKDIR}/emacs-19.28
+PATCHFILES=	diff-19.28-2.2.gz
 .if !defined(MASTER_SITE_OVERRIDE)
-PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
+# PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
+PATCHSITE=	ftp.cs.buffalo.edu:/pub/mule/
 .else
 PATCHSITE=	${MASTER_SITE_OVERRIDE}
 .endif
@@ -38,10 +39,6 @@ pre-fetch:
 pre-patch:	${PREPATCH_COOKIE}
 
 ${PREPATCH_COOKIE}:
-	/bin/rm -f ${WRKSRC}/src/unexsunos4.c ${WRKSRC}/src/s/freebsd.h
-# I took these two files from emacs-19.28 and added -lcrypt
-	cp ${FILESDIR}/unexsunos4.c ${WRKSRC}/src
-	cp ${FILESDIR}/freebsd.h ${WRKSRC}/src/s
 	@echo "===>  Applying emacs -> mule patch"
 	@for file in ${PATCHFILES}; do \
 		gzip -c -d ${DISTDIR}/$$file | patch -d ${WRKSRC} -p1 -s; \
diff --git a/japanese/mule-freewnn/pkg-comment b/japanese/mule-freewnn/pkg-comment
index a5e877d4bcae..3da1b5602cf4 100644
--- a/japanese/mule-freewnn/pkg-comment
+++ b/japanese/mule-freewnn/pkg-comment
@@ -1 +1 @@
-mule-2.1, a multilingual emacs
+mule-2.2, a multilingual emacs
diff --git a/japanese/mule-freewnn/pkg-descr b/japanese/mule-freewnn/pkg-descr
index 31dcabd5deb9..95ad0b97fa33 100644
--- a/japanese/mule-freewnn/pkg-descr
+++ b/japanese/mule-freewnn/pkg-descr
@@ -1,4 +1,4 @@
-This is mule-2.1, a multilingual editor based on emacs-19.27.
+This is mule-2.2, a multilingual editor based on emacs-19.28.
 
 This package is built with Japanese support, using Wnn, as default.  I 
 don't use other language/input methods.  People are welcome to test
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 9110db049aa5..c601218b89eb 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:	mule
-# Version required:	2.1
+# Version required:	2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.4 1994/11/27 03:40:09 asami Exp $
+# $Id: Makefile,v 1.5 1994/12/23 06:56:00 asami Exp $
 #
 
-DISTNAME=	mule-2.1
-DISTFILES=	emacs-19.27.tar.gz
+DISTNAME=	mule-2.2
+DISTFILES=	emacs-19.28.tar.gz
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 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.27
-PATCHFILES=	diff-19.27-2.1.gz
+WRKSRC=		${WRKDIR}/emacs-19.28
+PATCHFILES=	diff-19.28-2.2.gz
 .if !defined(MASTER_SITE_OVERRIDE)
-PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
+# PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
+PATCHSITE=	ftp.cs.buffalo.edu:/pub/mule/
 .else
 PATCHSITE=	${MASTER_SITE_OVERRIDE}
 .endif
@@ -38,10 +39,6 @@ pre-fetch:
 pre-patch:	${PREPATCH_COOKIE}
 
 ${PREPATCH_COOKIE}:
-	/bin/rm -f ${WRKSRC}/src/unexsunos4.c ${WRKSRC}/src/s/freebsd.h
-# I took these two files from emacs-19.28 and added -lcrypt
-	cp ${FILESDIR}/unexsunos4.c ${WRKSRC}/src
-	cp ${FILESDIR}/freebsd.h ${WRKSRC}/src/s
 	@echo "===>  Applying emacs -> mule patch"
 	@for file in ${PATCHFILES}; do \
 		gzip -c -d ${DISTDIR}/$$file | patch -d ${WRKSRC} -p1 -s; \
diff --git a/japanese/mule-wnn6/pkg-comment b/japanese/mule-wnn6/pkg-comment
index a5e877d4bcae..3da1b5602cf4 100644
--- a/japanese/mule-wnn6/pkg-comment
+++ b/japanese/mule-wnn6/pkg-comment
@@ -1 +1 @@
-mule-2.1, a multilingual emacs
+mule-2.2, a multilingual emacs
diff --git a/japanese/mule-wnn6/pkg-descr b/japanese/mule-wnn6/pkg-descr
index 31dcabd5deb9..95ad0b97fa33 100644
--- a/japanese/mule-wnn6/pkg-descr
+++ b/japanese/mule-wnn6/pkg-descr
@@ -1,4 +1,4 @@
-This is mule-2.1, a multilingual editor based on emacs-19.27.
+This is mule-2.2, a multilingual editor based on emacs-19.28.
 
 This package is built with Japanese support, using Wnn, as default.  I 
 don't use other language/input methods.  People are welcome to test
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index 9110db049aa5..c601218b89eb 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:	mule
-# Version required:	2.1
+# Version required:	2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.4 1994/11/27 03:40:09 asami Exp $
+# $Id: Makefile,v 1.5 1994/12/23 06:56:00 asami Exp $
 #
 
-DISTNAME=	mule-2.1
-DISTFILES=	emacs-19.27.tar.gz
+DISTNAME=	mule-2.2
+DISTFILES=	emacs-19.28.tar.gz
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 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.27
-PATCHFILES=	diff-19.27-2.1.gz
+WRKSRC=		${WRKDIR}/emacs-19.28
+PATCHFILES=	diff-19.28-2.2.gz
 .if !defined(MASTER_SITE_OVERRIDE)
-PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
+# PATCHSITE=	sh.wide.ad.jp:/JAPAN/mule/
+PATCHSITE=	ftp.cs.buffalo.edu:/pub/mule/
 .else
 PATCHSITE=	${MASTER_SITE_OVERRIDE}
 .endif
@@ -38,10 +39,6 @@ pre-fetch:
 pre-patch:	${PREPATCH_COOKIE}
 
 ${PREPATCH_COOKIE}:
-	/bin/rm -f ${WRKSRC}/src/unexsunos4.c ${WRKSRC}/src/s/freebsd.h
-# I took these two files from emacs-19.28 and added -lcrypt
-	cp ${FILESDIR}/unexsunos4.c ${WRKSRC}/src
-	cp ${FILESDIR}/freebsd.h ${WRKSRC}/src/s
 	@echo "===>  Applying emacs -> mule patch"
 	@for file in ${PATCHFILES}; do \
 		gzip -c -d ${DISTDIR}/$$file | patch -d ${WRKSRC} -p1 -s; \
diff --git a/japanese/mule-wnn7/pkg-comment b/japanese/mule-wnn7/pkg-comment
index a5e877d4bcae..3da1b5602cf4 100644
--- a/japanese/mule-wnn7/pkg-comment
+++ b/japanese/mule-wnn7/pkg-comment
@@ -1 +1 @@
-mule-2.1, a multilingual emacs
+mule-2.2, a multilingual emacs
diff --git a/japanese/mule-wnn7/pkg-descr b/japanese/mule-wnn7/pkg-descr
index 31dcabd5deb9..95ad0b97fa33 100644
--- a/japanese/mule-wnn7/pkg-descr
+++ b/japanese/mule-wnn7/pkg-descr
@@ -1,4 +1,4 @@
-This is mule-2.1, a multilingual editor based on emacs-19.27.
+This is mule-2.2, a multilingual editor based on emacs-19.28.
 
 This package is built with Japanese support, using Wnn, as default.  I 
 don't use other language/input methods.  People are welcome to test