ELFize. Also, upgrade to mule-2.3 based on emacs-19.34b (used to be

19.28).

PR:		8178
Submitted by:	taoka@infonets.hiroshima-u.ac.jp

4 files changed, 98 insertions, 82 deletions

diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 882ab10..0e3c557 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for:	mule
-# Version required:	2.3
+# New ports collection makefile for:	mule 2.3@19.34
+# Version required:	2.3@19.34
 # Date created:		6 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.31 1998/05/02 21:07:09 max Exp $
+# $Id: Makefile,v 1.32 1998/09/21 22:33:05 steve Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -12,17 +12,21 @@ CATEGORIES?=	editors
 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
+		http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/mule/
+DISTFILES=	emacs-19.34b.tar.gz mule-2.3-19.34.patch-981002.tar.gz
+
+PATCH_SITES=	ftp://etlport.etl.go.jp/pub/mule/
+PATCHFILES=	mule-23-1934-alpha01.diff.gz
+PATCH_DIST_STRIP= -p1
 
 MAINTAINER?=	taoka@infonets.hiroshima-u.ac.jp
 
-RUN_DEPENDS=	${PREFIX}/lib/mule/19.28/lisp/mule.el:${PORTSDIR}/editors/mule-common
+RUN_DEPENDS=	${PREFIX}/share/${EMACS_PREFIX}/19.34/lisp/mule.el:${PORTSDIR}/editors/mule-common
 LIB_DEPENDS=	${LIB_INPUT_METHOD}
 BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
 
-EXTRACT_ONLY=	mule-2.3.tar.gz
-WRKSRC=		${WRKDIR}/mule
+EXTRACT_ONLY=	emacs-19.34b.tar.gz
+WRKSRC=		${WRKDIR}/emacs-19.34
 PATCHDIR=	${.CURDIR}/../../editors/mule-common/patches
 FILESDIR=	${.CURDIR}/../../editors/mule-common/files
 SCRIPTDIR=	${.CURDIR}/../../editors/mule-common/scripts
@@ -31,9 +35,15 @@ INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --terminal-face \
+MAKE_ENV=      LIBDIR="${LIBDIR}"
+# /usr/bin/sed should be used because configure script includes 'Ctrl-L'
+CONFIGURE_ENV=	PATH=/usr/bin:$$PATH
+EMACS_PREFIX=	mule
+EMACS_EXECUTABLE =	mule
+CONFIGURE_ARGS=	i386--freebsd --with-executable=${EMACS_EXECUTABLE} \
+		--with-emacs-prefix=${EMACS_PREFIX} \
+		--with-terminal-face \
 		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \
-		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp \
 		${WITH_INPUT_METHOD} ${WITH_DIALOGS}
 STRIP=
 
@@ -41,63 +51,92 @@ INSTALL_TARGET=	install-arch-dep
 
 .if defined(CANNA)
 LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
-WITH_INPUT_METHOD+=	--canna --canna-libraries=${PREFIX}/lib \
-		--canna-includes=${PREFIX}/include
+WITH_INPUT_METHOD+=	--with-canna --with-canna-libraries=${PREFIX}/lib \
+		--with-canna-includes=${PREFIX}/include
 .endif
 .if defined(SJ3)
 BUILD_INPUT_METHOD+=sj3serv:${PORTSDIR}/japanese/sj3
-WITH_INPUT_METHOD+= --sj3
+WITH_INPUT_METHOD+= --with-sj3
 .endif
 .if defined(WNN4)
 BUILD_INPUT_METHOD+=${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-WITH_INPUT_METHOD+=	--with-wnn4 --wnn-libraries=${X11BASE}/lib/libwnn.a \
-		--wnn-includes=${X11BASE}/include/wnn
+WITH_INPUT_METHOD+=	--with-wnn4 --with-wnn-libraries=${X11BASE}/lib \
+		--with-wnn-includes=${X11BASE}/include/wnn
 .elif defined(CWNN4)
 BUILD_INPUT_METHOD+=${PREFIX}/bin/cWnn4/cserver:${PORTSDIR}/chinese/Wnn
-WITH_INPUT_METHOD+=	--with-wnn4 --wnn-libraries=${X11BASE}/lib/libcwnn.a \
-		--wnn-includes=${X11BASE}/include/cwnn
+WITH_INPUT_METHOD+=	--with-wnn4 --with-wnn-libraries=${X11BASE}/lib/libcwnn.a \
+		--with-wnn-includes=${X11BASE}/include/cwnn
 .elif defined(KWNN4)
 BUILD_INPUT_METHOD+=${PREFIX}/bin/kWnn4/kserver:${PORTSDIR}/korean/Wnn
-WITH_INPUT_METHOD+=	--with-wnn4 --wnn-libraries=${X11BASE}/lib/libkwnn.a \
-		--wnn-includes=${X11BASE}/include/kwnn
+WITH_INPUT_METHOD+=	--with-wnn4 --with-wnn-libraries=${X11BASE}/lib/libkwnn.a \
+		--with-wnn-includes=${X11BASE}/include/kwnn
 .elif defined(WNN6)
 BUILD_INPUT_METHOD+=${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
-WITH_INPUT_METHOD+=	--with-wnn6 --wnn-libraries=${PREFIX}/lib/libwnn.a \
-		--wnn-includes=${PREFIX}/include/wnn
+WITH_INPUT_METHOD+=	--with-wnn6 --with-wnn-libraries=${PREFIX}/lib/libwnn.a \
+		--with-wnn-includes=${PREFIX}/include/wnn
 .endif
+COMP_ELC=	egg.elc wnn-egg.elc sj3-client.elc sj3-egg.elc canna.elc
+ELC_DIR=	../lisp
 
 WITH_DIALOGS=	--with-x-toolkit
 
-SITE_START=${PREFIX}/lib/mule/site-lisp/site-start.el
+SITE_START=${PREFIX}/share/${EMACS_PREFIX}/19.34/site-lisp/site-start.el
 
+# ORIGINAL, MEW_ORG_PATCH and MEW_PATCH are used for debugging.
+#
+#   ORIGINAL: original mule 2.3 based on emacs 19.34
+#   MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org)
+#   MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches
 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
+	${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz
+	${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src
+.if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH)
+	${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz
+	${MKDIR} ${WRKSRC}/lisp/its
+	${CP} ${WRKDIR}/lisp/its/* ${WRKSRC}/lisp/its/
+.endif
 
+.if !defined(ORIGINAL)
 post-patch:
-	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Mule-2.3.patch
+.if !defined(MEW_ORG_PATCH)
+	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/patch-19.34
+	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/Mule-2.3-19.34.patch
+	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/extra.patch
+.if defined(MEW_PATCH)
+	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-19.34.patch-for_katayama
+.endif
+.else
+	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-19.34.patch
+.endif
+.if defined(MEW_PATCH) || defined(MEW_ORG_PATCH)
+	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/canna.el-19.34.patch
+	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/sj3-egg.el.patch
+.endif
+.endif
 
 pre-build:
 	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
-	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.28.*
+	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.34.*
+
+post-build:
+# bytecompile elisps for Japanese input method
+	for file in ${COMP_ELC}; do \
+		target="$$target ${ELC_DIR}/$$file"; \
+	done; \
+	cd ${WRKSRC}/src; \
+	./temacs -batch -l mule-inst.el $$target
 
 # If site-start.el exists, you should run below when you install by
 # this port
 pre-install:
 	@if [ -f ${SITE_START} ]; then \
 		${MV} ${SITE_START} ${SITE_START}.orig ; \
-		${SED} -e '/;; BEGIN mule-family/,/;; END mule-family/d' \
-			${SITE_START}.orig > ${SITE_START}; \
-	fi
+		 ${SED} -e '/;; BEGIN mule-family/,/;; END mule-family/d' \
+			 ${SITE_START}.orig > ${SITE_START}; \
+	 fi
 
 post-install:
-# note that any2ps is a script
-.for file in b2m coco ctags emacsclient etags m2ps mule-19.28
-	strip ${PREFIX}/bin/${file}
-.endfor
+	strip ${PREFIX}/bin/${EMACS_EXECUTABLE}-19.34
 # for wnn4+sj3 or wnn6+sj3
 	@if [ -e ${PKGDIR}/INSTALL ]; then \
 		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL; \
@@ -105,17 +144,23 @@ post-install:
 # Installing site-start.el
 #   (we redefun set-korean-environment etc)
 .if defined(CWNN4)
-	${SED} -e 's/;;\(.*\);;CHINESE$$/\1;;CHINESE/' \
+	 ${SED} -e 's/;;\(.*\);;CHINESE$$/\1;;CHINESE/' \
 		-e 's/;;\(.*\);;not KOREAN$$/\1;;not KOREAN/' \
-		${FILESDIR}/site-start.el.tmpl >> ${SITE_START}
+		-e 's,%%X11BASE%%,${X11BASE},' \
+		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
+		 ${FILESDIR}/site-start.el.tmpl >> ${SITE_START}
 .elif defined(KWNN4)
-	${SED} -e 's/;;\(.*\);;KOREAN$$/\1;;KOREAN/' \
-		${FILESDIR}/site-start.el.tmpl >> ${SITE_START}
+	 ${SED} -e 's/;;\(.*\);;KOREAN$$/\1;;KOREAN/' \
+		-e 's,%%X11BASE%%,${X11BASE},' \
+		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
+		 ${FILESDIR}/site-start.el.tmpl >> ${SITE_START}
 .else
-	${SED} -e 's/;;\(.*\);;not KOREAN$$/\1;;not KOREAN/' \
-		${FILESDIR}/site-start.el.tmpl >> ${SITE_START}
+	 ${SED} -e 's/;;\(.*\);;not KOREAN$$/\1;;not KOREAN/' \
+		-e 's,%%X11BASE%%,${X11BASE},' \
+		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
+		 ${FILESDIR}/site-start.el.tmpl >> ${SITE_START}
 .endif
-	@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
+	 @${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
 
 post-package:
 	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
diff --git a/editors/mule/pkg-comment b/editors/mule/pkg-comment
index e1c5942..51b3baf 100644
--- a/editors/mule/pkg-comment
+++ b/editors/mule/pkg-comment
@@ -1 +1 @@
-A multilingual emacs (Only the executables)
+A multilingual emacs based 19.34 (Only the executables)
diff --git a/editors/mule/pkg-descr b/editors/mule/pkg-descr
index 94c2063..626a3e5 100644
--- a/editors/mule/pkg-descr
+++ b/editors/mule/pkg-descr
@@ -1,5 +1,5 @@
 This is a package containing only the executables for mule-2.3, a
-multilingual editor based on emacs-19.28.
+multilingual editor based on emacs-19.34.
 
 You should install a package, mule-common-2.3, containing emacs lisp
 files, info pages, and so on (except executables) for mule-2.3.
@@ -15,15 +15,11 @@ 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.
 The Japanese version is build to install everything, by the way.
 
-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.
+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!
 
 - S. Taoka
 taoka@infonets.hiroshima-u.ac.jp
diff --git a/editors/mule/pkg-plist b/editors/mule/pkg-plist
index 0e2946d..ed04cf2 100644
--- a/editors/mule/pkg-plist
+++ b/editors/mule/pkg-plist
@@ -1,30 +1,5 @@
-bin/mule-19.28
+bin/mule-19.34
 @exec ln -sf %D/%F %B/mule
 @unexec rm %B/mule
-bin/any2ps
-bin/b2m
-bin/coco
-bin/ctags
-bin/emacsclient
-bin/etags
-bin/m2ps
-bin/rcs-checkin
-lib/mule/19.28/etc/DOC
-lib/mule/19.28/etc/DOC-19.28.1
-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/site-lisp/site-start.el
+share/mule/19.34/etc/DOC-19.34.1
+share/mule/19.34/site-lisp/site-start.el