- Convert USE_ICONV=yes to USES=iconv

- Change USE_GNOME=pkgconfig|gnomehack to USES=pathfix|pkgconfig while here

Reviewed by:	zeising

18 files changed, 21 insertions, 26 deletions

diff --git a/japanese/chasen-base/Makefile b/japanese/chasen-base/Makefile
index d2e9a2cacd34..5227d1f28aff 100644
--- a/japanese/chasen-base/Makefile
+++ b/japanese/chasen-base/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/darts.h:${PORTSDIR}/devel/darts
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-darts=${LOCALBASE}/include --with-libiconv=${LOCALBASE}
-USE_ICONV=	yes
+USES=		iconv
 USE_LDCONFIG=	yes
 
 post-install:
diff --git a/japanese/cmigemo/Makefile b/japanese/cmigemo/Makefile
index 5ccb1080b4a8..d55c9f4cbf71 100644
--- a/japanese/cmigemo/Makefile
+++ b/japanese/cmigemo/Makefile
@@ -32,7 +32,7 @@ PORTDOCS=	README_j.txt
 
 USE_ZIP=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index fd1a73648870..f3878e38ed73 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Japanese-English edict UTF-8 dictionaries
 
 EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 
-USE_ICONV=	yes
+USES=		iconv
 ICONV?=		iconv
 CONVERT_CMD=	${ICONV} -c -f EUC-JP -t UTF-8
 
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index e8ff345158b3..993a0843424b 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -33,7 +33,7 @@ TMAC_DISTNAME=	tmac-${TMAC_DATE}_2
 USE_GCC=	any
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 CONFLICTS=	groff-[0-9]*
 
diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index c03b675b8b73..939f06a9ed1b 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
 		--with-bzlib
 
 .if !defined(WITHOUT_JAPANESE_UTF8)
-USE_ICONV=	yes
+USES+=		iconv
 CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
 		--enable-japanese-utf8
 .else
diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index 2ed87b78537f..8c6e3e0cb0fe 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
 		--with-bzlib
 
 .if !defined(WITHOUT_JAPANESE_UTF8)
-USE_ICONV=	yes
+USES+=		iconv
 CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
 		--enable-japanese-utf8
 .else
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 998e64ef54e7..e670a443484c 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/GPL
 LICENSE_FILE_LGPL21=	${WRKSRC}/LGPL
 
 USE_AUTOTOOLS=	libtool
-USE_ICONV=	yes
+USES=		iconv
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 68753164607b..5adba7e5c232 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -15,10 +15,9 @@ COMMENT?=	Mozc server for IBus and others
 LIB_DEPENDS=	protobuf:${PORTSDIR}/devel/protobuf
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
-USES=		pkgconfig
+USES=		pkgconfig iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_OPENSSL=	yes
 
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 98e69cfb89a4..b0fb56a619e0 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -57,7 +57,7 @@ FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_AUTOTOOLS=	automake autoconf
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/mutt-${VERSION}
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 2ad4038c781d..10a663d8fafc 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		kasumi:${PORTSDIR}/japanese/kasumi
 
 USE_GNOME=	lthack
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index 02fe2edccf39..8b13e0f369e1 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	lthack
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 03c9d312ca0d..a81a3ce7aaa0 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -19,9 +19,8 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim \
 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gettext
-USE_GNOME=	lthack gnomehack
-USE_ICONV=	yes
+USES=		gettext iconv pathfix
+USE_GNOME=	lthack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index fdb72658ea30..d5dcee4a6229 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -22,9 +22,8 @@ RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim \
 		${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka \
 		${LOCALBASE}/lib/scim-1.0/1.4.0/honoka/plugin-romkan.so:${PORTSDIR}/japanese/scim-honoka-plugin-romkan
 
-USES=		gettext
-USE_GNOME=	lthack gnomehack
-USE_ICONV=	yes
+USES=		gettext iconv pathfix
+USE_GNOME=	lthack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 04d077b502da..d0f0a1bc9b31 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -19,9 +19,8 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_LDCONFIG=	yes
-USES=		gettext
-USE_GNOME=	lthack gnomehack
-USE_ICONV=	yes
+USES=		gettext iconv pathfix
+USE_GNOME=	lthack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index 3e80a18fcb72..dedc02e4082d 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GNOME=	lthack
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 4b0600766075..9b265de2c152 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_AUTOTOOLS=	libtool
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 10a7da436678..c1200ee12f73 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe \
 		tomoe-gtk.1:${PORTSDIR}/japanese/libtomoe-gtk
 
 USE_GNOME=	lthack intlhack
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 7a7061e9a6c4..ad8234cadf8b 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	uim:${PORTSDIR}/textproc/uim
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GNOME=	lthack
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes