diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
index 58c03328d5e6..27305c5a9c13 100644
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@@ -1,44 +1,39 @@
 PORTNAME=	skkinput
 PORTVERSION=	2.06.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11
 MASTER_SITES=	OSDN/skkinput2
 
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	SKK-like Japanese input method for X11
 WWW=		http://skkinput2.sourceforge.jp/
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/GPL
 
 USES=		imake xorg
 USE_XORG=	ice sm x11 xext xt xmu
 
 PLIST_FILES=	bin/skkinput lib/X11/app-defaults/Skkinput \
 		share/man/ja/man1/skkinput.1.gz share/man/man1/skkinput.1.gz
 PORTDOCS=	*.jis ChangeLog skkinputlisp.doc dot.skkinput
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_RADIO=	SKKSERVER
-OPTIONS_RADIO_SKKSERVER=DBSKKD RSKKSERV
-SKKSERVER_DESC=	Skkserver selection
-DBSKKD_DESC=	Use ja-dbskkd-cdb as skkserver
-RSKKSERV_DESC=	Use ja-rskkserv as skkserver
+OPTIONS_DEFINE=			DOCS
+OPTIONS_DEFAULT=		SKK9
+OPTIONS_RADIO=			SKKSERVER
+OPTIONS_RADIO_SKKSERVER=	DBSKKD SKK9
+DBSKKD_DESC=			Use ja-dbskkd-cdb as skkserver
+SKK9_DESC=			Use ja-skkserv as skkserver
+SKKSERVER_DESC=			Skkserver selection
 
-.include <bsd.port.options.mk>
+DBSKKD_RUN_DEPENDS=		${LOCALBASE}/libexec/dbskkd-cdb:japanese/dbskkd-cdb
+SKK9_RUN_DEPENDS=		${LOCALBASE}/sbin/skkserv:japanese/skkserv
 
-.if ${PORT_OPTIONS:MDBSKKD}
-RUN_DEPENDS=	${LOCALBASE}/libexec/dbskkd-cdb:japanese/dbskkd-cdb
-.elif ${PORT_OPTIONS:MRSKKSERV}
-RUN_DEPENDS=	${LOCALBASE}/libexec/rskkserv:japanese/rskkserv
-.else
-RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:japanese/skkserv
-.endif
-
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 # One of the docfiles lives in its own subdirectory; link it relative to
 # ${WRKSRC} to simplify installation routine (install all files at once)
 	@${LN} ${WRKSRC}/myeval/skkinputlisp.doc ${WRKSRC}/skkinputlisp.doc
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>