From owner-ports-jp@jp.freebsd.org  Wed Aug 25 22:20:57 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id WAA68444;
	Wed, 25 Aug 1999 22:20:57 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from pis.toba-cmt.ac.jp (pis.toba-cmt.ac.jp [202.26.248.77])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id WAA68438
	for <ports-jp@jp.freebsd.org>; Wed, 25 Aug 1999 22:20:56 +0900 (JST)
	(envelope-from kiri@pis.toba-cmt.ac.jp)
Received: from localhost (localhost [127.0.0.1])
	by pis.toba-cmt.ac.jp (8.9.3/8.9.3) with ESMTP id WAA92676
	for <ports-jp@jp.freebsd.org>; Wed, 25 Aug 1999 22:20:40 +0900 (JST)
	(envelope-from kiri@pis.toba-cmt.ac.jp)
To: ports-jp@jp.freebsd.org
X-Mailer: Mew version 1.93 on XEmacs 21.1 (Big Bend)
X-Prom-Mew: Prom-Mew 1.93.3 (procmail reader for Mew)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Wed_Aug_25_22:20:38_1999_742)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19990825222040R.kiri@pis.toba-cmt.ac.jp>
Date: Wed, 25 Aug 1999 22:20:40 +0900
From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 535
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: ports-jp 7335
Subject: [ports-jp 7335] APEL, FLIM, SEMI modified for XEmacs-21.*
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: kiri@pis.toba-cmt.ac.jp

----Next_Part(Wed_Aug_25_22:20:38_1999_742)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

$B6M;3(B $B$G$9!#(B

$B$H$j$"$($:(B editors/apel-*, editors/flim-*-current, editors/semi-*-current $B$K(B
XEmacs-21.* $B$r%$%s%/%k!<%I$7$^$7$?!#$5$9$,J!Eg$5$s$G$9!#JQ99$O6K$a$F%9%`!<%:$K(B
$B$$$-$^$7$?!#$3$s$J$K%9%s%J%j$H$$$/$H$O;W$C$F$b$_$^$;$s$G$7$?!#%9%P%i%7%$!*(B

$B$H$j$"$($:(B diff $B$r$P(B...$B!#(B

$B!t(B $BJQ$J$H$3$m$,$"$C$?$iJQ99$7$F$/$@$5$$$M(B :)

---
KIRIYAMA Kazuhiko
kiri@pis.toba-cmt.ac.jp


----Next_Part(Wed_Aug_25_22:20:38_1999_742)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: apel-990825
Content-Disposition: attachment; filename=apel--990825.diff

diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/apel-emacs/Makefile editors/apel-emacs/Makefile
--- /usr/ports/current/editors/apel-emacs/Makefile	Wed Aug 25 20:32:15 1999
+++ editors/apel-emacs/Makefile	Wed Aug 25 20:16:49 1999
@@ -32,8 +32,13 @@
 REQUIRE_SETUPEL=  YES
 .endif
 
-# target name for make build
+# target name for make build and install
+.if (${EMACS_PORT} == "emacs21" || ${EMACS_PORT} == "xemacs-mule")
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
+.else
 ALL_TARGET?=	elc
+.endif
 
 # if RUN_DEPENDS emacs port name has the suffix `-common'
 .if !defined(HAVE_COMMON_PORT)
@@ -58,8 +63,9 @@
 		TARGETS="${APEL_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL}
-MAKE_FLAGS+=	EMACS=${EMACS_CMD}
+		APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL} \
+		EMACS_PKGDIR=${EMACS_LIBDIR}/site-packages
+MAKE_FLAGS+=	EMACS=${EMACS_CMD} PACKAGEDIR=${PREFIX}/${EMACS_LIBDIR}/site-packages
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/apel-xemacs-mule/Makefile editors/apel-xemacs-mule/Makefile
--- /usr/ports/current/editors/apel-xemacs-mule/Makefile	Wed Aug 25 20:32:16 1999
@@ -16,8 +16,8 @@
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs-mule
-EMACS_VER=	20.4
-EMACS_LIBDIR=		lib/${EMACS_NAME}-${EMACS_VER}
+EMACS_VER=	21.1.6
+EMACS_LIBDIR=		lib/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
 
 # RUN_DEPENDS port name's suffix is '-common'.
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/apel-xemacs-mule/pkg/PLIST editors/apel-xemacs-mule/pkg/PLIST
--- /usr/ports/current/editors/apel-xemacs-mule/pkg/PLIST	Fri Aug 13 04:31:13 1999
+++ editors/apel-xemacs-mule/pkg/PLIST	Wed Aug 25 20:20:28 1999
@@ -1,55 +1,60 @@
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.el
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/install.el
-%%EMACS_LIBDIR%%/site-lisp/apel/install.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/mule-caesar.el
-%%EMACS_LIBDIR%%/site-lisp/apel/mule-caesar.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.el
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-xemacs.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-xemacs.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-xm.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-xm.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20_2.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20_2.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe-xemacs.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe-xemacs.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-xm.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-xm.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
+%%EMACS_PKGDIR%%/lisp/apel/alist.el
+%%EMACS_PKGDIR%%/lisp/apel/alist.elc
+%%EMACS_PKGDIR%%/lisp/apel/auto-autoloads.el
+%%EMACS_PKGDIR%%/lisp/apel/auto-autoloads.elc
+%%EMACS_PKGDIR%%/lisp/apel/broken.el
+%%EMACS_PKGDIR%%/lisp/apel/broken.elc
+%%EMACS_PKGDIR%%/lisp/apel/calist.el
+%%EMACS_PKGDIR%%/lisp/apel/calist.elc
+%%EMACS_PKGDIR%%/lisp/apel/custom-load.el
+%%EMACS_PKGDIR%%/lisp/apel/custom-load.elc
+%%EMACS_PKGDIR%%/lisp/apel/emu.el
+%%EMACS_PKGDIR%%/lisp/apel/emu.elc
+%%EMACS_PKGDIR%%/lisp/apel/filename.el
+%%EMACS_PKGDIR%%/lisp/apel/filename.elc
+%%EMACS_PKGDIR%%/lisp/apel/install.el
+%%EMACS_PKGDIR%%/lisp/apel/install.elc
+%%EMACS_PKGDIR%%/lisp/apel/inv-xemacs.el
+%%EMACS_PKGDIR%%/lisp/apel/inv-xemacs.elc
+%%EMACS_PKGDIR%%/lisp/apel/invisible.el
+%%EMACS_PKGDIR%%/lisp/apel/invisible.elc
+%%EMACS_PKGDIR%%/lisp/apel/mcharset.el
+%%EMACS_PKGDIR%%/lisp/apel/mcharset.elc
+%%EMACS_PKGDIR%%/lisp/apel/mcs-20.el
+%%EMACS_PKGDIR%%/lisp/apel/mcs-20.elc
+%%EMACS_PKGDIR%%/lisp/apel/mcs-xm.el
+%%EMACS_PKGDIR%%/lisp/apel/mcs-xm.elc
+%%EMACS_PKGDIR%%/lisp/apel/mule-caesar.el
+%%EMACS_PKGDIR%%/lisp/apel/mule-caesar.elc
+%%EMACS_PKGDIR%%/lisp/apel/path-util.el
+%%EMACS_PKGDIR%%/lisp/apel/path-util.elc
+%%EMACS_PKGDIR%%/lisp/apel/pccl-20.el
+%%EMACS_PKGDIR%%/lisp/apel/pccl-20.elc
+%%EMACS_PKGDIR%%/lisp/apel/pccl.el
+%%EMACS_PKGDIR%%/lisp/apel/pccl.elc
+%%EMACS_PKGDIR%%/lisp/apel/pces-20.el
+%%EMACS_PKGDIR%%/lisp/apel/pces-20.elc
+%%EMACS_PKGDIR%%/lisp/apel/pces-xfc.el
+%%EMACS_PKGDIR%%/lisp/apel/pces-xfc.elc
+%%EMACS_PKGDIR%%/lisp/apel/pces-xm.el
+%%EMACS_PKGDIR%%/lisp/apel/pces-xm.elc
+%%EMACS_PKGDIR%%/lisp/apel/pces.el
+%%EMACS_PKGDIR%%/lisp/apel/pces.elc
+%%EMACS_PKGDIR%%/lisp/apel/pcustom.el
+%%EMACS_PKGDIR%%/lisp/apel/pcustom.elc
+%%EMACS_PKGDIR%%/lisp/apel/poe-xemacs.el
+%%EMACS_PKGDIR%%/lisp/apel/poe-xemacs.elc
+%%EMACS_PKGDIR%%/lisp/apel/poe.el
+%%EMACS_PKGDIR%%/lisp/apel/poe.elc
+%%EMACS_PKGDIR%%/lisp/apel/poem-xm.el
+%%EMACS_PKGDIR%%/lisp/apel/poem-xm.elc
+%%EMACS_PKGDIR%%/lisp/apel/poem.el
+%%EMACS_PKGDIR%%/lisp/apel/poem.elc
+%%EMACS_PKGDIR%%/lisp/apel/richtext.el
+%%EMACS_PKGDIR%%/lisp/apel/richtext.elc
+%%EMACS_PKGDIR%%/lisp/apel/static.el
+%%EMACS_PKGDIR%%/lisp/apel/static.elc
+@dirrm %%EMACS_PKGDIR%%/lisp/apel
 %%APELDOCDIR%%/ChangeLog
 %%APELDOCDIR%%/README.en
 %%APELDOCDIR%%/README.ja

----Next_Part(Wed_Aug_25_22:20:38_1999_742)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: flim-current-990825
Content-Disposition: attachment; filename=flim--990825.diff

diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/flim-emacs-current/Makefile editors/flim-emacs-current/Makefile
--- /usr/ports/current/editors/flim-emacs-current/Makefile	Wed Aug 25 20:32:19 1999
+++ editors/flim-emacs-current/Makefile	Wed Aug 25 20:57:32 1999
@@ -30,8 +30,13 @@
 REQUIRE_SETUPEL=  YES
 .endif
 
-# target name for make build
+# target name for make build and install
+.if (${EMACS_PORT} == "emacs21" || ${EMACS_PORT} == "xemacs-mule")
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
+.else
 ALL_TARGET?=	elc
+.endif
 
 # if RUN_DEPENDS-emacs port name has the suffix '-common'.
 .if !defined(HAVE_COMMON_PORT)
@@ -56,16 +61,22 @@
 		TARGETS="${FLIM_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
+		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
+		EMACS_PKGDIR=${EMACS_LIBDIR}/site-packages
+MAKE_FLAGS=	EMACS=${EMACS_CMD} PACKAGEDIR=${PREFIX}/${EMACS_LIBDIR}/site-packages
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel
+.if (${EMACS_PORT} == "emacs21" || ${EMACS_PORT} == "xemacs-mule")
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/site-packages/lisp/apel/static.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/site-packages/lisp/apel/static.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+.else
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+.endif
 # depends on mmencode
 .if (${EMACS_NAME} != "xemacs")
 RUN_DEPENDS+=	mmencode:${PORTSDIR}/mail/metamail
@@ -99,11 +110,21 @@
 	done)
 
 post-install:
+.if (${EMACS_PORT} == "emacs21" || ${EMACS_PORT} == "xemacs-mule")
+	${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-packages/info
+	@(cd ${WRKSRC} ; \
+	for i in mime-en.info mime-ja.info; do \
+		${INSTALL_DATA} ${WRKSRC}/$${i} \
+			${PREFIX}/${EMACS_LIBDIR}/site-packages/info; \
+	done)
+.else
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
+.endif
+
 .if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/flim-xemacs-mule-current/Makefile editors/flim-xemacs-mule-current/Makefile
--- /usr/ports/current/editors/flim-xemacs-mule-current/Makefile	Wed Aug 25 20:32:20 1999
+++ editors/flim-xemacs-mule-current/Makefile	Wed Aug 25 20:24:27 1999
@@ -16,9 +16,9 @@
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs-mule
-EMACS_VER=	20.4
-EMACS_LIBDIR=		lib/${EMACS_NAME}-${EMACS_VER}
-# xemacs-mule-20.4 has no version specific site-lisp directories.
+EMACS_VER=	21.1.6
+EMACS_LIBDIR=		lib/${EMACS_NAME}
+# xemacs-mule-21.1.6 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
 # RUN_DEPENDS port name's suffix is '-common'.
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/flim-xemacs-mule-current/pkg/PLIST editors/flim-xemacs-mule-current/pkg/PLIST
--- /usr/ports/current/editors/flim-xemacs-mule-current/pkg/PLIST	Fri Aug 13 04:31:18 1999
+++ editors/flim-xemacs-mule-current/pkg/PLIST	Wed Aug 25 21:03:51 1999
@@ -1,47 +1,51 @@
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-g.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-g.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-u.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-u.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-def.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-def.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
-%%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
-%%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/flim
+%%EMACS_PKGDIR%%/info/mime-en.info
+%%EMACS_PKGDIR%%/info/mime-ja.info
+%%EMACS_PKGDIR%%/lisp/flim/auto-autoloads.el
+%%EMACS_PKGDIR%%/lisp/flim/auto-autoloads.elc
+%%EMACS_PKGDIR%%/lisp/flim/custom-load.el
+%%EMACS_PKGDIR%%/lisp/flim/custom-load.elc
+%%EMACS_PKGDIR%%/lisp/flim/eword-decode.el
+%%EMACS_PKGDIR%%/lisp/flim/eword-decode.elc
+%%EMACS_PKGDIR%%/lisp/flim/eword-encode.el
+%%EMACS_PKGDIR%%/lisp/flim/eword-encode.elc
+%%EMACS_PKGDIR%%/lisp/flim/mailcap.el
+%%EMACS_PKGDIR%%/lisp/flim/mailcap.elc
+%%EMACS_PKGDIR%%/lisp/flim/mel-b-ccl.el
+%%EMACS_PKGDIR%%/lisp/flim/mel-b-ccl.elc
+%%EMACS_PKGDIR%%/lisp/flim/mel-b-el.el
+%%EMACS_PKGDIR%%/lisp/flim/mel-b-el.elc
+%%EMACS_PKGDIR%%/lisp/flim/mel-g.el
+%%EMACS_PKGDIR%%/lisp/flim/mel-g.elc
+%%EMACS_PKGDIR%%/lisp/flim/mel-q-ccl.el
+%%EMACS_PKGDIR%%/lisp/flim/mel-q-ccl.elc
+%%EMACS_PKGDIR%%/lisp/flim/mel-q.el
+%%EMACS_PKGDIR%%/lisp/flim/mel-q.elc
+%%EMACS_PKGDIR%%/lisp/flim/mel-u.el
+%%EMACS_PKGDIR%%/lisp/flim/mel-u.elc
+%%EMACS_PKGDIR%%/lisp/flim/mel.el
+%%EMACS_PKGDIR%%/lisp/flim/mel.elc
+%%EMACS_PKGDIR%%/lisp/flim/mime-def.el
+%%EMACS_PKGDIR%%/lisp/flim/mime-def.elc
+%%EMACS_PKGDIR%%/lisp/flim/mime-parse.el
+%%EMACS_PKGDIR%%/lisp/flim/mime-parse.elc
+%%EMACS_PKGDIR%%/lisp/flim/mime.el
+%%EMACS_PKGDIR%%/lisp/flim/mime.elc
+%%EMACS_PKGDIR%%/lisp/flim/mmbuffer.el
+%%EMACS_PKGDIR%%/lisp/flim/mmbuffer.elc
+%%EMACS_PKGDIR%%/lisp/flim/mmcooked.el
+%%EMACS_PKGDIR%%/lisp/flim/mmcooked.elc
+%%EMACS_PKGDIR%%/lisp/flim/mmgeneric.el
+%%EMACS_PKGDIR%%/lisp/flim/mmgeneric.elc
+%%EMACS_PKGDIR%%/lisp/flim/smtp.el
+%%EMACS_PKGDIR%%/lisp/flim/smtp.elc
+%%EMACS_PKGDIR%%/lisp/flim/smtpmail.el
+%%EMACS_PKGDIR%%/lisp/flim/smtpmail.elc
+%%EMACS_PKGDIR%%/lisp/flim/std11.el
+%%EMACS_PKGDIR%%/lisp/flim/std11.elc
+@dirrm %%EMACS_PKGDIR%%/lisp/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
 %%FLIMDOCDIR%%/README.en
 %%FLIMDOCDIR%%/README.ja
 %%FLIMDOCDIR%%/VERSION
 @dirrm %%FLIMDOCDIR%%
-@unexec install-info --delete %D/info/mime-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ja.info %D/info/dir
-info/mime-en.info
-info/mime-ja.info
-@exec install-info %D/info/mime-en.info %D/info/dir
-@exec install-info %D/info/mime-ja.info %D/info/dir

----Next_Part(Wed_Aug_25_22:20:38_1999_742)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: semi-curent-990825
Content-Disposition: attachment; filename=semi--990825.diff

diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/semi-emacs-current/Makefile editors/semi-emacs-current/Makefile
--- /usr/ports/current/editors/semi-emacs-current/Makefile	Wed Aug 25 20:32:21 1999
+++ editors/semi-emacs-current/Makefile	Wed Aug 25 21:21:41 1999
@@ -31,8 +31,13 @@
 REQUIRE_SETUPEL=  YES
 .endif
 
-# target name for make build
+# target name for make build and install
+.if (${EMACS_PORT} == "emacs21" || ${EMACS_PORT} == "xemacs-mule")
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
+.else
 ALL_TARGET?=	elc
+.endif
 
 # if RUN_DEPENDS-emacs port name has the suffix '-common'.
 .if !defined(HAVE_COMMON_PORT)
@@ -57,16 +62,22 @@
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
+		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
+		EMACS_PKGDIR=${EMACS_LIBDIR}/site-packages
+MAKE_FLAGS=	EMACS=${EMACS_CMD} PACKAGEDIR=${PREFIX}/${EMACS_LIBDIR}/site-packages
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel
+.if (${EMACS_PORT} == "emacs21" || ${EMACS_PORT} == "xemacs-mule")
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/site-packages/lisp/apel/static.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/site-packages/lisp/apel/static.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+.else
 BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+.endif
 # depends on flim
 BUILD_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
@@ -99,11 +110,20 @@
 	done)
 
 post-install:
+.if (${EMACS_PORT} == "emacs21" || ${EMACS_PORT} == "xemacs-mule")
+	${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-packages/info
+	@(cd ${WRKSRC} ; \
+	for i in mime-ui-en.info mime-ui-ja.info; do \
+		${INSTALL_DATA} ${WRKSRC}/$${i} \
+			${PREFIX}/${EMACS_LIBDIR}/site-packages/info; \
+	done)
+.else
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
+.endif
 .if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/semi-xemacs-mule-current/Makefile editors/semi-xemacs-mule-current/Makefile
--- /usr/ports/current/editors/semi-xemacs-mule-current/Makefile	Wed Aug 25 20:32:22 1999
+++ editors/semi-xemacs-mule-current/Makefile	Wed Aug 25 18:48:52 1999
@@ -16,8 +16,8 @@
 # emacs port setup
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs-mule
-EMACS_VER=	20.4
-EMACS_LIBDIR=		lib/${EMACS_NAME}-${EMACS_VER}
+EMACS_VER=	21.1.6
+EMACS_LIBDIR=	lib/${EMACS_NAME}
 # xemacs-mule-20.4 has no version specific site-lisp directories.
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
 
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/editors/semi-xemacs-mule-current/pkg/PLIST editors/semi-xemacs-mule-current/pkg/PLIST
--- /usr/ports/current/editors/semi-xemacs-mule-current/pkg/PLIST	Fri Aug 13 04:31:19 1999
+++ editors/semi-xemacs-mule-current/pkg/PLIST	Wed Aug 25 21:31:59 1999
@@ -1,40 +1,42 @@
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/semi
+%%EMACS_PKGDIR%%/info/mime-ui-en.info
+%%EMACS_PKGDIR%%/info/mime-ui-ja.info
+%%EMACS_PKGDIR%%/lisp/apel/static.el
+%%EMACS_PKGDIR%%/lisp/semi/auto-autoloads.el
+%%EMACS_PKGDIR%%/lisp/semi/auto-autoloads.elc
+%%EMACS_PKGDIR%%/lisp/semi/custom-load.el
+%%EMACS_PKGDIR%%/lisp/semi/custom-load.elc
+%%EMACS_PKGDIR%%/lisp/semi/mail-mime-setup.el
+%%EMACS_PKGDIR%%/lisp/semi/mail-mime-setup.elc
+%%EMACS_PKGDIR%%/lisp/semi/mime-bbdb.el
+%%EMACS_PKGDIR%%/lisp/semi/mime-bbdb.elc
+%%EMACS_PKGDIR%%/lisp/semi/mime-edit.el
+%%EMACS_PKGDIR%%/lisp/semi/mime-edit.elc
+%%EMACS_PKGDIR%%/lisp/semi/mime-image.el
+%%EMACS_PKGDIR%%/lisp/semi/mime-image.elc
+%%EMACS_PKGDIR%%/lisp/semi/mime-mc.el
+%%EMACS_PKGDIR%%/lisp/semi/mime-mc.elc
+%%EMACS_PKGDIR%%/lisp/semi/mime-partial.el
+%%EMACS_PKGDIR%%/lisp/semi/mime-partial.elc
+%%EMACS_PKGDIR%%/lisp/semi/mime-pgp.el
+%%EMACS_PKGDIR%%/lisp/semi/mime-pgp.elc
+%%EMACS_PKGDIR%%/lisp/semi/mime-play.el
+%%EMACS_PKGDIR%%/lisp/semi/mime-play.elc
+%%EMACS_PKGDIR%%/lisp/semi/mime-setup.el
+%%EMACS_PKGDIR%%/lisp/semi/mime-setup.elc
+%%EMACS_PKGDIR%%/lisp/semi/mime-view.el
+%%EMACS_PKGDIR%%/lisp/semi/mime-view.elc
+%%EMACS_PKGDIR%%/lisp/semi/mime-w3.el
+%%EMACS_PKGDIR%%/lisp/semi/mime-w3.elc
+%%EMACS_PKGDIR%%/lisp/semi/semi-def.el
+%%EMACS_PKGDIR%%/lisp/semi/semi-def.elc
+%%EMACS_PKGDIR%%/lisp/semi/semi-setup.el
+%%EMACS_PKGDIR%%/lisp/semi/semi-setup.elc
+%%EMACS_PKGDIR%%/lisp/semi/signature.el
+%%EMACS_PKGDIR%%/lisp/semi/signature.elc
+@dirrm %%EMACS_PKGDIR%%/lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
 %%SEMIDOCDIR%%/README.en
 %%SEMIDOCDIR%%/TODO
 %%SEMIDOCDIR%%/VERSION
 @dirrm %%SEMIDOCDIR%%
-@unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
-info/mime-ui-en.info
-info/mime-ui-ja.info
-@exec install-info %D/info/mime-ui-en.info %D/info/dir
-@exec install-info %D/info/mime-ui-ja.info %D/info/dir

----Next_Part(Wed_Aug_25_22:20:38_1999_742)----
