diff -urN /usr/ports/japanese/skk-tools/Makefile japanese/skk-tools/Makefile
--- /usr/ports/japanese/skk-tools/Makefile	2012-04-03 19:41:32.000000000 +0900
+++ japanese/skk-tools/Makefile	2012-04-10 02:46:14.000000000 +0900
@@ -6,39 +6,45 @@
 #
 
 PORTNAME=	skk-tools
-PORTVERSION=	1.3.1
-#PORTREVISION=	0
+PORTVERSION=	1.3.2
 PORTEPOCH=	1
 CATEGORIES=	japanese
-MASTER_SITES=	http://openlab.ring.gr.jp/skk/tools/ \
-		${MASTER_SITE_RINGSERVER}
-MASTER_SITE_SUBDIR=	text/elisp/skk/tools
+MASTER_SITES=	RINGSERVER/elisp/skk/tools \
+		http://openlab.ring.gr.jp/skk/tools/
 DISTNAME=	skktools-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=Jisyo-tools for the SKK Japanese-input software
+COMMENT=	Jisyo-tools for the SKK Japanese-input software
 
-.if defined(WITHOUT_GNOME)
-CONFIGURE_ARGS=	--without-skkdic-expr2
-.else
-USE_GNOME=	glib20
-.endif
+LICENSE=	GPLv2
+
+OPTIONS=	EXPR2 "Build skkdic-expr2 (needs glib-2.x)" on
 
 GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/skk
 
-.if defined(WITHOUT_GNOME)
-PLIST_SUB+=	WITHOUT_GNOME:="@comment "
+PORTDOCS=	README.skktools
+PLIST_FILES=	bin/skkdic-count bin/skkdic-expr bin/skkdic-sort
+
+.include <bsd.port.options.mk>
+
+.if defined(WITHOUT_EXPR2)
+CONFIGURE_ARGS=	--without-skkdic-expr2
 .else
-PLIST_SUB+=	WITHOUT_GNOME:=""
+USE_GNOME=	glib20
+PORTDOCS+=	README.skkdic-expr2
+PLIST_FILES+=	bin/skkdic-expr2
 .endif
 
 post-install:
-	${MKDIR} ${DOCSDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/READMEs/README.C ${DOCSDIR}/README.skktools
-.if !defined(WITHOUT_GNOME)
+.if !defined(WITHOUT_EXPR2)
 	${INSTALL_DATA} ${WRKSRC}/READMEs/README.skkdic-expr2 ${DOCSDIR}
 .endif
+.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/japanese/skk-tools/distinfo japanese/skk-tools/distinfo
--- /usr/ports/japanese/skk-tools/distinfo	2011-03-19 09:27:11.000000000 +0900
+++ japanese/skk-tools/distinfo	2012-04-10 02:37:18.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (skktools-1.3.1.tar.gz) = 0abfa771914308db0c8014f1e531afc421bc8b76c565fa1a477b737d4349ccef
-SIZE (skktools-1.3.1.tar.gz) = 290215
+SHA256 (skktools-1.3.2.tar.gz) = cd1cc9d6d9674d70bbc69f52ac1d1a99a8067dd113a0fa1d50685a29e58a6791
+SIZE (skktools-1.3.2.tar.gz) = 273594
diff -urN /usr/ports/japanese/skk-tools/pkg-plist japanese/skk-tools/pkg-plist
--- /usr/ports/japanese/skk-tools/pkg-plist	2003-09-03 09:01:51.000000000 +0900
+++ japanese/skk-tools/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,7 +0,0 @@
-bin/skkdic-count
-bin/skkdic-expr
-%%WITHOUT_GNOME:%%bin/skkdic-expr2
-bin/skkdic-sort
-%%WITHOUT_GNOME:%%%%DOCSDIR%%/README.skkdic-expr2
-%%DOCSDIR%%/README.skktools
-@dirrm %%DOCSDIR%%