Index: Makefile
===================================================================
--- Makefile	(revision 310295)
+++ Makefile	(working copy)
@@ -1,20 +1,19 @@
-# New ports collection makefile for:	semi-current for emacs
-# Date created:		9 May 1999
-# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
-#
+# Created by: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}
 PORTREVISION=	14
 CATEGORIES=	editors elisp
-MASTER_SITES=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/comp/emacsen/lisp/semi/semi-1.14-for-flim-1.14/
+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
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/mime-setup.el
+
 PORTCLASS?=	master
 
 # distfile version
@@ -42,7 +41,11 @@
 		LISPDIR="${SEMI_LISPDIR}" \
 		VERSION_SPECIFIC_LISPDIR="${SEMI_VERSION_SPECIFIC_LISPDIR}"
 
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=	DOCS
+
 .include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(EMACS_PORT_NAME)
 .if (${EMACS_PORT_NAME} == "emacs23") || (${EMACS_PORT_NAME} == "emacs24") || (${EMACS_PORT_NAME} == "emacs-devel")
@@ -101,7 +104,7 @@
 .else
 	@${MAKE} info-install
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MAKE} doc-install
 .endif
 
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 310295)
+++ pkg-descr	(working copy)
@@ -20,4 +20,4 @@
 
 Ported by shige@FreeBSD.ORG
 
-WWW: http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/SEMI/ (in Japanese)
+WWW: http://git.chise.org/elisp/semi/ (in Japanese)
Index: pkg-plist.emacs20
===================================================================
--- pkg-plist.emacs20	(revision 310295)
+++ pkg-plist.emacs20	(working copy)
@@ -1,7 +1,7 @@
 %%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
-@unexec /bin/rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.elc
+@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
@@ -17,7 +17,7 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el
-@unexec /bin/rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.elc
+@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
@@ -55,4 +55,4 @@
 info/mime-ui-ja.info
 @exec install-info %D/info/mime-ui-ja.info %D/info/dir
 share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
+@dirrmtry share/semi