Since thud was down all day (no offense Gary :), I finally had time to

split mule into three ports:

editors/mule:          no language-specific support
japanese/mule-canna:   Japanese support, Canna library built-in
japanese/mule-wnn:     Japanese support, Wnn library built-in

Note that the two ports under japanese/ will overwrite some of the
emacs support files.  Although this itself isn't a problem, if you
pkg_delete it, you will lose some files needed for emacs.  (This is
explained in DESCR, although god knows who reads them.)

Also I've listed every single file in the PLIST.

3 files changed, 41 insertions, 33 deletions

diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index 69ffc4db5b93..ffa12e9e6411 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -1,47 +1,51 @@
-# New ports collection makefile for:	mule
+# New ports collection makefile for:	mule with Canna
 # Version required:	2.2.2
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.16 1995/04/20 18:23:06 asami Exp $
+# $Id: Makefile,v 1.17 1995/04/22 12:39:19 asami Exp $
 #
 
-DISTNAME=	mule-2.2.2
-CATEGORIES+=	editors
-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
+DISTNAME=	mule-2.2
+PKGNAME=	jp-cmule-2.2.2
+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
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-.if !exists(/usr/X11R6/lib/libwnn.a)
-DEPENDS=	${PORTSDIR}/japanese/Wnn
-.endif
+LIB_DEPENDS=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
 
-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
+CONFIGURE_ARGS=        i386--freebsd --prefix=${PREFIX} --with-x-toolkit \
+		--canna --canna-libraries=/usr/local/lib \
+		--canna-includes=/usr/local/canna/include --terminal-face
+
 STRIP=
 
 pre-build:
 	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
 
 post-install:
-# note that any2ps is a script
-	strip ${PREFIX}/bin/mule-19.28
-	strip ${PREFIX}/bin/m2ps
+# note that rcs-checkn and any2ps are scripts
 	strip ${PREFIX}/bin/b2m
 	strip ${PREFIX}/bin/coco
+	strip ${PREFIX}/bin/ctags
+	strip ${PREFIX}/bin/etags
+	strip ${PREFIX}/bin/m2ps
+	strip ${PREFIX}/bin/mule-19.28
+	gzip -9nf ${PREFIX}/man/man1/coco.1
+	gzip -9nf ${PREFIX}/man/man1/ctags.1
+	gzip -9nf ${PREFIX}/man/man1/etags.1
+	gzip -9nf ${PREFIX}/man/man1/m2ps.1
+	gzip -9nf ${PREFIX}/man/man1/mule.1
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-canna/pkg-comment b/japanese/mule-canna/pkg-comment
index a0a474925266..28ea692f19f9 100644
--- a/japanese/mule-canna/pkg-comment
+++ b/japanese/mule-canna/pkg-comment
@@ -1 +1 @@
-mule-2.2.2, a multilingual emacs
+mule-2.2.2, a multilingual emacs, with Canna support built in
diff --git a/japanese/mule-canna/pkg-descr b/japanese/mule-canna/pkg-descr
index 8019c3fa963b..91b860384c33 100644
--- a/japanese/mule-canna/pkg-descr
+++ b/japanese/mule-canna/pkg-descr
@@ -1,14 +1,18 @@
 This is mule-2.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
-other configurations and report their results.
+This package is built with Japanese support, using Canna as default.
 
-This package is designed *not* to clobber any existing emacs
-installation.  In particular, the executables and man pages of
-etags/ctags are not installed, and the info pages that come with the
-original emacs don't get installed too.  Remove the file
-patches/patch-ab if you want this package to stand on its own.
+This package *will* clobber any existing emacs installation.  In
+particular, the executables and man pages of etags/ctags are
+installed, and the info pages that come with the original emacs get
+installed too.
+
+Although this shouldn't cause any problems to run both mule and emacs,
+it may cause some confusion when one of them is pkg_delete'd.  If
+someone has a solution to this, please tell me.
+
+Also, it will overwrite itself over another mule using Wnn.
+Solutions to this is welcome, too.
 
 A "dir" file is supplied in the files/ subdirectory of the ports
 package.  Copy it into your /usr/local/info to read mule info pages,