24 files changed, 25 insertions, 39 deletions

diff --git a/security/bsp_upektfmess/Makefile b/security/bsp_upektfmess/Makefile
index 1e6b7add75b5..f168d6ea34e5 100644
--- a/security/bsp_upektfmess/Makefile
+++ b/security/bsp_upektfmess/Makefile
@@ -20,8 +20,7 @@ PLIST_FILES=	lib/libtfmessbsp.so
 
 USE_ZIP=	yes
 USE_LDCONFIG=	yes
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 # Maintainer note
 # Both the gui and the non-gui object are linked to libX11
 USE_XORG=	x11 xext
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index e4ee9ed0e1cc..178c04bb26b2 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -138,7 +138,7 @@ CONFIGURE_ARGS+=--disable-unrar
 .endif
 .if ${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=--with-iconv
-USE_ICONV=	yes
+USES+=		iconv
 .else
 CONFIGURE_ARGS+=--without-iconv
 .endif
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 181f8e98fdac..201875f9828e 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -133,7 +133,7 @@ CONFIGURE_ARGS+=--disable-unrar
 .endif
 .if ${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=--with-iconv
-USE_ICONV=	yes
+USES+=		iconv
 .else
 CONFIGURE_ARGS+=--without-iconv
 .endif
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 1a73889e4d95..8ab7df899c3b 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	assuan.0:${PORTSDIR}/security/libassuan \
 		pth:${PORTSDIR}/devel/pth
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index e8e746a3153c..14144f613bb9 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	assuan:${PORTSDIR}/security/libassuan \
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-USE_ICONV=	YES
+USES=		iconv
 USE_LDCONFIG=	YES
 CONFIGURE_ARGS+=	--enable-symcryptrun
 .if defined(NOPORTDOCS)
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index d88d489003c1..828ce2806e28 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -45,7 +45,7 @@ CFLAGS:=	${CFLAGS:S/$/ -fheinous-gnu-extensions/}
 .endif
 
 .if defined(WITH_LIBICONV)
-USE_ICONV=	yes
+USES+=		iconv
 .else
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 .endif
diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 6b8ba64a2e12..158ea23b4d98 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error \
 CONFLICTS=	gnutls-[0-9]*
 
 USE_XZ=		yes
-USE_ICONV=	yes
+USES=		iconv
 USE_GNOME=	pkgconfig ltverhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index b73aacb532b0..678838f2bb83 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -17,10 +17,9 @@ LIB_DEPENDS=	nettle:${PORTSDIR}/security/nettle \
 
 CONFLICTS=	gnutls-devel-[0-9]*
 
-USES=		pkgconfig
+USES=		pathfix pkgconfig iconv
 USE_BZIP2=	yes
-USE_ICONV=	yes
-USE_GNOME=	ltverhack gnomehack
+USE_GNOME=	ltverhack
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 832a95737c05..c5ff3852ecf3 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -121,7 +121,7 @@ CONFIGURE_ARGS+=	--without-libpam
 .endif
 
 .if ${PORT_OPTIONS:MGSSAPI}
-USE_ICONV=	yes
+USES+=		iconv
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--enable-gssapi
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 7f9f9f75335e..95abfa45102f 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -20,8 +20,7 @@ MAKE_JOBS_UNSAFE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_ICONV=	yes
-USES+=		gettext
+USES+=		gettext iconv
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB=	NLS=""
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index dc3c17db3b74..f234b0d96d0e 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -24,8 +24,7 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--enable-gtk-doc=no \
 		--with-html-dir=${PREFIX}/share/doc
 USE_GMAKE=	yes
-USE_ICONV=	yes
-USES=	pathfix pkgconfig gettext
+USES=	pathfix pkgconfig gettext iconv
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index 4d51458cf060..a8437fef1cc9 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 
 CONFIGURE_ARGS=	--enable-gtk-doc=no
 USE_LDCONFIG=	yes
diff --git a/security/openvas-libnasl/Makefile b/security/openvas-libnasl/Makefile
index 7750411d30e4..c3a40c9a67e9 100644
--- a/security/openvas-libnasl/Makefile
+++ b/security/openvas-libnasl/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_ICONV=	yes
-USES=		bison
+USES=		bison iconv
 
 MAN1=		openvas-libnasl-config.1 openvas-nasl.1
 
diff --git a/security/pam_krb5-rh/Makefile b/security/pam_krb5-rh/Makefile
index 17415f7d7075..0865f7a4c70e 100644
--- a/security/pam_krb5-rh/Makefile
+++ b/security/pam_krb5-rh/Makefile
@@ -20,7 +20,7 @@ LICENSE_COMB=	dual
 
 CONFLICTS=	pam_krb5-4.*
 
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} --without-afs \
 		--with-libintl-prefix=${LOCALBASE} --with-krb4=no \
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 6d6c3b09e902..dc43dc04f088 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
 
 CONFLICTS_INSTALL?=	pinentry-[a-z]*-[0.9]*
 
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INFO=		pinentry
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index a36d718f03f1..5e3bbe6b9cf8 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -25,8 +25,7 @@ USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	prelude-lml
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-USES=		pkgconfig gettext
-USE_ICONV=	yes
+USES=		pkgconfig gettext iconv
 
 OPTIONS_DEFINE=	FAM
 
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 6b322cc2b4f6..b459a071e4eb 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -19,11 +19,10 @@ LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
 		nettle:${PORTSDIR}/security/nettle \
 		p11-kit:${PORTSDIR}/security/p11-kit
 
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	prelude-manager
diff --git a/security/rifiuti2/Makefile b/security/rifiuti2/Makefile
index 3188e5690d98..9faad1ece14b 100644
--- a/security/rifiuti2/Makefile
+++ b/security/rifiuti2/Makefile
@@ -14,8 +14,7 @@ LICENSE=	BSD
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gettext
-USE_ICONV=	yes
+USES=		pkgconfig gettext iconv
 USE_GNOME=	glib20
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/security/scanhill/Makefile b/security/scanhill/Makefile
index f475e7a198d5..55d6a28ef825 100644
--- a/security/scanhill/Makefile
+++ b/security/scanhill/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Microsoft Messenger Protocol Sniffer
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
+USES=		iconv
 MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	README.txt INSTALL.txt mysql.sql
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index 86e59cde951c..7e0199676f9f 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	idn:${PORTSDIR}/dns/libidn \
 
 USE_AUTOTOOLS=	libtool
 USE_PERL5_BUILD=	yes
-USE_GNOME=	gnomehack pkgconfig
-USE_ICONV=	yes
+USES=		pathfix pkgconfig iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--with-db-dir=/var/shishi
diff --git a/security/sssd/Makefile b/security/sssd/Makefile
index 2714f88ed35a..e032cc72a347 100644
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@@ -53,8 +53,7 @@ USE_PYTHON=	yes
 USE_OPENLDAP=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_PYTHON=	yes
 
 USE_RC_SUBR=	${PORTNAME}
diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile
index fee37ba49af6..93b7b8657f66 100644
--- a/security/tpm-tools/Makefile
+++ b/security/tpm-tools/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:${PORTSDIR}/security/trousers
 RUN_DEPENDS+=	${LOCALBASE}/lib/pkcs11/libopencryptoki.so:${PORTSDIR}/security/opencryptoki
 
 USE_GMAKE=	YES
-USE_ICONV=	YES
-USES=		gettext
+USES=		gettext iconv
 USE_LDCONFIG=	YES
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	YES
diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index 3d8a9fd4b24f..ef7c36e5d094 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -12,10 +12,9 @@ COMMENT=	The open-source TCG Software Stack
 
 USE_GCC=	any
 USE_GMAKE=	YES
-USE_ICONV=	YES
 USE_OPENSSL=	YES
 USE_LDCONFIG=	YES
-USES=		pkgconfig
+USES=		pkgconfig iconv
 USE_AUTOTOOLS=	autoconf automake libtool
 GNU_CONFIGURE=	YES
 MAKE_JOBS_SAFE=	YES
diff --git a/security/truecrypt/Makefile b/security/truecrypt/Makefile
index a4e4aec09884..a0b035bd28a3 100644
--- a/security/truecrypt/Makefile
+++ b/security/truecrypt/Makefile
@@ -22,9 +22,8 @@ RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
 
 WRKSRC=		${WRKDIR}/truecrypt-${PORTVERSION}-source
 
-USES=		fuse
+USES=		fuse iconv
 USE_GMAKE=	yes
-USE_ICONV=	yes
 RESTRICTED=	Downloading requires acceptance of license agreement
 NO_CDROM=	Distribution requires acceptance of license agreement
 NO_PACKAGE=	Distribution requires acceptance of license agreement