9 files changed, 20 insertions, 25 deletions

diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index a7a2e3b2dd98..a74763140525 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	head files and libraries of Wnn7
-# Date created:		01/07/16
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
+# Created by: Satoshi Taoka <taoka@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Wnn7-lib
 PORTVERSION=	2001.10.17
@@ -16,8 +12,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Wnn7 client library
 
+USES=		imake
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/src
 PORTDOCS=	README
@@ -29,10 +25,11 @@ post-patch:
 		${WRKSRC}/config/Project.tmpl \
 		${WRKSRC}/config/X11.tmpl \
 		${WRKSRC}/Makefile.ini
+	@${REINPLACE_CMD} -e 's/((/(/' ${WRKSRC}/config/X11.tmpl
 
 # Warning: we cannot use USE_IMAKE.
 do-build:
-	cd ${WRKSRC} && make World -f Makefile.ini
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} make World -f Makefile.ini
 
 post-install:
 	${MKDIR} ${PREFIX}/include/wnn7/wnn
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index c352ed792fae..7dcefd6fd578 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	canna-lib
-# Date created:		7 September 2008
-# Whom:			hrs
-#
+# Created by: hrs
 # $FreeBSD$
-#
 
 PORTNAME=	canna
 PORTVERSION=	3.7p3
@@ -17,9 +13,9 @@ DISTNAME=	Canna${PORTVERSION:S/.//g}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A Kana-to-Kanji conversion system, library part
 
+USES=		imake
 USE_BZIP2=	yes
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_LDCONFIG=	yes
 NO_INSTALL_MANPAGES=yes
 MAKE_JOBS_UNSAFE=	yes
@@ -28,12 +24,10 @@ PLIST_SUB=	METAFILE="${METAFILE}" \
 
 ALL_TARGET=	canna
 INSTALL_TARGET=	instsgs
+XMKMF=		xmkmf
 
 METAFILE=	${DATADIR_REL}/canna-lib-dic.meta
 
-post-configure:
-	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
-
 post-install:
 	${MTREE_CMD} -cdink uname,gname,mode,nochange \
 		-p ${DATADIR}/dic > ${PREFIX}/${METAFILE}
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 1820d4558c38..87c0fd468182 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -15,9 +15,10 @@ COMMENT=	A Kana-to-Kanji conversion system, binary part
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/canna-lib
 
+USES=		imake
+USE_GCC=	any
 USE_RC_SUBR=	canna
 USE_BZIP2=	yes
-USE_IMAKE=	yes
 ALL_TARGET=	canna
 INSTALL_TARGET=	instserver instclient
 PLIST_SUB=	METAFILE="${METAFILE}" \
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 2ec396758353..9172f9db6688 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A Japanese text input server for X11 applications
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 SUB_FILES=	Kinput2.conf
 PLIST_FILES=	${PLIST_ALL}
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 4b9564f9cbfe..0476d47e8055 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -36,7 +36,7 @@ COMMENT=	An xterm variant with Japanese support
 
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	xaw
 CFLAGS+=	-Wno-return-type
 
diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
index 674342676641..6603afa3b23b 100644
--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@@ -13,10 +13,10 @@ PATCHFILES=	${PORTNAME}-qq-2.0.1.21.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	A Japanese input method, library part
+COMMENT=	Japanese input method, library part
 
+USES=		imake
 USE_GCC=	any
-USE_IMAKE=	yes
 USE_LDCONFIG=	yes
 NO_INSTALL_MANPAGES=	yes
 SUB_FILES=	sj3_freebsd.tmpl
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index c986c5e4df71..86f7214641b4 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -13,14 +13,15 @@ PATCHFILES=	${PORTNAME}-qq-2.0.1.21.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	A Japanese input method, binary part
+COMMENT=	Japanese input method, binary part
 
 LIB_DEPENDS=	sj3lib:${PORTSDIR}/japanese/sj3-lib
 
+USES=		imake
 USE_RC_SUBR=	sj3
-USE_IMAKE=	yes
 SUB_FILES=	sj3_freebsd.tmpl
 SUB_LIST=	DESTDIR=${DESTDIR}
+CFLAGS+=	-Wno-return-type
 
 USERS=		_sj3
 GROUPS=		_sj3
diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
index 24372cb57b38..11910cd7aa63 100644
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	skkinput2/6273
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	SKK-like Japanese input method for X11
 
-USE_IMAKE=	yes
+USES=		imake
 USE_XORG=	ice sm x11 xext xt xmu
 
 OPTIONS_RADIO=	RG1
diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile
index 3140872f7675..358f7a75b561 100644
--- a/japanese/skkinput3/Makefile
+++ b/japanese/skkinput3/Makefile
@@ -11,7 +11,8 @@ DISTNAME=	skkinput-${PORTVERSION}
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	SKK-like Japanese input method for X11
 
-USE_IMAKE=	yes
+USES=		imake
+USE_GCC=	any
 USE_XORG=	ice sm x11 xext xmu xt
 
 OPTIONS_DEFINE=	SKK10
@@ -21,6 +22,7 @@ RG1_DESC=	Skkserver Selection
 DBSKKD_DESC=	Use ja-dbskkd-cdb as skkserver
 RSKKSERV_DESC=	Use ja-rskkserv as skkserver
 SKK10_DESC=	Use SKK10 elisps
+USE_CSTD=	gnu89
 
 NO_INSTALL_MANPAGES=	yes