Version up to 2.2 (now based on emacs-19.28).

@ Don't need freebsd.h and unexsunos4.c anymore (these were taken from
  19.28, with a minor modification, which is now known as patch-ac).
@ Tweaked lib-src/Makefile.in.in so that it won't clobber existing emacs
  installation (patch-ab).
@ Taken out -g from configure per someone's suggestion (patch-aa).
@ Changed patch site to one in US.
@ New md5 checksums.

10 files changed, 44 insertions, 31 deletions

diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 9110db049aa5..c601218b89eb 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/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/editors/mule-common/distinfo b/editors/mule-common/distinfo
index ec7f31029773..f460d30de45a 100644
--- a/editors/mule-common/distinfo
+++ b/editors/mule-common/distinfo
@@ -1 +1 @@
-MD5 (emacs-19.27.tar.gz) = da83db063eb1ce925ae104e1ab60f89e
+MD5 (emacs-19.28.tar.gz) = c8813274e5a34b14dcf46255d91c3089
diff --git a/editors/mule-common/files/patch-ac b/editors/mule-common/files/patch-ac
new file mode 100644
index 000000000000..1003722439e2
--- /dev/null
+++ b/editors/mule-common/files/patch-ac
@@ -0,0 +1,11 @@
+--- ./src/s/freebsd.h.org	Mon Oct 24 21:18:02 1994
++++ ./src/s/freebsd.h	Tue Jan  3 02:14:03 1995
+@@ -31,7 +31,7 @@
+ 
+ #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
+ 
+-#define LIBS_DEBUG
++#define LIBS_DEBUG -lcrypt
+ #define LIBS_SYSTEM -lutil
+ #define LIBS_TERMCAP -ltermcap
+ #define LIB_GCC -lgcc
diff --git a/editors/mule-common/pkg-comment b/editors/mule-common/pkg-comment
index a5e877d4bcae..3da1b5602cf4 100644
--- a/editors/mule-common/pkg-comment
+++ b/editors/mule-common/pkg-comment
@@ -1 +1 @@
-mule-2.1, a multilingual emacs
+mule-2.2, a multilingual emacs
diff --git a/editors/mule-common/pkg-descr b/editors/mule-common/pkg-descr
index 31dcabd5deb9..95ad0b97fa33 100644
--- a/editors/mule-common/pkg-descr
+++ b/editors/mule-common/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/editors/mule-common/pkg-plist b/editors/mule-common/pkg-plist
index e936beeac2cf..8c10c17f4a6e 100644
--- a/editors/mule-common/pkg-plist
+++ b/editors/mule-common/pkg-plist
@@ -2,13 +2,17 @@
 @exec mkdir -p %D/lib/mule/site-lisp
 @exec mkdir -p %D/lib/mule/lock
 @exec chmod 777 %D/lib/mule/lock
-bin/mule-19.27
+bin/mule-19.28
 @exec ln -s %D/%F %B/mule
 @unexec rm %B/mule
 bin/m2ps
-lib/mule/19.27
+bin/any2ps
+bin/b2m
+bin/coco
+lib/mule/19.28
 man/man1/mule.1
 man/man1/m2ps.1
+man/man1/coco.1
 info/CCL
 info/ISO2022
 info/R2L
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 9110db049aa5..c601218b89eb 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/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/editors/mule/pkg-comment b/editors/mule/pkg-comment
index a5e877d4bcae..3da1b5602cf4 100644
--- a/editors/mule/pkg-comment
+++ b/editors/mule/pkg-comment
@@ -1 +1 @@
-mule-2.1, a multilingual emacs
+mule-2.2, a multilingual emacs
diff --git a/editors/mule/pkg-descr b/editors/mule/pkg-descr
index 31dcabd5deb9..95ad0b97fa33 100644
--- a/editors/mule/pkg-descr
+++ b/editors/mule/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/editors/mule/pkg-plist b/editors/mule/pkg-plist
index e936beeac2cf..8c10c17f4a6e 100644
--- a/editors/mule/pkg-plist
+++ b/editors/mule/pkg-plist
@@ -2,13 +2,17 @@
 @exec mkdir -p %D/lib/mule/site-lisp
 @exec mkdir -p %D/lib/mule/lock
 @exec chmod 777 %D/lib/mule/lock
-bin/mule-19.27
+bin/mule-19.28
 @exec ln -s %D/%F %B/mule
 @unexec rm %B/mule
 bin/m2ps
-lib/mule/19.27
+bin/any2ps
+bin/b2m
+bin/coco
+lib/mule/19.28
 man/man1/mule.1
 man/man1/m2ps.1
+man/man1/coco.1
 info/CCL
 info/ISO2022
 info/R2L