Update to 1.13.4.

12 files changed, 77 insertions, 46 deletions

diff --git a/editors/semi-emacs/Makefile b/editors/semi-emacs/Makefile
index 80baa9f09acf..4d89f3fa0984 100644
--- a/editors/semi-emacs/Makefile
+++ b/editors/semi-emacs/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	semi for emacs
-# Version required:	1.8.6
+# Version required:	1.13.4
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -8,19 +8,24 @@
 
 DISTNAME=	semi-${SEMI_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.08-for-flim-1.9/
+MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \
+		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \
+		ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.12/ \
+		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.12/
 
 MAINTAINER?=	shige@FreeBSD.org
 
 PORTCLASS?=	master
 
 # distfile version
-FLIM_VER=	1.9.2
-SEMI_VER=	1.8.6
+FLIM_VER=	1.12.7
+SEMI_VER=	1.13.4
 # setupel filename
 SEMI_SETUPEL=	semi-setupel.el
 # document install directory by install-doc target
 SEMIDOCDIR?=	share/doc/semi
+FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
+SEMI_COOKIE=	semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
@@ -29,6 +34,7 @@ EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
+# whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
@@ -38,9 +44,9 @@ ALL_TARGET?=	elc
 .if defined(EMACS_PORT)
 PKGNAME=	semi-${EMACS_PORT}-${SEMI_VER}
 EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES")
-RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
+BUILD_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
+.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
+RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 .else
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
@@ -51,8 +57,9 @@ SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
-		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
-MAKE_FLAGS+=	EMACS=${EMACS_CMD}
+		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
+		FLIM_COOKIE=${FLIM_COOKIE}
+MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .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}
@@ -68,8 +75,8 @@ BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSD
 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}
-RUN_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
@@ -77,8 +84,10 @@ RUN_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/fl
 	@${FALSE}
 .endif
 
+.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
+.endif
 
 pre-configure:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@@ -92,7 +101,11 @@ MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
 post-build:
+.if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
+	@${MAKE} info-build-by-emacs
+.else
 	@${MAKE} info-build
+.endif
 
 post-install:
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@@ -109,22 +122,37 @@ post-install:
 .endif
 
 
-# functions
+###############################################################################
+#
+# miscellaneous local functions
+#
 info-build:
 	@(cd ${WRKSRC} ; \
-	for i in mime-ui-en.texi mime-ui-ja.texi; do \
+	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
-
-info-build-by-emacs:
+.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
-	for i in mime-ui-en.texi mime-ui-ja.texi; do \
+	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
+		${MAKEINFO} $${i} || ${TRUE} ; \
+	done)
+.endif
+
+info-build-by-emacs:
+	@(cd ${WRKSRC} ; \
+	for i in mime-ui-en.texi; do \
+		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
+	done)
+.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+	@(cd ${WRKSRC} ; \
+	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
+.endif
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
@@ -139,10 +167,17 @@ setupel-install:
 
 info-install:
 	@(cd ${WRKSRC} ; \
-	for i in mime-ui-en.info mime-ui-ja.info; do \
+	for i in mime-ui-en.info; do \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
+		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+	done)
+.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+	@(cd ${WRKSRC} ; \
+	for i in mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
 		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
 	done)
+.endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
diff --git a/editors/semi-emacs/distinfo b/editors/semi-emacs/distinfo
index 89f7a8762c56..d316af32ce57 100644
--- a/editors/semi-emacs/distinfo
+++ b/editors/semi-emacs/distinfo
@@ -1 +1 @@
-MD5 (semi-1.8.6.tar.gz) = 1ecbe5bff3baa4ce180596220aa07091
+MD5 (semi-1.13.4.tar.gz) = 192c5cf3ce66a46f986e6514b07c0631
diff --git a/editors/semi-emacs/pkg-plist b/editors/semi-emacs/pkg-plist
index 9ba812ce5582..723126a725d8 100644
--- a/editors/semi-emacs/pkg-plist
+++ b/editors/semi-emacs/pkg-plist
@@ -6,8 +6,6 @@
 %%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
 %%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-text.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-text.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
@@ -31,8 +29,5 @@
 %%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
diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile
index ec1a80c3e485..1efed4b00193 100644
--- a/editors/semi-emacs20/Makefile
+++ b/editors/semi-emacs20/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	semi for emacs
-# Version required:	1.8.6
+# Version required:	1.13.4
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -20,6 +20,9 @@ EMACS_VER=	20.4
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
+# whether emacs has mule feature
+HAS_MULE=	YES
+
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
diff --git a/editors/semi-emacs20/pkg-plist b/editors/semi-emacs20/pkg-plist
index b353aaf754d8..319d4d2f30f4 100644
--- a/editors/semi-emacs20/pkg-plist
+++ b/editors/semi-emacs20/pkg-plist
@@ -8,8 +8,6 @@
 %%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-text.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-text.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
diff --git a/editors/semi-mule/Makefile b/editors/semi-mule/Makefile
index 77536269fa87..deb8f21bc31e 100644
--- a/editors/semi-mule/Makefile
+++ b/editors/semi-mule/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	semi for mule
-# Version required:	1.8.6
+# Version required:	1.13.4
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -20,8 +20,12 @@ EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
-HAVE_COMMON_PORT=	YES
+# whether emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
+# whether emacs has a *-common port
+HAS_COMMON_PORT=	YES
+# whether emacs has mule feature
+HAS_MULE=               YES
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/semi-mule/pkg-plist b/editors/semi-mule/pkg-plist
index a72c35ee8d36..99d0da3c9dfe 100644
--- a/editors/semi-mule/pkg-plist
+++ b/editors/semi-mule/pkg-plist
@@ -8,8 +8,6 @@
 %%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-text.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-text.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
diff --git a/editors/semi-xemacs/Makefile b/editors/semi-xemacs/Makefile
index 46ea7a63c47f..67795b85dbff 100644
--- a/editors/semi-xemacs/Makefile
+++ b/editors/semi-xemacs/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	semi for xemacs
-# Version required:	1.8.6
+# Version required:	1.13.4
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
diff --git a/editors/semi-xemacs/pkg-plist b/editors/semi-xemacs/pkg-plist
index f858427c4757..1fcd35a087b2 100644
--- a/editors/semi-xemacs/pkg-plist
+++ b/editors/semi-xemacs/pkg-plist
@@ -8,8 +8,6 @@
 %%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-text.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-text.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
@@ -34,8 +32,5 @@
 %%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
diff --git a/editors/semi-xemacs20/pkg-plist b/editors/semi-xemacs20/pkg-plist
index b4b631429c13..e8706ea30024 100644
--- a/editors/semi-xemacs20/pkg-plist
+++ b/editors/semi-xemacs20/pkg-plist
@@ -8,8 +8,6 @@
 %%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-text.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-text.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
@@ -35,8 +33,5 @@
 %%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
diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile
index ec5fee052d73..bfe19d9fac02 100644
--- a/editors/semi-xemacs21-mule/Makefile
+++ b/editors/semi-xemacs21-mule/Makefile
@@ -24,7 +24,15 @@ ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
-HAVE_COMMON_PORT=	YES
+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+=	${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/semi-xemacs21-mule/pkg-plist b/editors/semi-xemacs21-mule/pkg-plist
index 081c51f45c29..854fa9a0040e 100644
--- a/editors/semi-xemacs21-mule/pkg-plist
+++ b/editors/semi-xemacs21-mule/pkg-plist
@@ -16,14 +16,14 @@
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-text.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-text.elc
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.elc
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.el