Fix INDEX build:

- Get back editors/semi-xemacs21-mule and editors/flim-xemacs21-mule
  untill a decision will be found.
- editors/flim: fix dependency. bump PORTREVISION.

5 files changed, 123 insertions, 4 deletions

diff --git a/MOVED b/MOVED
index 69720093d462..0575b1a55f75 100644
--- a/MOVED
+++ b/MOVED
@@ -1960,10 +1960,8 @@ deskutils/smeg|deskutils/alacarte|2005-11-16|Now project name is alacarte
 devel/bison1875||2005-11-16|No longer needed
 databases/postgresql-devel||2005-11-16|PostgreSQL 8.1 has landed
 editors/apel-xemacs21-mule||2005-11-17|Deleted from ports collection
-editors/flim-xemacs21-mule||2005-11-17|Deleted from ports collection
 editors/flim113-xemacs21-mule||2005-11-17|Deleted from ports collection
 editors/psgml-xemacs21-mule||2005-11-17|Deleted from ports collection
-editors/semi-xemacs21-mule||2005-11-17|Deleted from ports collection
 editors/semi113-xemacs21-mule||2005-11-17|Deleted from ports collection
 mail/mew-xemacs21-mule||2005-11-17|Deleted from ports collection
 mail/mew2-xemacs21-mule||2005-11-17|Deleted from ports collection
diff --git a/editors/Makefile b/editors/Makefile
index 15e47c40f1c7..c1c2892164d2 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -52,6 +52,7 @@
     SUBDIR += fb
     SUBDIR += flim
     SUBDIR += flim-emacs20
+    SUBDIR += flim-xemacs21-mule
     SUBDIR += flim113
     SUBDIR += flim113-emacs19
     SUBDIR += flim113-emacs20
@@ -133,6 +134,7 @@
     SUBDIR += scite
     SUBDIR += semi
     SUBDIR += semi-emacs20
+    SUBDIR += semi-xemacs21-mule
     SUBDIR += semi113
     SUBDIR += semi113-emacs19
     SUBDIR += semi113-emacs20
diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile
new file mode 100644
index 000000000000..e72fa1ae05b4
--- /dev/null
+++ b/editors/flim-xemacs21-mule/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for:	flim for xemacs21-mule
+# Date created:		25 July 1999
+# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+MAINTAINER=	ports@FreeBSD.org
+
+# This is a slave port.
+PORTCLASS=	slave
+
+MASTERDIR=	${.CURDIR}/../../editors/flim
+COMMENT=	FLIM, message representation or encoding elisp library for xemacs21-mule
+
+# emacs port setup
+EMACS_PORT_NAME=	xemacs21-mule
+EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
+# packages-subdirectories which this port requires
+EMACS_PACKAGES_SUBDIRS=	info lisp man pkginfo
+
+SCRIPTS_ENV=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+PLIST_SUB=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+
+# how to make and install
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
+
+# whether building info files by emacs or makeinfo
+BUILD_INFO_BY_EMACS=	YES
+# texinfo packages
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages
+
+# package info manifest
+MANIFEST=	MANIFEST.flim
+
+# xemacs package
+XEMACS_PKGNAME=	flim
+XEMACS_PKGVER=	1.14
+#XEMACS_PKGVER!=	grep version ${.CURDIR}/../flim-emacs/files/_pkg.el | \
+#		sed 's/.*:version \([0-9.]*\).*/\1/'
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
+			info/mime-en.info info/mime-ja.info \
+			man/${XEMACS_PKGNAME}
+
+# package documents
+FLIMDOCDIR=	${EMACS_PACKAGESDIR}/lisp/flim
+
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${LOCALBASE}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
+.include "${MASTERDIR}/Makefile"
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index a1cc15834b37..ff287ef89d29 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flim
 PORTVERSION=	${FLIM_VER}
+PORTREVISION?=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/flim/flim-1.14/ \
 		http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.14/ \
@@ -50,8 +51,8 @@ MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
 .if defined(EMACS_PORT_NAME)
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/xemacs-packages
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/xemacs-packages
 .else
 # depends on apel (case of gnu emacsen etc...)
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile
new file mode 100644
index 000000000000..0ed962b015b4
--- /dev/null
+++ b/editors/semi-xemacs21-mule/Makefile
@@ -0,0 +1,62 @@
+# New ports collection makefile for:	semi for xemacs21-mule
+# Date created:		25 July 1999
+# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule
+
+# This is a slave port.
+PORTCLASS=	slave
+
+MASTERDIR=	${.CURDIR}/../../editors/semi
+
+# emacs port setup
+EMACS_PORT_NAME=	xemacs21-mule
+EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
+# packages-subdirectories which this port requires
+EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
+
+SCRIPTS_ENV=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+PLIST_SUB=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+
+# how to make and install
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
+
+# RUN_DEPENDS port name's suffix is '-common'.
+HAS_COMMON_PORT=	YES
+
+# whether emacs has mule feature
+HAS_MULE=		YES
+
+# whether building info files by emacs or makeinfo
+BUILD_INFO_BY_EMACS=	YES
+# texinfo packages
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages
+
+# package info manifest
+MANIFEST=	MANIFEST.semi
+
+# xemacs package
+XEMACS_PKGNAME=	semi
+XEMACS_PKGVER=	1.14
+#XEMACS_PKGVER!=	grep version ${.CURDIR}/../semi-emacs/files/_pkg.el | \
+#		sed 's/.*:version \([0-9.]*\).*/\1/'
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
+			info/mime-ui-en.info info/mime-ui-ja.info \
+			man/${XEMACS_PKGNAME}
+
+# package documents
+SEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
+
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${LOCALBASE}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
+.include "${MASTERDIR}/Makefile"