Index: Makefile
===================================================================
--- Makefile	(revision 310361)
+++ Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   anthy
-# Date created:        26 February 2002
-# Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
-#
+# Created by: Yukihiro Nakai <nakai@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	anthy
 PORTVERSION=	9100h
@@ -17,27 +13,42 @@
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Another Kana-Kanji conversion system
 
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/alt-cannadic/COPYING
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	lthack pkgconfig
+USE_GNOME=	lthack
+USE_PKGCONFIG=	build
 
 DOCSDIR=	share/doc/ja/anthy
 ELISPDIR=	share/emacs/site-lisp/anthy
 PLIST_SUB=	ELISPDIR=${ELISPDIR}
 
-.if defined(WITH_2CHDIC)
+OPTIONS_DEFINE=	2CHDIC ODIC GSKKDIC DOCS
+OPTIONS_DEFAULT=	DOCS
+
+2CHDIC_DESC=	2ch Dictionary
+ODIC_DESC=	Okinawa Dictionary
+GSKKDIC_DESC=	SKK Dictionary
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:M2CHDIC}
 MASTER_SITES+=	http://omaemona.sourceforge.net/packages/Zisyo/:2chdic
 DISTFILES+=	2ch.t:2chdic
 .endif
 
-.if defined(WITH_ODIC)
+.if ${PORT_OPTIONS:MODIC}
 MASTER_SITES+=	http://www.ofug.net/~yamajun/files/:odic
 DISTFILES+=	${ODIC_SRCS}:odic
 ODIC_SRCS=	${ODIC_VERS}.t
 ODIC_VERS=	okinawa-20070717
 .endif
 
-.if defined(WITH_GSKKDIC)
+.if ${PORT_OPTIONS:MGSKKDIC}
 MASTER_SITES+=	http://www.ohnolab.org/~kimoto/:gskk
 DISTFILES+=	${GSKK_SRCS}:gskk
 GSKK_SRCS=	${GSKK_VERS}.t.gz
@@ -45,19 +56,19 @@
 .endif
 
 post-extract:
-.if defined(WITH_2CHDIC)
+.if ${PORT_OPTIONS:M2CHDIC}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/2ch.t ${WRKSRC}/mkworddic
 	${PRINTF} "/mkworddic\\\\/base.t/a\\\\\\nread @top_srcdir@/mkworddic/2ch.t\\n" | \
 	${REINPLACE_CMD} -f /dev/stdin ${WRKSRC}/mkworddic/dict.args.in
 .endif
 
-.if defined(WITH_ODIC)
+.if ${PORT_OPTIONS:MODIC}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ODIC_SRCS} ${WRKSRC}/mkworddic
 	${PRINTF} "/mkworddic\\\\/base.t/a\\\\\\nread @top_srcdir@/mkworddic/${ODIC_SRCS}\\n" | \
 	${REINPLACE_CMD} -f /dev/stdin ${WRKSRC}/mkworddic/dict.args.in
 .endif
 
-.if defined(WITH_GSKKDIC)
+.if ${PORT_OPTIONS:MGSKKDIC}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${GSKK_SRCS} ${WRKSRC}/mkworddic
 	${GUNZIP_CMD} ${WRKSRC}/mkworddic/${GSKK_SRCS}
 	${PRINTF} "/mkworddic\\\\/base.t/a\\\\\\nread @top_srcdir@/mkworddic/${GSKK_VERS}.t\\n" | \
@@ -73,7 +84,7 @@
 post-install:
 	${MKDIR} ${PREFIX}/${ELISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/src-util/*.el ${PREFIX}/${ELISPDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${PREFIX}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/ELISP ${PREFIX}/${DOCSDIR}
 .endif