--- ./Makefile	2010-06-06 05:05:46.000000000 +0900
+++ ../../japanese/emacs-canna/Makefile.new	2010-06-08 13:25:09.000000000 +0900
@@ -16,6 +16,11 @@
 MAINTAINER=	wahjava@gmail.com
 COMMENT=	GNU editing macros
 
+PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	nork
+PATCHFILES=	emacs232canna-20100608.patch.gz
+PATCH_DIST_STRIP=	-p1
+
 MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
@@ -64,7 +69,8 @@
 		SCROLLBARS	"Without toolkit scroll-bars"			ON \
 		XFT	"Xft support"			ON \
 		XIM	"XIM support"			ON \
-		XPM	"XPM support"			ON
+		XPM	"XPM support"			ON \
+		CANNA	"Canna support "		ON
 
 .include <bsd.port.options.mk>
 
@@ -192,6 +198,13 @@
 CONFIGURE_ARGS+=	--without-sound
 .endif
 
+.if defined(WITH_CANNA)
+CONFIGURE_ARGS+=	--with-canna \
+			--with-canna-includes=${LOCALBASE}/include \
+			--with-canna-libraries=${LOCALBASE}/lib
+LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/canna-lib
+.endif
+
 .if defined(WITHOUT_DBUS)
 CONFIGURE_ARGS+=	--without-dbus
 .else