Convert USE_FUSE macros into USES feature.7-eol

While here trim headers
Convert some USE_GNOME= gnomehack -> USES= pathfix

50 files changed, 91 insertions, 198 deletions

diff --git a/Mk/Uses/fuse.mk b/Mk/Uses/fuse.mk
new file mode 100644
index 000000000000..3f58941fb884
--- /dev/null
+++ b/Mk/Uses/fuse.mk
@@ -0,0 +1,15 @@
+# $FreeBSD$
+#
+# handle dependency on the fuse port
+#
+# MAINTAINER: portmgr@FreeBSD.org
+#
+.if !defined(_INCLUDE_FUSE_MK)
+_INCLUDE_FUSE_MK=	yes
+
+LIB_DEPENDS+=	fuse:${PORTSDIR}/sysutils/fusefs-libs
+.if !exists(/sbin/mount_fusefs)
+RUN_DEPENDS+=	mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
+.endif
+
+.endif
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 7d8b8919fec7..9ca06919450b 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -408,9 +408,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				- Legal values are: gamin (default),fam
 #				  If set to an unknown value, the port is marked IGNORE.
 ##
-# USE_FUSE		- If set, make sure necessary components unavailable in base
-#				  are installed from ports.
-##
 # USE_AUTOTOOLS	- If set, this port uses various GNU autotools
 #				  (libtool, autoconf, autoheader, automake et al.)
 #				  See bsd.autotools.mk for more details.
@@ -1854,13 +1851,6 @@ IGNORE=		cannot be built with unknown FAM system: ${FAM_SYSTEM}
 .endif
 .endif # USE_FAM
 
-.if defined(USE_FUSE)
-LIB_DEPENDS+=	fuse:${PORTSDIR}/sysutils/fusefs-libs
-.if !exists(/sbin/mount_fusefs)
-RUN_DEPENDS+=	mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
-.endif
-.endif
-
 .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
 SUB_FILES+=	${USE_RC_SUBR}
 .endif
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index 914262751584..bab0245e4e93 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--with-text-scope
 .endif
 
 .if ${PORT_OPTIONS:MFUSE}
-USE_FUSE=	yes
+USES+=		fuse
 MAN1+=		uadefs.1
 PLIST_SUB+=	FUSE=""
 .else
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index e896cd18c30a..4d93e890610b 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	gvfs
-# Date created:		2007-11-06
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/gvfs/Makefile,v 1.70 2011/01/31 19:06:42 kwm Exp $
 #
@@ -40,7 +37,7 @@ OPTIONS=	FUSE "Enable fuse" off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FUSE)
-USE_FUSE=	yes
+USES+=		fuse
 PLIST_SUB+=	FUSE=""
 .else
 CONFIGURE_ARGS+=	--disable-fuse
diff --git a/devel/libewf/Makefile b/devel/libewf/Makefile
index 93e1435302be..28553112e4cb 100644
--- a/devel/libewf/Makefile
+++ b/devel/libewf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libewf
-# Date created:		31 May 2012
-# Whom:			MANTANI Nobutaka <nobutaka@FreeBSD.org>
-#
+# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libewf
 PORTVERSION=	20120813
@@ -18,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
 
-USE_FUSE=	yes
+USES=		fuse
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/libregf/Makefile b/devel/libregf/Makefile
index 8add73b45cad..79c50fdb7fdc 100644
--- a/devel/libregf/Makefile
+++ b/devel/libregf/Makefile
@@ -13,9 +13,8 @@ LICENSE=	LGPL3
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_FUSE=	yes
+USES=		fuse pathfix
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehack
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/libvshadow/Makefile b/devel/libvshadow/Makefile
index f1d8620470a6..badb4b877cbf 100644
--- a/devel/libvshadow/Makefile
+++ b/devel/libvshadow/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libvshadow
-# Date created:		31 May 2012
-# Whom:			MANTANI Nobutaka <nobutaka@FreeBSD.org>
-#
+# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libvshadow
 PORTVERSION=	20130113
@@ -17,9 +13,8 @@ COMMENT=	A library to support the Volume Service Snapshot (VSS) format
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_FUSE=	yes
+USES=		fuse pathfix
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehack
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/py-fusefs/Makefile b/devel/py-fusefs/Makefile
index bce6720114d1..8afe731abcb0 100644
--- a/devel/py-fusefs/Makefile
+++ b/devel/py-fusefs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	py-fusefs
-# Date created:		22 July 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fusefs
 DISTVERSION=	0.2.1
@@ -15,7 +11,7 @@ DISTNAME=	fuse-python-${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FUSE Python bindings
 
-USE_FUSE=	yes
+USES=		fuse
 USE_PYTHON=	yes
 USE_PKGCONFIG=	yes
 USE_PYDISTUTILS=easy_install
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 7acad9852c43..b3d683140b01 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -49,7 +49,7 @@ CONFLICTS=		open-vm-tools-nox11-[0-9]*
 .endif
 
 .if !defined(WITHOUT_FUSE)
-USE_FUSE=	yes
+USES=		fuse
 PLIST_SUB+=	FUSE=""
 .else
 PLIST_SUB+=	FUSE="@comment "
diff --git a/graphics/fusefs-gphotofs/Makefile b/graphics/fusefs-gphotofs/Makefile
index c9987a770acb..e97591ed7395 100644
--- a/graphics/fusefs-gphotofs/Makefile
+++ b/graphics/fusefs-gphotofs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gphotofs
-# Date created:				21 June 2006
-# Whom:					Pav Lucistnik <pav@FreeBSD.org>
-#
+# Created by: Pav Lucistnik <pav@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gphotofs
 PORTVERSION=	0.4.0
@@ -17,8 +13,8 @@ COMMENT=	Mount PTP camera as a file system
 
 LIB_DEPENDS=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 
+USES=		fuse
 USE_BZIP2=	yes
-USE_FUSE=	yes
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 
diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index d32fa502e0b0..e19ac0f8705f 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -75,7 +75,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 	${CONFIGURE_TARGET}
 
 .if ${PORT_OPTIONS:MFUSE}
-USE_FUSE=	yes
+USES+=		fuse
 PLIST_SUB+=	FUSE=""
 .else
 CONFIGURE_ARGS+=	--disable-fuse-client
diff --git a/security/truecrypt/Makefile b/security/truecrypt/Makefile
index 842f9d75ba17..a4e4aec09884 100644
--- a/security/truecrypt/Makefile
+++ b/security/truecrypt/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
 
 WRKSRC=		${WRKDIR}/truecrypt-${PORTVERSION}-source
 
-USE_FUSE=	yes
+USES=		fuse
 USE_GMAKE=	yes
 USE_ICONV=	yes
 RESTRICTED=	Downloading requires acceptance of license agreement
diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index e1531b9d9855..c5757822645e 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -1,10 +1,5 @@
-# Ports collection makefile for: afflib
-#
-# Date created: 	15/02/2008
-# Whom: 		Chris Calvey <chris@securityforensics.co.uk>
-#
+# Created by: Chris Calvey <chris@securityforensics.co.uk>
 # $FreeBSD$
-#
 
 PORTNAME=	afflib
 PORTVERSION=	3.7.1
@@ -23,10 +18,9 @@ LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 USE_ICONV=	yes
-USE_FUSE=	yes
+USES=		fuse pathfix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--enable-s3=yes --libdir=${PREFIX}
 CPPFLAGS+=	-DFUSE_USE_VERSION=26
diff --git a/sysutils/archivemount/Makefile b/sysutils/archivemount/Makefile
index b11471537929..1881cc5a1a4f 100644
--- a/sysutils/archivemount/Makefile
+++ b/sysutils/archivemount/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: archivemount
-# Date created: 2008-06-20
-# Whom: Evgeny Zhirnov <jirnov@gmail.com>
-#
+# Created by: Evgeny Zhirnov <jirnov@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	archivemount
 PORTVERSION=	0.6.1
@@ -19,7 +15,7 @@ MAN1=		archivemount.1
 GNU_CONFIGURE=	yes
 
 NO_INSTALL_MANPAGES=	yes
-USE_FUSE=	yes
+USES=		fuse
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PKGCONFIG=	yes
diff --git a/sysutils/avfs/Makefile b/sysutils/avfs/Makefile
index 7cd340dbc132..d1413bc68ef0 100644
--- a/sysutils/avfs/Makefile
+++ b/sysutils/avfs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	avfs
-# Date created:				2008-06-14
-# Whom:					Evgeny Zhirnov <jirnov@gmail.com>
-#
+# Created by: Evgeny Zhirnov <jirnov@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	avfs
 PORTVERSION=	0.9.9
@@ -22,7 +18,7 @@ NO_INSTALL_MANPAGES=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv
 
 GNU_CONFIGURE=	yes
-USE_FUSE=	yes
+USES=		fuse
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/djmount/Makefile b/sysutils/djmount/Makefile
index 5ec1bd30bead..8543e4919cc0 100644
--- a/sysutils/djmount/Makefile
+++ b/sysutils/djmount/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 
 PLIST_FILES=	bin/${PORTNAME}
 GNU_CONFIGURE=	yes
-USE_FUSE=	yes
+USES=		fuse
 USE_GNOME=	pkgconfig
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-fuse-prefix=${LOCALBASE} \
diff --git a/sysutils/fusefs-afuse/Makefile b/sysutils/fusefs-afuse/Makefile
index c3a648b4eb50..99927db1e7f0 100644
--- a/sysutils/fusefs-afuse/Makefile
+++ b/sysutils/fusefs-afuse/Makefile
@@ -1,8 +1,5 @@
-# New ports collection makefile for:	afuse
-# Date created: 			03 March 2009
-# Whom:					Alexander Logvinov <ports@logvinov.com>
+# Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
-#
 
 PORTNAME=	afuse
 PORTVERSION=	0.2
@@ -20,7 +17,7 @@ GNU_CONFIGURE=	yes
 PORTDOCS=	AUTHORS ChangeLog README
 PLIST_FILES=	bin/${PORTNAME}
 
-USE_FUSE=	yes
+USES=		fuse
 USE_PKGCONFIG=	yes
 
 MAN1=		afuse.1
diff --git a/sysutils/fusefs-chironfs/Makefile b/sysutils/fusefs-chironfs/Makefile
index d1deb7660a07..d7d0411c71d7 100644
--- a/sysutils/fusefs-chironfs/Makefile
+++ b/sysutils/fusefs-chironfs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-chironfs
-# Date created:				2008-04-06
-# Whom:					Yen-Ming Lee <leeym@FreeBSD.org>
-#
+# Created by: Yen-Ming Lee <leeym@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	chironfs
 PORTVERSION=	1.1.1
@@ -18,7 +14,7 @@ COMMENT=	A FUSE based filesystem with replication at the filesystem level
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_FUSE=	yes
+USES=		fuse
 
 PLIST_FILES=	bin/chironfs bin/chirctl
 PORTDOCS=	*
diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile
index 2c7a6ccdec31..1191bfe6e1e9 100644
--- a/sysutils/fusefs-cryptofs/Makefile
+++ b/sysutils/fusefs-cryptofs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-cryptofs
-# Date created:				2008-05-21
-# Whom:					Yen-Ming Lee <leeym@FreeBSD.org>
-#
+# Created by: Yen-Ming Lee <leeym@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cryptofs
 PORTVERSION=	0.6.0
@@ -20,7 +16,7 @@ LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_FUSE=	yes
+USES=		fuse
 
 PLIST_FILES=	bin/cryptofs
 
diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile
index 29f4f2279cd3..d401891ea389 100644
--- a/sysutils/fusefs-curlftpfs/Makefile
+++ b/sysutils/fusefs-curlftpfs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-curlftpfs
-# Date created:		25 May 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	curlftpfs
 PORTVERSION=	0.9.2
@@ -18,7 +14,7 @@ COMMENT=	Mount remote ftp directories
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-USE_FUSE=	yes
+USES=		fuse
 USE_GNOME=	glib20
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/curlftpfs
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 3b2e44ffa29a..3fc1675e5252 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--with-boost-serialization=boost_serialization \
 		--with-boost-filesystem=boost_filesystem
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_FUSE=	yes
+USES=		fuse
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/sysutils/fusefs-exfat/Makefile b/sysutils/fusefs-exfat/Makefile
index a2556d18ca7d..4746da3b8fd1 100644
--- a/sysutils/fusefs-exfat/Makefile
+++ b/sysutils/fusefs-exfat/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	ublio:${PORTSDIR}/devel/libublio
 
-USE_FUSE=	yes
+USES=		fuse
 USE_ICONV=	yes
 USE_SCONS=	yes
 
diff --git a/sysutils/fusefs-ext4fuse/Makefile b/sysutils/fusefs-ext4fuse/Makefile
index fcaaacecc0f5..e16107098dbd 100644
--- a/sysutils/fusefs-ext4fuse/Makefile
+++ b/sysutils/fusefs-ext4fuse/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 
-USE_FUSE=	yes
+USES=		fuse
 USE_GMAKE=	yes
 USE_PKGCONFIG=	build
 USE_GITHUB=	yes
diff --git a/sysutils/fusefs-funionfs/Makefile b/sysutils/fusefs-funionfs/Makefile
index a023cc52f045..d450dbb34e33 100644
--- a/sysutils/fusefs-funionfs/Makefile
+++ b/sysutils/fusefs-funionfs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-funionfs
-# Date created:		2006-07-16
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	funionfs
 PORTVERSION=	0.4.3
@@ -17,7 +13,7 @@ COMMENT=	Union filesystem for the FUSE driver
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-USE_FUSE=	yes
+USES=		fuse
 
 MAN1=		funionfs.1
 PLIST_FILES=	bin/funionfs
diff --git a/sysutils/fusefs-fur/Makefile b/sysutils/fusefs-fur/Makefile
index 9bf9eb69f48d..87704311dbbe 100644
--- a/sysutils/fusefs-fur/Makefile
+++ b/sysutils/fusefs-fur/Makefile
@@ -20,7 +20,7 @@ VCHMOD_DESC=	Fake hook for chmod that just returns 0
 MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
-USE_FUSE=	yes
+USES=		fuse
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PKGCONFIG=	build
diff --git a/sysutils/fusefs-fusexmp_fh/Makefile b/sysutils/fusefs-fusexmp_fh/Makefile
index b018cebc40b9..0ecdb8427ccd 100644
--- a/sysutils/fusefs-fusexmp_fh/Makefile
+++ b/sysutils/fusefs-fusexmp_fh/Makefile
@@ -1,8 +1,5 @@
-# New ports collection makefile for:    fusefs-fusexmp_fh
-# Date created:         22 August 2010
-# Whom:                 buganini@gmail.com
+# Created by: buganini@gmail.com
 # $FreeBSD$
-#
 
 PORTNAME=	fusexmp_fh
 PORTVERSION=	2.7.4
@@ -17,8 +14,7 @@ COMMENT=	Dummy driver from fusefs-libs example
 
 
 USE_AUTOTOOLS=	libtool
-USE_FUSE=	yes
-USE_GNOME=	pkgconfig
+USES=		fuse pathfix
 USE_LDCONFIG=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/fusefs-gnome-vfs/Makefile b/sysutils/fusefs-gnome-vfs/Makefile
index 28857a595413..addcb58179b0 100644
--- a/sysutils/fusefs-gnome-vfs/Makefile
+++ b/sysutils/fusefs-gnome-vfs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-gnome-vfs
-# Date created:		2006-12-23
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fusefs-gnome-vfs
 PORTVERSION=	0.1
@@ -17,7 +13,7 @@ COMMENT=	Interface between FUSE and the Gnome VFS 2.0
 
 RPORTNAME=	gnome-vfs-fuse
 WRKSRC=		${WRKDIR}/${RPORTNAME}
-USE_FUSE=	yes
+USES=		fuse
 USE_GNOME=	gnomevfs2
 USE_GMAKE=	yes
 USE_PKGCONFIG=	yes
diff --git a/sysutils/fusefs-gstfs/Makefile b/sysutils/fusefs-gstfs/Makefile
index 7e821f70de97..2145ea9128b5 100644
--- a/sysutils/fusefs-gstfs/Makefile
+++ b/sysutils/fusefs-gstfs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-gstfs
-# Date created:		2008-12-26
-# Whom:			Dennis Herrmann <adox@mcx2.org>
-#
+# Created by: Dennis Herrmann <adox@mcx2.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gstfs
 PORTVERSION=	0.1
@@ -15,7 +11,7 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	On-demand, transcoding filesystem (using GStreamer pipeline)
 
-USE_FUSE=	yes
+USES=		fuse
 USE_GNOME=	pkgconfig
 USE_GSTREAMER=	yes
 
diff --git a/sysutils/fusefs-gunzip/Makefile b/sysutils/fusefs-gunzip/Makefile
index 907388715828..e4c28789e902 100644
--- a/sysutils/fusefs-gunzip/Makefile
+++ b/sysutils/fusefs-gunzip/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-gunzip
-# Date created:				2008-06-16
-# Whom:					Evgeny Zhirnov <jirnov@gmail.com>
-#
+# Created by: Evgeny Zhirnov <jirnov@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	fuse.gunzip
 PORTVERSION=	20070320
@@ -14,7 +10,7 @@ MAINTAINER=	jirnov@gmail.com
 COMMENT=	Fuse.gunzip provides transparent decompression of gzip compressed files
 
 WRKSRC=		${WRKDIR}/fuse.gunzip
-USE_FUSE=	yes
+USES=		fuse
 
 PLIST_FILES=	bin/fuse.gunzip
 
diff --git a/sysutils/fusefs-httpfs/Makefile b/sysutils/fusefs-httpfs/Makefile
index 23ece14aa761..aecd5db7e4ff 100644
--- a/sysutils/fusefs-httpfs/Makefile
+++ b/sysutils/fusefs-httpfs/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Fuse-based http filesystem
 WRKSRC=		${WRKDIR}/${PORTNAME}2-${VERSION}
 
 VERSION=	0.1.5
-USE_FUSE=	yes
+USES=		fuse
 USE_PKGCONFIG=	yes
 USE_GMAKE=	yes
 CFLAGS+=	-D__BSD_VISIBLE
diff --git a/sysutils/fusefs-ifuse/Makefile b/sysutils/fusefs-ifuse/Makefile
index 31e954e30a8c..447a7b2cc35e 100644
--- a/sysutils/fusefs-ifuse/Makefile
+++ b/sysutils/fusefs-ifuse/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    fusefs-ifuse
-# Date created:                         09 October 2011
-# Whom:                                 Gabor Zahemszky
-#
+# Created by: Gabor Zahemszky
 # $FreeBSD$
-#
 
 PORTNAME=	ifuse
 PORTVERSION=	1.1.1
@@ -23,7 +19,7 @@ RUN_DEPENDS=	usbmuxd:${PORTSDIR}/comms/usbmuxd
 
 SUB_FILES=	pkg-message
 USE_BZIP2=	yes
-USE_FUSE=	yes
+USES=		fuse
 USE_GNOME=	glib20 pkgconfig
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/fusefs-mhddfs/Makefile b/sysutils/fusefs-mhddfs/Makefile
index 56643ff9156c..1e7eb9703c07 100644
--- a/sysutils/fusefs-mhddfs/Makefile
+++ b/sysutils/fusefs-mhddfs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-mhddfs
-# Date created:		2009-06-25
-# Whom:			Oleg Alexeenkov <proler@gmail.com>
-#
+# Created by: Oleg Alexeenkov <proler@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	mhddfs
 PORTVERSION=	0.1.37
@@ -15,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	proler@gmail.com
 COMMENT=	Multi HDD [FUSE] File System
 
-USE_FUSE=	yes
+USES=		fuse
 USE_GMAKE=	yes
 USE_PKGCONFIG=	build
 MAKE_ARGS=	WITHOUT_XATTR=1
diff --git a/sysutils/fusefs-mp3fs/Makefile b/sysutils/fusefs-mp3fs/Makefile
index ff67c3afce85..ab6cf48b1aca 100644
--- a/sysutils/fusefs-mp3fs/Makefile
+++ b/sysutils/fusefs-mp3fs/Makefile
@@ -18,7 +18,7 @@ FETCH_CMD=	fetch -Fpr
 
 CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-USE_FUSE=	yes
+USES=		fuse
 MAN1=		mp3fs.1
 PLIST_FILES=	bin/mp3fs
 
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index 72944f25de19..e84fc4d3082f 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -16,9 +16,9 @@ LICENSE=	GPLv2
 
 CONFLICTS_BUILD=	bonobo-1.*
 CONFLICTS_INSTALL=	ntfsprogs-*
+USES=		fuse
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_FUSE=	yes
 USE_ICONV=	yes
 USE_PKGCONFIG=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} --disable-mount-helper \
diff --git a/sysutils/fusefs-pod/Makefile b/sysutils/fusefs-pod/Makefile
index 216f13f97a48..87830520f847 100644
--- a/sysutils/fusefs-pod/Makefile
+++ b/sysutils/fusefs-pod/Makefile
@@ -1,8 +1,5 @@
-# New ports collection makefile for:	fusefs-pod
-# Date created: 			22 Aug 2007
-# Whom:					Max Khon
+# Created by: Max Khon
 # $FreeBSD$
-#
 
 PORTNAME=	pod
 PORTVERSION=	0.5.2
@@ -19,7 +16,7 @@ LIB_DEPENDS=	gpod.7:${PORTSDIR}/audio/libgpod\
 		tag.1:${PORTSDIR}/audio/taglib
 
 USE_BZIP2=	yes
-USE_FUSE=	yes
+USES=		fuse
 GNU_CONFIGURE=	yes
 MAN1=		fusepod.1
 PLIST_FILES=	bin/fusepod
diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile
index 50c3c112b5b9..a5a99d996e70 100644
--- a/sysutils/fusefs-rar2fs/Makefile
+++ b/sysutils/fusefs-rar2fs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for: rar2fs
-# Date created:        30 May 2011
-# Whom:                Joris Vandalon
-#
+# Created by: Joris Vandalon
 # $FreeBSD$
-#
 
 PORTNAME=	rar2fs
 PORTVERSION=	1.15.1
@@ -27,7 +23,7 @@ CONFIGURE_ARGS=	--with-fuse-lib=${LOCALBASE}/lib \
 
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		rar2fs.1
-USE_FUSE=	yes
+USES=		fuse
 USE_GMAKE=	yes
 
 do-install:
diff --git a/sysutils/fusefs-s3fs/Makefile b/sysutils/fusefs-s3fs/Makefile
index 121190ad4cae..391ba84299a9 100644
--- a/sysutils/fusefs-s3fs/Makefile
+++ b/sysutils/fusefs-s3fs/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/s3fs
-USE_FUSE=	yes
+USES=		fuse
 
 MAN1=		s3fs.1
 
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile
index 691651795ff9..b7b3975b2c12 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/sysutils/fusefs-smbnetfs/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 DOCSDIR+=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
 USE_BZIP2=	yes
-USE_FUSE=	yes
+USES=		fuse
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/fusefs-sqlfs/Makefile b/sysutils/fusefs-sqlfs/Makefile
index 9a69e72872db..1bf3e9e7aba4 100644
--- a/sysutils/fusefs-sqlfs/Makefile
+++ b/sysutils/fusefs-sqlfs/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	fusefs-sqlfs
-# Date created:		2006-08-19
-# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
-#
+# Created by: Stanislav Sedov <ssedov@mbsd.msk.ru>
 # $MBSDlabs$
 # $FreeBSD$
-#
 
 PORTNAME=	sqlfs
 PORTVERSION=	1.1
@@ -18,7 +14,7 @@ DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SQLite backed FUSE file system
 
-USE_FUSE=	yes
+USES=		fuse
 USE_SQLITE=	3
 
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/fusefs-sshfs/Makefile b/sysutils/fusefs-sshfs/Makefile
index d8bdfe446e2d..1bf3b51af337 100644
--- a/sysutils/fusefs-sshfs/Makefile
+++ b/sysutils/fusefs-sshfs/Makefile
@@ -1,8 +1,5 @@
-# New ports collection makefile for:	fusefs-sshfs
-# Date created: 			01 October 2005
-# Whom:					Anish Mistry
+# Created by: Anish Mistry
 # $FreeBSD$
-#
 
 PORTNAME=	sshfs
 PORTVERSION=	2.4
@@ -17,7 +14,7 @@ COMMENT=	Mount remote directories over ssh
 KMODDIR?=	${LOCALBASE}/modules
 
 GNU_CONFIGURE=	yes
-USE_FUSE=	yes
+USES=		fuse
 USE_GNOME=	glib20
 
 MAN1=	sshfs.1
diff --git a/sysutils/fusefs-unionfs/Makefile b/sysutils/fusefs-unionfs/Makefile
index 06686a79f89d..c675f9583e91 100644
--- a/sysutils/fusefs-unionfs/Makefile
+++ b/sysutils/fusefs-unionfs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-unionfs
-# Date created:		2006-07-16
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	unionfs
 PORTVERSION=	0.24
@@ -17,7 +13,7 @@ COMMENT=	FUSE based implementation of the well-known unionfs
 
 PLIST_FILES=	bin/unionfs
 
-USE_FUSE=	yes
+USES=		fuse
 USE_BZIP2=	yes
 
 do-build:
diff --git a/sysutils/fusefs-wdfs/Makefile b/sysutils/fusefs-wdfs/Makefile
index 2ad2fc032e24..05298dfcb539 100644
--- a/sysutils/fusefs-wdfs/Makefile
+++ b/sysutils/fusefs-wdfs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-wdfs
-# Date created:				13 June 2006
-# Whom:					Gyorgy Teubel <tgyurci@freemail.hu>
-#
+# Created by: Gyorgy Teubel <tgyurci@freemail.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	wdfs
 PORTVERSION=	1.4.2
@@ -18,7 +14,7 @@ COMMENT=	Mount remote WedDAV directories with Fuse
 LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29
 
 GNU_CONFIGURE=	yes
-USE_FUSE=	yes
+USES=		fuse
 USE_GNOME=	glib20
 
 PLIST_FILES=	bin/wdfs
diff --git a/sysutils/fusefs-wikipediafs/Makefile b/sysutils/fusefs-wikipediafs/Makefile
index 9cfbcb7c65e2..258d9c9048e1 100644
--- a/sysutils/fusefs-wikipediafs/Makefile
+++ b/sysutils/fusefs-wikipediafs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fusefs-wikipediafs
-# Date created:		10 August 2007
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	wikipediafs
 PORTVERSION=	0.4
@@ -16,7 +12,7 @@ COMMENT=	Mount mediawikis
 
 RUN_DEPENDS=	py*-fusefs>=0.2:${PORTSDIR}/devel/py-fusefs
 
-USE_FUSE=	yes
+USES=		fuse
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PORTDOCS=	AUTHORS ChangeLog HACKING NEWS README TODO
diff --git a/sysutils/fusefs-zip/Makefile b/sysutils/fusefs-zip/Makefile
index b383c37c6812..8771ed110a6e 100644
--- a/sysutils/fusefs-zip/Makefile
+++ b/sysutils/fusefs-zip/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	zip:${PORTSDIR}/archivers/libzip
 
 USE_GMAKE=	yes
 USE_PKGCONFIG=	build
-USE_FUSE=	yes
+USES=		fuse
 
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		${PORTNAME}.1
diff --git a/sysutils/moosefs-client/Makefile b/sysutils/moosefs-client/Makefile
index d0456e7cbe52..246ca464a26c 100644
--- a/sysutils/moosefs-client/Makefile
+++ b/sysutils/moosefs-client/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    moosefs-client
-# Date created:         1 April 2010
-# Whom:                 Chifeng Qu <chifeng@gmail.com>
-#
+# Created by: Chifeng Qu <chifeng@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	moosefs
 PORTREVISION=	#
@@ -16,7 +12,7 @@ COMMENT=	Moosefs client tools
 
 DISTINFO_FILE=	${.CURDIR}/../moosefs-master/distinfo
 
-USE_FUSE=	yes
+USES=		fuse
 USE_PKGCONFIG=	yes
 
 MAN1=		mfstools.1 mfscheckfile.1 mfsdirinfo.1 mfsfileinfo.1 \
diff --git a/sysutils/mtpfs/Makefile b/sysutils/mtpfs/Makefile
index 429bfad44b1e..cf9bab847b27 100644
--- a/sysutils/mtpfs/Makefile
+++ b/sysutils/mtpfs/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	mtp:${PORTSDIR}/audio/libmtp \
 		id3tag:${PORTSDIR}/audio/libid3tag \
 		mad:${PORTSDIR}/audio/libmad
 
-USE_FUSE=	yes
+USES=		fuse
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/mtpfs
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index dcbd59f687b6..e3569d984513 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -15,7 +15,7 @@ CONFLICTS_INSTALL=	fusefs-ntfs-*
 
 USE_PKGCONFIG=	build
 USE_BZIP2=	yes
-USE_FUSE=	yes
+USES=		fuse
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/p5-Fuse/Makefile b/sysutils/p5-Fuse/Makefile
index baa11dfaa252..fad6a94d8d23 100644
--- a/sysutils/p5-Fuse/Makefile
+++ b/sysutils/p5-Fuse/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Write filesystems in Perl using FUSE
 PERL_CONFIGURE=	yes
 PORTSCOUT=	skipv:0.09_4
 
-USE_FUSE=	yes
+USES=		fuse
 USE_PKGCONFIG=	build
 
 MAN3=		Fuse.3
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index 927111de2997..0317d6163f1b 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   udfclient
-# Date created:        3 January 2005
-# Whom:                Andriy Gapon <avg@icyb.net.ua>
-#
+# Created by: Andriy Gapon <avg@icyb.net.ua>
 # $FreeBSD$
-#
 
 PORTNAME=	udfclient
 PORTVERSION=	0.7.5
@@ -44,7 +40,7 @@ MASTER_SITES+=	http://www.icyb.net.ua/~avg/distfiles/:fuse
 DISTFILES+=	${UDFCLIENTFS_NAME}-${UDFCLIENTFS_VERSION}.tgz:fuse
 EXTRA_PATCHES+=	${UDFCLIENTFS_DIR}/${UDFCLIENTFS_NAME}.patch
 
-USE_FUSE=	yes
+USES+=		fuse
 
 PLIST_FILES+=	bin/${UDFCLIENTFS_NAME}
 .endif
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index a9cfad9ee7b9..ef708ead2f00 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -144,7 +144,7 @@ PLIST_SUB+=	DBUS="@comment "
 
 .if ${PORT_OPTIONS:MFUSE}
 CONFIGURE_ARGS+=	--enable-fuse
-USE_FUSE=		yes
+USES+=			fuse
 PLIST_SUB+=		FUSE=""
 .else
 CONFIGURE_ARGS+=	--disable-fuse