15 files changed, 16 insertions, 14 deletions

diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 7d6ddef9e360..998cf039ac2f 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 PORTSCOUT=	limitw:1,even
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix pkgconfig
+USES=		alias gmake libtool pathfix pkgconfig
 USE_GNOME=	glib20 libxslt:build
 USE_SQLITE=	yes
 USE_OPENSSL=	yes
diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index 245f7c2179ef..584a6ff84a29 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo # for better debugging
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
-USES=		bison cmake python
+USES=		alias bison cmake python
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
diff --git a/net-mgmt/sysmon/Makefile b/net-mgmt/sysmon/Makefile
index 8a4e63e69b48..9d6968b10019 100644
--- a/net-mgmt/sysmon/Makefile
+++ b/net-mgmt/sysmon/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Network tool designed for high performance and accurate monitoring
 
 LICENSE=	GPLv2
 
+USES=		alias
 DOCS=		Changes.html binaries.html config.html docs.html index.html \
 		jclient.jpg net-example.png sysmon.conf.man.html sysmon.jpg \
 		sysmon.man.html reporting.xml-spec.txt
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 12db203a9ea5..40912f7a834b 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -26,7 +26,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GCC=	yes
 USE_GNOME=	libxml2
-USES=		bison cpe gmake shebangfix
+USES=		alias bison cpe gmake shebangfix
 CPE_VENDOR=	digium
 SHEBANG_FILES=	agi/agi-test.agi \
 		agi/jukebox.agi
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index b0042bb39138..a19fcd7de18f 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS?=	libexpat.so:${PORTSDIR}/textproc/expat2 \
 USERS?=		${PORTNAME}
 GROUPS?=	${USERS}
 
-USES+=		gettext gmake libtool:keepla pathfix pkgconfig
+USES+=		alias gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME+=	glib20 intltool introspection
 USE_GNOME_SUBR=	yes
 USE_LDCONFIG=	yes
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index a11b83c44979..5c6b88c2f7d9 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
-USES=		cmake:outsource pkgconfig compiler:c++11-lib
+USES=		alias cmake:outsource pkgconfig compiler:c++11-lib
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
 GH_PROJECT=	FreeRDP
diff --git a/net/krfb/Makefile b/net/krfb/Makefile
index 7d4a9c22e82b..be3fef33db42 100644
--- a/net/krfb/Makefile
+++ b/net/krfb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	VNC server for KDE
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4
 
-USES=		cmake:outsource tar:xz
+USES=		alias cmake:outsource tar:xz
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	corelib gui network \
 		moc_build qmake_build rcc_build uic_build
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index e8bb0cfb48c3..b1a86d044d7b 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -20,8 +20,8 @@ COMMENT?=	Powerful network analyzer/capture tool
 DATADIR_NAME=	wireshark
 
 USE_PERL5=	build
-USES=		iconv gettext pkgconfig gmake perl5 tar:bzip2 libtool \
-    		python:build
+USES=		alias gettext gmake iconv libtool perl5 pkgconfig \
+		python:build tar:bzip2
 WANT_GNOME=	yes
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--program-transform-name="" \
diff --git a/news/husky/Makefile.local b/news/husky/Makefile.local
index 008211799d80..785edfb828fe 100644
--- a/news/husky/Makefile.local
+++ b/news/husky/Makefile.local
@@ -26,7 +26,7 @@ CONFLICTS=	${PORTNAME}-[0-9]*
 USERS=		fido
 GROUPS=		fido
 
-USES+=		gmake
+USES+=		alias gmake
 
 pre-build:
 	${LN} -sf ${HUSKY_ROOTDIR}/huskybse/huskymak.cfg ${HUSKY_ROOTDIR}
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index d03054e2d5c1..00e4b3caa6fd 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tools to convert Xfig .fig files
 RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
-USES=		imake
+USES=		alias imake
 CFLAGS+=	-Wno-return-type
 USE_GHOSTSCRIPT_RUN=	yes
 USE_XORG=	xpm
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 9e8d73723fd5..21d96920825d 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -41,7 +41,7 @@ USE_GL=		yes
 USE_XORG=	x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	yes
-USES=		cmake:outsource execinfo gmake python shebangfix
+USES=		alias cmake:outsource execinfo gmake python shebangfix
 
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS="ON" \
 		-DVTK_USE_SYSTEM_PNG="ON" \
diff --git a/security/libkpass/Makefile b/security/libkpass/Makefile
index 1c133702c523..22e6785e002e 100644
--- a/security/libkpass/Makefile
+++ b/security/libkpass/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libnettle.so:${PORTSDIR}/security/nettle
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gettext gmake libtool
+USES=		alias gettext gmake libtool
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-Dbswap_32=bswap32 -Dbswap_16=bswap16 \
 		-I${LOCALBASE}/include
diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile
index f24f3cfbf10e..fb98611cbaf0 100644
--- a/security/opencryptoki/Makefile
+++ b/security/opencryptoki/Makefile
@@ -17,7 +17,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
 
-USES=		gmake libtool tar:bzip2
+USES=		alias gmake libtool tar:bzip2
 USE_LDCONFIG=	${PREFIX}/lib/opencryptoki
 USE_AUTOTOOLS=	libtoolize aclocal autoconf automake
 AUTOMAKE_ARGS=	-a -c -f
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index f368b4c8a0db..fd76ddab489e 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -18,6 +18,7 @@ COMMENT=	The portable version of OpenBSD's OpenSSH
 
 CONFLICTS?=		openssh-3.* ssh-1.* ssh2-3.*
 
+USES=			alias
 USE_AUTOTOOLS=		autoconf autoheader
 USE_OPENSSL=		yes
 GNU_CONFIGURE=		yes
diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index 2bad670f0f5a..5a0f54285130 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	Common Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		gmake iconv libtool pkgconfig
+USES=		alias gmake iconv libtool pkgconfig
 USE_OPENSSL=	YES
 USE_LDCONFIG=	YES
 USE_AUTOTOOLS= 	libtoolize aclocal autoconf automake