3 files changed, 71 insertions, 184 deletions

diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 80bd8fca599f..5c4d1ccb1dc0 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -6,165 +6,53 @@ PORTVERSION=	${SEMI_VER}
 PORTREVISION=	19
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	SEMI, Library of MIME feature for GNU Emacs for emacs
 
 LICENSE=	GPLv2
 
-USES=		makeinfo
+BUILD_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR} \
+		nkf:japanese/nkf
+RUN_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
 
-PORTCLASS?=	master
+USES=		emacs makeinfo
+
+NO_ARCH=	yes
 
-# 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}
+SEMI_TRUNK=	1.14
 
-USE_EMACS=	yes
+ALL_TARGET=	elc
 
-EMACS_MASTERDIR_PKGFILES=YES
-DESCR=		${PKGDIR}/pkg-descr
+MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" \
+		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${EMACS_VERSION_SITE_LISPDIR}"
 
-# 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}"
+INFO=		mime-ui-en mime-ui-ja
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-PLIST=		${PKGDIR}/pkg-plist.emacs20
-# depends on flim
-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_FLAGS=		--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} ${MAKEINFO_FLAGS} $${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} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
+	for i in mime-ui-en.texi mime-ui-ja.texi; do \
+		${CAT} $${i} | nkf -e > $${i}.jis ; \
+		${MAKEINFO} --no-split --no-validate $${i}.jis ; \
 	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")
+post-install:
 	@(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} ; \
+	for i in mime-ui-en.info mime-ui-ja.info; do \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${PREFIX}/info ; \
 	done)
 
-doc-install:
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/${SEMIDOCDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(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 ; \
+		${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}/ ; \
 	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>
+.include <bsd.port.mk>
diff --git a/editors/semi/pkg-plist b/editors/semi/pkg-plist
new file mode 100644
index 000000000000..47d19ee55814
--- /dev/null
+++ b/editors/semi/pkg-plist
@@ -0,0 +1,48 @@
+%%EMACS_SITE_LISPDIR%%/semi/mail-mime-setup.el
+%%EMACS_SITE_LISPDIR%%/semi/mail-mime-setup.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-bbdb.el
+@rmtry %%EMACS_SITE_LISPDIR%%/semi/mime-bbdb.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-edit.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-edit.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-image.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-image.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-partial.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-partial.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-pgp.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-pgp.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-play.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-play.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-setup.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-setup.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-view.el
+%%EMACS_SITE_LISPDIR%%/semi/mime-view.elc
+%%EMACS_SITE_LISPDIR%%/semi/mime-w3.el
+@rmtry %%EMACS_SITE_LISPDIR%%/semi/mime-w3.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg-def.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg-def.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg-gpg.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg-gpg.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg-parse.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg-parse.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp5.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp5.elc
+%%EMACS_SITE_LISPDIR%%/semi/pgg.el
+%%EMACS_SITE_LISPDIR%%/semi/pgg.elc
+%%EMACS_SITE_LISPDIR%%/semi/postpet.el
+%%EMACS_SITE_LISPDIR%%/semi/postpet.elc
+%%EMACS_SITE_LISPDIR%%/semi/semi-def.el
+%%EMACS_SITE_LISPDIR%%/semi/semi-def.elc
+%%EMACS_SITE_LISPDIR%%/semi/semi-setup.el
+%%EMACS_SITE_LISPDIR%%/semi/semi-setup.elc
+%%EMACS_SITE_LISPDIR%%/semi/signature.el
+%%EMACS_SITE_LISPDIR%%/semi/signature.elc
+%%EMACS_SITE_LISPDIR%%/semi/smime.el
+%%EMACS_SITE_LISPDIR%%/semi/smime.elc
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README.en
+%%PORTDOCS%%%%DOCSDIR%%/README.ja
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/VERSION
diff --git a/editors/semi/pkg-plist.emacs20 b/editors/semi/pkg-plist.emacs20
deleted file mode 100644
index 990f1fbb73b2..000000000000
--- a/editors/semi/pkg-plist.emacs20
+++ /dev/null
@@ -1,49 +0,0 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.el
-@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el
-@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.elc
-%%PORTDOCS%%%%SEMIDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%SEMIDOCDIR%%/NEWS
-%%PORTDOCS%%%%SEMIDOCDIR%%/README.en
-%%PORTDOCS%%%%SEMIDOCDIR%%/README.ja
-%%PORTDOCS%%%%SEMIDOCDIR%%/TODO
-%%PORTDOCS%%%%SEMIDOCDIR%%/VERSION
-share/semi/%%SEMI_COOKIE%%