8 files changed, 157 insertions, 64 deletions

diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index c8f11501b34d..d66a03119ae4 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -1,38 +1,73 @@
-# New ports collection makefile for:	mule
+# New ports collection makefile for:	files except executables for mule
 # Version required:	2.3
-# Date created:		22 November 1994
-# Whom:			Satoshi Asami (asami)
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.28 1997/05/28 03:06:31 asami Exp $
+# $Id$
 #
 
 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/ \
-		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
+PKGNAME=	mule-common-2.3
+CATEGORIES=	editors chinese japanese korean
+MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
+		ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \
+		ftp://ftp.iij.ad.jp/pub/misc/mule/ \
+		ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/
+DISTFILES=	mule-2.3.tar.gz mule-2.3.patch-970819.tar.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
+
+EXTRACT_ONLY=	mule-2.3.tar.gz
+.for dir in editors/mule japanese/mule-canna japanese/mule-canna+sj3 \
+	japanese/mule-canna japanese/mule-canna+sj3 \
+	japanese/mule-canna+sj3+wnn4 japanese/mule-canna+sj3+wnn6 \
+	japanese/mule-canna+wnn4 japanese/mule-canna+wnn6 \
+	japanese/mule-sj3 japanese/mule-sj3+wnn japanese/mule-sj3+wnn6 \
+	japanese/mule-wnn4 japanese/mule-wnn6 \
+	chinese/mule-wnn4 korean/mule-wnn4
+.if exists(${.CURDIR}/../../${dir}/work/.build_done)
+WRKDIR?=	${.CURDIR}/../../${dir}/work
+.endif
+.endfor
+WRKSRC= ${WRKDIR}/mule
+
+.if !defined(WRKDIR) && !defined(PACKAGE_BUILDING)
+BROKEN=		You should build install one of the other mule ports first
+.endif
+
+INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
+PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
+
+USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
 		--terminal-face \
+		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \
 		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 STRIP=
 MAN1=		coco.1 ctags.1 etags.1 m2ps.1 mule.1
 
+INSTALL_TARGET=	install-arch-indep
+
+post-extract:
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3.patch-970819.tar.gz
+	cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ./takana.tar.gz
+
+pre-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/patch
+
+post-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Mule-2.3.patch
+
 pre-build:
-	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
+	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.28.*
 
 post-install:
-# note that any2ps is a script
-.for file in b2m coco ctags etags m2ps mule-19.28
-	strip ${PREFIX}/bin/${file}
-.endfor
 	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 .for info in emacs vip forms gnus cl sc
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
@@ -43,5 +78,10 @@ post-install:
 	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
 	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
 	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
+
+post-package:
+	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 
 .include <bsd.port.mk>
diff --git a/textproc/coco/distinfo b/textproc/coco/distinfo
index b6026659567d..cd2ed03a779e 100644
--- a/textproc/coco/distinfo
+++ b/textproc/coco/distinfo
@@ -1 +1,2 @@
-MD5 (mule-2.3.tar.gz) = 1394af7f1f0f1fa4552984924e7789db
+MD5 (mule-2.3.tar.gz) = e97cfbf19ee43442b416004eb92aac41
+MD5 (mule-2.3.patch-970819.tar.gz) = affdd51086c15abbb0a50999ac2e2796
diff --git a/textproc/coco/files/patch-ac b/textproc/coco/files/patch-ac
index 4b0f8afd8bfe..f9d3e07d53be 100644
--- a/textproc/coco/files/patch-ac
+++ b/textproc/coco/files/patch-ac
@@ -1,4 +1,4 @@
---- ./src/s/freebsd.h.org	Fri Nov  4 03:11:17 1994
+--- ../mule-2.3.org/src/s/freebsd.h.org	Fri Nov  4 03:11:17 1994
 +++ ./src/s/freebsd.h	Wed Aug  9 02:29:56 1995
 @@ -31,10 +31,10 @@
  
diff --git a/textproc/coco/files/site-start.el.tmpl b/textproc/coco/files/site-start.el.tmpl
new file mode 100644
index 000000000000..d5a9dfa4453a
--- /dev/null
+++ b/textproc/coco/files/site-start.el.tmpl
@@ -0,0 +1,37 @@
+;; Chinese
+;;(load "its/erpin")
+;;(load "its/zhuyin")
+;;(load "its/quanjiao")
+;;(set-primary-environment 'chinese);;CHINESE
+
+;; Korean
+;;(if (boundp 'WNN);;KOREAN
+;;    (load "its/Korean"));;KOREAN
+;;(set-primary-environment 'korean);;KOREAN
+
+;; Japanese
+;;(set-primary-environment 'japanese);;JAPANESE
+
+;; For languages except Korean (kr-mule-wnn)
+(defun set-korean-environment ()
+  (setq *coding-category-iso-8-2* '*euc-korea*)
+
+  (set-coding-priority
+   '(*coding-category-iso-8-2*
+     *coding-category-iso-8-1*))
+
+  (set-default-file-coding-system '*iso-2022-kr*)
+
+  (if (boundp 'WNN)
+      (progn
+;;	(load "its/Korean");;not KOREAN
+	(set-default-wnn-environment 'kserver)))
+
+  (setq-default quail-current-package (assoc "hangul" quail-package-alist))
+  )
+
+;; Add System Info path '/usr/share/info' into Info-default-directory-list
+(setq Info-default-directory-list
+      (append (list
+	       "/usr/share/info"
+	       ) Info-default-directory-list)) 
diff --git a/textproc/coco/pkg-comment b/textproc/coco/pkg-comment
index a942ef6fd09f..b8a538c20d85 100644
--- a/textproc/coco/pkg-comment
+++ b/textproc/coco/pkg-comment
@@ -1 +1 @@
-A multilingual emacs
+For a multilingual emacs (mule-2.3), emacs lisp files, info pages, etc (except executables)
diff --git a/textproc/coco/pkg-descr b/textproc/coco/pkg-descr
index c30d1534f978..0e97b0f7f334 100644
--- a/textproc/coco/pkg-descr
+++ b/textproc/coco/pkg-descr
@@ -1,21 +1,29 @@
-This is mule-2.3, a multilingual editor based on emacs-19.28.
+This is emacs lisp files, info pages, and so on (except executables)
+for 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-
-specific directories.  Currently only Japanese (Wnn and Canna) is
-available.
+You must install one of packages, mule-2.3, jp-mule-*-2.3 (
+jp-mule-canna-2.3, jp-mule-canna+sj3-2.3, etc.), cn-mule-wnn4-2.3 and
+kr-mule-wnn4-2.3, each of which contains only the executables for
+mule-2.3.
 
-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.
-The Japanese version is build to install everything, by the way.
+This package and the above package of the executables *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.
 
-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,
-but also make sure you also add everything that may have been added to
-that file!
+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.
 
-- Satoshi
-asami@cs.berkeley.edu
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
diff --git a/textproc/coco/pkg-install b/textproc/coco/pkg-install
new file mode 100644
index 000000000000..892eeb848ba6
--- /dev/null
+++ b/textproc/coco/pkg-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
+echo "############################################################"
+echo "You must install one of packages, mule-2.3, jp-mule-*-2.3"
+echo "(jp-mule-canna-2.3, jp-mule-canna+sj3-2.3, etc.),"
+echo "cn-mule-wnn4-2.3 and kr-mule-wnn4-2.3, each of"
+echo "which contains only the executables for mule-2.3"
+echo "############################################################"
diff --git a/textproc/coco/pkg-plist b/textproc/coco/pkg-plist
index fb4e72b549f6..c06f38e9890e 100644
--- a/textproc/coco/pkg-plist
+++ b/textproc/coco/pkg-plist
@@ -1,19 +1,9 @@
 @exec mkdir -p %D/share/emacs/site-lisp
+@dirrm share/emacs/site-lisp
+@dirrm share/emacs
 @exec mkdir -p %D/lib/mule/site-lisp
 @exec mkdir -p %D/lib/mule/lock
 @exec chmod 777 %D/lib/mule/lock
-@unexec rmdir %D/lib/mule/site-lisp
-@unexec rmdir %D/lib/mule/lock
-bin/mule-19.28
-@exec ln -sf %D/%F %B/mule
-@unexec rm %B/mule
-bin/any2ps
-bin/b2m
-bin/coco
-bin/ctags
-bin/etags
-bin/m2ps
-bin/rcs-checkin
 man/man1/coco.1.gz
 man/man1/ctags.1.gz
 man/man1/etags.1.gz
@@ -205,22 +195,6 @@ lib/mule/19.28/etc/tom.xbm
 lib/mule/19.28/etc/ulimit.hack
 lib/mule/19.28/etc/vipcard.tex
 lib/mule/19.28/etc/yow.lines
-lib/mule/19.28/i386--freebsd/cvtmail
-lib/mule/19.28/i386--freebsd/digest-doc
-lib/mule/19.28/i386--freebsd/emacsserver
-lib/mule/19.28/i386--freebsd/fakemail
-lib/mule/19.28/i386--freebsd/hexl
-lib/mule/19.28/i386--freebsd/make-docfile
-lib/mule/19.28/i386--freebsd/make-path
-lib/mule/19.28/i386--freebsd/movemail
-lib/mule/19.28/i386--freebsd/profile
-lib/mule/19.28/i386--freebsd/rcs2log
-lib/mule/19.28/i386--freebsd/sorted-doc
-lib/mule/19.28/i386--freebsd/test-distrib
-lib/mule/19.28/i386--freebsd/timer
-lib/mule/19.28/i386--freebsd/vcdiff
-lib/mule/19.28/i386--freebsd/wakeup
-lib/mule/19.28/i386--freebsd/yow
 lib/mule/19.28/lisp/COPYING
 lib/mule/19.28/lisp/ChangeLog
 lib/mule/19.28/lisp/ChangeLog.1
@@ -568,6 +542,8 @@ lib/mule/19.28/lisp/lucid.el
 lib/mule/19.28/lisp/lucid.elc
 lib/mule/19.28/lisp/lunar.el
 lib/mule/19.28/lisp/lunar.elc
+lib/mule/19.28/lisp/m2ps-util.el
+lib/mule/19.28/lisp/m2ps-util.elc
 lib/mule/19.28/lisp/macros.el
 lib/mule/19.28/lisp/macros.elc
 lib/mule/19.28/lisp/mail-extr.el
@@ -641,6 +617,7 @@ lib/mule/19.28/lisp/mule-diag.el
 lib/mule/19.28/lisp/mule-diag.elc
 lib/mule/19.28/lisp/mule-init.el
 lib/mule/19.28/lisp/mule-init.elc
+lib/mule/19.28/lisp/mule-init.el.old
 lib/mule/19.28/lisp/mule-inst.el
 lib/mule/19.28/lisp/mule-util.el
 lib/mule/19.28/lisp/mule-util.elc
@@ -903,6 +880,13 @@ lib/mule/19.28/lisp/its/kata.el
 lib/mule/19.28/lisp/its/pinyin.el
 lib/mule/19.28/lisp/its/zenkaku.el
 lib/mule/19.28/lisp/its/zhuyin.el
+lib/mule/19.28/lisp/its/Chinese.el
+lib/mule/19.28/lisp/its/Japanese.el
+lib/mule/19.28/lisp/its/Korean.el
+lib/mule/19.28/lisp/its/erpin.el
+lib/mule/19.28/lisp/its/jeonkak.el
+lib/mule/19.28/lisp/its/quanjiao.el
+lib/mule/19.28/lisp/quail/4c-CNS.el
 lib/mule/19.28/lisp/quail/ccdospy.el
 lib/mule/19.28/lisp/quail/ccdospy.elc
 lib/mule/19.28/lisp/quail/ctlau.el
@@ -937,6 +921,8 @@ lib/mule/19.28/lisp/quail/punct-b5.el
 lib/mule/19.28/lisp/quail/punct-b5.elc
 lib/mule/19.28/lisp/quail/punct.el
 lib/mule/19.28/lisp/quail/punct.elc
+lib/mule/19.28/lisp/quail/py-CNS.el
+lib/mule/19.28/lisp/quail/py-CNS.elc
 lib/mule/19.28/lisp/quail/py-b5.el
 lib/mule/19.28/lisp/quail/py-b5.elc
 lib/mule/19.28/lisp/quail/py.el
@@ -945,6 +931,8 @@ lib/mule/19.28/lisp/quail/qj-b5.el
 lib/mule/19.28/lisp/quail/qj-b5.elc
 lib/mule/19.28/lisp/quail/qj.el
 lib/mule/19.28/lisp/quail/qj.elc
+lib/mule/19.28/lisp/quail/sisheng.el
+lib/mule/19.28/lisp/quail/sisheng.elc
 lib/mule/19.28/lisp/quail/sw.el
 lib/mule/19.28/lisp/quail/sw.elc
 lib/mule/19.28/lisp/quail/tcode.el
@@ -1002,3 +990,13 @@ lib/mule/19.28/lisp/term/wyse50.el
 lib/mule/19.28/lisp/term/wyse50.elc
 lib/mule/19.28/lisp/term/x-win.el
 lib/mule/19.28/lisp/term/x-win.elc
+@dirrm lib/mule/19.28/etc
+@dirrm lib/mule/19.28/lisp/term
+@dirrm lib/mule/19.28/lisp/its
+@dirrm lib/mule/19.28/lisp/quail
+@dirrm lib/mule/19.28/lisp
+@dirrm lib/mule/19.28/i386--freebsd
+@dirrm lib/mule/19.28
+@dirrm lib/mule/lock
+@dirrm lib/mule/site-lisp
+@dirrm lib/mule