5 files changed, 74 insertions, 45 deletions

diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 9f16d10ebea9..b1550f45c2fa 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	flim for emacs
-# Version required:	1.12.5
+# New ports collection makefile for:	flim-current for emacs
+# Version required:	1.13.2
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -8,18 +8,21 @@
 
 DISTNAME=	flim-${FLIM_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/GNU/elisp/flim/flim-1.12/
-
+MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.12/ \
+		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/flim/flim-1.12/ \
+		ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.12/ \
+		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.12/
 MAINTAINER?=	shige@FreeBSD.org
 
 PORTCLASS?=	master
 
 # distfile version
-FLIM_VER=	1.12.5
+FLIM_VER=	1.13.2
 # setupel filename
 FLIM_SETUPEL=	flim-setupel.el
 # document install directory by install-doc target
 FLIMDOCDIR?=	share/doc/flim
+FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # for emacs
@@ -28,8 +31,8 @@ EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=  YES
+# whether emacs requires *-setupel.el
+REQUIRE_SETUPEL= YES
 .endif
 
 # target name for make build
@@ -38,11 +41,11 @@ ALL_TARGET?=	elc
 .if defined(EMACS_PORT)
 PKGNAME=	flim-${EMACS_PORT}-${FLIM_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}
+RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
@@ -51,8 +54,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} \
-		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL}
-MAKE_FLAGS+=	EMACS=${EMACS_CMD}
+		FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_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}
@@ -60,17 +64,13 @@ RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}
 .endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+=   ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 .else
 # depends on apel (case of other emacsen etc...)
 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
-.endif
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
@@ -78,8 +78,10 @@ RUN_DEPENDS+=	mmencode:${PORTSDIR}/mail/metamail
 	@${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")
@@ -88,15 +90,23 @@ pre-configure:
 
 .include <bsd.port.pre.mk>
 
+# makeinfo stuff
 MAKEINFO=		makeinfo --no-split --no-validate
 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:
+# install package-cookie
+	@${MKDIR} -p ${PREFIX}/share/flim
+	@${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
@@ -111,27 +121,42 @@ post-install:
 .endif
 
 
-# install functions
+###############################################################################
+#
+# miscellaneous local functions
+#
 info-build:
 	@(cd ${WRKSRC} ; \
-	for i in mime-en.texi mime-ja.texi; do \
+	for i in mime-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-en.texi mime-ja.texi; do \
+	for i in mime-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-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
+.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+	@(cd ${WRKSRC} ; \
+	for i in mime-ja.texi; do \
+		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
+	done)
+.endif
 
 doc-install:
 	@${MKDIR} ${PREFIX}/${FLIMDOCDIR}
 	@(cd ${WRKSRC} ; \
-	for i in ChangeLog README.* NEWS VERSION ; do \
+	for i in ChangeLog NEWS README.* VERSION ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
 	done)
 
@@ -139,23 +164,31 @@ setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
+
 info-install:
 	@(cd ${WRKSRC} ; \
-	for i in mime-en.info mime-ja.info; do \
+	for i in mime-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-ja.info; do \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
+		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+	done)
+.endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-en.info mime-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
-			${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+				${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	for i in mime-en.texi mime-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
-			${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+				${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
 	done)
 
 manifest-install:
@@ -165,5 +198,4 @@ manifest-install:
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
-
 .include <bsd.port.post.mk>
diff --git a/editors/flim/distinfo b/editors/flim/distinfo
index 160519c45896..c5c1ac37bdf0 100644
--- a/editors/flim/distinfo
+++ b/editors/flim/distinfo
@@ -1 +1 @@
-MD5 (flim-1.12.5.tar.gz) = 4424ecbbdca8ec46cbc05eaefd32fcf8
+MD5 (flim-1.13.2.tar.gz) = 3a7341529167bd1de0b510150c48d41e
diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist
index bb84e793d46a..92def16ebe96 100644
--- a/editors/flim/pkg-plist
+++ b/editors/flim/pkg-plist
@@ -2,6 +2,8 @@
 %%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/luna.el
+%%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.el
@@ -24,8 +26,8 @@
 %%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/mmdbuffer.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/std11.el
 %%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
@@ -41,8 +43,5 @@
 %%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
diff --git a/editors/flim/pkg-plist.emacs20 b/editors/flim/pkg-plist.emacs20
index bb84e793d46a..92def16ebe96 100644
--- a/editors/flim/pkg-plist.emacs20
+++ b/editors/flim/pkg-plist.emacs20
@@ -2,6 +2,8 @@
 %%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/luna.el
+%%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.el
@@ -24,8 +26,8 @@
 %%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/mmdbuffer.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/std11.el
 %%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
@@ -41,8 +43,5 @@
 %%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
diff --git a/editors/flim/pkg-plist.emacs21 b/editors/flim/pkg-plist.emacs21
index bb84e793d46a..92def16ebe96 100644
--- a/editors/flim/pkg-plist.emacs21
+++ b/editors/flim/pkg-plist.emacs21
@@ -2,6 +2,8 @@
 %%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/luna.el
+%%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
 %%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.el
@@ -24,8 +26,8 @@
 %%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/mmdbuffer.el
+%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/std11.el
 %%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
 %%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
@@ -41,8 +43,5 @@
 %%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