Index: head/editors/semi/pkg-plist.xemacs21-mule
===================================================================
--- head/editors/semi/pkg-plist.xemacs21-mule	(revision 426049)
+++ head/editors/semi/pkg-plist.xemacs21-mule	(nonexistent)
@@ -1,60 +0,0 @@
-%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.semi
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/ChangeLog
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/NEWS
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/README.en
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/README.ja
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/TODO
-%%PORTDOCS%%%%EMACS_PACKAGESDIR%%/lisp/semi/VERSION
-%%EMACS_PACKAGESDIR%%/lisp/semi/_pkg.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.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-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
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-def.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-def.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-gpg.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-gpg.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-parse.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-parse.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-pgp.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-pgp.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-pgp5.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg-pgp5.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/pgg.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/postpet.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/postpet.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-setup.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-setup.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/signature.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/signature.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/smime.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/smime.elc
-%%EMACS_PACKAGESDIR%%/info/mime-ui-en.info
-%%EMACS_PACKAGESDIR%%/info/mime-ui-ja.info
-%%EMACS_PACKAGESDIR%%/man/semi/mime-ui-en.texi
-%%EMACS_PACKAGESDIR%%/man/semi/mime-ui-ja.texi
-share/semi/%%SEMI_COOKIE%%
-@unexec rmdir %D/share/semi||(echo "===>  Please ignore above error.";true)

Property changes on: head/editors/semi/pkg-plist.xemacs21-mule
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/editors/semi/Makefile
===================================================================
--- head/editors/semi/Makefile	(revision 426049)
+++ head/editors/semi/Makefile	(revision 426050)
@@ -1,185 +1,171 @@
 # Created by: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}
 PORTREVISION=	17
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER?=	nobutaka@FreeBSD.org
-COMMENT?=	SEMI, Library of MIME feature for GNU Emacs for emacs
+MAINTAINER=	nobutaka@FreeBSD.org
+COMMENT=	SEMI, Library of MIME feature for GNU Emacs for emacs
 
 LICENSE=	GPLv2
 
 USES=		makeinfo
 
 PORTCLASS?=	master
 
 # distfile version
 FLIM_TRUNK=	1.14
 SEMI_TRUNK=	1.14
 SEMI_VER=	${SEMI_TRUNK}.6
 # document install directory by install-doc target
 SEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages
 # semi lispdir
 SEMI_LISPDIR=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 SEMI_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 USE_EMACS=	yes
 
 EMACS_MASTERDIR_PKGFILES=YES
 DESCR=		${PKGDIR}/pkg-descr
 
 # target name for make build
 ALL_TARGET?=	elc
 # environments
 PLIST_SUB+=	SEMIDOCDIR=${SEMIDOCDIR} SEMI_COOKIE=${SEMI_COOKIE}
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBASE}" \
 		LISPDIR="${STAGEDIR}${SEMI_LISPDIR}" \
 		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${SEMI_VERSION_SPECIFIC_LISPDIR}"
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
-.if defined(EMACS_PORT_NAME)
-.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-nox11") || (${EMACS_PORT_NAME} == "emacs-devel")
-DEPPORT_SUFFIX=
-.else
-DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
-.endif
-.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-nox11") || (${EMACS_PORT_NAME} == "emacs-devel")
 PLIST=		${PKGDIR}/pkg-plist.emacs20
-.endif
 # depends on flim
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:editors/flim${DEPPORT_SUFFIX}
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:editors/flim${DEPPORT_SUFFIX}
-.else
-.BEGIN:
-	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_PORT_NAME."
-	@${FALSE}
-.endif
+BUILD_DEPENDS+=	flim-${EMACS_PORT_NAME}>0:editors/flim
+RUN_DEPENDS+=	flim-${EMACS_PORT_NAME}>0:editors/flim
 
 .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
 # info files JIS to EUC
 BUILD_DEPENDS+=	nkf:japanese/nkf
 .endif
 
 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
 
 .if ! defined(EMACS_PACKAGESDIR) || ! defined(MANIFEST)
 INFO=		mime-ui-en
 .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 INFO+=		mime-ui-ja
 .endif
 .endif
 
 post-build:
 .if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
 	@${MAKE} -C ${.CURDIR} info-build-by-emacs
 .else
 	@${MAKE} -C ${.CURDIR} info-build
 .endif
 
 pre-install:
 .if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
 	@${MAKE} -C ${.CURDIR} mkdir-site-packages
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/semi
 	@${TOUCH} ${STAGEDIR}${LOCALBASE}/share/semi/${SEMI_COOKIE}
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
 	@${MAKE} -C ${.CURDIR} info-package-install
 	@${MAKE} -C ${.CURDIR} manifest-install
 .else
 	@${MAKE} -C ${.CURDIR} info-install
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MAKE} -C ${.CURDIR} doc-install
 .endif
 
 ###############################################################################
 #
 # miscellaneous local functions
 #
 info-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
 .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	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(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
 .endif
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
 		${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/${SEMIDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${STAGEDIR}${LOCALBASE}/${SEMIDOCDIR}/ ; \
 	done)
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \
 	done)
 .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \
 	done)
 .endif
 
 info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
 			${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
 	done)
 
 manifest-install:
 	@${RM} ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>
Index: head/editors/semi/files/patch-SEMI-CFG
===================================================================
--- head/editors/semi/files/patch-SEMI-CFG	(revision 426049)
+++ head/editors/semi/files/patch-SEMI-CFG	(revision 426050)
@@ -1,11 +1,11 @@
---- SEMI-CFG.orig	Wed Sep 16 15:48:58 1998
-+++ SEMI-CFG	Sun May  9 21:54:02 1999
-@@ -11,6 +11,8 @@
+--- SEMI-CFG.orig	2003-01-10 18:12:05 UTC
++++ SEMI-CFG
+@@ -9,6 +9,8 @@
  (add-to-list 'load-path
  	     (expand-file-name "../../site-lisp/apel" data-directory))
  (add-to-list 'load-path
 +	     (expand-file-name "../site-lisp/emu" data-directory))
 +(add-to-list 'load-path
  	     (expand-file-name "." data-directory))
  
- (when (boundp 'LISPDIR)
+ (if (boundp 'LISPDIR)
Index: head/editors/semi/files/patch-mime-ui-en.texi
===================================================================
--- head/editors/semi/files/patch-mime-ui-en.texi	(revision 426049)
+++ head/editors/semi/files/patch-mime-ui-en.texi	(revision 426050)
@@ -1,14 +1,14 @@
---- ./mime-ui-en.texi.orig	2002-10-15 06:59:21.000000000 +0000
-+++ ./mime-ui-en.texi	2014-06-29 07:49:25.000000000 +0000
+--- mime-ui-en.texi.orig	2002-10-15 06:59:21 UTC
++++ mime-ui-en.texi
 @@ -1,6 +1,10 @@
  \input texinfo.tex
  @setfilename mime-ui-en.info
 -@settitle{SEMI 1.14 Manual}
 +@settitle SEMI 1.14 Manual
 +@dircategory The Emacs editor and associated tools 
 +@direntry 
 +* mime-ui-en: (mime-ui-en).	MIME user interface for GNU Emacs. (English)
 +@end direntry 
  @titlepage
  @title SEMI 1.14 Manual
  @author MORIOKA Tomohiko <morioka@@jaist.ac.jp>
Index: head/editors/semi/files/patch-mime-ui-ja.texi
===================================================================
--- head/editors/semi/files/patch-mime-ui-ja.texi	(revision 426049)
+++ head/editors/semi/files/patch-mime-ui-ja.texi	(revision 426050)
@@ -1,14 +1,14 @@
---- ./mime-ui-ja.texi.orig	2002-10-15 06:59:21.000000000 +0000
-+++ ./mime-ui-ja.texi	2014-06-29 07:49:58.000000000 +0000
+--- mime-ui-ja.texi.orig	2002-10-15 06:59:21 UTC
++++ mime-ui-ja.texi
 @@ -1,6 +1,10 @@
  \input texinfo.tex
  @setfilename mime-ui-ja.info
 -@settitle{SEMI 1.14 説明書}
 +@settitle SEMI 1.14 説明書
 +@dircategory The Emacs editor and associated tools 
 +@direntry 
 +* mime-ui-ja: (mime-ui-ja).	MIME user interface for GNU Emacs. (Japanese)
 +@end direntry 
  @titlepage
  @title SEMI 1.14 説明書
  @author 守岡 知彦 <morioka@@jaist.ac.jp>